更好的背景设计

Author: matsuzaka-yuki

app/src/main/java/me/bmax/apatch/ui/MainActivity.kt

@@ -49,6 +49,9 @@ import me.bmax.apatch.APApplication
 import me.bmax.apatch.ui.screen.BottomBarDestination
 import me.bmax.apatch.ui.theme.APatchTheme
 import me.bmax.apatch.ui.theme.APatchThemeWithBackground
+import me.bmax.apatch.ui.theme.BackgroundConfig
+import androidx.compose.material3.NavigationBarDefaults
+import androidx.compose.material3.MaterialTheme
 import me.bmax.apatch.util.PermissionRequestHandler
 import me.bmax.apatch.util.PermissionUtils
 import me.bmax.apatch.util.ui.LocalSnackbarHost
@@ -186,7 +189,14 @@ private fun BottomBar(navController: NavHostController) {
         val kPatchReady = state != APApplication.State.UNKNOWN_STATE
         val aPatchReady = state == APApplication.State.ANDROIDPATCH_INSTALLED
 
-        NavigationBar(tonalElevation = 8.dp) {
+        NavigationBar(
+            tonalElevation = 8.dp,
+            containerColor = if (BackgroundConfig.isCustomBackgroundEnabled) {
+                MaterialTheme.colorScheme.surface
+            } else {
+                NavigationBarDefaults.containerColor
+            }
+        ) {
             BottomBarDestination.entries.forEach { destination ->
                 val isCurrentDestOnBackStack by navController.isRouteOnBackStackAsState(destination.direction)
 

app/src/main/java/me/bmax/apatch/ui/screen/Settings.kt

@@ -71,6 +71,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.stringArrayResource
@@ -156,6 +157,11 @@ fun SettingScreen() {
                 title = { Text(stringResource(R.string.settings)) },
             )
         },
+        containerColor = if (BackgroundConfig.isCustomBackgroundEnabled) {
+            Color.Transparent
+        } else {
+            MaterialTheme.colorScheme.background
+        },
         snackbarHost = { SnackbarHost(snackBarHost) }
     ) { paddingValues ->
 

app/src/main/java/me/bmax/apatch/ui/theme/Theme.kt

@@ -182,25 +182,25 @@ fun APatchTheme(
     }
 
     val colorScheme = baseColorScheme.copy(
-        background = if (BackgroundConfig.isCustomBackgroundEnabled && !isSettingsScreen) Color.Transparent else baseColorScheme.background,
-        surface = if (BackgroundConfig.isCustomBackgroundEnabled && !isSettingsScreen) {
+        background = if (BackgroundConfig.isCustomBackgroundEnabled) Color.Transparent else baseColorScheme.background,
+        surface = if (BackgroundConfig.isCustomBackgroundEnabled) {
             // 在自定义背景模式下，为surface添加半透明效果
             baseColorScheme.surface.copy(alpha = 0.75f)
         } else {
             baseColorScheme.surface
         },
         // 同样处理primary和secondary颜色，确保KStatusCard也有半透明效果
-        primary = if (BackgroundConfig.isCustomBackgroundEnabled && !isSettingsScreen) {
+        primary = if (BackgroundConfig.isCustomBackgroundEnabled) {
             baseColorScheme.primary.copy(alpha = 0.75f)
         } else {
             baseColorScheme.primary
         },
-        secondary = if (BackgroundConfig.isCustomBackgroundEnabled && !isSettingsScreen) {
+        secondary = if (BackgroundConfig.isCustomBackgroundEnabled) {
             baseColorScheme.secondary.copy(alpha = 0.75f)
         } else {
             baseColorScheme.secondary
         },
-        secondaryContainer = if (BackgroundConfig.isCustomBackgroundEnabled && !isSettingsScreen) {
+        secondaryContainer = if (BackgroundConfig.isCustomBackgroundEnabled) {
             baseColorScheme.secondaryContainer.copy(alpha = 0.75f)
         } else {
             baseColorScheme.secondaryContainer
@@ -240,11 +240,10 @@ fun APatchThemeWithBackground(
 
     APatchTheme(isSettingsScreen = isSettingsScreen) {
         Box(modifier = Modifier.fillMaxSize()) {
-            // 只有不在设置页面时才显示背景层
-            if (!isSettingsScreen) {
-                BackgroundLayer()
-            }
-            // 内容层 - 添加zIndex确保在背景之上
+            // Always show background layer if enabled
+            BackgroundLayer()
+            
+            // Content layer - add zIndex to ensure it's above the background
             Box(modifier = Modifier.fillMaxSize().zIndex(1f)) {
                 content()
             }
@@ -299,22 +298,5 @@ fun BackgroundLayer() {
                 .zIndex(-1f)
                 .paint(painter = painter, contentScale = ContentScale.Crop)
         )
-        
-        // 只在暗色模式下添加半透明遮罩层，白天模式下不添加
-        if (darkTheme) {
-            Box(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .zIndex(-1f)
-                    .background(
-                        Brush.verticalGradient(
-                            colors = listOf(
-                                Color.Black.copy(alpha = 0.4f),
-                                Color.Black.copy(alpha = 0.2f)
-                            )
-                        )
-                    )
-            )
-        }
     }
 }