From 5cc0315bfbdf89903c9d99c3d0a4426bc4102078 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 19 Jun 2022 17:45:25 +0530 Subject: [PATCH] common: switch to richtext-ui-material3 --- common/build.gradle.kts | 2 +- .../kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt | 4 ++-- gradle/libs.versions.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/build.gradle.kts b/common/build.gradle.kts index b9e82935..0fc0502d 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -37,7 +37,7 @@ kotlin { api(libs.napier) implementation(libs.kotlin.coroutines.core) implementation(libs.compose.richtext.markdown) - implementation(libs.compose.richtext.material) + implementation(libs.compose.richtext.material3) implementation(libs.compose.richtext.ui) } kotlin.srcDir("src/gen/kotlin/") diff --git a/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt b/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt index 90c25fe6..a7f2c002 100644 --- a/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt +++ b/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt @@ -31,7 +31,7 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import com.halilibo.richtext.markdown.Markdown import com.halilibo.richtext.ui.RichTextScope -import com.halilibo.richtext.ui.material.MaterialRichText +import com.halilibo.richtext.ui.material3.Material3RichText import dev.msfjarvis.claw.common.posts.PostActions import dev.msfjarvis.claw.common.posts.PostTitle import dev.msfjarvis.claw.common.posts.Submitter @@ -49,7 +49,7 @@ fun ThemedRichText( LocalTextStyle provides MaterialTheme.typography.bodyLarge, LocalContentColor provides MaterialTheme.colorScheme.onBackground, ) { - MaterialRichText(modifier) { content() } + Material3RichText(modifier) { content() } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c59daac0..9c7383a8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -37,7 +37,7 @@ build-spotless = "com.diffplug.spotless:spotless-plugin-gradle:6.7.2" coil = { module = "io.coil-kt:coil", version.ref = "coil" } coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" } compose-richtext-markdown = { module = "com.halilibo.compose-richtext:richtext-commonmark", version.ref = "richtext" } -compose-richtext-material = { module = "com.halilibo.compose-richtext:richtext-ui-material", version.ref = "richtext" } +compose-richtext-material3 = { module = "com.halilibo.compose-richtext:richtext-ui-material3", version.ref = "richtext" } compose-richtext-ui = { module = "com.halilibo.compose-richtext:richtext-ui", version.ref = "richtext" } copydown = "io.github.furstenheim:copy_down:1.0" dagger-hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "dagger" }