Adjust card transparency and shadow settings to improve visualization

This commit is contained in:
ShirkNeko
2025-04-04 13:39:29 +08:00
parent c83b1e88b9
commit 8d04ecdc52
4 changed files with 16 additions and 32 deletions

View File

@@ -117,8 +117,7 @@ private fun BottomBar(navController: NavHostController) {
NavigationBar( NavigationBar(
tonalElevation = cardElevation, // 动态设置阴影 tonalElevation = cardElevation, // 动态设置阴影
containerColor = cardColor.copy(alpha = cardAlpha), // 动态设置颜色和透明度 containerColor = cardColor.copy(alpha = cardAlpha),
contentColor = if (cardColor.luminance() > 0.5) Color.Black else Color.White, // 根据背景亮度设置文字颜色
windowInsets = WindowInsets.systemBars.union(WindowInsets.displayCutout).only( windowInsets = WindowInsets.systemBars.union(WindowInsets.displayCutout).only(
WindowInsetsSides.Horizontal + WindowInsetsSides.Bottom WindowInsetsSides.Horizontal + WindowInsetsSides.Bottom
) )
@@ -182,9 +181,6 @@ private fun BottomBar(navController: NavHostController) {
}, },
label = { Text(stringResource(destination.label)) }, label = { Text(stringResource(destination.label)) },
alwaysShowLabel = false, alwaysShowLabel = false,
colors = androidx.compose.material3.NavigationBarItemDefaults.colors(
unselectedTextColor = MaterialTheme.colorScheme.onSurfaceVariant
)
) )
} }
} }

View File

@@ -9,6 +9,7 @@ import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.annotation.StringRes import androidx.annotation.StringRes
import androidx.compose.foundation.LocalIndication import androidx.compose.foundation.LocalIndication
import androidx.compose.foundation.background
import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
@@ -197,13 +198,6 @@ fun InstallScreen(navigator: DestinationsNavigator) {
} }
} }
private fun launchHorizonKernelFlash(context: Context, uri: Uri) {
val worker = HorizonKernelWorker(context)
worker.uri = uri
worker.setOnFlashCompleteListener {
}
worker.start()
}
@Composable @Composable
private fun RebootDialog( private fun RebootDialog(
@@ -513,21 +507,15 @@ fun rememberSelectKmiDialog(onSelected: (String?) -> Unit): DialogHandle {
} }
var selection by remember { mutableStateOf<String?>(null) } var selection by remember { mutableStateOf<String?>(null) }
Surface( Box(
color = MaterialTheme.colorScheme.secondaryContainer, modifier = Modifier.background(MaterialTheme.colorScheme.surface)
contentColor = MaterialTheme.colorScheme.onSecondaryContainer,
shape = MaterialTheme.shapes.medium
) { ) {
ListDialog( ListDialog(
state = rememberUseCaseState( state = rememberUseCaseState(visible = true, onFinishedRequest = {
visible = true, onSelected(selection)
onFinishedRequest = { }, onCloseRequest = {
onSelected(selection) dismiss()
}, }),
onCloseRequest = {
dismiss()
}
),
header = Header.Default( header = Header.Default(
title = stringResource(R.string.select_kmi), title = stringResource(R.string.select_kmi),
), ),

View File

@@ -131,7 +131,7 @@ fun MoreSettingsScreen(navigator: DestinationsNavigator) {
val systemIsDark = isSystemInDarkTheme() val systemIsDark = isSystemInDarkTheme()
LaunchedEffect(Unit) { LaunchedEffect(Unit) {
CardConfig.apply { CardConfig.apply {
cardAlpha = prefs.getFloat("card_alpha", 0.65f) cardAlpha = prefs.getFloat("card_alpha", 0.45f)
cardElevation = if (prefs.getBoolean("custom_background_enabled", false)) 0.dp else defaultElevation cardElevation = if (prefs.getBoolean("custom_background_enabled", false)) 0.dp else defaultElevation
isCustomAlphaSet = prefs.getBoolean("is_custom_alpha_set", false) isCustomAlphaSet = prefs.getBoolean("is_custom_alpha_set", false)
@@ -139,7 +139,7 @@ fun MoreSettingsScreen(navigator: DestinationsNavigator) {
if (!isCustomAlphaSet) { if (!isCustomAlphaSet) {
val isDarkMode = ThemeConfig.forceDarkMode ?: systemIsDark val isDarkMode = ThemeConfig.forceDarkMode ?: systemIsDark
if (isDarkMode) { if (isDarkMode) {
cardAlpha = 0.5f cardAlpha = 0.35f
} }
} }
} }
@@ -385,10 +385,10 @@ fun MoreSettingsScreen(navigator: DestinationsNavigator) {
context.saveCustomBackground(null) context.saveCustomBackground(null)
isCustomBackgroundEnabled = false isCustomBackgroundEnabled = false
CardConfig.cardElevation = CardConfig.defaultElevation CardConfig.cardElevation = CardConfig.defaultElevation
CardConfig.cardAlpha = 1f CardConfig.cardAlpha = 0.45f
CardConfig.isCustomAlphaSet = false CardConfig.isCustomAlphaSet = false
saveCardConfig(context) saveCardConfig(context)
cardAlpha = 0.65f cardAlpha = 0.35f
themeMode = 0 themeMode = 0
context.saveThemeMode(null) context.saveThemeMode(null)
CardConfig.isUserDarkModeEnabled = false CardConfig.isUserDarkModeEnabled = false

View File

@@ -15,7 +15,7 @@ import androidx.compose.ui.unit.dp
object CardConfig { object CardConfig {
val defaultElevation: Dp = 0.dp val defaultElevation: Dp = 0.dp
var cardAlpha by mutableStateOf(1f) var cardAlpha by mutableStateOf(0.45f)
var cardElevation by mutableStateOf(defaultElevation) var cardElevation by mutableStateOf(defaultElevation)
var isShadowEnabled by mutableStateOf(true) var isShadowEnabled by mutableStateOf(true)
var isCustomAlphaSet by mutableStateOf(false) var isCustomAlphaSet by mutableStateOf(false)
@@ -38,7 +38,7 @@ object CardConfig {
fun load(context: Context) { fun load(context: Context) {
val prefs = context.getSharedPreferences("settings", Context.MODE_PRIVATE) val prefs = context.getSharedPreferences("settings", Context.MODE_PRIVATE)
cardAlpha = prefs.getFloat("card_alpha", 1f) cardAlpha = prefs.getFloat("card_alpha", 0.45f)
cardElevation = if (prefs.getBoolean("custom_background_enabled", false)) 0.dp else defaultElevation cardElevation = if (prefs.getBoolean("custom_background_enabled", false)) 0.dp else defaultElevation
isCustomAlphaSet = prefs.getBoolean("is_custom_alpha_set", false) isCustomAlphaSet = prefs.getBoolean("is_custom_alpha_set", false)
isUserDarkModeEnabled = prefs.getBoolean("is_user_dark_mode_enabled", false) isUserDarkModeEnabled = prefs.getBoolean("is_user_dark_mode_enabled", false)
@@ -53,7 +53,7 @@ object CardConfig {
fun setDarkModeDefaults() { fun setDarkModeDefaults() {
if (!isCustomAlphaSet) { if (!isCustomAlphaSet) {
cardAlpha = 0.5f cardAlpha = 0.35f
cardElevation = 0.dp cardElevation = 0.dp
} }
} }