From fafb40df20436b5662bb632e376153c08b17e349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolf-Martell=20Montw=C3=A9?= <wolf@thunderbird.net>
Date: Mon, 29 Apr 2024 16:28:29 +0200
Subject: [PATCH] Change status and navigation bar colors to surfaceContainer

---
 .../main/java/app/k9mail/ui/catalog/CatalogActivity.kt |  5 ++---
 app/ui/legacy/src/main/res/values-v23/themes.xml       | 10 ++++++----
 app/ui/legacy/src/main/res/values-v27/themes.xml       |  8 ++++----
 app/ui/legacy/src/main/res/values/themes.xml           |  8 ++++----
 .../app/k9mail/core/ui/compose/theme2/SystemBar.kt     |  4 ++--
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/CatalogActivity.kt b/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/CatalogActivity.kt
index 799e9c7d115..41b45a446d1 100644
--- a/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/CatalogActivity.kt
+++ b/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/CatalogActivity.kt
@@ -2,19 +2,18 @@ package app.k9mail.ui.catalog
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import androidx.activity.enableEdgeToEdge
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.core.view.WindowCompat
 import app.k9mail.core.ui.compose.common.activity.setActivityContent
 import app.k9mail.ui.catalog.ui.CatalogScreen
 
 class CatalogActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         installSplashScreen()
+        enableEdgeToEdge()
 
         super.onCreate(savedInstanceState)
 
-        WindowCompat.setDecorFitsSystemWindows(window, false)
-
         setActivityContent {
             CatalogScreen()
         }
diff --git a/app/ui/legacy/src/main/res/values-v23/themes.xml b/app/ui/legacy/src/main/res/values-v23/themes.xml
index 9f89ee20052..0de4be1135f 100644
--- a/app/ui/legacy/src/main/res/values-v23/themes.xml
+++ b/app/ui/legacy/src/main/res/values-v23/themes.xml
@@ -2,15 +2,17 @@
 <resources>
 
     <style name="Theme.K9.Light" parent="Theme.K9.Light.Common">
-        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">?attr/colorSurfaceContainer</item>
         <item name="android:windowLightStatusBar">true</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
+
+        <item name="android:navigationBarColor">?attr/colorSurfaceInverse</item>
     </style>
 
     <style name="Theme.K9.Dark" parent="Theme.K9.Dark.Common">
-        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">?attr/colorSurfaceContainer</item>
         <item name="android:windowLightStatusBar">false</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
+
+        <item name="android:navigationBarColor">?attr/colorSurfaceContainer</item>
     </style>
 
 </resources>
diff --git a/app/ui/legacy/src/main/res/values-v27/themes.xml b/app/ui/legacy/src/main/res/values-v27/themes.xml
index 16aa84bf0be..473ffa181f0 100644
--- a/app/ui/legacy/src/main/res/values-v27/themes.xml
+++ b/app/ui/legacy/src/main/res/values-v27/themes.xml
@@ -2,18 +2,18 @@
 <resources>
 
     <style name="Theme.K9.Light" parent="Theme.K9.Light.Common">
-        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">?attr/colorSurfaceContainer</item>
         <item name="android:windowLightStatusBar">true</item>
 
-        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">?attr/colorSurfaceContainer</item>
         <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="Theme.K9.Dark" parent="Theme.K9.Dark.Common">
-        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">?attr/colorSurfaceContainer</item>
         <item name="android:windowLightStatusBar">false</item>
 
-        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">?attr/colorSurfaceContainer</item>
         <item name="android:windowLightNavigationBar">false</item>
     </style>
 
diff --git a/app/ui/legacy/src/main/res/values/themes.xml b/app/ui/legacy/src/main/res/values/themes.xml
index ede82b87572..ebce72c8652 100644
--- a/app/ui/legacy/src/main/res/values/themes.xml
+++ b/app/ui/legacy/src/main/res/values/themes.xml
@@ -200,13 +200,13 @@
     </style>
 
     <style name="Theme.K9.Light" parent="Theme.K9.Light.Common">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">?attr/colorSurfaceInverse</item>
+        <item name="android:navigationBarColor">?attr/colorSurfaceInverse</item>
     </style>
 
     <style name="Theme.K9.Dark" parent="Theme.K9.Dark.Common">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">?attr/colorSurfaceContainer</item>
+        <item name="android:navigationBarColor">?attr/colorSurfaceContainer</item>
     </style>
 
     <style name="Theme.K9.Dark.Common" parent="Theme.K9.Dark.Base">
diff --git a/core/ui/compose/theme2/common/src/main/kotlin/app/k9mail/core/ui/compose/theme2/SystemBar.kt b/core/ui/compose/theme2/common/src/main/kotlin/app/k9mail/core/ui/compose/theme2/SystemBar.kt
index 72f3398762e..9648b3e24d2 100644
--- a/core/ui/compose/theme2/common/src/main/kotlin/app/k9mail/core/ui/compose/theme2/SystemBar.kt
+++ b/core/ui/compose/theme2/common/src/main/kotlin/app/k9mail/core/ui/compose/theme2/SystemBar.kt
@@ -16,8 +16,8 @@ fun SystemBar(
     if (!view.isInEditMode) {
         SideEffect {
             val window = (view.context as Activity).window
-            window.statusBarColor = colorScheme.surface.toArgb()
-            window.navigationBarColor = colorScheme.surface.toArgb()
+            window.statusBarColor = colorScheme.surfaceContainer.toArgb()
+            window.navigationBarColor = colorScheme.surfaceContainer.toArgb()
             WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = !darkTheme
         }
     }