Merge pull request #11043 from t895/nav-bar

Android: Match navigation bar color to background
dolphin-emu · Sep 13, 2022 · 3420823 · 3420823
2 parents 351ebe6 + bb398c8
commit 3420823
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/Source/Android/app/src/main/res/values-night/bools.xml b/Source/Android/app/src/main/res/values-night/bools.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <bool name="lightStatusBar">false</bool>
+    <bool name="lightSystemBars">false</bool>
 </resources>
diff --git a/Source/Android/app/src/main/res/values-v27/themes.xml b/Source/Android/app/src/main/res/values-v27/themes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.V27.Dolphin" parent="Theme.Dolphin">
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowLightNavigationBar">@bool/lightSystemBars</item>
+    </style>
+
+    <style name="Theme.Dolphin.Main" parent="Theme.V27.Dolphin" />
+</resources>
diff --git a/Source/Android/app/src/main/res/values/bools.xml b/Source/Android/app/src/main/res/values/bools.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <bool name="lightStatusBar">true</bool>
+    <bool name="lightSystemBars">true</bool>
 </resources>
diff --git a/Source/Android/app/src/main/res/values/themes.xml b/Source/Android/app/src/main/res/values/themes.xml
@@ -13,7 +13,7 @@
     </style>
 
     <!-- Base theme -->
-    <style name="Theme.Dolphin.Main" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Theme.Dolphin" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="colorPrimary">@color/dolphin_primary</item>
         <item name="colorOnPrimary">@color/dolphin_onPrimary</item>
         <item name="colorPrimaryContainer">@color/dolphin_primary</item>
@@ -49,13 +49,16 @@
 
         <item name="homeAsUpIndicator">@drawable/ic_back</item>
 
-        <item name="android:windowLightStatusBar" tools:targetApi="m">@bool/lightStatusBar</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">@bool/lightSystemBars</item>
 
         <item name="materialAlertDialogTheme">@style/DolphinMaterialDialog</item>
         <item name="popupTheme">@style/DolphinPopup</item>
         <item name="sliderStyle">@style/DolphinSlider</item>
     </style>
 
+    <!-- Trick for API >= 27 specific changes -->
+    <style name="Theme.Dolphin.Main" parent="Theme.Dolphin" />
+
     <style name="Theme.Dolphin.Main.Material" parent="Theme.Dolphin.Main">
         <item name="colorPrimaryContainer">@color/dolphin_primaryContainer</item>
         <item name="colorOnPrimaryContainer">@color/dolphin_onPrimaryContainer</item>