From 3a827d1c4814670a2128f48241460f9c5a04e5cb Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 22 May 2018 12:26:40 -0400
Subject: [PATCH] Fix dark theme in search.

Fixed #7821
---
 res/drawable/header_search_background.xml | 2 +-
 res/layout/fragment_search.xml            | 2 +-
 res/values/attrs.xml                      | 1 +
 res/values/themes.xml                     | 2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/res/drawable/header_search_background.xml b/res/drawable/header_search_background.xml
index 2331f677b..7932fc93d 100644
--- a/res/drawable/header_search_background.xml
+++ b/res/drawable/header_search_background.xml
@@ -7,7 +7,7 @@
     </item>
     <item android:top="1dp">
         <shape android:shape="rectangle" >
-            <solid android:color="@color/white" />
+            <solid android:color="?attr/search_background" />
         </shape>
     </item>
 </layer-list>
diff --git a/res/layout/fragment_search.xml b/res/layout/fragment_search.xml
index d273167dd..99a167b43 100644
--- a/res/layout/fragment_search.xml
+++ b/res/layout/fragment_search.xml
@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center"
-        android:background="@color/white"
+        android:background="?attr/search_background"
         android:visibility="gone" />
 
     <android.support.v7.widget.RecyclerView
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index db247ed57..7fa23f321 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -135,6 +135,7 @@
     <attr name="shared_contact_details_titlebar" format="color"/>
 
     <attr name="search_toolbar_background" format="color"/>
+    <attr name="search_background" format="color"/>
 
     <attr name="contact_list_divider" format="reference"/>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 8d186c508..c47aa779e 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -240,6 +240,7 @@
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.Fix</item>
 
         <item name="search_toolbar_background">@color/white</item>
+        <item name="search_background">@color/white</item>
         <item name="invite_background">@color/signal_primary</item>
     </style>
 
@@ -364,6 +365,7 @@
         <item name="group_members_dialog_icon">@drawable/ic_group_white_24dp</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.Fix</item>
         <item name="search_toolbar_background">@color/black</item>
+        <item name="search_background">@color/black</item>
         <item name="invite_background">@color/black</item>
     </style>