From 8d04ecdc521f34c75ba7fe724d82ce65d025dbe3 Mon Sep 17 00:00:00 2001 From: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com> Date: Fri, 4 Apr 2025 13:39:29 +0800 Subject: [PATCH] Adjust card transparency and shadow settings to improve visualization --- .../shirkneko/zako/sukisu/ui/MainActivity.kt | 6 +--- .../zako/sukisu/ui/screen/Install.kt | 28 ++++++------------- .../zako/sukisu/ui/screen/MoreSettings.kt | 8 +++--- .../zako/sukisu/ui/theme/CardManage.kt | 6 ++-- 4 files changed, 16 insertions(+), 32 deletions(-) diff --git a/manager/app/src/main/java/shirkneko/zako/sukisu/ui/MainActivity.kt b/manager/app/src/main/java/shirkneko/zako/sukisu/ui/MainActivity.kt index f2153d20..0e194929 100644 --- a/manager/app/src/main/java/shirkneko/zako/sukisu/ui/MainActivity.kt +++ b/manager/app/src/main/java/shirkneko/zako/sukisu/ui/MainActivity.kt @@ -117,8 +117,7 @@ private fun BottomBar(navController: NavHostController) { NavigationBar( tonalElevation = cardElevation, // 动态设置阴影 - containerColor = cardColor.copy(alpha = cardAlpha), // 动态设置颜色和透明度 - contentColor = if (cardColor.luminance() > 0.5) Color.Black else Color.White, // 根据背景亮度设置文字颜色 + containerColor = cardColor.copy(alpha = cardAlpha), windowInsets = WindowInsets.systemBars.union(WindowInsets.displayCutout).only( WindowInsetsSides.Horizontal + WindowInsetsSides.Bottom ) @@ -182,9 +181,6 @@ private fun BottomBar(navController: NavHostController) { }, label = { Text(stringResource(destination.label)) }, alwaysShowLabel = false, - colors = androidx.compose.material3.NavigationBarItemDefaults.colors( - unselectedTextColor = MaterialTheme.colorScheme.onSurfaceVariant - ) ) } } diff --git a/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/Install.kt b/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/Install.kt index 806fe011..ce757db4 100644 --- a/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/Install.kt +++ b/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/Install.kt @@ -9,6 +9,7 @@ import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts import androidx.annotation.StringRes import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.* 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 private fun RebootDialog( @@ -513,21 +507,15 @@ fun rememberSelectKmiDialog(onSelected: (String?) -> Unit): DialogHandle { } var selection by remember { mutableStateOf(null) } - Surface( - color = MaterialTheme.colorScheme.secondaryContainer, - contentColor = MaterialTheme.colorScheme.onSecondaryContainer, - shape = MaterialTheme.shapes.medium + Box( + modifier = Modifier.background(MaterialTheme.colorScheme.surface) ) { ListDialog( - state = rememberUseCaseState( - visible = true, - onFinishedRequest = { - onSelected(selection) - }, - onCloseRequest = { - dismiss() - } - ), + state = rememberUseCaseState(visible = true, onFinishedRequest = { + onSelected(selection) + }, onCloseRequest = { + dismiss() + }), header = Header.Default( title = stringResource(R.string.select_kmi), ), diff --git a/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/MoreSettings.kt b/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/MoreSettings.kt index 741d24cf..c7b38373 100644 --- a/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/MoreSettings.kt +++ b/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/MoreSettings.kt @@ -131,7 +131,7 @@ fun MoreSettingsScreen(navigator: DestinationsNavigator) { val systemIsDark = isSystemInDarkTheme() LaunchedEffect(Unit) { 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 isCustomAlphaSet = prefs.getBoolean("is_custom_alpha_set", false) @@ -139,7 +139,7 @@ fun MoreSettingsScreen(navigator: DestinationsNavigator) { if (!isCustomAlphaSet) { val isDarkMode = ThemeConfig.forceDarkMode ?: systemIsDark if (isDarkMode) { - cardAlpha = 0.5f + cardAlpha = 0.35f } } } @@ -385,10 +385,10 @@ fun MoreSettingsScreen(navigator: DestinationsNavigator) { context.saveCustomBackground(null) isCustomBackgroundEnabled = false CardConfig.cardElevation = CardConfig.defaultElevation - CardConfig.cardAlpha = 1f + CardConfig.cardAlpha = 0.45f CardConfig.isCustomAlphaSet = false saveCardConfig(context) - cardAlpha = 0.65f + cardAlpha = 0.35f themeMode = 0 context.saveThemeMode(null) CardConfig.isUserDarkModeEnabled = false diff --git a/manager/app/src/main/java/shirkneko/zako/sukisu/ui/theme/CardManage.kt b/manager/app/src/main/java/shirkneko/zako/sukisu/ui/theme/CardManage.kt index b91c3403..16048c2c 100644 --- a/manager/app/src/main/java/shirkneko/zako/sukisu/ui/theme/CardManage.kt +++ b/manager/app/src/main/java/shirkneko/zako/sukisu/ui/theme/CardManage.kt @@ -15,7 +15,7 @@ import androidx.compose.ui.unit.dp object CardConfig { val defaultElevation: Dp = 0.dp - var cardAlpha by mutableStateOf(1f) + var cardAlpha by mutableStateOf(0.45f) var cardElevation by mutableStateOf(defaultElevation) var isShadowEnabled by mutableStateOf(true) var isCustomAlphaSet by mutableStateOf(false) @@ -38,7 +38,7 @@ object CardConfig { fun load(context: Context) { 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 isCustomAlphaSet = prefs.getBoolean("is_custom_alpha_set", false) isUserDarkModeEnabled = prefs.getBoolean("is_user_dark_mode_enabled", false) @@ -53,7 +53,7 @@ object CardConfig { fun setDarkModeDefaults() { if (!isCustomAlphaSet) { - cardAlpha = 0.5f + cardAlpha = 0.35f cardElevation = 0.dp } }