From 868784de76c8b7554ca3d5a354405ea9e93534b9 Mon Sep 17 00:00:00 2001
From: Andrew Gunnerson <accounts+github@chiller3.com>
Date: Thu, 2 Jul 2026 21:50:02 -0400
Subject: [PATCH] ui: Adjust background color to match AOSP SettingsLib

The previous color was set to Compose's default background color for
dialogs, which looked nice, but didn't match AOSP Settings. However, it
resulted in relatively low contrast with the filled back button icon
background due to the colors being only one step apart instead of two.

Signed-off-by: Andrew Gunnerson <accounts+github@chiller3.com>
---
 app/src/main/java/com/chiller3/bcr/ui/Preferences.kt | 4 ++--
 app/src/main/java/com/chiller3/bcr/ui/Screen.kt      | 3 +--
 app/src/main/res/values/themes.xml                   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/chiller3/bcr/ui/Preferences.kt b/app/src/main/java/com/chiller3/bcr/ui/Preferences.kt
index f0c12cdf9..d8ac50800 100644
--- a/app/src/main/java/com/chiller3/bcr/ui/Preferences.kt
+++ b/app/src/main/java/com/chiller3/bcr/ui/Preferences.kt
@@ -68,9 +68,9 @@ object PreferenceDefaults {
     val ListPadding = PaddingValues(horizontal = HorizontalPadding)
 
     val containerColor: Color
-        @Composable get() = MaterialTheme.colorScheme.surfaceContainerHigh
+        @Composable get() = MaterialTheme.colorScheme.surfaceContainer
     val scrolledContainerColor: Color
-        @Composable get() = MaterialTheme.colorScheme.surfaceContainerLow
+        @Composable get() = MaterialTheme.colorScheme.surfaceContainerHighest
 
     @Composable
     fun appBarColors() = TopAppBarDefaults.topAppBarColors(
diff --git a/app/src/main/java/com/chiller3/bcr/ui/Screen.kt b/app/src/main/java/com/chiller3/bcr/ui/Screen.kt
index 813245c69..6940d037a 100644
--- a/app/src/main/java/com/chiller3/bcr/ui/Screen.kt
+++ b/app/src/main/java/com/chiller3/bcr/ui/Screen.kt
@@ -14,7 +14,6 @@ import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.IconButtonDefaults
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
@@ -62,7 +61,7 @@ fun AppScreen(
                         IconButton(
                             onClick = onClick,
                             colors = IconButtonDefaults.filledIconButtonColors(
-                                containerColor = MaterialTheme.colorScheme.surfaceContainerHighest,
+                                containerColor = PreferenceDefaults.scrolledContainerColor,
                             ),
                         ) {
                             @SuppressLint("PrivateResource")
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index b832f1bc1..a408c32e1 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -11,6 +11,6 @@
 
             This must be set statically. Keep this in sync with PreferenceDefaults.containerColor.
         -->
-        <item name="android:colorBackground">?attr/colorSurfaceContainerHigh</item>
+        <item name="android:colorBackground">?attr/colorSurfaceContainer</item>
     </style>
 </resources>