fix: 新 API 下的参数错误
This commit is contained in:
parent
bcdb5f88f5
commit
47abaa12cc
1 changed files with 15 additions and 8 deletions
|
|
@ -9,7 +9,7 @@ import androidx.compose.foundation.layout.FlowRow
|
||||||
import androidx.compose.foundation.layout.Row
|
import androidx.compose.foundation.layout.Row
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.padding
|
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.MaterialTheme
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.material3.Typography
|
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.LibraryColors
|
||||||
import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults
|
import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults
|
||||||
import com.mikepenz.aboutlibraries.ui.compose.LibraryPadding
|
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.m3.libraryColors
|
||||||
import com.mikepenz.aboutlibraries.ui.compose.util.author
|
import com.mikepenz.aboutlibraries.ui.compose.util.author
|
||||||
|
|
||||||
|
|
@ -68,7 +69,7 @@ fun LicenceItem(
|
||||||
if (version != null && showVersion) {
|
if (version != null && showVersion) {
|
||||||
Text(
|
Text(
|
||||||
version,
|
version,
|
||||||
modifier = Modifier.padding(padding.versionPadding),
|
modifier = Modifier.padding(padding.versionPadding.contentPadding),
|
||||||
style = typography.bodyMedium,
|
style = typography.bodyMedium,
|
||||||
color = colors.contentColor,
|
color = colors.contentColor,
|
||||||
textAlign = TextAlign.Center
|
textAlign = TextAlign.Center
|
||||||
|
|
@ -86,14 +87,20 @@ fun LicenceItem(
|
||||||
if (showLicenseBadges && library.licenses.isNotEmpty()) {
|
if (showLicenseBadges && library.licenses.isNotEmpty()) {
|
||||||
FlowRow {
|
FlowRow {
|
||||||
library.licenses.forEach {
|
library.licenses.forEach {
|
||||||
Badge(
|
LibraryChip(
|
||||||
modifier = Modifier.padding(padding.badgePadding),
|
modifier = Modifier.padding(padding.licensePadding.containerPadding),
|
||||||
contentColor = colors.badgeContentColor,
|
minHeight = LibraryDefaults.libraryDimensions().chipMinHeight,
|
||||||
containerColor = colors.badgeBackgroundColor
|
containerColor = colors.licenseChipColors.containerColor,
|
||||||
|
contentColor = colors.licenseChipColors.contentColor,
|
||||||
|
shape = LibraryDefaults.libraryShapes().chipShape,
|
||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
modifier = Modifier.padding(padding.badgeContentPadding),
|
modifier = Modifier.padding(padding.licensePadding.contentPadding),
|
||||||
text = it.name
|
maxLines = 1,
|
||||||
|
text = it.name,
|
||||||
|
style = MaterialTheme.typography.labelSmall,
|
||||||
|
textAlign = TextAlign.Center,
|
||||||
|
overflow = LibraryDefaults.libraryTextStyles().defaultOverflow,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue