From a7d6ad51627f739279ce823340645c0a2877750d Mon Sep 17 00:00:00 2001
From: krlvm <51774833+krlvm@users.noreply.github.com>
Date: Mon, 29 Mar 2021 14:44:29 +0300
Subject: [PATCH] Fix Subscription Picker's Toolbar colors

---
 .../res/layout/dialog_feed_group_create.xml   |  3 ++-
 .../res/layout/picker_subscription_item.xml   |  2 +-
 .../main/res/layout/toolbar_search_layout.xml |  5 ++---
 .../main/res/menu/menu_feed_group_dialog.xml  |  1 +
 app/src/main/res/values/attrs.xml             |  1 +
 app/src/main/res/values/styles.xml            |  9 +-------
 app/src/main/res/values/styles_misc.xml       | 21 +++++++++++++++++++
 7 files changed, 29 insertions(+), 13 deletions(-)

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 1dbf8e761..e849524b0 100644
--- a/app/src/main/res/layout/dialog_feed_group_create.xml
+++ b/app/src/main/res/layout/dialog_feed_group_create.xml
@@ -108,7 +108,8 @@
                 android:id="@+id/subscriptions_header_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:gravity="center_vertical">
+                android:gravity="center_vertical"
+                android:theme="@style/ContrastToolbarTheme">
 
                 <LinearLayout
                     android:id="@+id/subscriptions_header_info_container"
diff --git a/app/src/main/res/layout/picker_subscription_item.xml b/app/src/main/res/layout/picker_subscription_item.xml
index 6bc68cab8..352ef4d62 100644
--- a/app/src/main/res/layout/picker_subscription_item.xml
+++ b/app/src/main/res/layout/picker_subscription_item.xml
@@ -52,7 +52,7 @@
             android:layout_gravity="top|center_horizontal"
             android:layout_marginTop="4dp"
             android:scaleType="centerInside"
-            android:tint="@color/white"
+            app:tint="@color/white"
             app:srcCompat="@drawable/ic_done"
             tools:ignore="ContentDescription" />
     </FrameLayout>
diff --git a/app/src/main/res/layout/toolbar_search_layout.xml b/app/src/main/res/layout/toolbar_search_layout.xml
index d24944e2f..e2b0ed4cb 100644
--- a/app/src/main/res/layout/toolbar_search_layout.xml
+++ b/app/src/main/res/layout/toolbar_search_layout.xml
@@ -18,12 +18,11 @@
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:hint="@string/search"
-        android:textColor="@color/white"
+        android:textColor="?attr/toolbarSearchColor"
         android:imeOptions="actionSearch|flagNoFullscreen"
         android:inputType="textFilter|textNoSuggestions"
         android:maxLines="1"
         android:nextFocusDown="@+id/suggestions_list"
-        android:theme="@style/WhiteAccentTheme"
         tools:ignore="RtlHardcoded" />
 
     <FrameLayout
@@ -47,7 +46,7 @@
             android:layout_gravity="center"
             android:contentDescription="@string/search"
             android:scaleType="fitCenter"
-            app:tint="@color/white"
+            app:tint="?attr/toolbarSearchColor"
             app:srcCompat="@drawable/ic_close"
             tools:ignore="RtlHardcoded" />
     </FrameLayout>
diff --git a/app/src/main/res/menu/menu_feed_group_dialog.xml b/app/src/main/res/menu/menu_feed_group_dialog.xml
index 38473e4d5..b0c1e494d 100644
--- a/app/src/main/res/menu/menu_feed_group_dialog.xml
+++ b/app/src/main/res/menu/menu_feed_group_dialog.xml
@@ -7,6 +7,7 @@
         android:id="@+id/action_search"
         android:icon="@drawable/ic_search"
         android:title="@string/search"
+        app:iconTint="@color/contrastColor"
         app:showAsAction="always"
         tools:ignore="AlwaysShowAction" />
 
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 43fcb2db0..d349cb96f 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -15,6 +15,7 @@
     <attr name="contrast_background_color" format="color" />
     <attr name="windowBackground" format="color" />
     <attr name="colorPrimary" format="color" />
+    <attr name="toolbarSearchColor" format="reference|color" />
 
     <attr name="card_item_background_color" format="color" />
     <attr name="card_item_contrast_color" format="color" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9100de20a..1c0d0b63c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -13,6 +13,7 @@
 
     <!-- Base Theme -->
     <style name="Base.V19" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="toolbarSearchColor">@color/white</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
     <style name="Base" parent="Base.V19"/>
@@ -170,12 +171,4 @@
         <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>
-        <item name="tint">@color/white</item>
-        <item name="iconTint">@color/white</item>
-    </style>
-
 </resources>
diff --git a/app/src/main/res/values/styles_misc.xml b/app/src/main/res/values/styles_misc.xml
index 275374fcf..fafa01310 100644
--- a/app/src/main/res/values/styles_misc.xml
+++ b/app/src/main/res/values/styles_misc.xml
@@ -62,6 +62,22 @@
 
     <style name="DarkPopupMenu" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
 
+    <style name="ToolbarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+        <item name="popupTheme">@style/ThemeOverlay.AppCompat.DayNight.ActionBar</item>
+        <item name="android:textColorPrimary">@android:color/white</item>
+        <item name="android:textColorSecondary">@android:color/white</item>
+        <item name="tint">@color/white</item>
+        <item name="iconTint">@color/white</item>
+    </style>
+    <style name="ContrastToolbarTheme" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
+        <item name="popupTheme">@style/ThemeOverlay.AppCompat.DayNight.ActionBar</item>
+        <item name="android:textColorPrimary">@color/contrastColor</item>
+        <item name="android:textColorSecondary">@color/contrastColor</item>
+        <item name="tint">@color/contrastColor</item>
+        <item name="iconTint">@color/contrastColor</item>
+        <item name="toolbarSearchColor">@color/contrastColor</item>
+    </style>
+
     <style name="WhiteAccentTheme">
         <item name="colorAccent">@color/white</item>
     </style>
@@ -79,4 +95,9 @@
         <item name="iconTint">@color/contrastColor</item>
     </style>
 
+
+    <style name="SearchToolbarTheme">
+        <item name="colorAccent">@color/white</item>
+    </style>
+
 </resources>