From 6c4c51994d3b49ef026c0bce70b4da584e37b094 Mon Sep 17 00:00:00 2001
From: ByteHamster <ByteHamster@users.noreply.github.com>
Date: Sun, 27 Nov 2022 12:42:42 +0100
Subject: Switch back to non-transparent navigation bar (#6111)

---
 core/src/main/res/values-v21/styles.xml |  8 ++++++++
 core/src/main/res/values-v23/styles.xml |  9 +++++++++
 core/src/main/res/values-v27/styles.xml | 10 ++++++++++
 core/src/main/res/values/colors.xml     |  1 +
 core/src/main/res/values/styles.xml     |  8 ++------
 5 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 core/src/main/res/values-v21/styles.xml
 create mode 100644 core/src/main/res/values-v23/styles.xml
 create mode 100644 core/src/main/res/values-v27/styles.xml

(limited to 'core/src')

diff --git a/core/src/main/res/values-v21/styles.xml b/core/src/main/res/values-v21/styles.xml
new file mode 100644
index 000000000..fd2e0b640
--- /dev/null
+++ b/core/src/main/res/values-v21/styles.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <style name="Theme.AntennaPod.Light" parent="Theme.Base.AntennaPod.Light">
+        <!-- To make icons visible -->
+        <item name="android:statusBarColor">@color/grey600</item>
+        <item name="android:navigationBarColor">@color/grey600</item>
+    </style>
+</resources>
diff --git a/core/src/main/res/values-v23/styles.xml b/core/src/main/res/values-v23/styles.xml
new file mode 100644
index 000000000..ef24601e2
--- /dev/null
+++ b/core/src/main/res/values-v23/styles.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <style name="Theme.AntennaPod.Light" parent="Theme.Base.AntennaPod.Light">
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <!-- To make icons visible -->
+        <item name="android:navigationBarColor">@color/grey600</item>
+    </style>
+</resources>
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..3ee5f0d64
--- /dev/null
+++ b/core/src/main/res/values-v27/styles.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <style name="Theme.AntennaPod.Light" parent="Theme.Base.AntennaPod.Light">
+        <item name="android:statusBarColor">@android:color/transparent</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>
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index d948fc2bb..8b84e11a2 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_light_alpha">#250078C2</color>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 6330444e0..ad1216f26 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -36,10 +36,6 @@
         <item name="icon_gray">#25365A</item>
         <item name="android:splitMotionEvents">false</item>
         <item name="android:fitsSystemWindows">false</item>
-        <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/transparent</item>
-        <item name="android:navigationBarColor" tools:targetApi="lollipop">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
-        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
         <item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
     </style>
 
@@ -80,10 +76,9 @@
         <item name="android:splitMotionEvents">false</item>
         <item name="android:fitsSystemWindows">false</item>
         <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/transparent</item>
-        <item name="android:navigationBarColor" tools:targetApi="lollipop">@android:color/transparent</item>
         <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
-        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
         <item name="android:windowContentTransitions" tools:targetApi="lollipop">true</item>
+        <item name="android:navigationBarColor" tools:targetApi="lollipop">@color/background_darktheme</item>
     </style>
 
     <style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack">
@@ -104,6 +99,7 @@
         <item name="android:actionBarStyle">@color/black</item>
         <item name="background_elevated">@color/black</item>
         <item name="android:textColorHint">@color/medium_gray</item>
+        <item name="android:navigationBarColor" tools:targetApi="lollipop">@color/black</item>
     </style>
 
     <style name="Theme.AntennaPod.Light.NoTitle" parent="Theme.AntennaPod.Light">
-- 
cgit v1.2.3