From ffe3d5de11f67cc90da6c407bf52bbd2f3f25de9 Mon Sep 17 00:00:00 2001 From: Winnie0408 <1196903869@qq.com> Date: Tue, 23 Jan 2024 20:36:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=94=AF=E6=8C=81Markdown=E6=B8=B2=E6=9F=93?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added support for Markdown rendering in the update log. --- app/build.gradle.kts | 3 +++ .../com/hwinzniej/musichelper/MainActivity.kt | 15 ++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9c412ee..c5da9d4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -117,6 +117,9 @@ dependencies { //OkHttp3 implementation("com.squareup.okhttp3:okhttp:4.12.0") + //Markdown渲染器 + implementation("com.github.jeziellago:compose-markdown:0.3.7") //TODO 使用高于此版本会出现问题,已提Issue。 + //Jsoup-可注释 // implementation("org.jsoup:jsoup:1.17.2") diff --git a/app/src/main/java/com/hwinzniej/musichelper/MainActivity.kt b/app/src/main/java/com/hwinzniej/musichelper/MainActivity.kt index 6b557eb..02fecfb 100644 --- a/app/src/main/java/com/hwinzniej/musichelper/MainActivity.kt +++ b/app/src/main/java/com/hwinzniej/musichelper/MainActivity.kt @@ -27,7 +27,6 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.pager.HorizontalPager import androidx.compose.foundation.pager.rememberPagerState import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.Text import androidx.compose.material3.dynamicDarkColorScheme import androidx.compose.material3.dynamicLightColorScheme import androidx.compose.runtime.Composable @@ -47,7 +46,9 @@ import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import androidx.core.view.WindowCompat import androidx.datastore.core.DataStore import androidx.datastore.preferences.core.Preferences @@ -77,6 +78,7 @@ import com.moriafly.salt.ui.UnstableSaltApi import com.moriafly.salt.ui.darkSaltColors import com.moriafly.salt.ui.lightSaltColors import com.moriafly.salt.ui.saltColorsByColorScheme +import dev.jeziellago.compose.markdowntext.MarkdownText import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch @@ -323,10 +325,13 @@ private fun Pages( .clip(RoundedCornerShape(10.dp)) ) { item { - Text( - modifier = Modifier.padding(top = 4.dp), - text = latestDescription.value, - color = SaltTheme.colors.text + MarkdownText( + modifier = Modifier.padding(vertical = 8.dp), + markdown = latestDescription.value, + style = TextStyle( + color = SaltTheme.colors.text, + fontSize = 14.sp + ) ) } }