From 5dfc9cb699867f645811796886fd61422fc9631f Mon Sep 17 00:00:00 2001
From: Suraj Shah <shahsurajk@users.noreply.github.com>
Date: Fri, 28 Aug 2020 13:52:47 +0530
Subject: [PATCH] Fixes #4840 - - Adds dark search widget based on system theme
 (#13975)

* Fixes #4840

* Fixes #4840 - Adds dark search widget based on system theme
---
 app/src/main/res/drawable/ic_microphone_widget.xml           | 2 +-
 ...hite_corners.xml => rounded_search_widget_background.xml} | 2 +-
 app/src/main/res/layout/search_widget_extra_small_v1.xml     | 2 +-
 app/src/main/res/layout/search_widget_extra_small_v2.xml     | 2 +-
 app/src/main/res/layout/search_widget_large.xml              | 2 +-
 app/src/main/res/layout/search_widget_medium.xml             | 2 +-
 app/src/main/res/layout/search_widget_small.xml              | 2 +-
 app/src/main/res/layout/search_widget_small_no_mic.xml       | 2 +-
 app/src/main/res/values-night/colors.xml                     | 5 +++++
 app/src/main/res/values/colors.xml                           | 2 ++
 10 files changed, 15 insertions(+), 8 deletions(-)
 rename app/src/main/res/drawable/{rounded_white_corners.xml => rounded_search_widget_background.xml} (84%)

diff --git a/app/src/main/res/drawable/ic_microphone_widget.xml b/app/src/main/res/drawable/ic_microphone_widget.xml
index 7cbf04262..42d29e1d2 100644
--- a/app/src/main/res/drawable/ic_microphone_widget.xml
+++ b/app/src/main/res/drawable/ic_microphone_widget.xml
@@ -4,5 +4,5 @@
 
 <vector android:height="32dp" android:viewportHeight="24"
     android:viewportWidth="24" android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:fillType="evenOdd" android:pathData="M17,11v-1a1,1 0,0 1,2 0v1a7,7 0,0 1,-6 6.93L13,21a1,1 0,0 1,-2 0v-3.07A7,7 0,0 1,5 11v-1a1,1 0,0 1,2 0v1a5,5 0,0 0,10 0zM12,2a3,3 0,0 1,3 3v6a3,3 0,0 1,-6 0L9,5a3,3 0,0 1,3 -3z"/>
+    <path android:fillColor="@color/search_widget_mic_fill_color" android:fillType="evenOdd" android:pathData="M17,11v-1a1,1 0,0 1,2 0v1a7,7 0,0 1,-6 6.93L13,21a1,1 0,0 1,-2 0v-3.07A7,7 0,0 1,5 11v-1a1,1 0,0 1,2 0v1a5,5 0,0 0,10 0zM12,2a3,3 0,0 1,3 3v6a3,3 0,0 1,-6 0L9,5a3,3 0,0 1,3 -3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/rounded_white_corners.xml b/app/src/main/res/drawable/rounded_search_widget_background.xml
similarity index 84%
rename from app/src/main/res/drawable/rounded_white_corners.xml
rename to app/src/main/res/drawable/rounded_search_widget_background.xml
index 88f681fd0..e37f2029b 100644
--- a/app/src/main/res/drawable/rounded_white_corners.xml
+++ b/app/src/main/res/drawable/rounded_search_widget_background.xml
@@ -4,6 +4,6 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/white_color" />
+    <solid android:color="@color/search_widget_background" />
     <corners android:radius="@dimen/tab_corner_radius"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/search_widget_extra_small_v1.xml b/app/src/main/res/layout/search_widget_extra_small_v1.xml
index 4dd9c31de..3ee0f9f36 100644
--- a/app/src/main/res/layout/search_widget_extra_small_v1.xml
+++ b/app/src/main/res/layout/search_widget_extra_small_v1.xml
@@ -8,7 +8,7 @@
     android:id="@id/button_search_widget_new_tab"
     android:layout_width="match_parent"
     android:layout_height="50dp"
-    android:background="@drawable/rounded_white_corners"
+    android:background="@drawable/rounded_search_widget_background"
     android:layout_gravity="center">
 
     <ImageView
diff --git a/app/src/main/res/layout/search_widget_extra_small_v2.xml b/app/src/main/res/layout/search_widget_extra_small_v2.xml
index e61a0fde2..e07a8f9ad 100644
--- a/app/src/main/res/layout/search_widget_extra_small_v2.xml
+++ b/app/src/main/res/layout/search_widget_extra_small_v2.xml
@@ -8,7 +8,7 @@
         android:id="@id/button_search_widget_new_tab"
         android:layout_width="64dp"
         android:layout_height="50dp"
-        android:background="@drawable/rounded_white_corners"
+        android:background="@drawable/rounded_search_widget_background"
         android:layout_gravity="center">
 
     <ImageView
diff --git a/app/src/main/res/layout/search_widget_large.xml b/app/src/main/res/layout/search_widget_large.xml
index 0f06e86b0..2c11c7c1a 100644
--- a/app/src/main/res/layout/search_widget_large.xml
+++ b/app/src/main/res/layout/search_widget_large.xml
@@ -7,7 +7,7 @@
     android:layout_width="match_parent"
     android:layout_height="50dp"
     android:layout_gravity="center"
-    android:background="@drawable/rounded_white_corners">
+    android:background="@drawable/rounded_search_widget_background">
 
     <ImageView
         android:id="@+id/button_search_widget_new_tab_icon"
diff --git a/app/src/main/res/layout/search_widget_medium.xml b/app/src/main/res/layout/search_widget_medium.xml
index e27b1229a..186926c5b 100644
--- a/app/src/main/res/layout/search_widget_medium.xml
+++ b/app/src/main/res/layout/search_widget_medium.xml
@@ -7,7 +7,7 @@
     android:layout_width="192dp"
     android:layout_height="50dp"
     android:layout_gravity="center"
-    android:background="@drawable/rounded_white_corners">
+    android:background="@drawable/rounded_search_widget_background">
 
     <ImageView
         android:id="@+id/button_search_widget_new_tab_icon"
diff --git a/app/src/main/res/layout/search_widget_small.xml b/app/src/main/res/layout/search_widget_small.xml
index 8680a3851..2a1b82a9b 100644
--- a/app/src/main/res/layout/search_widget_small.xml
+++ b/app/src/main/res/layout/search_widget_small.xml
@@ -6,7 +6,7 @@
     android:layout_width="100dp"
     android:layout_height="50dp"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@drawable/rounded_white_corners"
+    android:background="@drawable/rounded_search_widget_background"
     android:orientation="horizontal">
 
     <ImageView
diff --git a/app/src/main/res/layout/search_widget_small_no_mic.xml b/app/src/main/res/layout/search_widget_small_no_mic.xml
index 2435adcda..4235bc141 100644
--- a/app/src/main/res/layout/search_widget_small_no_mic.xml
+++ b/app/src/main/res/layout/search_widget_small_no_mic.xml
@@ -7,7 +7,7 @@
         android:id="@id/button_search_widget_new_tab"
         android:layout_width="100dp"
         android:layout_height="50dp"
-        android:background="@drawable/rounded_white_corners"
+        android:background="@drawable/rounded_search_widget_background"
         android:layout_gravity="center"
         android:orientation="vertical">
 
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index f7656c92b..5f0f08d11 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -87,6 +87,11 @@
     <color name="collection_icon_color_green">@color/collection_icon_color_green_dark_theme</color>
     <color name="collection_icon_color_yellow">@color/collection_icon_color_yellow_dark_theme</color>
 
+    <!-- Search Widget -->
+    <color name="search_widget_background">@color/inset_dark_theme</color>
+    <color name="search_widget_mic_fill_color">@color/primary_text_dark_theme</color>
+    <color name="search_widget_text">@color/primary_text_dark_theme</color>
+
     <!-- Reader View colors -->
     <color name="mozac_feature_readerview_text_color">@color/primary_text_dark_theme</color>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8469a6d0b..58c98a8db 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -389,6 +389,8 @@
     <color name="button_text_color">#312A65</color>
 
     <!-- Search Widget -->
+    <color name="search_widget_background">@color/white_color</color>
+    <color name="search_widget_mic_fill_color">#FF000000</color>
     <color name="search_widget_text">#737373</color>
 
     <!-- Private Browsing Mode Persistent Notification -->