Set correct status/navigation bar color across Android version

alexbakker · Mar 9, 2024 · ffb496f · ffb496f
1 parent c4b2f21
commit ffb496f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java
@@ -4,6 +4,7 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.content.res.Configuration;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
@@ -248,10 +249,12 @@ private void apply(int visibility) {
             actionModeView.setVisibility(visibility);
             actionModeView.setAlpha(visibility == View.VISIBLE ? 1f : 0f);
 
-            int statusBarColor = visibility == View.VISIBLE
-                    ? ThemeHelper.getThemeColor(com.google.android.material.R.attr.colorSurfaceContainer, getTheme())
-                    : _statusBarColor;
-            getWindow().setStatusBarColor(statusBarColor);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                int statusBarColor = visibility == View.VISIBLE
+                        ? ThemeHelper.getThemeColor(com.google.android.material.R.attr.colorSurfaceContainer, getTheme())
+                        : _statusBarColor;
+                getWindow().setStatusBarColor(statusBarColor);
+            }
         }
     }
 

diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml
@@ -1,6 +1,5 @@
 <resources>
     <style name="Theme.Aegis.Light" parent="Base.Theme.Aegis.Light">
-        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">true</item>
     </style>

diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
@@ -0,0 +1,22 @@
+<resources>
+    <style name="Theme.Aegis.Light" parent="Base.Theme.Aegis.Light">
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="Theme.Aegis.Dark" parent="Base.Theme.Aegis.Dark">
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="Theme.Aegis.Amoled" parent="Base.Theme.Aegis.Amoled">
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+</resources>