From f793e5e98841782ea83bd3f5c964fa0d94b2598b Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Thu, 6 Jan 2022 20:16:44 -0500 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/23086 - Add Border Inverted 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 bab7453834..fb41ce4905 100644 --- a/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt +++ b/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt @@ -82,6 +82,7 @@ private val darkColorPalette = FirefoxColors( iconGradientStart = PhotonColors.Violet20, iconGradientEnd = PhotonColors.Blue20, borderDefault = PhotonColors.DarkGrey05, + borderInverted = PhotonColors.LightGrey30, borderFormDefault = PhotonColors.LightGrey05, borderAccent = PhotonColors.Violet40, borderDisabled = PhotonColors.LightGrey70, @@ -130,6 +131,7 @@ private val lightColorPalette = FirefoxColors( iconGradientStart = PhotonColors.Violet50, iconGradientEnd = PhotonColors.Blue60, borderDefault = PhotonColors.LightGrey30, + borderInverted = PhotonColors.DarkGrey05, borderFormDefault = PhotonColors.DarkGrey90, borderAccent = PhotonColors.Ink20, borderDisabled = PhotonColors.LightGrey70, @@ -183,6 +185,7 @@ class FirefoxColors( iconGradientStart: Color, iconGradientEnd: Color, borderDefault: Color, + borderInverted: Color, borderFormDefault: Color, borderAccent: Color, borderDisabled: Color, @@ -316,6 +319,9 @@ class FirefoxColors( // Default, Divider, Dotted var borderDefault by mutableStateOf(borderDefault) private set + // Onboarding + var borderInverted by mutableStateOf(borderInverted) + private set // Form parts var borderFormDefault by mutableStateOf(borderFormDefault) private set @@ -371,6 +377,7 @@ class FirefoxColors( iconGradientStart = other.iconGradientStart iconGradientEnd = other.iconGradientEnd borderDefault = other.borderDefault + borderInverted = other.borderInverted borderFormDefault = other.borderFormDefault borderAccent = other.borderAccent borderDisabled = other.borderDisabled @@ -419,6 +426,7 @@ class FirefoxColors( iconGradientStart = iconGradientStart, iconGradientEnd = iconGradientEnd, borderDefault = borderDefault, + borderInverted = borderInverted, borderFormDefault = borderFormDefault, borderAccent = borderAccent, borderDisabled = borderDisabled, diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 877281ba6d..48766c870b 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -87,6 +87,8 @@ @color/photonDarkGrey05 + + @color/photonLightGrey30 @color/photonLightGrey05 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 6d3939e2a9..337b7a2455 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -87,6 +87,8 @@ @color/photonLightGrey30 + + @color/photonDarkGrey05 @color/photonDarkGrey90