From 6c49904bf8422f69cbec087b88746b714ee07c05 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 31 May 2025 04:55:01 +0000 Subject: [PATCH] Update aboutlibraries to v12.2.0 (#2370) * Update dependency com.mikepenz.aboutlibraries.plugin to v12.2.0 * Fix build --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: FooIbar <118464521+FooIbar@users.noreply.github.com> --- .../hippo/ehviewer/ui/settings/LicenseScreen.kt | 15 +++++++-------- gradle/libs.versions.toml | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/LicenseScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/LicenseScreen.kt index 70e48076e..2980927af 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/LicenseScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/LicenseScreen.kt @@ -6,11 +6,13 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material3.Icon import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.res.stringResource @@ -18,10 +20,9 @@ import androidx.compose.ui.unit.dp import com.hippo.ehviewer.R import com.hippo.ehviewer.ui.Screen import com.hippo.ehviewer.ui.openBrowser -import com.mikepenz.aboutlibraries.Libs import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults +import com.mikepenz.aboutlibraries.ui.compose.android.rememberLibraries import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer -import com.mikepenz.aboutlibraries.util.withJson import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootGraph import com.ramcosta.composedestinations.navigation.DestinationsNavigator @@ -43,15 +44,13 @@ fun AnimatedVisibilityScope.LicenseScreen(navigator: DestinationsNavigator) = Sc ) }, ) { paddingValues -> + val libraries by rememberLibraries(R.raw.aboutlibraries) LibrariesContainer( + libraries = libraries, modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), - librariesBlock = { ctx -> - // Avoid `Resources.getIdentifier()` call for strict resource shrinking - // https://developer.android.com/build/shrink-code#strict-reference-checks - Libs.Builder().withJson(ctx, R.raw.aboutlibraries).build() - }, contentPadding = paddingValues, - padding = LibraryDefaults.libraryPadding(badgeContentPadding = PaddingValues(4.dp)), + padding = LibraryDefaults.libraryPadding(licensePadding = LibraryDefaults.chipPadding(contentPadding = PaddingValues(horizontal = 8.dp, vertical = 4.dp))), + textStyles = LibraryDefaults.libraryTextStyles(licensesTextStyle = MaterialTheme.typography.labelSmall), onLibraryClick = { library -> library.website?.let { openBrowser(it) } }, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7ad043d9f..ee6149dbd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -aboutlibraries = "12.1.2" +aboutlibraries = "12.2.0" accompanist = "0.37.3" agp = "8.10.1" androidx-activity = "1.10.1"