diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsAboutLicence.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsAboutLicence.kt index 6627f4c..222f504 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsAboutLicence.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsAboutLicence.kt @@ -7,17 +7,12 @@ import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable -import androidx.compose.runtime.produceState import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import cn.super12138.todo.R import cn.super12138.todo.ui.components.LargeTopAppBarScaffold import cn.super12138.todo.ui.pages.settings.components.licence.LicenceList -import com.mikepenz.aboutlibraries.Libs -import com.mikepenz.aboutlibraries.util.withContext -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.withContext +import com.mikepenz.aboutlibraries.ui.compose.android.produceLibraries @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -32,13 +27,7 @@ fun SettingsAboutLicence( onBack = onNavigateUp, modifier = modifier ) { innerPadding -> - val context = LocalContext.current - - val libraries = produceState(null) { - value = withContext(Dispatchers.IO) { - Libs.Builder().withContext(context).build() - } - } + val libraries by produceLibraries(R.raw.aboutlibraries) Column( modifier = Modifier @@ -47,7 +36,7 @@ fun SettingsAboutLicence( ) { val listState = rememberLazyListState() LicenceList( - libraries = libraries.value, + libraries = libraries, state = listState ) } diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/licence/LicenceItem.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/licence/LicenceItem.kt index d699c21..52c5442 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/licence/LicenceItem.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/licence/LicenceItem.kt @@ -1,6 +1,5 @@ package cn.super12138.todo.ui.pages.settings.components.licence -import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -45,7 +44,6 @@ fun LicenceItem( Column( modifier = modifier .fillMaxWidth() - .background(colors.backgroundColor) .clip(shape) .clickable { onClick.invoke() } .padding(libraryPadding.contentPadding) @@ -60,7 +58,6 @@ fun LicenceItem( .padding(padding.namePadding) .weight(1f), style = typography.titleLarge, - color = colors.contentColor, maxLines = 1, overflow = TextOverflow.Ellipsis ) @@ -70,7 +67,6 @@ fun LicenceItem( version, modifier = Modifier.padding(padding.versionPadding.contentPadding), style = typography.bodyMedium, - color = colors.contentColor, textAlign = TextAlign.Center ) } @@ -79,8 +75,7 @@ fun LicenceItem( if (showAuthor && author.isNotBlank()) { Text( text = author, - style = typography.bodyMedium, - color = colors.contentColor + style = typography.bodyMedium ) } if (showLicenseBadges && library.licenses.isNotEmpty()) {