From f9098b53799660d44ff2b8f73ac71d3a9668f93a Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sun, 9 Feb 2020 22:59:03 -0500
Subject: [PATCH] Restrict translucent reader UI to API 26+ (fixes #2580)

---
 app/src/main/res/values-v26/colors.xml | 8 ++++++++
 app/src/main/res/values/colors.xml     | 4 ++--
 app/src/main/res/values/themes.xml     | 8 ++++----
 3 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/values-v26/colors.xml

diff --git a/app/src/main/res/values-v26/colors.xml b/app/src/main/res/values-v26/colors.xml
new file mode 100644
index 0000000000..160454dfb7
--- /dev/null
+++ b/app/src/main/res/values-v26/colors.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Reader Theme -->
+    <color name="readerColorDarkPrimary">#BF212121</color>
+    <color name="readerColorDarkPrimaryDark">#BF1C1C1D</color>
+
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 14249a4476..c862ef3528 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,8 +6,6 @@
     <!-- Dark Application Colors -->
     <color name="colorDarkPrimary">#212121</color>
     <color name="colorDarkPrimaryDark">#1C1C1D</color>
-    <color name="colorDarkPrimaryTranslucent">#BF212121</color>
-    <color name="colorDarkPrimaryDarkTranslucent">#BF1C1C1D</color>
     <color name="colorAmoledPrimary">@color/md_black_1000</color>
 
     <color name="splashBackgroundColor">@color/colorPrimary</color>
@@ -47,6 +45,8 @@
     <color name="iconColorDark">@color/md_white_1000_54</color>
 
     <!-- Reader Theme -->
+    <color name="readerColorDarkPrimary">@color/colorDarkPrimary</color>
+    <color name="readerColorDarkPrimaryDark">@color/colorDarkPrimaryDark</color>
     <color name="pageNumberBackgroundLight">@color/md_grey_50_75</color>
     <color name="pageNumberBackgroundDark">@color/md_grey_900_75</color>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 409b88fd27..5cf5aad2cd 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -131,8 +131,8 @@
     <!-- Reader Theme -->
     <!--==============-->
     <style name="Theme.Base.Reader.Dark" parent="Theme.Base.Dark">
-        <item name="colorPrimary">@color/colorDarkPrimaryTranslucent</item>
-        <item name="colorPrimaryDark">@color/colorDarkPrimaryDarkTranslucent</item>
+        <item name="colorPrimary">@color/readerColorDarkPrimary</item>
+        <item name="colorPrimaryDark">@color/readerColorDarkPrimaryDark</item>
         <item name="android:colorBackground">@android:color/black</item>
 
         <item name="android:statusBarColor">?colorPrimaryDark</item>
@@ -140,8 +140,8 @@
     </style>
 
     <style name="Theme.Base.Reader.Light" parent="Theme.Base">
-        <item name="colorPrimary">@color/colorDarkPrimaryTranslucent</item>
-        <item name="colorPrimaryDark">@color/colorDarkPrimaryDarkTranslucent</item>
+        <item name="colorPrimary">@color/readerColorDarkPrimary</item>
+        <item name="colorPrimaryDark">@color/readerColorDarkPrimaryDark</item>
         <item name="android:colorBackground">@android:color/white</item>
 
         <item name="android:statusBarColor">?colorPrimaryDark</item>