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

For #23086 - Add Border Inverted design token

Browse Source
This commit is contained in:
Gabriel Luong 2022-01-06 20:16:44 -05:00 committed by mergify[bot]
parent a39224e44b
commit 873d8257d1
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

@ -82,6 +82,7 @@ private val darkColorPalette = FirefoxColors(
iconGradientStart = PhotonColors.Violet20, iconGradientStart = PhotonColors.Violet20,
iconGradientEnd = PhotonColors.Blue20, iconGradientEnd = PhotonColors.Blue20,
borderDefault = PhotonColors.DarkGrey05, borderDefault = PhotonColors.DarkGrey05,
borderInverted = PhotonColors.LightGrey30,
borderFormDefault = PhotonColors.LightGrey05, borderFormDefault = PhotonColors.LightGrey05,
borderAccent = PhotonColors.Violet40, borderAccent = PhotonColors.Violet40,
borderDisabled = PhotonColors.LightGrey70, borderDisabled = PhotonColors.LightGrey70,
@ -130,6 +131,7 @@ private val lightColorPalette = FirefoxColors(
iconGradientStart = PhotonColors.Violet50, iconGradientStart = PhotonColors.Violet50,
iconGradientEnd = PhotonColors.Blue60, iconGradientEnd = PhotonColors.Blue60,
borderDefault = PhotonColors.LightGrey30, borderDefault = PhotonColors.LightGrey30,
borderInverted = PhotonColors.DarkGrey05,
borderFormDefault = PhotonColors.DarkGrey90, borderFormDefault = PhotonColors.DarkGrey90,
borderAccent = PhotonColors.Ink20, borderAccent = PhotonColors.Ink20,
borderDisabled = PhotonColors.LightGrey70, borderDisabled = PhotonColors.LightGrey70,
@ -183,6 +185,7 @@ class FirefoxColors(
iconGradientStart: Color, iconGradientStart: Color,
iconGradientEnd: Color, iconGradientEnd: Color,
borderDefault: Color, borderDefault: Color,
borderInverted: Color,
borderFormDefault: Color, borderFormDefault: Color,
borderAccent: Color, borderAccent: Color,
borderDisabled: Color, borderDisabled: Color,
@ -316,6 +319,9 @@ class FirefoxColors(
// Default, Divider, Dotted // Default, Divider, Dotted
var borderDefault by mutableStateOf(borderDefault) var borderDefault by mutableStateOf(borderDefault)
private set private set
// Onboarding
var borderInverted by mutableStateOf(borderInverted)
private set
// Form parts // Form parts
var borderFormDefault by mutableStateOf(borderFormDefault) var borderFormDefault by mutableStateOf(borderFormDefault)
private set private set
@ -371,6 +377,7 @@ class FirefoxColors(
iconGradientStart = other.iconGradientStart iconGradientStart = other.iconGradientStart
iconGradientEnd = other.iconGradientEnd iconGradientEnd = other.iconGradientEnd
borderDefault = other.borderDefault borderDefault = other.borderDefault
borderInverted = other.borderInverted
borderFormDefault = other.borderFormDefault borderFormDefault = other.borderFormDefault
borderAccent = other.borderAccent borderAccent = other.borderAccent
borderDisabled = other.borderDisabled borderDisabled = other.borderDisabled
@ -419,6 +426,7 @@ class FirefoxColors(
iconGradientStart = iconGradientStart, iconGradientStart = iconGradientStart,
iconGradientEnd = iconGradientEnd, iconGradientEnd = iconGradientEnd,
borderDefault = borderDefault, borderDefault = borderDefault,
borderInverted = borderInverted,
borderFormDefault = borderFormDefault, borderFormDefault = borderFormDefault,
borderAccent = borderAccent, borderAccent = borderAccent,
borderDisabled = borderDisabled, borderDisabled = borderDisabled,

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

@ -87,6 +87,8 @@
<!-- Border --> <!-- Border -->
<!-- Default, Divider, Dotted --> <!-- Default, Divider, Dotted -->
<color name="fx_mobile_border_color_default" tools:ignore="UnusedResources">@color/photonDarkGrey05</color> <color name="fx_mobile_border_color_default" tools:ignore="UnusedResources">@color/photonDarkGrey05</color>
<!-- Onboarding -->
<color name="fx_mobile_border_color_inverted" tools:ignore="UnusedResources">@color/photonLightGrey30</color>
<!-- Form parts --> <!-- Form parts -->
<color name="fx_mobile_border_color_form_default" tools:ignore="UnusedResources">@color/photonLightGrey05</color> <color name="fx_mobile_border_color_form_default" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Active tab (Nav), Selected tab, Active form --> <!-- Active tab (Nav), Selected tab, Active form -->

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

@ -87,6 +87,8 @@
<!-- Border --> <!-- Border -->
<!-- Default, Divider, Dotted --> <!-- Default, Divider, Dotted -->
<color name="fx_mobile_border_color_default" tools:ignore="UnusedResources">@color/photonLightGrey30</color> <color name="fx_mobile_border_color_default" tools:ignore="UnusedResources">@color/photonLightGrey30</color>
<!-- Onboarding -->
<color name="fx_mobile_border_color_inverted" tools:ignore="UnusedResources">@color/photonDarkGrey05</color>
<!-- Form parts --> <!-- Form parts -->
<color name="fx_mobile_border_color_form_default" tools:ignore="UnusedResources">@color/photonDarkGrey90</color> <color name="fx_mobile_border_color_form_default" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
<!-- Active tab (Nav), Selected tab, Active form --> <!-- Active tab (Nav), Selected tab, Active form -->