summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorByteHamster <ByteHamster@users.noreply.github.com>2021-11-17 22:22:20 +0100
committerGitHub <noreply@github.com>2021-11-17 22:22:20 +0100
commite353b276f68f24ff16b1238e1beb1793ef9b7f69 (patch)
treee2ca59acfde58d731f25f7d244e382b49ed48766
parent0670c96892e8a059a59a2e0ab4363aec748c6cd0 (diff)
parentc6da8f5c7bbb2d2adae314b0fbf04dac613954bb (diff)
downloadAntennaPod-e353b276f68f24ff16b1238e1beb1793ef9b7f69.zip
Merge pull request #5422 from TacoTheDank/transparentNavBar
Make navigation bar color match theming
-rw-r--r--core/src/main/res/values-v21/styles.xml3
-rw-r--r--core/src/main/res/values-v23/styles.xml3
-rw-r--r--core/src/main/res/values-v27/styles.xml11
-rw-r--r--core/src/main/res/values/colors.xml1
4 files changed, 18 insertions, 0 deletions
diff --git a/core/src/main/res/values-v21/styles.xml b/core/src/main/res/values-v21/styles.xml
index 996b16f5e..349ca3213 100644
--- a/core/src/main/res/values-v21/styles.xml
+++ b/core/src/main/res/values-v21/styles.xml
@@ -4,14 +4,17 @@
<item name="android:windowContentTransitions">true</item>
<!-- To make icons visible -->
<item name="android:statusBarColor">@color/grey600</item>
+ <item name="android:navigationBarColor">@color/grey600</item>
</style>
<style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark">
<item name="android:windowContentTransitions">true</item>
<item name="android:statusBarColor">@color/background_darktheme</item>
+ <item name="android:navigationBarColor">@color/background_darktheme</item>
</style>
<style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack">
<item name="android:statusBarColor">@color/black</item>
+ <item name="android:navigationBarColor">@color/black</item>
</style>
</resources> \ No newline at end of file
diff --git a/core/src/main/res/values-v23/styles.xml b/core/src/main/res/values-v23/styles.xml
index fd339a071..dde8e41ae 100644
--- a/core/src/main/res/values-v23/styles.xml
+++ b/core/src/main/res/values-v23/styles.xml
@@ -4,15 +4,18 @@
<item name="android:windowContentTransitions">true</item>
<item name="android:statusBarColor">@color/background_light</item>
<item name="android:windowLightStatusBar">true</item>
+ <item name="android:navigationBarColor">@color/background_light</item>
</style>
<style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark">
<item name="android:windowContentTransitions">true</item>
<item name="android:statusBarColor">@color/background_darktheme</item>
<item name="android:windowLightStatusBar">false</item>
+ <item name="android:navigationBarColor">@color/background_darktheme</item>
</style>
<style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack">
<item name="android:statusBarColor">@color/black</item>
+ <item name="android:navigationBarColor">@color/black</item>
</style>
</resources> \ No newline at end of file
diff --git a/core/src/main/res/values-v27/styles.xml b/core/src/main/res/values-v27/styles.xml
new file mode 100644
index 000000000..a28090155
--- /dev/null
+++ b/core/src/main/res/values-v27/styles.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <style name="Theme.AntennaPod.Light" parent="Theme.Base.AntennaPod.Light">
+ <item name="android:windowContentTransitions">true</item>
+ <item name="android:statusBarColor">@color/background_light</item>
+ <item name="android:windowLightStatusBar">true</item>
+ <item name="android:navigationBarColor">@color/background_light</item>
+ <item name="android:navigationBarDividerColor">@color/navigation_bar_divider_light</item>
+ <item name="android:windowLightNavigationBar">true</item>
+ </style>
+</resources> \ No newline at end of file
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index 760044854..859b64367 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -25,6 +25,7 @@
<color name="non_square_icon_background">#22777777</color>
<color name="seek_background_light">#90000000</color>
<color name="seek_background_dark">#905B5B5B</color>
+ <color name="navigation_bar_divider_light">#1F000000</color>
<color name="accent_light">#0078C2</color>
<color name="accent_dark">#3D8BFF</color>