From 47abaa12cc92f8777409db4e8950cb6a97ac6f52 Mon Sep 17 00:00:00 2001 From: Super12138 <70494801+Super12138@users.noreply.github.com> Date: Sat, 31 May 2025 17:55:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=20API=20=E4=B8=8B=E7=9A=84?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/licence/LicenceItem.kt | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) 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 18b6605..edd9c20 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 @@ -9,7 +9,7 @@ import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material3.Badge +import androidx.compose.material3.LocalTextStyle import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.Typography @@ -24,6 +24,7 @@ import com.mikepenz.aboutlibraries.entity.Library import com.mikepenz.aboutlibraries.ui.compose.LibraryColors import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults import com.mikepenz.aboutlibraries.ui.compose.LibraryPadding +import com.mikepenz.aboutlibraries.ui.compose.m3.component.LibraryChip import com.mikepenz.aboutlibraries.ui.compose.m3.libraryColors import com.mikepenz.aboutlibraries.ui.compose.util.author @@ -68,7 +69,7 @@ fun LicenceItem( if (version != null && showVersion) { Text( version, - modifier = Modifier.padding(padding.versionPadding), + modifier = Modifier.padding(padding.versionPadding.contentPadding), style = typography.bodyMedium, color = colors.contentColor, textAlign = TextAlign.Center @@ -86,14 +87,20 @@ fun LicenceItem( if (showLicenseBadges && library.licenses.isNotEmpty()) { FlowRow { library.licenses.forEach { - Badge( - modifier = Modifier.padding(padding.badgePadding), - contentColor = colors.badgeContentColor, - containerColor = colors.badgeBackgroundColor + LibraryChip( + modifier = Modifier.padding(padding.licensePadding.containerPadding), + minHeight = LibraryDefaults.libraryDimensions().chipMinHeight, + containerColor = colors.licenseChipColors.containerColor, + contentColor = colors.licenseChipColors.contentColor, + shape = LibraryDefaults.libraryShapes().chipShape, ) { Text( - modifier = Modifier.padding(padding.badgeContentPadding), - text = it.name + modifier = Modifier.padding(padding.licensePadding.contentPadding), + maxLines = 1, + text = it.name, + style = MaterialTheme.typography.labelSmall, + textAlign = TextAlign.Center, + overflow = LibraryDefaults.libraryTextStyles().defaultOverflow, ) } }