From 5f5fc7787747c218c6329cf28e82788dbf2f7a71 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Mon, 23 Aug 2021 17:31:16 -0400
Subject: [PATCH] Fix toolbar text color in light blue theme

---
 app/src/main/res/values/styles.xml | 2 ++
 app/src/main/res/values/themes.xml | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4c42aee98..05f3245ea 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -32,6 +32,8 @@
 
     <style name="Widget.Tachiyomi.Toolbar.Colored" parent="Widget.MaterialComponents.Toolbar">
         <item name="android:background">?attr/colorToolbar</item>
+        <item name="titleTextColor">?attr/colorOnToolbar</item>
+        <item name="subtitleTextColor">?attr/colorOnToolbar</item>
         <item name="android:elevation">0dp</item>
     </style>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 79bb62711..0f03a6c84 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -84,7 +84,7 @@
     <style name="Theme.Tachiyomi.Blue">
         <!-- Theme Colors -->
         <item name="colorToolbar">@color/accent_blue</item>
-        <item name="colorOnToolbar">?attr/colorOnPrimary</item>
+        <item name="colorOnToolbar">@color/md_white_1000</item>
         <item name="colorPrimary">@color/primary_blue</item>
         <item name="colorControlHighlight">@color/ripple_colored_blue</item>
     </style>
@@ -169,6 +169,9 @@
 
     <!--== Colored Bars (toolbar-navbar-navrail) Mode Overlay ==-->
     <style name="ThemeOverlay.Tachiyomi.ColoredBars" parent="">
+        <!-- Base background/text colors -->
+        <item name="background">?attr/colorPrimary</item>
+
         <!-- Themes -->
         <item name="actionBarTheme">@style/ThemeOverlay.Tachiyomi.ActionBar.Colored</item>
         <item name="toolbarNavigationButtonStyle">@style/Widget.Tachiyomi.Toolbar.Button.Navigation</item>