diff options
| author | JosJuice <josjuice@gmail.com> | 2022-09-13 22:34:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-13 22:34:52 +0200 |
| commit | 3420823002dce682ff7ea8e96642e44d1cc36842 (patch) | |
| tree | a21f276cf3fdf5904c1e21422585d7b9a371485a /Source/Android/app/src | |
| parent | 351ebe668ff613e5619cf7e7e91b0771238d75e4 (diff) | |
| parent | bb398c86486a33d46c1d391c955075115da23635 (diff) | |
Merge pull request #11043 from t895/nav-bar
Android: Match navigation bar color to background
Diffstat (limited to 'Source/Android/app/src')
4 files changed, 16 insertions, 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 index 14d6d1cbc8..85800a2f2c 100644 --- 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 new file mode 100644 index 0000000000..06e1668481 --- /dev/null +++ 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 index d0bda19f24..fbc2def833 100644 --- 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 index 7dcf9e0052..f31e87f72e 100644 --- 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> |