chore: :lettertrees is now :markdown

This commit is contained in:
Infi 2023-01-25 23:16:39 +01:00
parent 69c88d1a30
commit a80eb22f99
19 changed files with 42 additions and 22 deletions

View File

@ -8,11 +8,12 @@
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="$PROJECT_DIR$/../../../../Gradle" />
<option name="gradleJvm" value="Embedded JDK" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/lettertrees" />
<option value="$PROJECT_DIR$/markdown" />
</set>
</option>
</GradleProjectSettings>

View File

@ -5,10 +5,16 @@
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
@ -21,6 +27,9 @@
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />

View File

@ -10,7 +10,7 @@
</map>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

View File

@ -6,10 +6,10 @@ This is the official Android app for the [Revolt](https://revolt.chat) chat plat
The codebase includes the app itself, as well as an internal library for interacting with the Revolt
API.
| Module | Description |
|----------------|-----------------------------------------|
| `:app` | The main app module. |
| `:lettertrees` | A library for parsing text into an AST. |
| Module | Package | Description |
|-------------|------------------------|----------------------|
| `:app` | `chat.revolt` | The main app module. |
| `:markdown` | `chat.revolt.markdown` | Markdown library. |
The API library is part of the `app` module, and is not intended to be used as a standalone library,
as it makes liberal use of Android-specific APIs for reactivity.

View File

@ -105,8 +105,8 @@ dependencies {
implementation "androidx.datastore:datastore-preferences:1.1.0-alpha01"
implementation "androidx.datastore:datastore:1.1.0-alpha01"
// Lettertrees
implementation project(':lettertrees')
// Markdown
implementation project(':markdown')
}
kapt {

View File

@ -25,7 +25,7 @@ import chat.revolt.api.RevoltAPI
import chat.revolt.api.internals.ULID
import chat.revolt.api.schemas.AutumnResource
import chat.revolt.components.generic.RemoteImage
import chat.revolt.lettertrees.Renderer
import chat.revolt.markdown.Renderer
import chat.revolt.api.schemas.Message as MessageSchema
fun viewAttachmentInBrowser(ctx: android.content.Context, attachment: AutumnResource) {

View File

@ -487,7 +487,17 @@ fun ChannelScreen(
}
}
androidx.compose.animation.AnimatedVisibility(!isScrolledToBottom.value) {
androidx.compose.animation.AnimatedVisibility(
!isScrolledToBottom.value,
enter = slideInHorizontally(
animationSpec = RevoltTweenInt,
initialOffsetX = { -it },
) + fadeIn(animationSpec = RevoltTweenFloat),
exit = slideOutHorizontally(
animationSpec = RevoltTweenInt,
targetOffsetX = { -it },
) + fadeOut(animationSpec = RevoltTweenFloat)
) {
ExtendedFloatingActionButton(
modifier = Modifier
.align(Alignment.BottomEnd)
@ -506,8 +516,8 @@ fun ChannelScreen(
lazyListState.animateScrollToItem(viewModel.renderableMessages.size)
}
},
contentColor = MaterialTheme.colorScheme.onSecondary,
containerColor = MaterialTheme.colorScheme.secondary
contentColor = MaterialTheme.colorScheme.onPrimary,
containerColor = MaterialTheme.colorScheme.primary
)
}
}

View File

@ -1,4 +0,0 @@
package chat.revolt.lettertrees.parser
class Parser {
}

View File

@ -4,7 +4,7 @@ plugins {
}
android {
namespace 'chat.revolt.lettertrees'
namespace 'chat.revolt.markdown'
compileSdk 33
defaultConfig {

View File

@ -1,4 +1,4 @@
package chat.revolt.lettertrees
package chat.revolt.markdown
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.SpanStyle

View File

@ -1,4 +1,4 @@
package chat.revolt.lettertrees.ast
package chat.revolt.markdown.ast
/*
* SPECS:

View File

@ -1,4 +1,4 @@
package chat.revolt.lettertrees.ast
package chat.revolt.markdown.ast
/*
* SPECS:

View File

@ -0,0 +1,4 @@
package chat.revolt.markdown.parser
class Parser {
}

View File

@ -1,4 +1,4 @@
package chat.revolt.lettertrees
package chat.revolt.markdown
import org.junit.Test

View File

@ -14,4 +14,4 @@ dependencyResolutionManagement {
}
rootProject.name = "Revolt"
include ':app'
include ':lettertrees'
include ':markdown'