From 2163238f4816c674d98d7aaa217cf8ef79c52ecf Mon Sep 17 00:00:00 2001 From: Dude so hot Date: Thu, 8 Oct 2026 00:42:05 +0800 Subject: [PATCH] Use aboutlibraries default style It's refined enough. --- .../ehviewer/ui/settings/LicenseScreen.kt | 24 ++++++++++++------- gradle/libs.versions.toml | 2 +- 2 files changed, 17 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 1e7c3c964..1ba604e1d 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 @@ -1,8 +1,6 @@ package com.hippo.ehviewer.ui.settings import androidx.compose.animation.AnimatedVisibilityScope -import androidx.compose.foundation.layout.PaddingValues -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar @@ -12,14 +10,15 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.res.stringResource -import androidx.compose.ui.unit.dp import com.ehviewer.core.i18n.R import com.hippo.ehviewer.ui.Screen import com.hippo.ehviewer.ui.main.NavigationIcon import com.hippo.ehviewer.ui.openBrowser -import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults import com.mikepenz.aboutlibraries.ui.compose.android.produceLibraries import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer +import com.mikepenz.aboutlibraries.ui.compose.variant.LibrariesVariant +import com.mikepenz.aboutlibraries.ui.compose.variant.LibraryActionKind +import com.mikepenz.aboutlibraries.ui.compose.variant.LibraryBadges import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootGraph import com.ramcosta.composedestinations.navigation.DestinationsNavigator @@ -42,10 +41,19 @@ fun AnimatedVisibilityScope.LicenseScreen(navigator: DestinationsNavigator) = Sc libraries = libraries, modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), contentPadding = paddingValues, - 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) } + badges = LibraryBadges(funding = false), + variant = LibrariesVariant.Refined, + onActionClick = { lib, kind -> + val open = { url: String -> url.isNotBlank().also { if (it) openBrowser(url) } } + val website = lib.website.orEmpty() + val source = lib.scm?.url.orEmpty() + val license = lib.licenses.firstOrNull()?.url.orEmpty() + when (kind) { + LibraryActionKind.Source -> open(source) + LibraryActionKind.Website -> open(website) + LibraryActionKind.License -> open(license) + LibraryActionKind.Sponsor -> false + } }, ) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f6b9d35f2..62100f636 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -aboutlibraries = "14.2.1" +aboutlibraries = "15.2.0" accompanist = "0.37.3" agp = "9.4.1" androidx-activity = "1.13.0"