From 43a41e0790f38f8fc376db1a13dd1cc1e7b8905d Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Mon, 28 Feb 2022 22:45:05 -0500
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/24055 - Replace ?contrastText
 with Action Primary Text for Primary buttons

---
 app/src/main/res/layout/fragment_pwa_onboarding.xml | 2 +-
 app/src/main/res/values-night/colors.xml            | 2 +-
 app/src/main/res/values/attrs.xml                   | 2 ++
 app/src/main/res/values/colors.xml                  | 4 ++--
 app/src/main/res/values/styles.xml                  | 6 +++++-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/fragment_pwa_onboarding.xml b/app/src/main/res/layout/fragment_pwa_onboarding.xml
index 71dd368ace..3b92bed368 100644
--- a/app/src/main/res/layout/fragment_pwa_onboarding.xml
+++ b/app/src/main/res/layout/fragment_pwa_onboarding.xml
@@ -69,7 +69,7 @@
             android:letterSpacing="0"
             android:text="@string/add_to_homescreen_title"
             android:textAllCaps="false"
-            android:textColor="?contrastText"
+            android:textColor="?textActionPrimary"
             android:textSize="16sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@id/cancel_button"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index d640d124c4..cc4fb627a3 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -68,7 +68,7 @@
     <!-- Text Inverted/On Color -->
     <color name="fx_mobile_text_color_oncolor_secondary">@color/photonLightGrey40</color>
     <!-- Action Primary text -->
-    <color name="fx_mobile_text_color_action_primary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
+    <color name="fx_mobile_text_color_action_primary">@color/photonLightGrey05</color>
     <!-- Action Secondary text -->
     <color name="fx_mobile_text_color_action_secondary" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
     <!-- Action Tertiary text -->
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index c8324c5f8d..83b99ffdff 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -17,6 +17,8 @@
     <!-- Text -->
     <!-- Small heading, Text link -->
     <attr name="textAccent" format="reference" />
+    <!-- Action Primary text -->
+    <attr name="textActionPrimary" format="reference" />
 
     <!-- Icon -->
     <!-- Active tab -->
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 28c0fe3a6f..9bb3180f89 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -68,7 +68,7 @@
     <!-- Text Inverted/On Color -->
     <color name="fx_mobile_text_color_oncolor_secondary">@color/photonLightGrey40</color>
     <!-- Action Primary text -->
-    <color name="fx_mobile_text_color_action_primary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
+    <color name="fx_mobile_text_color_action_primary">@color/photonLightGrey05</color>
     <!-- Action Secondary text -->
     <color name="fx_mobile_text_color_action_secondary" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
     <!-- Action Tertiary text -->
@@ -191,7 +191,7 @@
     <!-- Text Inverted/On Color -->
     <color name="fx_mobile_private_text_color_oncolor_secondary" tools:ignore="UnusedResources">@color/photonLightGrey40</color>
     <!-- Action Primary text -->
-    <color name="fx_mobile_private_text_color_action_primary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
+    <color name="fx_mobile_private_text_color_action_primary">@color/photonLightGrey05</color>
     <!-- Action Secondary text -->
     <color name="fx_mobile_private_text_color_action_secondary" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
     <!-- Action Tertiary text -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 67152eac53..d19e0f370d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -45,6 +45,8 @@
         <!-- Text -->
         <!-- Small heading, Text link -->
         <item name="textAccent">@color/fx_mobile_text_color_accent</item>
+        <!-- Action Primary text -->
+        <item name="textActionPrimary">@color/fx_mobile_text_color_action_primary</item>
 
         <!-- Icon -->
         <!-- Active tab -->
@@ -236,6 +238,8 @@
         <!-- Text -->
         <!-- Small heading, Text link -->
         <item name="textAccent">@color/fx_mobile_private_text_color_accent</item>
+        <!-- Action Primary text -->
+        <item name="textActionPrimary">@color/fx_mobile_private_text_color_action_primary</item>
 
         <!-- Icon -->
         <!-- Active tab -->
@@ -357,7 +361,7 @@
     <style name="PositiveButton" parent="NeutralButton">
         <item name="backgroundTint">?actionPrimary</item>
         <item name="iconTint">?contrastText</item>
-        <item name="android:textColor">?contrastText</item>
+        <item name="android:textColor">?textActionPrimary</item>
     </style>
 
     <style name="search_pill" parent="Widget.AppCompat.Button.Borderless">