Use aboutlibraries default style
It's refined enough.
This commit is contained in:
1 parent
1f4b93bddd
commit
2163238f48
2 files changed
+17
-9
No files matched your search
@@ -1,8 +1,6 @@
|
|||||||
package com.hippo.ehviewer.ui.settings
|
package com.hippo.ehviewer.ui.settings
|
||||||
|
|
||||||
import androidx.compose.animation.AnimatedVisibilityScope
|
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.Scaffold
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.material3.TopAppBar
|
import androidx.compose.material3.TopAppBar
|
||||||
@@ -12,14 +10,15 @@ import androidx.compose.runtime.getValue
|
|||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.input.nestedscroll.nestedScroll
|
import androidx.compose.ui.input.nestedscroll.nestedScroll
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import com.ehviewer.core.i18n.R
|
import com.ehviewer.core.i18n.R
|
||||||
import com.hippo.ehviewer.ui.Screen
|
import com.hippo.ehviewer.ui.Screen
|
||||||
import com.hippo.ehviewer.ui.main.NavigationIcon
|
import com.hippo.ehviewer.ui.main.NavigationIcon
|
||||||
import com.hippo.ehviewer.ui.openBrowser
|
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.android.produceLibraries
|
||||||
import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer
|
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.Destination
|
||||||
import com.ramcosta.composedestinations.annotation.RootGraph
|
import com.ramcosta.composedestinations.annotation.RootGraph
|
||||||
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
|
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
|
||||||
@@ -42,10 +41,19 @@ fun AnimatedVisibilityScope.LicenseScreen(navigator: DestinationsNavigator) = Sc
|
|||||||
libraries = libraries,
|
libraries = libraries,
|
||||||
modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
|
modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
|
||||||
contentPadding = paddingValues,
|
contentPadding = paddingValues,
|
||||||
padding = LibraryDefaults.libraryPadding(licensePadding = LibraryDefaults.chipPadding(contentPadding = PaddingValues(horizontal = 8.dp, vertical = 4.dp))),
|
badges = LibraryBadges(funding = false),
|
||||||
textStyles = LibraryDefaults.libraryTextStyles(licensesTextStyle = MaterialTheme.typography.labelSmall),
|
variant = LibrariesVariant.Refined,
|
||||||
onLibraryClick = { library ->
|
onActionClick = { lib, kind ->
|
||||||
library.website?.let { openBrowser(it) }
|
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
|
||||||
|
}
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
[versions]
|
[versions]
|
||||||
aboutlibraries = "14.2.1"
|
aboutlibraries = "15.2.0"
|
||||||
accompanist = "0.37.3"
|
accompanist = "0.37.3"
|
||||||
agp = "9.4.1"
|
agp = "9.4.1"
|
||||||
androidx-activity = "1.13.0"
|
androidx-activity = "1.13.0"
|
||||||
|
|||||||
Reference in new issue
Block a user