From f1e574249108de4a51bf9d77b6ee31afd2d73845 Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Wed, 14 Apr 2021 00:49:17 -0400
Subject: [PATCH] Fixes to color primary values

---
 app/src/main/res/values-night/colors.xml | 1 +
 app/src/main/res/values-night/themes.xml | 5 +++--
 app/src/main/res/values/colors.xml       | 4 ++++
 app/src/main/res/values/themes.xml       | 5 ++---
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index e0b89322c1..248329513f 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -29,6 +29,7 @@
     <color name="colorAccentDuskDawnText">#f091b7</color>
     <color name="backgroundDuskDawn">#16151D</color>
     <color name="dialogDuskDawn">#201F27</color>
+    <color name="primaryDuskDawn">#E570A0</color>
     <color name="textPrimaryDuskDawn">@color/md_white_1000</color>
     <color name="appBarTextDuskDawn">@color/md_white_1000</color>
 
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index cf5452bdb8..e8ca31124f 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -10,7 +10,6 @@
     <!-- Amoled Theme -->
     <!--==============-->
     <style name="Theme.Tachiyomi.Amoled" parent="Theme.Tachiyomi">
-        <item name="colorPrimary">@color/colorAmoledPrimary</item>
         <item name="colorSecondary">@color/colorAmoledPrimary</item>
         <item name="colorPrimaryVariant">@color/colorAmoledPrimary</item>
         <item name="colorOnPrimary">@color/colorAmoledPrimary</item>
@@ -23,17 +22,19 @@
     </style>
 
     <style name="Theme.Tachiyomi.BlackAndRed" parent="Theme.Tachiyomi.Amoled">
+        <item name="colorPrimary">@color/primaryRed</item>
         <item name="colorAccent">@color/holo_red</item>
         <item name="colorAccentText">@color/md_red_500</item>
     </style>
 
     <style name="Theme.Tachiyomi.HotPink" parent="Theme.Tachiyomi.Amoled">
+        <item name="colorPrimary">@color/colorPrimaryPink</item>
         <item name="colorAccent">@color/colorAccentPink</item>
         <item name="colorAccentText">@color/colorAccentPink</item>
     </style>
 
     <style name="Theme.Tachiyomi.FlatLime" parent="Theme.Tachiyomi">
-        <item name="colorPrimary">@color/backgroundLime</item>
+        <item name="colorPrimary">@color/primaryLime</item>
         <item name="colorPrimaryDark">@color/backgroundLime</item>
         <item name="colorAccent">@color/colorAccentLime</item>
         <item name="colorAccentText">@color/colorAccentLime</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index db2377b6fb..329eeb1643 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -56,6 +56,7 @@
 
     <color name="md_red_500">#F44336</color>
     <color name="holo_red">#AA2200</color>
+    <color name="primaryRed">#C14033</color>
 
     <color name="pale_green">#99CC99</color>
 
@@ -69,13 +70,16 @@
     <color name="colorAccentDuskDawnText">#803d6a</color>
     <color name="backgroundDuskDawn">#f7f4f8</color>
     <color name="dialogDuskDawn">#efe3f3</color>
+    <color name="primaryDuskDawn">#efe3f3</color>
     <color name="textPrimaryDuskDawn">#DE240728</color>
     <color name="appBarTextDuskDawn">#DE4c0d4b</color>
 
     <!-- Hot Pink Theme -->
     <color name="colorAccentPink">#FF3399</color>
+    <color name="colorPrimaryPink">#FF57B3</color>
 
     <!-- Flat Lime Theme -->
+    <color name="primaryLime">#7CF7A5</color>
     <color name="colorAccentLime">#4AF88A</color>
     <color name="textColorPrimaryLime">@color/md_white_1000</color>
     <color name="textColorSecondaryLime">@color/md_white_1000_76</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index e6e567fe1d..25a7409a7e 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -13,7 +13,7 @@
         <item name="colorPrimary">@color/app_color_primary</item>
         <item name="colorPrimaryVariant">@color/colorPrimary</item>
         <item name="colorSecondary">@color/background</item>
-        <item name="colorPrimaryDark">@color/app_color_primary</item>
+        <item name="colorPrimaryDark">?colorPrimary</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="colorAccentText">@color/colorAccentText</item>
         <item name="colorControlActivated">?colorAccent</item>
@@ -74,8 +74,7 @@
     <style name="Theme.Tachiyomi.HotPink" parent="Theme.Tachiyomi.Amoled"/>
     <style name="Theme.Tachiyomi.FlatLime" parent="Theme.Tachiyomi"/>
     <style name="Theme.Tachiyomi.MidnightDusk" parent="Theme.Tachiyomi">
-        <item name="colorPrimary">@color/dialogDuskDawn</item>
-        <item name="colorPrimaryDark">@color/dialogDuskDawn</item>
+        <item name="colorPrimary">@color/primaryDuskDawn</item>
         <item name="colorAccent">@color/colorAccentDuskDawn</item>
         <item name="colorAccentText">@color/colorAccentDuskDawnText</item>
         <item name="colorPrimaryVariant">@color/dialogDuskDawn</item>