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

For #22965 - Update Action Teritary to Form Default design colors

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

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

@ -53,7 +53,7 @@ private val darkColorPalette = FirefoxColors(
gradientEnd = PhotonColors.Violet40, gradientEnd = PhotonColors.Violet40,
actionPrimary = PhotonColors.Violet60, actionPrimary = PhotonColors.Violet60,
actionSecondary = PhotonColors.DarkGrey50, actionSecondary = PhotonColors.DarkGrey50,
actionTertiary = PhotonColors.LightGrey40, formDefault = PhotonColors.LightGrey05,
actionDisabled = PhotonColors.DarkGrey05, actionDisabled = PhotonColors.DarkGrey05,
control = PhotonColors.DarkGrey05, control = PhotonColors.DarkGrey05,
controlDark = PhotonColors.Violet40A30, controlDark = PhotonColors.Violet40A30,
@ -99,7 +99,7 @@ private val lightColorPalette = FirefoxColors(
gradientEnd = PhotonColors.Violet40, gradientEnd = PhotonColors.Violet40,
actionPrimary = PhotonColors.Violet90, actionPrimary = PhotonColors.Violet90,
actionSecondary = PhotonColors.LightGrey40, actionSecondary = PhotonColors.LightGrey40,
actionTertiary = PhotonColors.DarkGrey05, formDefault = PhotonColors.DarkGrey90,
actionDisabled = PhotonColors.LightGrey50, actionDisabled = PhotonColors.LightGrey50,
control = PhotonColors.LightGrey30, control = PhotonColors.LightGrey30,
controlDark = PhotonColors.Violet40A30, controlDark = PhotonColors.Violet40A30,
@ -150,7 +150,7 @@ class FirefoxColors(
gradientEnd: Color, gradientEnd: Color,
actionPrimary: Color, actionPrimary: Color,
actionSecondary: Color, actionSecondary: Color,
actionTertiary: Color, formDefault: Color,
actionDisabled: Color, actionDisabled: Color,
control: Color, control: Color,
controlDark: Color, controlDark: Color,
@ -220,8 +220,8 @@ class FirefoxColors(
// Secondary button, Chip // Secondary button, Chip
var actionSecondary by mutableStateOf(actionSecondary) var actionSecondary by mutableStateOf(actionSecondary)
private set private set
// Checkbox enabled, Radio enabled // Checkbox default, Radio button default
var actionTertiary by mutableStateOf(actionTertiary) var formDefault by mutableStateOf(formDefault)
private set private set
// Checkbox disabled, Radio disabled // Checkbox disabled, Radio disabled
var actionDisabled by mutableStateOf(actionDisabled) var actionDisabled by mutableStateOf(actionDisabled)
@ -329,7 +329,7 @@ class FirefoxColors(
gradientEnd = other.gradientEnd gradientEnd = other.gradientEnd
actionPrimary = other.actionPrimary actionPrimary = other.actionPrimary
actionSecondary = other.actionSecondary actionSecondary = other.actionSecondary
actionTertiary = other.actionTertiary formDefault = other.formDefault
actionDisabled = other.actionDisabled actionDisabled = other.actionDisabled
control = other.control control = other.control
controlDark = other.controlDark controlDark = other.controlDark
@ -375,7 +375,7 @@ class FirefoxColors(
gradientEnd = gradientEnd, gradientEnd = gradientEnd,
actionPrimary = actionPrimary, actionPrimary = actionPrimary,
actionSecondary = actionSecondary, actionSecondary = actionSecondary,
actionTertiary = actionTertiary, formDefault = formDefault,
actionDisabled = actionDisabled, actionDisabled = actionDisabled,
control = control, control = control,
controlDark = controlDark, controlDark = controlDark,

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

@ -29,8 +29,8 @@
<color name="fx_mobile_action_color_primary" tools:ignore="UnusedResources">@color/photonViolet60</color> <color name="fx_mobile_action_color_primary" tools:ignore="UnusedResources">@color/photonViolet60</color>
<!-- Secondary button, Chip --> <!-- Secondary button, Chip -->
<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 enabled, Radio enabled --> <!-- Checkbox default, Radio button default -->
<color name="fx_mobile_action_color_tertiary" tools:ignore="UnusedResources">@color/photonLightGrey40</color> <color name="fx_mobile_action_color_form_default" tools:ignore="UnusedResources">@color/photonLightGrey05</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 -->

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

@ -29,8 +29,8 @@
<color name="fx_mobile_action_color_primary" tools:ignore="UnusedResources">@color/photonViolet90</color> <color name="fx_mobile_action_color_primary" tools:ignore="UnusedResources">@color/photonViolet90</color>
<!-- Secondary button, Chip --> <!-- Secondary button, Chip -->
<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 enabled, Radio enabled --> <!-- Checkbox default, Radio button default -->
<color name="fx_mobile_action_color_tertiary" tools:ignore="UnusedResources">@color/photonDarkGrey05</color> <color name="fx_mobile_action_color_form_default" tools:ignore="UnusedResources">@color/photonDarkGrey90</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 -->