From 5147bdfbcb36b46ec83befea461239c8e3aef640 Mon Sep 17 00:00:00 2001
From: Anton Chekulaev <metaphore@bk.ru>
Date: Thu, 17 Sep 2020 19:16:29 +1000
Subject: [PATCH] Search view style cleanup.

---
 res/values/styles.xml                                  |  4 ++--
 res/values/themes.xml                                  |  6 +++---
 .../securesms/components/SearchToolbar.java            | 10 ++--------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 268915c03a..db1af0eab2 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -18,8 +18,8 @@
         <item name="android:textSize">@dimen/very_large_font_size</item>
     </style>
 
-    <style name="TextSecure.BaseDarkTheme.SearchView" parent="@style/Widget.AppCompat.SearchView">
-        <item name="closeIcon">@drawable/ic_baseline_clear_24</item>
+    <style name="Widget.Session.SearchView" parent="@style/Widget.AppCompat.SearchView">
+        <item name="closeIcon">@drawable/ic_clear</item>
     </style>
 
     <style name="ThemeOverlay.Session.AlertDialog" parent="ThemeOverlay.AppCompat.Dialog.Alert">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 1bccd76368..5a6e6f7e78 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -41,6 +41,8 @@
         <item name="dividerVertical">@color/separator</item>
         <item name="dividerHorizontal">?dividerVertical</item>
 
+        <item name="searchViewStyle">@style/Widget.Session.SearchView</item>
+
         <!-- App specific attributes -->
         <item name="ic_visibility_on">@drawable/ic_baseline_visibility_24</item>
         <item name="ic_visibility_off">@drawable/ic_baseline_visibility_off_24</item>
@@ -50,8 +52,7 @@
 
         <item name="media_overview_toolbar_background">@color/transparent</item>
         <item name="media_overview_header_foreground">@color/text</item>
-        <item name="media_keyboard_button_color">@color/core_grey_25</item>
-        <item name="searchViewStyle">@style/TextSecure.BaseDarkTheme.SearchView</item>
+        <item name="media_keyboard_button_color">@color/core_grey_25</item>\
 
         <item name="attachment_type_selector_background">?android:windowBackground</item>
         <item name="attachment_type_selector_hide_button_background">@color/gray50</item>
@@ -161,7 +162,6 @@
         <item name="media_overview_header_foreground">@color/text</item>
 
         <item name="theme_type">dark</item>
-        <item name="searchViewStyle">@style/TextSecure.BaseDarkTheme.SearchView</item>
         <item name="android:navigationBarColor">@color/compose_view_background</item>
 
         <item name="attachment_document_icon_small">@drawable/ic_document_small_dark</item>
diff --git a/src/org/thoughtcrime/securesms/components/SearchToolbar.java b/src/org/thoughtcrime/securesms/components/SearchToolbar.java
index e4f9ad41b7..b3ef44585a 100644
--- a/src/org/thoughtcrime/securesms/components/SearchToolbar.java
+++ b/src/org/thoughtcrime/securesms/components/SearchToolbar.java
@@ -3,8 +3,6 @@ package org.thoughtcrime.securesms.components;
 
 import android.animation.Animator;
 import android.content.Context;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.util.AttributeSet;
 import android.view.MenuItem;
@@ -49,11 +47,8 @@ public class SearchToolbar extends LinearLayout {
 
     Toolbar toolbar = findViewById(R.id.toolbar);
 
-    Drawable drawable = getContext().getResources().getDrawable(R.drawable.ic_arrow_back_white_24dp);
-    drawable.mutate();
-    drawable.setColorFilter(getContext().getResources().getColor(R.color.grey_700), PorterDuff.Mode.SRC_IN);
-
-    toolbar.setNavigationIcon(drawable);
+    toolbar.setNavigationIcon(
+            getContext().getResources().getDrawable(R.drawable.ic_baseline_clear_24));
     toolbar.inflateMenu(R.menu.conversation_list_search);
 
     this.searchItem = toolbar.getMenu().findItem(R.id.action_filter_search);
@@ -122,7 +117,6 @@ public class SearchToolbar extends LinearLayout {
   private void hide() {
     if (getVisibility() == View.VISIBLE) {
 
-
       if (listener != null) listener.onSearchClosed();
 
       if (Build.VERSION.SDK_INT >= 21) {