ishan/fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

For #22965 - Add Form Selected design color token

Browse Source
This commit is contained in:
Gabriel Luong 2021-12-23 13:12:09 -05:00 committed by mergify[bot]
parent c9bc38d67c
commit 5bea4554ad
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
View File

@ -54,6 +54,7 @@ private val darkColorPalette = FirefoxColors(
actionPrimary = PhotonColors.Violet60, actionPrimary = PhotonColors.Violet60,
actionSecondary = PhotonColors.DarkGrey50, actionSecondary = PhotonColors.DarkGrey50,
formDefault = PhotonColors.LightGrey05, formDefault = PhotonColors.LightGrey05,
formSelected = PhotonColors.Violet40,
actionDisabled = PhotonColors.DarkGrey05, actionDisabled = PhotonColors.DarkGrey05,
control = PhotonColors.DarkGrey05, control = PhotonColors.DarkGrey05,
controlDark = PhotonColors.Violet40A30, controlDark = PhotonColors.Violet40A30,
@ -100,6 +101,7 @@ private val lightColorPalette = FirefoxColors(
actionPrimary = PhotonColors.Violet90, actionPrimary = PhotonColors.Violet90,
actionSecondary = PhotonColors.LightGrey40, actionSecondary = PhotonColors.LightGrey40,
formDefault = PhotonColors.DarkGrey90, formDefault = PhotonColors.DarkGrey90,
formSelected = PhotonColors.Violet90,
actionDisabled = PhotonColors.LightGrey50, actionDisabled = PhotonColors.LightGrey50,
control = PhotonColors.LightGrey30, control = PhotonColors.LightGrey30,
controlDark = PhotonColors.Violet40A30, controlDark = PhotonColors.Violet40A30,
@ -151,6 +153,7 @@ class FirefoxColors(
actionPrimary: Color, actionPrimary: Color,
actionSecondary: Color, actionSecondary: Color,
formDefault: Color, formDefault: Color,
formSelected: Color,
actionDisabled: Color, actionDisabled: Color,
control: Color, control: Color,
controlDark: Color, controlDark: Color,
@ -223,6 +226,9 @@ class FirefoxColors(
// Checkbox default, Radio button default // Checkbox default, Radio button default
var formDefault by mutableStateOf(formDefault) var formDefault by mutableStateOf(formDefault)
private set private set
// Checkbox selected, Radio button selected
var formSelected by mutableStateOf(formSelected)
private set
// Checkbox disabled, Radio disabled // Checkbox disabled, Radio disabled
var actionDisabled by mutableStateOf(actionDisabled) var actionDisabled by mutableStateOf(actionDisabled)
private set private set
@ -330,6 +336,7 @@ class FirefoxColors(
actionPrimary = other.actionPrimary actionPrimary = other.actionPrimary
actionSecondary = other.actionSecondary actionSecondary = other.actionSecondary
formDefault = other.formDefault formDefault = other.formDefault
formSelected = other.formSelected
actionDisabled = other.actionDisabled actionDisabled = other.actionDisabled
control = other.control control = other.control
controlDark = other.controlDark controlDark = other.controlDark
@ -376,6 +383,7 @@ class FirefoxColors(
actionPrimary = actionPrimary, actionPrimary = actionPrimary,
actionSecondary = actionSecondary, actionSecondary = actionSecondary,
formDefault = formDefault, formDefault = formDefault,
formSelected = formSelected,
actionDisabled = actionDisabled, actionDisabled = actionDisabled,
control = control, control = control,
controlDark = controlDark, controlDark = controlDark,

2
app/src/main/res/values-night/colors.xml
View File

@ -31,6 +31,8 @@
<color name="fx_mobile_action_color_secondary" tools:ignore="UnusedResources">@color/photonDarkGrey50</color> <color name="fx_mobile_action_color_secondary" tools:ignore="UnusedResources">@color/photonDarkGrey50</color>
<!-- Checkbox default, Radio button default --> <!-- Checkbox default, Radio button default -->
<color name="fx_mobile_action_color_form_default" tools:ignore="UnusedResources">@color/photonLightGrey05</color> <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>
<!-- Checkbox disabled, Radio disabled --> <!-- Checkbox disabled, Radio disabled -->
<color name="fx_mobile_action_color_disabled" tools:ignore="UnusedResources">@color/photonDarkGrey05</color> <color name="fx_mobile_action_color_disabled" tools:ignore="UnusedResources">@color/photonDarkGrey05</color>
<!-- Switch background OFF, Indicator OFF --> <!-- Switch background OFF, Indicator OFF -->

2
app/src/main/res/values/colors.xml
View File

@ -31,6 +31,8 @@
<color name="fx_mobile_action_color_secondary" tools:ignore="UnusedResources">@color/photonLightGrey40</color> <color name="fx_mobile_action_color_secondary" tools:ignore="UnusedResources">@color/photonLightGrey40</color>
<!-- Checkbox default, Radio button default --> <!-- Checkbox default, Radio button default -->
<color name="fx_mobile_action_color_form_default" tools:ignore="UnusedResources">@color/photonDarkGrey90</color> <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>
<!-- Checkbox disabled, Radio disabled --> <!-- Checkbox disabled, Radio disabled -->
<color name="fx_mobile_action_color_disabled" tools:ignore="UnusedResources">@color/photonLightGrey50</color> <color name="fx_mobile_action_color_disabled" tools:ignore="UnusedResources">@color/photonLightGrey50</color>
<!-- Switch background OFF, Indicator OFF --> <!-- Switch background OFF, Indicator OFF -->