From dd008bc13ac153c9d8d335f46079c568a6fb3194 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sat, 21 Aug 2021 18:04:54 -0400
Subject: [PATCH] Adjust blue theme

---
 app/src/main/res/values/colors.xml |  1 +
 app/src/main/res/values/styles.xml |  9 +++++++--
 app/src/main/res/values/themes.xml | 15 +++++----------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 994e0b3507..9feadb4218 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -21,6 +21,7 @@
     <color name="on_background_monet" tools:targetApi="31">@color/on_surface_monet</color>
 
     <!-- Blue Theme -->
+    <color name="primary_blue">#3598FE</color>
     <color name="accent_blue">#54759E</color>
     <color name="ripple_colored_blue">#1F54759E</color>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 84274ec8b2..64c69877e3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -10,7 +10,8 @@
     </style>
 
     <style name="ThemeOverlay.Tachiyomi.ActionBar.Colored" parent="ThemeOverlay.MaterialComponents.ActionBar">
-        <item name="android:colorControlHighlight">?attr/colorOnPrimary</item>
+        <item name="android:background">?attr/colorToolbar</item>
+        <item name="android:colorControlHighlight">?attr/colorOnToolbar</item>
     </style>
 
     <style name="Widget.Tachiyomi.Toolbar.Button.Navigation" parent="Widget.AppCompat.Toolbar.Button.Navigation">
@@ -30,7 +31,8 @@
         <item name="android:tint">?attr/colorOnToolbar</item>
     </style>
 
-    <style name="Widget.Tachiyomi.Toolbar.Primary" parent="Widget.MaterialComponents.Toolbar.Primary">
+    <style name="Widget.Tachiyomi.Toolbar.Colored" parent="Widget.MaterialComponents.Toolbar">
+        <item name="android:background">?attr/colorToolbar</item>
         <item name="android:elevation">0dp</item>
     </style>
 
@@ -251,6 +253,7 @@
     </style>
 
     <style name="Widget.Tachiyomi.TabLayout.Colored" parent="Widget.MaterialComponents.TabLayout.Colored">
+        <item name="android:background">?attr/colorToolbar</item>
         <item name="tabGravity">center</item>
         <item name="tabIndicator">@drawable/tab_indicator</item>
         <item name="tabIndicatorFullWidth">false</item>
@@ -282,6 +285,7 @@
     </style>
 
     <style name="Widget.Tachiyomi.BottomNavigationView.Colored" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
+        <item name="android:background">?attr/colorToolbar</item>
         <item name="labelVisibilityMode">labeled</item>
     </style>
 
@@ -291,6 +295,7 @@
     </style>
 
     <style name="Widget.Tachiyomi.NavigationRailView.Colored" parent="Widget.MaterialComponents.NavigationRailView.Colored">
+        <item name="android:background">?attr/colorToolbar</item>
         <item name="labelVisibilityMode">labeled</item>
     </style>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index c9addc5742..a28aad1646 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -83,7 +83,9 @@
     <!--== Blue Theme ==-->
     <style name="Theme.Tachiyomi.Blue">
         <!-- Theme Colors -->
-        <item name="colorPrimary">@color/accent_blue</item>
+        <item name="colorToolbar">@color/accent_blue</item>
+        <item name="colorOnToolbar">?attr/colorOnPrimary</item>
+        <item name="colorPrimary">@color/primary_blue</item>
         <item name="colorControlHighlight">@color/ripple_colored_blue</item>
     </style>
 
@@ -167,18 +169,11 @@
 
     <!--== Colored Bars (toolbar-navbar-navrail) Mode Overlay ==-->
     <style name="ThemeOverlay.Tachiyomi.ColoredBars" parent="">
-        <item name="colorToolbar">?attr/colorPrimary</item>
-        <item name="colorOnToolbar">?attr/colorOnPrimary</item>
-
-        <!-- Base background/text colors -->
-        <item name="background">?attr/colorPrimary</item>
-
         <!-- Themes -->
         <item name="actionBarTheme">@style/ThemeOverlay.Tachiyomi.ActionBar.Colored</item>
-        <item name="actionModeStyle">@style/Widget.Tachiyomi.ActionMode</item>
         <item name="toolbarNavigationButtonStyle">@style/Widget.Tachiyomi.Toolbar.Button.Navigation</item>
         <item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Primary</item>
-        <item name="toolbarStyle">@style/Widget.Tachiyomi.Toolbar.Primary</item>
+        <item name="toolbarStyle">@style/Widget.Tachiyomi.Toolbar.Colored</item>
         <item name="tabStyle">@style/Widget.Tachiyomi.TabLayout.Colored</item>
         <item name="bottomNavigationStyle">@style/Widget.Tachiyomi.BottomNavigationView.Colored</item>
         <item name="navigationRailStyle">@style/Widget.Tachiyomi.NavigationRailView.Colored</item>
@@ -186,7 +181,7 @@
         <!-- Status/Navigation bar -->
         <item name="android:windowLightStatusBar" tools:targetApi="m">?attr/lightSystemBarsOnPrimary</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">?attr/lightSystemBarsOnPrimary</item>
-        <item name="android:navigationBarColor">?attr/colorPrimary</item>
+        <item name="android:navigationBarColor">?attr/colorToolbar</item>
     </style>
 
     <!--===============-->