From d5d302da6985c294ef8b8ed5c0c278a93b45c1f2 Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Sat, 16 Oct 2021 14:32:41 -0400
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/21973 - Remove redirection of
 color variables for the collection color variables

---
 .../main/res/layout/migration_list_item.xml   |  2 +-
 app/src/main/res/values-night/colors.xml      | 10 +++++-----
 app/src/main/res/values/colors.xml            | 20 +++++--------------
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/app/src/main/res/layout/migration_list_item.xml b/app/src/main/res/layout/migration_list_item.xml
index 811790ec20..585c83aa3b 100644
--- a/app/src/main/res/layout/migration_list_item.xml
+++ b/app/src/main/res/layout/migration_list_item.xml
@@ -14,7 +14,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:contentDescription="@string/migration_icon_description"
-            app:tint="@color/collection_icon_color_violet_light_theme"
+            app:tint="@color/photonViolet60"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/mozac_ic_check"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 81a95a7599..1e88daaec4 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -86,11 +86,11 @@
     <color name="synced_tabs_separator">@color/synced_tabs_separator_dark_theme</color>
 
     <!-- Collection icons-->
-    <color name="collection_icon_color_violet">@color/collection_icon_color_violet_dark_theme</color>
-    <color name="collection_icon_color_blue">@color/collection_icon_color_blue_dark_theme</color>
-    <color name="collection_icon_color_pink">@color/collection_icon_color_pink_dark_theme</color>
-    <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>
+    <color name="collection_icon_color_violet">@color/photonViolet40</color>
+    <color name="collection_icon_color_blue">@color/photonBlue30</color>
+    <color name="collection_icon_color_pink">@color/photonPink30</color>
+    <color name="collection_icon_color_green">#88FFD1</color>
+    <color name="collection_icon_color_yellow">#FFDE67</color>
 
     <!-- Home screen -->
     <color name="home_show_all_button_text">@color/photonViolet40</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f08a1878c9..82f3b22d27 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -27,11 +27,6 @@
     <color name="dark_grey_90_gradient_end">#0015141A</color>
     <color name="synced_tabs_separator_light_theme">@color/photonLightGrey30</color>
     <color name="top_site_title_text_light_theme">@color/photonDarkGrey90</color>
-    <color name="collection_icon_color_violet_light_theme">@color/photonViolet60</color>
-    <color name="collection_icon_color_blue_light_theme">@color/photonBlue60</color>
-    <color name="collection_icon_color_pink_light_theme">@color/photonPink60</color>
-    <color name="collection_icon_color_green_light_theme">@color/photonGreen60</color>
-    <color name="collection_icon_color_yellow_light_theme">@color/photonYellow60</color>
     <color name="toolbar_start_gradient_light_theme">@color/foundation_light_theme</color>
     <color name="toolbar_center_gradient_light_theme">@color/foundation_light_theme</color>
     <color name="toolbar_end_gradient_light_theme">@color/foundation_light_theme</color>
@@ -79,11 +74,6 @@
     <color name="scrimEnd_dark_theme">#F515141A</color>
     <color name="synced_tabs_separator_dark_theme">@color/photonDarkGrey10</color>
     <color name="top_site_title_text_dark_theme">@color/photonLightGrey05</color>
-    <color name="collection_icon_color_violet_dark_theme">@color/photonViolet40</color>
-    <color name="collection_icon_color_blue_dark_theme">@color/photonBlue30</color>
-    <color name="collection_icon_color_pink_dark_theme">@color/photonPink30</color>
-    <color name="collection_icon_color_green_dark_theme">#88FFD1</color>
-    <color name="collection_icon_color_yellow_dark_theme">#FFDE67</color>
     <color name="toolbar_start_gradient_dark_theme">@color/foundation_dark_theme</color>
     <color name="toolbar_center_gradient_dark_theme">@color/foundation_dark_theme</color>
     <color name="toolbar_end_gradient_dark_theme">@color/foundation_dark_theme</color>
@@ -250,11 +240,11 @@
     <color name="synced_tabs_separator">@color/synced_tabs_separator_light_theme</color>
 
     <!-- Collection icons-->
-    <color name="collection_icon_color_violet">@color/collection_icon_color_violet_light_theme</color>
-    <color name="collection_icon_color_blue">@color/collection_icon_color_blue_light_theme</color>
-    <color name="collection_icon_color_pink">@color/collection_icon_color_pink_light_theme</color>
-    <color name="collection_icon_color_green">@color/collection_icon_color_green_light_theme</color>
-    <color name="collection_icon_color_yellow">@color/collection_icon_color_yellow_light_theme</color>
+    <color name="collection_icon_color_violet">@color/photonViolet60</color>
+    <color name="collection_icon_color_blue">@color/photonBlue60</color>
+    <color name="collection_icon_color_pink">@color/photonPink60</color>
+    <color name="collection_icon_color_green">@color/photonGreen60</color>
+    <color name="collection_icon_color_yellow">@color/photonYellow60</color>
     <array name="collection_icon_colors">
         <item>@color/collection_icon_color_violet</item>
         <item>@color/collection_icon_color_blue</item>