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

For #23086 - Change design token name from Border Selected to Border Accent

Browse Source
This commit is contained in:
Gabriel Luong 2022-01-06 19:55:56 -05:00 committed by mergify[bot]
parent 2ad2691724
commit a39224e44b
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

@ -83,7 +83,7 @@ private val darkColorPalette = FirefoxColors(
iconGradientEnd = PhotonColors.Blue20, iconGradientEnd = PhotonColors.Blue20,
borderDefault = PhotonColors.DarkGrey05, borderDefault = PhotonColors.DarkGrey05,
borderFormDefault = PhotonColors.LightGrey05, borderFormDefault = PhotonColors.LightGrey05,
borderSelected = PhotonColors.Violet40, borderAccent = PhotonColors.Violet40,
borderDisabled = PhotonColors.LightGrey70, borderDisabled = PhotonColors.LightGrey70,
borderWarning = PhotonColors.Red40 borderWarning = PhotonColors.Red40
) )
@ -131,7 +131,7 @@ private val lightColorPalette = FirefoxColors(
iconGradientEnd = PhotonColors.Blue60, iconGradientEnd = PhotonColors.Blue60,
borderDefault = PhotonColors.LightGrey30, borderDefault = PhotonColors.LightGrey30,
borderFormDefault = PhotonColors.DarkGrey90, borderFormDefault = PhotonColors.DarkGrey90,
borderSelected = PhotonColors.Ink20, borderAccent = PhotonColors.Ink20,
borderDisabled = PhotonColors.LightGrey70, borderDisabled = PhotonColors.LightGrey70,
borderWarning = PhotonColors.Red80 borderWarning = PhotonColors.Red80
) )
@ -184,7 +184,7 @@ class FirefoxColors(
iconGradientEnd: Color, iconGradientEnd: Color,
borderDefault: Color, borderDefault: Color,
borderFormDefault: Color, borderFormDefault: Color,
borderSelected: Color, borderAccent: Color,
borderDisabled: Color, borderDisabled: Color,
borderWarning: Color borderWarning: Color
) { ) {
@ -319,8 +319,8 @@ class FirefoxColors(
// Form parts // Form parts
var borderFormDefault by mutableStateOf(borderFormDefault) var borderFormDefault by mutableStateOf(borderFormDefault)
private set private set
// Selected tab // Active tab (Nav), Selected tab, Active form
var borderSelected by mutableStateOf(borderSelected) var borderAccent by mutableStateOf(borderAccent)
private set private set
// Form parts // Form parts
var borderDisabled by mutableStateOf(borderDisabled) var borderDisabled by mutableStateOf(borderDisabled)
@ -372,7 +372,7 @@ class FirefoxColors(
iconGradientEnd = other.iconGradientEnd iconGradientEnd = other.iconGradientEnd
borderDefault = other.borderDefault borderDefault = other.borderDefault
borderFormDefault = other.borderFormDefault borderFormDefault = other.borderFormDefault
borderSelected = other.borderSelected borderAccent = other.borderAccent
borderDisabled = other.borderDisabled borderDisabled = other.borderDisabled
borderWarning = other.borderWarning borderWarning = other.borderWarning
} }
@ -420,7 +420,7 @@ class FirefoxColors(
iconGradientEnd = iconGradientEnd, iconGradientEnd = iconGradientEnd,
borderDefault = borderDefault, borderDefault = borderDefault,
borderFormDefault = borderFormDefault, borderFormDefault = borderFormDefault,
borderSelected = borderSelected, borderAccent = borderAccent,
borderDisabled = borderDisabled, borderDisabled = borderDisabled,
borderWarning = borderWarning borderWarning = borderWarning
) )

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

@ -89,8 +89,8 @@
<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>
<!-- 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>
<!-- Selected tab --> <!-- Active tab (Nav), Selected tab, Active form -->
<color name="fx_mobile_border_color_selected" tools:ignore="UnusedResources">@color/photonViolet40</color> <color name="fx_mobile_border_color_accent" tools:ignore="UnusedResources">@color/photonViolet40</color>
<!-- Form parts --> <!-- Form parts -->
<color name="fx_mobile_border_color_disabled" tools:ignore="UnusedResources">@color/photonLightGrey70</color> <color name="fx_mobile_border_color_disabled" tools:ignore="UnusedResources">@color/photonLightGrey70</color>
<!-- Form parts --> <!-- Form parts -->

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

@ -89,8 +89,8 @@
<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>
<!-- 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>
<!-- Selected tab --> <!-- Active tab (Nav), Selected tab, Active form -->
<color name="fx_mobile_border_color_selected" tools:ignore="UnusedResources">@color/photonInk20</color> <color name="fx_mobile_border_color_accent" tools:ignore="UnusedResources">@color/photonInk20</color>
<!-- Form parts --> <!-- Form parts -->
<color name="fx_mobile_border_color_disabled" tools:ignore="UnusedResources">@color/photonLightGrey70</color> <color name="fx_mobile_border_color_disabled" tools:ignore="UnusedResources">@color/photonLightGrey70</color>
<!-- Form parts --> <!-- Form parts -->