From 06af26f1f2b5c4f6da66060f74c6f0ae4c827f7c Mon Sep 17 00:00:00 2001
From: Marco vR <marcovr@live.de>
Date: Tue, 27 Aug 2019 22:43:59 +0200
Subject: [PATCH 1/3] Black navigation bar for black theme

See: https://github.com/TeamNewPipe/NewPipe/issues/1494
---
 app/src/main/res/values-v27/styles.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 app/src/main/res/values-v27/styles.xml

diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
new file mode 100644
index 000000000..50843937e
--- /dev/null
+++ b/app/src/main/res/values-v27/styles.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="BlackTheme" parent="DarkTheme">
+        <item name="android:windowBackground">@color/black_background_color</item>
+        <item name="windowBackground">@color/black_background_color</item>
+        <item name="android:navigationBarColor">@android:color/black</item>
+        <item name="android:windowLightNavigationBar">false</item>
+
+        <item name="separator_color">@color/black_separator_color</item>
+        <item name="contrast_background_color">@color/black_contrast_background_color</item>
+    </style>
+</resources>
\ No newline at end of file

From 7e78197b37ccd8e13566185e7cc92a06440f3e13 Mon Sep 17 00:00:00 2001
From: Marco vR <marcovr@live.de>
Date: Tue, 15 Oct 2019 14:23:55 +0200
Subject: [PATCH 2/3] Avoid duplicated code & dark navbar for DarkTheme

---
 app/src/main/res/values-v27/styles.xml | 17 +++++++++--------
 app/src/main/res/values/styles.xml     |  8 ++++++--
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
index 50843937e..09e827ecd 100644
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="BlackTheme" parent="DarkTheme">
-        <item name="android:windowBackground">@color/black_background_color</item>
-        <item name="windowBackground">@color/black_background_color</item>
-        <item name="android:navigationBarColor">@android:color/black</item>
+    <style name="Base.V21.DarkTheme" parent="Base.V7.DarkTheme">
+        <item name="android:navigationBarColor">@color/dark_background_color</item>
         <item name="android:windowLightNavigationBar">false</item>
-
-        <item name="separator_color">@color/black_separator_color</item>
-        <item name="contrast_background_color">@color/black_contrast_background_color</item>
     </style>
-</resources>
\ No newline at end of file
+    <style name="Base.DarkTheme" parent="Base.V21.DarkTheme" />
+
+    <style name="Base.V21.BlackTheme" parent="Base.V7.BlackTheme">
+        <item name="android:navigationBarColor">@android:color/black</item>
+    </style>
+    <style name="Base.BlackTheme" parent="Base.V21.BlackTheme" />
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ba3fe78d5..679d4d1cd 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -77,7 +77,9 @@
         <item name="android:windowAnimationStyle">@style/SwitchAnimation</item>
     </style>
 
-    <style name="DarkTheme" parent="Theme.AppCompat.NoActionBar">
+    <style name="Base.V7.DarkTheme" parent="Theme.AppCompat.NoActionBar" />
+    <style name="Base.DarkTheme" parent="Base.V7.DarkTheme" />
+    <style name="DarkTheme" parent="Base.DarkTheme">
         <item name="colorPrimary">@color/dark_youtube_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_youtube_dark_color</item>
         <item name="colorAccent">@color/dark_youtube_accent_color</item>
@@ -144,7 +146,9 @@
         <item name="android:windowAnimationStyle">@style/SwitchAnimation</item>
     </style>
 
-    <style name="BlackTheme" parent="DarkTheme">
+    <style name="Base.V7.BlackTheme" parent="DarkTheme"/>
+    <style name="Base.BlackTheme" parent="Base.V7.BlackTheme"/>
+    <style name="BlackTheme" parent="Base.BlackTheme">
         <item name="android:windowBackground">@color/black_background_color</item>
         <item name="windowBackground">@color/black_background_color</item>
 

From d90588ce6bd0bb6427c5b5dafb63c5043fd7d432 Mon Sep 17 00:00:00 2001
From: Marco vR <marcovr@live.de>
Date: Tue, 15 Oct 2019 14:49:52 +0200
Subject: [PATCH 3/3] Fix style version

---
 app/src/main/res/values-v27/styles.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
index 09e827ecd..f888ae539 100644
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Base.V21.DarkTheme" parent="Base.V7.DarkTheme">
+    <style name="Base.V27.DarkTheme" parent="Base.V7.DarkTheme">
         <item name="android:navigationBarColor">@color/dark_background_color</item>
         <item name="android:windowLightNavigationBar">false</item>
     </style>
-    <style name="Base.DarkTheme" parent="Base.V21.DarkTheme" />
+    <style name="Base.DarkTheme" parent="Base.V27.DarkTheme" />
 
-    <style name="Base.V21.BlackTheme" parent="Base.V7.BlackTheme">
+    <style name="Base.V27.BlackTheme" parent="Base.V7.BlackTheme">
         <item name="android:navigationBarColor">@android:color/black</item>
     </style>
-    <style name="Base.BlackTheme" parent="Base.V21.BlackTheme" />
+    <style name="Base.BlackTheme" parent="Base.V27.BlackTheme" />
 </resources>