From de628fa63579485e3d86664046eec88bba2f35cb Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Mon, 24 Jan 2022 13:17:07 -0500 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/23374 - Add Action Quarternary design token --- app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt | 8 ++++++++ app/src/main/res/values-night/colors.xml | 2 ++ app/src/main/res/values/colors.xml | 2 ++ 3 files changed, 12 insertions(+) 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 1faa4d46e..a3038a1e0 100644 --- a/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt +++ b/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt @@ -54,6 +54,7 @@ private val darkColorPalette = FirefoxColors( actionPrimary = PhotonColors.Violet60, actionSecondary = PhotonColors.LightGrey05, actionTertiary = PhotonColors.DarkGrey10, + actionQuarternary = PhotonColors.DarkGrey80, formDefault = PhotonColors.LightGrey05, formSelected = PhotonColors.Violet40, formSurface = PhotonColors.DarkGrey05, @@ -106,6 +107,7 @@ private val lightColorPalette = FirefoxColors( actionPrimary = PhotonColors.Ink20, actionSecondary = PhotonColors.LightGrey40, actionTertiary = PhotonColors.LightGrey40, + actionQuarternary = PhotonColors.LightGrey10, formDefault = PhotonColors.DarkGrey90, formSelected = PhotonColors.Ink20, formSurface = PhotonColors.LightGrey50, @@ -163,6 +165,7 @@ class FirefoxColors( actionPrimary: Color, actionSecondary: Color, actionTertiary: Color, + actionQuarternary: Color, formDefault: Color, formSelected: Color, formSurface: Color, @@ -241,6 +244,9 @@ class FirefoxColors( // Filter var actionTertiary by mutableStateOf(actionTertiary) private set + // Chip + var actionQuarternary by mutableStateOf(actionQuarternary) + private set // Checkbox default, Radio button default var formDefault by mutableStateOf(formDefault) private set @@ -367,6 +373,7 @@ class FirefoxColors( actionPrimary = other.actionPrimary actionSecondary = other.actionSecondary actionTertiary = other.actionTertiary + actionQuarternary = other.actionQuarternary formDefault = other.formDefault formSelected = other.formSelected formSurface = other.formSurface @@ -419,6 +426,7 @@ class FirefoxColors( actionPrimary = actionPrimary, actionSecondary = actionSecondary, actionTertiary = actionTertiary, + actionQuarternary = actionQuarternary, formDefault = formDefault, formSelected = formSelected, formSurface = formSurface, diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index a6a75b6f9..20226ef6a 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -31,6 +31,8 @@ @color/photonLightGrey05 @color/photonDarkGrey10 + + @color/photonDarkGrey80 @color/photonLightGrey05 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 8b4cd2bc4..9b67ec499 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -31,6 +31,8 @@ @color/photonLightGrey40 @color/photonLightGrey40 + + @color/photonLightGrey10 @color/photonDarkGrey90