From 4163da8ef8b1d7acba1e3082bb2318d7870bb99c Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Thu, 10 Mar 2022 01:19:37 -0500
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/24141 - Add Icon Action
 Primary and Secondary design tokens

---
 .../main/java/org/mozilla/fenix/theme/FirefoxTheme.kt    | 16 ++++++++++++++++
 .../fenix/app/src/main/res/values-night/colors.xml       |  4 ++++
 mobile/android/fenix/app/src/main/res/values/colors.xml  |  4 ++++
 3 files changed, 24 insertions(+)

diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
index d494620b3e89..f081b084568a 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
@@ -92,6 +92,8 @@ private val darkColorPalette = FirefoxColors(
     iconAccentPink = PhotonColors.Pink20,
     iconAccentGreen = PhotonColors.Green20,
     iconAccentYellow = PhotonColors.Yellow20,
+    iconActionPrimary = PhotonColors.LightGrey05,
+    iconActionSecondary = PhotonColors.DarkGrey90,
     iconGradientStart = PhotonColors.Violet20,
     iconGradientEnd = PhotonColors.Blue20,
     borderPrimary = PhotonColors.DarkGrey05,
@@ -152,6 +154,8 @@ private val lightColorPalette = FirefoxColors(
     iconAccentPink = PhotonColors.Pink60,
     iconAccentGreen = PhotonColors.Green60,
     iconAccentYellow = PhotonColors.Yellow60,
+    iconActionPrimary = PhotonColors.LightGrey05,
+    iconActionSecondary = PhotonColors.DarkGrey90,
     iconGradientStart = PhotonColors.Violet50,
     iconGradientEnd = PhotonColors.Blue60,
     borderPrimary = PhotonColors.LightGrey30,
@@ -217,6 +221,8 @@ class FirefoxColors(
     iconAccentPink: Color,
     iconAccentGreen: Color,
     iconAccentYellow: Color,
+    iconActionPrimary: Color,
+    iconActionSecondary: Color,
     iconGradientStart: Color,
     iconGradientEnd: Color,
     borderPrimary: Color,
@@ -377,6 +383,12 @@ class FirefoxColors(
         private set
     var iconAccentYellow by mutableStateOf(iconAccentYellow)
         private set
+    // Action primary icon
+    var iconActionPrimary by mutableStateOf(iconActionPrimary)
+        private set
+    // Action secondary icon
+    var iconActionSecondary by mutableStateOf(iconActionSecondary)
+        private set
     // Reader, ETP Shield
     var iconGradientStart by mutableStateOf(iconGradientStart)
         private set
@@ -455,6 +467,8 @@ class FirefoxColors(
         iconAccentPink = other.iconAccentPink
         iconAccentGreen = other.iconAccentGreen
         iconAccentYellow = other.iconAccentYellow
+        iconActionPrimary = other.iconActionPrimary
+        iconActionSecondary = other.iconActionSecondary
         iconGradientStart = other.iconGradientStart
         iconGradientEnd = other.iconGradientEnd
         borderPrimary = other.borderPrimary
@@ -515,6 +529,8 @@ class FirefoxColors(
         iconAccentPink = iconAccentPink,
         iconAccentGreen = iconAccentGreen,
         iconAccentYellow = iconAccentYellow,
+        iconActionPrimary = iconActionPrimary,
+        iconActionSecondary = iconActionSecondary,
         iconGradientStart = iconGradientStart,
         iconGradientEnd = iconGradientEnd,
         borderPrimary = borderPrimary,
diff --git a/mobile/android/fenix/app/src/main/res/values-night/colors.xml b/mobile/android/fenix/app/src/main/res/values-night/colors.xml
index 0e58ce31f0a2..6ae3498418b7 100644
--- a/mobile/android/fenix/app/src/main/res/values-night/colors.xml
+++ b/mobile/android/fenix/app/src/main/res/values-night/colors.xml
@@ -103,6 +103,10 @@
     <color name="fx_mobile_icon_color_accent_pink">@color/photonPink20</color>
     <color name="fx_mobile_icon_color_accent_green">@color/photonGreen20</color>
     <color name="fx_mobile_icon_color_accent_yellow">@color/photonYellow20</color>
+    <!-- Action Primary Icon -->
+    <color name="fx_mobile_icon_color_action_primary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
+    <!-- Action Secondary Icon -->
+    <color name="fx_mobile_icon_color_action_secondary" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
     <!-- Reader, ETP Shield -->
     <color name="fx_mobile_icon_color_gradient_start">@color/photonViolet20</color>
     <!-- Reader, ETP Shield -->
diff --git a/mobile/android/fenix/app/src/main/res/values/colors.xml b/mobile/android/fenix/app/src/main/res/values/colors.xml
index 674bb789518a..cd183f8c86ea 100644
--- a/mobile/android/fenix/app/src/main/res/values/colors.xml
+++ b/mobile/android/fenix/app/src/main/res/values/colors.xml
@@ -103,6 +103,10 @@
     <color name="fx_mobile_icon_color_accent_pink">@color/photonPink60</color>
     <color name="fx_mobile_icon_color_accent_green">@color/photonGreen60</color>
     <color name="fx_mobile_icon_color_accent_yellow">@color/photonYellow60</color>
+    <!-- Action Primary Icon -->
+    <color name="fx_mobile_icon_color_action_primary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
+    <!-- Action Secondary Icon -->
+    <color name="fx_mobile_icon_color_action_secondary" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
     <!-- Reader, ETP Shield -->
     <color name="fx_mobile_icon_color_gradient_start">@color/photonViolet50</color>
     <!-- Reader, ETP Shield -->
-- 
2.11.4.GIT