From 517f30df3145ac417831907ef74b67ce44049326 Mon Sep 17 00:00:00 2001 From: SanmerDev Date: Sat, 29 Jun 2024 23:30:57 +0800 Subject: [PATCH] Remove `tonalElevation` for ModalBottomSheet --- .../sanmer/mrepo/ui/component/VersionItemBottomSheet.kt | 2 ++ .../dev/sanmer/mrepo/ui/screens/modules/ModulesMenu.kt | 8 +++++--- .../sanmer/mrepo/ui/screens/repository/RepositoryMenu.kt | 8 +++++--- .../ui/screens/repository/view/items/LicenseItem.kt | 8 +++++--- .../mrepo/ui/screens/settings/app/items/AppThemeItem.kt | 8 +++++--- .../ui/screens/settings/app/items/ThemePaletteItem.kt | 9 +++++---- 6 files changed, 27 insertions(+), 16 deletions(-) diff --git a/app/src/main/kotlin/dev/sanmer/mrepo/ui/component/VersionItemBottomSheet.kt b/app/src/main/kotlin/dev/sanmer/mrepo/ui/component/VersionItemBottomSheet.kt index 115cf7bc..78939891 100644 --- a/app/src/main/kotlin/dev/sanmer/mrepo/ui/component/VersionItemBottomSheet.kt +++ b/app/src/main/kotlin/dev/sanmer/mrepo/ui/component/VersionItemBottomSheet.kt @@ -63,6 +63,8 @@ fun VersionItemBottomSheet( sheetState = state, shape = BottomSheetDefaults.expandedShape(15.dp), windowInsets = WindowInsets.navigationBars, + containerColor = MaterialTheme.colorScheme.surface, + tonalElevation = 0.dp, dragHandle = { if (hasChangelog) { BottomSheetDefaults.DragHandle() diff --git a/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/modules/ModulesMenu.kt b/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/modules/ModulesMenu.kt index d9ffa491..1a38f6b7 100644 --- a/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/modules/ModulesMenu.kt +++ b/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/modules/ModulesMenu.kt @@ -18,7 +18,7 @@ import androidx.compose.material3.rememberModalBottomSheetState import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -47,7 +47,7 @@ internal fun ModulesMenu( setHomepage: () -> Unit, ) { val userPreferences = LocalUserPreferences.current - var open by rememberSaveable { mutableStateOf(false) } + var open by remember { mutableStateOf(false) } IconButton( onClick = { open = true } @@ -80,7 +80,9 @@ private fun BottomSheet( onDismissRequest = onClose, sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true), shape = BottomSheetDefaults.expandedShape(15.dp), - windowInsets = WindowInsets.navigationBars + windowInsets = WindowInsets.navigationBars, + containerColor = MaterialTheme.colorScheme.surface, + tonalElevation = 0.dp ) { Text( text = stringResource(id = R.string.menu_advanced_menu), diff --git a/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/repository/RepositoryMenu.kt b/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/repository/RepositoryMenu.kt index 7e10840e..4efb2d4a 100644 --- a/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/repository/RepositoryMenu.kt +++ b/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/repository/RepositoryMenu.kt @@ -21,7 +21,7 @@ import androidx.compose.material3.rememberModalBottomSheetState import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -52,7 +52,7 @@ internal fun RepositoryMenu( setHomepage: () -> Unit, ) { val userPreferences = LocalUserPreferences.current - var open by rememberSaveable { mutableStateOf(false) } + var open by remember { mutableStateOf(false) } IconButton( onClick = { open = true } @@ -85,7 +85,9 @@ private fun BottomSheet( onDismissRequest = onClose, sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true), shape = BottomSheetDefaults.expandedShape(15.dp), - windowInsets = WindowInsets.navigationBars + windowInsets = WindowInsets.navigationBars, + containerColor = MaterialTheme.colorScheme.surface, + tonalElevation = 0.dp ) { Text( text = stringResource(id = R.string.menu_advanced_menu), diff --git a/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/repository/view/items/LicenseItem.kt b/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/repository/view/items/LicenseItem.kt index dbe1ed6b..e15526ad 100644 --- a/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/repository/view/items/LicenseItem.kt +++ b/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/repository/view/items/LicenseItem.kt @@ -11,7 +11,7 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -25,12 +25,14 @@ import dev.sanmer.mrepo.ui.utils.expandedShape internal fun LicenseItem( licenseId: String ) = Box { - var open by rememberSaveable { mutableStateOf(false) } + var open by remember { mutableStateOf(false) } if (open) { ModalBottomSheet( onDismissRequest = { open = false }, shape = BottomSheetDefaults.expandedShape(15.dp), - windowInsets = WindowInsets.navigationBars + windowInsets = WindowInsets.navigationBars, + containerColor = MaterialTheme.colorScheme.surface, + tonalElevation = 0.dp ) { Text( text = stringResource(id = R.string.license_title), diff --git a/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/settings/app/items/AppThemeItem.kt b/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/settings/app/items/AppThemeItem.kt index a5b0aa26..61094f02 100644 --- a/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/settings/app/items/AppThemeItem.kt +++ b/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/settings/app/items/AppThemeItem.kt @@ -11,7 +11,7 @@ import androidx.compose.material3.rememberModalBottomSheetState import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -30,7 +30,7 @@ internal fun AppThemeItem( onThemeColorChange: (Int) -> Unit, onDarkModeChange: (DarkMode) -> Unit ) { - var open by rememberSaveable { mutableStateOf(false) } + var open by remember { mutableStateOf(false) } if (open) { BottomSheet( onClose = { open = false }, @@ -62,7 +62,9 @@ private fun BottomSheet( onDismissRequest = onClose, sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true), shape = BottomSheetDefaults.expandedShape(15.dp), - windowInsets = WindowInsets.navigationBars + windowInsets = WindowInsets.navigationBars, + containerColor = MaterialTheme.colorScheme.surface, + tonalElevation = 0.dp ) { Text( text = stringResource(id = R.string.settings_app_theme), diff --git a/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/settings/app/items/ThemePaletteItem.kt b/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/settings/app/items/ThemePaletteItem.kt index 3e1883d3..b515442d 100644 --- a/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/settings/app/items/ThemePaletteItem.kt +++ b/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/settings/app/items/ThemePaletteItem.kt @@ -2,6 +2,7 @@ package dev.sanmer.mrepo.ui.screens.settings.app.items import androidx.compose.foundation.background import androidx.compose.foundation.clickable +import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -83,11 +84,11 @@ private fun ThemeColorItem( modifier = Modifier .clip(RoundedCornerShape(15.dp)) .clickable( - onClick = { onChange(id) } - ) - .background( - color = colorScheme.surfaceColorAtElevation(3.dp) + onClick = { onChange(id) }, + indication = null, + interactionSource = remember { MutableInteractionSource() } ) + .background(color = colorScheme.surfaceColorAtElevation(6.dp)) .size(60.dp), contentAlignment = Alignment.Center ) {