From 433ae3f6c51f9f912ac53619732cfffdb0567728 Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Fri, 3 Dec 2021 19:12:04 -0500
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/22694 - Remove
 primary_text_dark_theme usage

---
 app/src/main/res/layout/button_tip_item.xml          | 10 +++++-----
 app/src/main/res/layout/pbm_shortcut_popup.xml       |  2 +-
 .../tracking_protection_learn_more_preference.xml    |  8 ++++----
 app/src/main/res/values-night/colors.xml             | 12 ++++++------
 app/src/main/res/values/colors.xml                   |  3 +--
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/app/src/main/res/layout/button_tip_item.xml b/app/src/main/res/layout/button_tip_item.xml
index be9c1ae0e9..f02fbe5737 100644
--- a/app/src/main/res/layout/button_tip_item.xml
+++ b/app/src/main/res/layout/button_tip_item.xml
@@ -22,8 +22,8 @@
         android:lineSpacingExtra="2dp"
         android:maxLines="2"
         android:textAppearance="@style/HeaderTextStyle"
-        android:textColor="@color/primary_text_dark_theme"
-        app:drawableTint="@color/primary_text_dark_theme"
+        android:textColor="@color/photonLightGrey05"
+        app:drawableTint="@color/photonLightGrey05"
         app:layout_constraintEnd_toStartOf="@id/tip_close"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -35,7 +35,7 @@
         android:layout_height="48dp"
         android:background="?selectableItemBackgroundBorderless"
         android:contentDescription="@string/create_collection_close"
-        app:tint="@color/primary_text_dark_theme"
+        app:tint="@color/photonLightGrey05"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_close" />
@@ -48,7 +48,7 @@
         android:layout_marginTop="8dp"
         android:lineSpacingExtra="2dp"
         android:textAppearance="@style/Body14TextStyle"
-        android:textColor="@color/primary_text_dark_theme"
+        android:textColor="@color/photonLightGrey05"
         app:layout_constraintEnd_toStartOf="@id/tip_close"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tip_header_text"
@@ -60,7 +60,7 @@
         android:layout_height="wrap_content"
         android:text="@string/search_suggestions_onboarding_learn_more_link"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="@color/primary_text_dark_theme"
+        android:textColor="@color/photonLightGrey05"
         app:layout_constraintEnd_toEndOf="@id/tip_description_text"
         app:layout_constraintStart_toStartOf="@id/tip_description_text"
         app:layout_constraintTop_toBottomOf="@id/tip_description_text"
diff --git a/app/src/main/res/layout/pbm_shortcut_popup.xml b/app/src/main/res/layout/pbm_shortcut_popup.xml
index f365d36810..23b43e1d5c 100644
--- a/app/src/main/res/layout/pbm_shortcut_popup.xml
+++ b/app/src/main/res/layout/pbm_shortcut_popup.xml
@@ -31,7 +31,7 @@
             android:layout_marginEnd="32dp"
             android:lineSpacingExtra="2dp"
             android:text="@string/cfr_message"
-            android:textColor="@color/primary_text_dark_theme"
+            android:textColor="@color/photonLightGrey05"
             android:textSize="16sp"
             app:fontFamily="@font/metropolis_medium"
             app:layout_constraintBottom_toTopOf="@id/cfr_pos_button"
diff --git a/app/src/main/res/layout/tracking_protection_learn_more_preference.xml b/app/src/main/res/layout/tracking_protection_learn_more_preference.xml
index 95db39932a..6f96cf9734 100644
--- a/app/src/main/res/layout/tracking_protection_learn_more_preference.xml
+++ b/app/src/main/res/layout/tracking_protection_learn_more_preference.xml
@@ -32,7 +32,7 @@
         android:text="@string/preference_enhanced_tracking_protection_explanation_title"
         android:textAlignment="viewStart"
         android:textAppearance="@style/Header16TextStyle"
-        android:textColor="@color/primary_text_dark_theme"
+        android:textColor="@color/photonLightGrey05"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toStartOf="@id/guideline"
         app:layout_constraintStart_toStartOf="parent" />
@@ -47,7 +47,7 @@
         android:scrollHorizontally="false"
         android:text="@string/preference_enhanced_tracking_protection_explanation"
         android:textAlignment="viewStart"
-        android:textColor="@color/primary_text_dark_theme"
+        android:textColor="@color/photonLightGrey05"
         android:textSize="14sp"
         app:layout_constraintBottom_toTopOf="@id/learn_more"
         app:layout_constraintEnd_toStartOf="@id/guideline"
@@ -63,7 +63,7 @@
         android:ellipsize="none"
         android:text="@string/preference_enhanced_tracking_protection_explanation_learn_more"
         android:textAlignment="viewStart"
-        android:textColor="@color/primary_text_dark_theme"
+        android:textColor="@color/photonLightGrey05"
         android:textSize="14sp"
         app:layout_constraintEnd_toStartOf="@id/guideline"
         app:layout_constraintHorizontal_bias="0.0"
@@ -77,7 +77,7 @@
         android:layout_marginStart="12dp"
         android:paddingBottom="12dp"
         android:importantForAccessibility="no"
-        app:tint="@color/primary_text_dark_theme"
+        app:tint="@color/photonLightGrey05"
         app:layout_constraintBottom_toBottomOf="@id/learn_more"
         app:layout_constraintStart_toEndOf="@id/learn_more"
         app:layout_constraintTop_toTopOf="@id/learn_more"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 95ea2dd94a..b7b99be8e6 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -88,7 +88,7 @@
     <color name="fx_mobile_border_color_divider" tools:ignore="UnusedResources">@color/photonDarkGrey05</color>
 
     <!-- Normal theme colors for dark mode -->
-    <color name="primary_text_normal_theme">@color/primary_text_dark_theme</color>
+    <color name="primary_text_normal_theme">@color/fx_mobile_text_color_primary</color>
     <color name="secondary_text_normal_theme">#A7A2B7</color>
     <color name="contrast_text_normal_theme">@color/primary_text_normal_theme</color>
     <color name="caption_text_normal_theme">@color/photonLightGrey70</color>
@@ -173,13 +173,13 @@
 
     <!-- Search Widget -->
     <color name="search_widget_background">@color/inset_normal_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>
+    <color name="search_widget_mic_fill_color">@color/photonLightGrey05</color>
+    <color name="search_widget_text">@color/fx_mobile_text_color_primary</color>
 
     <!-- Reader View colors -->
-    <color name="mozac_feature_readerview_text_color">@color/primary_text_dark_theme</color>
+    <color name="mozac_feature_readerview_text_color">@color/fx_mobile_text_color_primary</color>
 
     <!-- Tab Counter colors -->
-    <color name="mozac_ui_tabcounter_default_tint">@color/primary_text_dark_theme</color>
-    <color name="mozac_ui_tabcounter_default_text">@color/primary_text_dark_theme</color>
+    <color name="mozac_ui_tabcounter_default_tint">@color/photonLightGrey05</color>
+    <color name="mozac_ui_tabcounter_default_text">@color/fx_mobile_text_color_primary</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d7738aec60..456ba490bb 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -89,7 +89,7 @@
 
     <!-- Light theme color palette -->
     <color name="primary_text_light_theme">@color/photonInk80</color>
-    <color name="contrast_text_light_theme">@color/primary_text_dark_theme</color>
+    <color name="contrast_text_light_theme">@color/photonLightGrey05</color>
     <color name="foundation_light_theme">@color/photonLightGrey20</color>
     <color name="inset_light_theme">@color/photonLightGrey30</color>
     <color name="accent_light_theme">@color/photonInk20</color>
@@ -108,7 +108,6 @@
     <color name="tab_tray_item_media_stroke">@color/photonWhite</color>
 
     <!-- Dark theme color palette -->
-    <color name="primary_text_dark_theme">@color/photonLightGrey05</color>
     <color name="above_dark_theme">@color/photonDarkGrey50</color>
     <color name="accent_bright_dark_theme">@color/photonViolet70</color>
     <color name="accent_high_contrast_dark_theme">@color/photonViolet40</color>