From 2db2c4fb36c4bb420921e597776d195bd87b525a Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Thu, 23 Dec 2021 13:42:04 -0500
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/22965 - Update Control to Form
 Surface design colors

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

diff --git a/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt b/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
index 0e698e2d9c..6549c2ebf1 100644
--- a/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
+++ b/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
@@ -55,8 +55,8 @@ private val darkColorPalette = FirefoxColors(
     actionSecondary = PhotonColors.DarkGrey50,
     formDefault = PhotonColors.LightGrey05,
     formSelected = PhotonColors.Violet40,
+    formSurface = PhotonColors.DarkGrey05,
     actionDisabled = PhotonColors.DarkGrey05,
-    control = PhotonColors.DarkGrey05,
     controlDark = PhotonColors.Violet40A30,
     controlActive = PhotonColors.LightGrey90,
     textPrimary = PhotonColors.LightGrey05,
@@ -102,8 +102,8 @@ private val lightColorPalette = FirefoxColors(
     actionSecondary = PhotonColors.LightGrey40,
     formDefault = PhotonColors.DarkGrey90,
     formSelected = PhotonColors.Violet90,
+    formSurface = PhotonColors.LightGrey50,
     actionDisabled = PhotonColors.LightGrey50,
-    control = PhotonColors.LightGrey30,
     controlDark = PhotonColors.Violet40A30,
     controlActive = PhotonColors.LightGrey50,
     textPrimary = PhotonColors.DarkGrey90,
@@ -154,8 +154,8 @@ class FirefoxColors(
     actionSecondary: Color,
     formDefault: Color,
     formSelected: Color,
+    formSurface: Color,
     actionDisabled: Color,
-    control: Color,
     controlDark: Color,
     controlActive: Color,
     textPrimary: Color,
@@ -229,12 +229,12 @@ class FirefoxColors(
     // Checkbox selected, Radio button selected
     var formSelected by mutableStateOf(formSelected)
         private set
+    // Switch background OFF, Switch background ON
+    var formSurface by mutableStateOf(formSurface)
+        private set
     // Checkbox disabled, Radio disabled
     var actionDisabled by mutableStateOf(actionDisabled)
         private set
-    // Switch background OFF, Indicator OFF
-    var control by mutableStateOf(control)
-        private set
     // Switch background ON
     var controlDark by mutableStateOf(controlDark)
         private set
@@ -337,8 +337,8 @@ class FirefoxColors(
         actionSecondary = other.actionSecondary
         formDefault = other.formDefault
         formSelected = other.formSelected
+        formSurface = other.formSurface
         actionDisabled = other.actionDisabled
-        control = other.control
         controlDark = other.controlDark
         controlActive = other.controlActive
         textPrimary = other.textPrimary
@@ -384,8 +384,8 @@ class FirefoxColors(
         actionSecondary = actionSecondary,
         formDefault = formDefault,
         formSelected = formSelected,
+        formSurface = formSurface,
         actionDisabled = actionDisabled,
-        control = control,
         controlDark = controlDark,
         controlActive = controlActive,
         textPrimary = textPrimary,
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index a041894c8a..72df649d3c 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -33,10 +33,10 @@
     <color name="fx_mobile_action_color_form_default" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
     <!-- Checkbox selected, Radio button selected -->
     <color name="fx_mobile_action_color_form_selected" tools:ignore="UnusedResources">@color/photonViolet40</color>
+    <!-- Switch background OFF, Switch background ON -->
+    <color name="fx_mobile_action_color_form_surface" tools:ignore="UnusedResources">@color/photonDarkGrey05</color>
     <!-- Checkbox disabled, Radio disabled -->
     <color name="fx_mobile_action_color_disabled" tools:ignore="UnusedResources">@color/photonDarkGrey05</color>
-    <!-- Switch background OFF, Indicator OFF -->
-    <color name="fx_mobile_action_color_control" tools:ignore="UnusedResources">@color/photonDarkGrey05</color>
     <!-- Switch background ON -->
     <color name="fx_mobile_action_color_control_dark" tools:ignore="UnusedResources">@color/photonViolet40A30</color>
     <!-- Indicator active -->
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index dce216c1ab..870f3415f2 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -33,10 +33,10 @@
     <color name="fx_mobile_action_color_form_default" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
     <!-- Checkbox selected, Radio button selected -->
     <color name="fx_mobile_action_color_form_selected" tools:ignore="UnusedResources">@color/photonViolet90</color>
+    <!-- Switch background OFF, Switch background ON -->
+    <color name="fx_mobile_action_color_form_surface" tools:ignore="UnusedResources">@color/photonLightGrey50</color>
     <!-- Checkbox disabled, Radio disabled -->
     <color name="fx_mobile_action_color_disabled" tools:ignore="UnusedResources">@color/photonLightGrey50</color>
-    <!-- Switch background OFF, Indicator OFF -->
-    <color name="fx_mobile_action_color_control" tools:ignore="UnusedResources">@color/photonLightGrey30</color>
     <!-- Switch background ON -->
     <color name="fx_mobile_action_color_control_dark" tools:ignore="UnusedResources">@color/photonViolet40A30</color>
     <!-- Indicator active -->