From 49b4eaf182fa062cd6177c290fa6b9ff90fcf989 Mon Sep 17 00:00:00 2001
From: Sawyer Blatz <sdblatz@gmail.com>
Date: Mon, 15 Apr 2019 13:14:49 -0700
Subject: [PATCH] For #724: Fixes white color in dark mode and removes
 android:tint (#1641)

---
 app/src/main/res/drawable/ic_menu.xml                  | 2 +-
 app/src/main/res/drawable/ic_new.xml                   | 2 +-
 app/src/main/res/drawable/ic_private_browsing.xml      | 2 +-
 app/src/main/res/drawable/ic_send.xml                  | 2 +-
 app/src/main/res/layout/bookmark_row.xml               | 1 -
 app/src/main/res/layout/fragment_home.xml              | 2 --
 app/src/main/res/layout/history_list_item.xml          | 1 -
 app/src/main/res/layout/mozac_ui_tabcounter_layout.xml | 3 +--
 app/src/main/res/layout/session_item.xml               | 4 +---
 app/src/main/res/layout/tab_header.xml                 | 2 --
 app/src/main/res/values/colors.xml                     | 2 +-
 11 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/app/src/main/res/drawable/ic_menu.xml b/app/src/main/res/drawable/ic_menu.xml
index 8b8a8d0d8..126d113c3 100644
--- a/app/src/main/res/drawable/ic_menu.xml
+++ b/app/src/main/res/drawable/ic_menu.xml
@@ -8,6 +8,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#0C0C0D"
+        android:fillColor="?primaryText"
         android:pathData="M14,6a2,2 0,1 1,-4 0,2 2,0 0,1 4,0zM14,12a2,2 0,1 1,-4 0,2 2,0 0,1 4,0zM12,20a2,2 0,1 0,0 -4,2 2,0 0,0 0,4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_new.xml b/app/src/main/res/drawable/ic_new.xml
index e4ac67508..52f76c04b 100644
--- a/app/src/main/res/drawable/ic_new.xml
+++ b/app/src/main/res/drawable/ic_new.xml
@@ -8,6 +8,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#0C0C0D"
+        android:fillColor="?primaryText"
         android:pathData="M13,4a1,1 0,1 0,-2 0v7H4a1,1 0,1 0,0 2h7v7a1,1 0,1 0,2 0v-7h7a1,1 0,1 0,0 -2h-7V4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_private_browsing.xml b/app/src/main/res/drawable/ic_private_browsing.xml
index d2e14d3fb..e56d5dd32 100644
--- a/app/src/main/res/drawable/ic_private_browsing.xml
+++ b/app/src/main/res/drawable/ic_private_browsing.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M17.5,17c-2.1,0 -3.5,-2.5 -5.5,-2.5S8.4,17 6.5,17C3.9,17 2,14.6 2,10.4 2,7.8 2.8,7 6.1,7s4.3,1.4 5.9,1.4c1.6,0 2.6,-1.4 5.9,-1.4 3.3,0 4.1,0.8 4.1,3.4 0,4.2 -1.9,6.6 -4.5,6.6zM7.7,10.2c-2,0.1 -2.9,1.3 -2.9,1.6 0,0.3 1.3,1.1 2.7,1.1 1.3,0 2.9,-0.5 2.9,-0.9 0,-0.5 -0.8,-1.9 -2.7,-1.8zM16.3,10.2c-1.9,-0.1 -2.7,1.3 -2.7,1.8 0,0.4 1.5,0.9 2.9,0.9s2.7,-0.8 2.7,-1.1c-0.1,-0.3 -0.9,-1.5 -2.9,-1.6z"
-      android:fillColor="?primaryText" />
+      android:fillColor="?attr/primaryText" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_send.xml b/app/src/main/res/drawable/ic_send.xml
index ef904a7d6..9a5d7d0ab 100644
--- a/app/src/main/res/drawable/ic_send.xml
+++ b/app/src/main/res/drawable/ic_send.xml
@@ -8,6 +8,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#202340"
+        android:fillColor="?primaryText"
         android:pathData="M11.293,2.293c0.39,-0.39 1.024,-0.39 1.414,0l6,6c0.379,0.392 0.374,1.016 -0.012,1.402 -0.386,0.385 -1.01,0.39 -1.402,0.012L13,5.414V17c0,0.552 -0.448,1 -1,1s-1,-0.448 -1,-1V5.414L6.707,9.707c-0.392,0.379 -1.016,0.373 -1.402,-0.012 -0.386,-0.386 -0.391,-1.01 -0.012,-1.402l6,-6zM3,17c0,-0.552 0.448,-1 1,-1s1,0.448 1,1v2c0,0.552 0.448,1 1,1h13c0.552,0 1,-0.448 1,-1v-2c0,-0.552 0.448,-1 1,-1s1,0.448 1,1v2c0,1.657 -1.343,3 -3,3H6c-1.657,0 -3,-1.343 -3,-3v-2z" />
 </vector>
diff --git a/app/src/main/res/layout/bookmark_row.xml b/app/src/main/res/layout/bookmark_row.xml
index 5e2ac3e24..13ef17ef0 100644
--- a/app/src/main/res/layout/bookmark_row.xml
+++ b/app/src/main/res/layout/bookmark_row.xml
@@ -54,7 +54,6 @@
         android:layout_margin="10dp"
         android:contentDescription="@string/bookmark_menu_content_description"
         android:src="@drawable/ic_menu"
-        android:tint="?primaryText"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 93208824f..7e37ba0b3 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -22,7 +22,6 @@
             android:layout_marginTop="16dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:src="@drawable/ic_menu"
-            android:tint="?primaryText"
             android:contentDescription="@string/content_description_menu"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -33,7 +32,6 @@
             android:layout_height="@dimen/glyph_button_height"
             android:background="?privateBrowsingButtonBackground"
             android:src="@drawable/ic_private_browsing"
-            android:tint="?primaryText"
             android:contentDescription="@string/content_description_private_browsing_button"
             app:layout_constraintEnd_toStartOf="@id/menuButton"
             app:layout_constraintTop_toTopOf="@id/menuButton" />
diff --git a/app/src/main/res/layout/history_list_item.xml b/app/src/main/res/layout/history_list_item.xml
index e9f4c722f..3fb4aaf86 100644
--- a/app/src/main/res/layout/history_list_item.xml
+++ b/app/src/main/res/layout/history_list_item.xml
@@ -28,7 +28,6 @@
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/content_description_history_menu"
         android:src="@drawable/ic_menu"
-        android:tint="?primaryText"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/mozac_ui_tabcounter_layout.xml b/app/src/main/res/layout/mozac_ui_tabcounter_layout.xml
index 7bb2fb4d5..987c993fe 100644
--- a/app/src/main/res/layout/mozac_ui_tabcounter_layout.xml
+++ b/app/src/main/res/layout/mozac_ui_tabcounter_layout.xml
@@ -20,8 +20,7 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:contentDescription="@string/mozac_ui_tabcounter_description"
-            android:src="@drawable/mozac_ui_tabcounter_box"
-            android:tint="?primaryText" />
+            android:src="@drawable/mozac_ui_tabcounter_box"/>
 
         <!-- This text size auto adjusts based on num digits in `TabCounter` -->
         <TextView
diff --git a/app/src/main/res/layout/session_item.xml b/app/src/main/res/layout/session_item.xml
index 33e9851ec..ba43b9aed 100644
--- a/app/src/main/res/layout/session_item.xml
+++ b/app/src/main/res/layout/session_item.xml
@@ -77,7 +77,6 @@
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/content_description_session_menu"
             android:src="@drawable/ic_menu"
-            android:tint="?primaryText"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -90,6 +89,5 @@
         android:layout_gravity="bottom|end"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/content_description_session_share"
-        android:src="@drawable/ic_send"
-        android:tint="?primaryText" />
+        android:src="@drawable/ic_send"/>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/tab_header.xml b/app/src/main/res/layout/tab_header.xml
index b66738662..2bef385f3 100644
--- a/app/src/main/res/layout/tab_header.xml
+++ b/app/src/main/res/layout/tab_header.xml
@@ -27,7 +27,6 @@
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/add_tab"
         android:src="@drawable/ic_new"
-        android:tint="?primaryText"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/tabs_overflow_button"
         app:layout_constraintTop_toTopOf="parent" />
@@ -39,7 +38,6 @@
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/tab_menu"
         android:src="@drawable/ic_menu"
-        android:tint="?primaryText"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c55a803f6..c557a8477 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -14,7 +14,7 @@
     <color name="neutral_light_theme">@color/photonGrey20</color>
 
     <!-- Dark theme color palette -->
-    <color name="primary_text_dark_theme">#FBEBFE</color>
+    <color name="primary_text_dark_theme">#FBFBFE</color>
     <color name="secondary_text_dark_theme">#A4A3AA</color>
     <color name="foundation_dark_theme">#1C1B22</color>
     <color name="above_dark_theme">#32313C</color>