From 1d5100217381ee7e4643bc0399f6cf45327b53e6 Mon Sep 17 00:00:00 2001
From: krlvm <51774833+krlvm@users.noreply.github.com>
Date: Sat, 27 Mar 2021 01:28:28 +0300
Subject: [PATCH] Fix Dark toolbar text in Light theme

---
 app/src/main/res/layout/activity_recaptcha.xml |  5 +----
 .../res/layout/dialog_feed_group_create.xml    |  5 +----
 app/src/main/res/layout/toolbar_layout.xml     |  4 +---
 app/src/main/res/values/styles.xml             | 18 ++++++++++++------
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/layout/activity_recaptcha.xml b/app/src/main/res/layout/activity_recaptcha.xml
index 19e5238dc..12339d119 100644
--- a/app/src/main/res/layout/activity_recaptcha.xml
+++ b/app/src/main/res/layout/activity_recaptcha.xml
@@ -11,10 +11,7 @@
         android:layout_height="?attr/actionBarSize"
         android:background="?attr/colorPrimary"
         android:gravity="center_vertical"
-        android:minHeight="?attr/actionBarSize"
-        android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
-        app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
-        app:titleTextAppearance="@style/Toolbar.Title" />
+        android:minHeight="?attr/actionBarSize" />
 
     <WebView
         android:id="@+id/reCaptchaWebView"
diff --git a/app/src/main/res/layout/dialog_feed_group_create.xml b/app/src/main/res/layout/dialog_feed_group_create.xml
index da98be390..91002e006 100644
--- a/app/src/main/res/layout/dialog_feed_group_create.xml
+++ b/app/src/main/res/layout/dialog_feed_group_create.xml
@@ -108,10 +108,7 @@
                 android:id="@+id/subscriptions_header_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:gravity="center_vertical"
-                android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
-                app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
-                app:titleTextAppearance="@style/Toolbar.Title">
+                android:gravity="center_vertical">
 
                 <LinearLayout
                     android:id="@+id/subscriptions_header_info_container"
diff --git a/app/src/main/res/layout/toolbar_layout.xml b/app/src/main/res/layout/toolbar_layout.xml
index 5f2085d6e..85408a293 100644
--- a/app/src/main/res/layout/toolbar_layout.xml
+++ b/app/src/main/res/layout/toolbar_layout.xml
@@ -14,9 +14,7 @@
         android:background="?attr/colorPrimary"
         android:gravity="center_vertical"
         android:minHeight="?attr/actionBarSize"
-        android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
-        app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
-        app:titleTextAppearance="@style/Toolbar.Title">
+        android:theme="@style/ToolbarTheme">
 
         <include
             android:id="@+id/toolbar_search_container"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 55cdc5936..6093ca8b8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -9,7 +9,11 @@
     </style>
 
     <!-- Base themes -->
-    <style name="Base.V7.LightTheme" parent="Theme.AppCompat.DayNight.NoActionBar" />
+    <style name="Base.V7" parent="Theme.AppCompat.DayNight.NoActionBar"/>
+
+    <style name="Base" parent="Base.V7"/>
+
+    <style name="Base.V7.LightTheme" parent="Base" />
 
     <style name="Base.LightTheme" parent="Base.V7.LightTheme" />
 
@@ -119,7 +123,7 @@
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
 
-    <style name="Base.V7.DarkTheme" parent="Theme.AppCompat.DayNight.NoActionBar" />
+    <style name="Base.V7.DarkTheme" parent="Base" />
 
     <style name="Base.DarkTheme" parent="Base.V7.DarkTheme" />
 
@@ -292,10 +296,6 @@
         <item name="colorAccent">@color/black_settings_accent_color</item>
     </style>
 
-    <style name="Toolbar.Title" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
-        <item name="android:textSize">18sp</item>
-    </style>
-
     <style name="OldVideoPlayerTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <item name="colorPrimary">@color/light_youtube_primary_color</item>
         <item name="colorPrimaryDark">@color/light_youtube_primary_color</item>
@@ -339,4 +339,10 @@
         <item name="android:windowAnimationStyle">@null</item>
     </style>
 
+    <style name="ToolbarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+        <item name="android:textColorPrimary">@android:color/white</item>
+        <item name="android:textColorSecondary">@android:color/white</item>
+        <item name="popupTheme">@style/ThemeOverlay.AppCompat.DayNight.ActionBar</item>
+    </style>
+
 </resources>