[fenix] For https://github.com/mozilla-mobile/fenix/issues/22965 - Remove Control Dark design color token

pull/600/head
Gabriel Luong 3 years ago committed by mergify[bot]
parent f6f0964023
commit 47729fd237

@ -57,7 +57,6 @@ private val darkColorPalette = FirefoxColors(
formSelected = PhotonColors.Violet40,
formSurface = PhotonColors.DarkGrey05,
formDisabled = PhotonColors.DarkGrey05,
controlDark = PhotonColors.Violet40A30,
controlActive = PhotonColors.LightGrey90,
textPrimary = PhotonColors.LightGrey05,
textSecondary = PhotonColors.LightGrey40,
@ -104,7 +103,6 @@ private val lightColorPalette = FirefoxColors(
formSelected = PhotonColors.Violet90,
formSurface = PhotonColors.LightGrey50,
formDisabled = PhotonColors.LightGrey50,
controlDark = PhotonColors.Violet40A30,
controlActive = PhotonColors.LightGrey50,
textPrimary = PhotonColors.DarkGrey90,
textSecondary = PhotonColors.DarkGrey05,
@ -156,7 +154,6 @@ class FirefoxColors(
formSelected: Color,
formSurface: Color,
formDisabled: Color,
controlDark: Color,
controlActive: Color,
textPrimary: Color,
textSecondary: Color,
@ -235,9 +232,6 @@ class FirefoxColors(
// Checkbox disabled, Radio disabled
var formDisabled by mutableStateOf(formDisabled)
private set
// Switch background ON
var controlDark by mutableStateOf(controlDark)
private set
// Indicator active
var controlActive by mutableStateOf(controlActive)
private set
@ -339,7 +333,6 @@ class FirefoxColors(
formSelected = other.formSelected
formSurface = other.formSurface
formDisabled = other.formDisabled
controlDark = other.controlDark
controlActive = other.controlActive
textPrimary = other.textPrimary
textSecondary = other.textSecondary
@ -386,7 +379,6 @@ class FirefoxColors(
formSelected = formSelected,
formSurface = formSurface,
formDisabled = formDisabled,
controlDark = controlDark,
controlActive = controlActive,
textPrimary = textPrimary,
textSecondary = textSecondary,

@ -37,8 +37,6 @@
<color name="fx_mobile_action_color_form_surface" tools:ignore="UnusedResources">@color/photonDarkGrey05</color>
<!-- Checkbox disabled, Radio disabled -->
<color name="fx_mobile_action_color_form_disabled" 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 -->
<color name="fx_mobile_action_color_control_active" tools:ignore="UnusedResources">@color/photonLightGrey90</color>

@ -37,8 +37,6 @@
<color name="fx_mobile_action_color_form_surface" tools:ignore="UnusedResources">@color/photonLightGrey50</color>
<!-- Checkbox disabled, Radio disabled -->
<color name="fx_mobile_action_color_form_disabled" tools:ignore="UnusedResources">@color/photonLightGrey50</color>
<!-- Switch background ON -->
<color name="fx_mobile_action_color_control_dark" tools:ignore="UnusedResources">@color/photonViolet40A30</color>
<!-- Indicator active -->
<color name="fx_mobile_action_color_control_active" tools:ignore="UnusedResources">@color/photonLightGrey50</color>

Loading…
Cancel
Save