Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-19 09:25:34 +00:00
Code Issues Releases Wiki Activity

[fenix] For https://github.com/mozilla-mobile/fenix/issues/23374 - Update Action Secondary colors and Add Action Tertiary

Browse Source
This commit is contained in:
Gabriel Luong 2022-01-24 02:32:15 -05:00 committed by mergify[bot]
parent 9d35f41d65
commit c7b4415d24
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,8 @@ private val darkColorPalette = FirefoxColors(
gradientStart = PhotonColors.Violet70, gradientStart = PhotonColors.Violet70,
gradientEnd = PhotonColors.Violet40, gradientEnd = PhotonColors.Violet40,
actionPrimary = PhotonColors.Violet60, actionPrimary = PhotonColors.Violet60,
actionSecondary = PhotonColors.DarkGrey10, actionSecondary = PhotonColors.LightGrey05,
actionTertiary = PhotonColors.DarkGrey10,
formDefault = PhotonColors.LightGrey05, formDefault = PhotonColors.LightGrey05,
formSelected = PhotonColors.Violet40, formSelected = PhotonColors.Violet40,
formSurface = PhotonColors.DarkGrey05, formSurface = PhotonColors.DarkGrey05,
@ -104,6 +105,7 @@ private val lightColorPalette = FirefoxColors(
gradientEnd = PhotonColors.Violet40, gradientEnd = PhotonColors.Violet40,
actionPrimary = PhotonColors.Ink20, actionPrimary = PhotonColors.Ink20,
actionSecondary = PhotonColors.LightGrey40, actionSecondary = PhotonColors.LightGrey40,
actionTertiary = PhotonColors.LightGrey40,
formDefault = PhotonColors.DarkGrey90, formDefault = PhotonColors.DarkGrey90,
formSelected = PhotonColors.Ink20, formSelected = PhotonColors.Ink20,
formSurface = PhotonColors.LightGrey50, formSurface = PhotonColors.LightGrey50,
@ -160,6 +162,7 @@ class FirefoxColors(
gradientEnd: Color, gradientEnd: Color,
actionPrimary: Color, actionPrimary: Color,
actionSecondary: Color, actionSecondary: Color,
actionTertiary: Color,
formDefault: Color, formDefault: Color,
formSelected: Color, formSelected: Color,
formSurface: Color, formSurface: Color,
@ -232,9 +235,12 @@ class FirefoxColors(
// Primary button, Snackbar, Floating action button, Chip selected // Primary button, Snackbar, Floating action button, Chip selected
var actionPrimary by mutableStateOf(actionPrimary) var actionPrimary by mutableStateOf(actionPrimary)
private set private set
// Secondary button, Chip // Secondary button
var actionSecondary by mutableStateOf(actionSecondary) var actionSecondary by mutableStateOf(actionSecondary)
private set private set
// Filter
var actionTertiary by mutableStateOf(actionTertiary)
private set
// Checkbox default, Radio button default // Checkbox default, Radio button default
var formDefault by mutableStateOf(formDefault) var formDefault by mutableStateOf(formDefault)
private set private set
@ -360,6 +366,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 formDefault = other.formDefault
formSelected = other.formSelected formSelected = other.formSelected
formSurface = other.formSurface formSurface = other.formSurface
@ -411,6 +418,7 @@ class FirefoxColors(
gradientEnd = gradientEnd, gradientEnd = gradientEnd,
actionPrimary = actionPrimary, actionPrimary = actionPrimary,
actionSecondary = actionSecondary, actionSecondary = actionSecondary,
actionTertiary = actionTertiary,
formDefault = formDefault, formDefault = formDefault,
formSelected = formSelected, formSelected = formSelected,
formSurface = formSurface, formSurface = formSurface,

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

@ -27,8 +27,10 @@
<!-- Action --> <!-- Action -->
<!-- Primary button, Snackbar, Floating action button, Chip selected --> <!-- Primary button, Snackbar, Floating action button, Chip selected -->
<color name="fx_mobile_action_color_primary">@color/photonViolet60</color> <color name="fx_mobile_action_color_primary">@color/photonViolet60</color>
<!-- Secondary button, Chip --> <!-- Secondary button -->
<color name="fx_mobile_action_color_secondary" tools:ignore="UnusedResources">@color/photonDarkGrey10</color> <color name="fx_mobile_action_color_secondary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Filter -->
<color name="fx_mobile_action_color_tertiary" tools:ignore="UnusedResources">@color/photonDarkGrey10</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 --> <!-- Checkbox selected, Radio button selected -->

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

@ -27,8 +27,10 @@
<!-- Action --> <!-- Action -->
<!-- Primary button, Snackbar, Floating action button, Chip selected --> <!-- Primary button, Snackbar, Floating action button, Chip selected -->
<color name="fx_mobile_action_color_primary">@color/photonInk20</color> <color name="fx_mobile_action_color_primary">@color/photonInk20</color>
<!-- Secondary button, Chip --> <!-- Secondary button -->
<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>
<!-- Filter -->
<color name="fx_mobile_action_color_tertiary" 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 --> <!-- Checkbox selected, Radio button selected -->