[fenix] For https://github.com/mozilla-mobile/fenix/issues/23086 - Update Border Divider to Border Default

pull/600/head
Gabriel Luong 3 years ago committed by mergify[bot]
parent f97de9afe4
commit 1d3e76f885

@ -343,7 +343,7 @@ private fun RecentlyVisitedDivider(
) { ) {
Divider( Divider(
modifier = modifier, modifier = modifier,
color = FirefoxTheme.colors.borderDivider, color = FirefoxTheme.colors.borderDefault,
thickness = 0.5.dp thickness = 0.5.dp
) )
} }

@ -81,11 +81,11 @@ private val darkColorPalette = FirefoxColors(
iconAccentYellow = PhotonColors.Yellow20, iconAccentYellow = PhotonColors.Yellow20,
iconGradientStart = PhotonColors.Violet20, iconGradientStart = PhotonColors.Violet20,
iconGradientEnd = PhotonColors.Blue20, iconGradientEnd = PhotonColors.Blue20,
borderDefault = PhotonColors.DarkGrey05,
borderFormDefault = PhotonColors.LightGrey05, borderFormDefault = PhotonColors.LightGrey05,
borderSelected = PhotonColors.Violet40, borderSelected = PhotonColors.Violet40,
borderDisabled = PhotonColors.LightGrey70, borderDisabled = PhotonColors.LightGrey70,
borderWarning = PhotonColors.Red40, borderWarning = PhotonColors.Red40
borderDivider = PhotonColors.DarkGrey05
) )
private val lightColorPalette = FirefoxColors( private val lightColorPalette = FirefoxColors(
@ -129,11 +129,11 @@ private val lightColorPalette = FirefoxColors(
iconAccentYellow = PhotonColors.Yellow60, iconAccentYellow = PhotonColors.Yellow60,
iconGradientStart = PhotonColors.Violet50, iconGradientStart = PhotonColors.Violet50,
iconGradientEnd = PhotonColors.Blue60, iconGradientEnd = PhotonColors.Blue60,
borderDefault = PhotonColors.LightGrey30,
borderFormDefault = PhotonColors.DarkGrey90, borderFormDefault = PhotonColors.DarkGrey90,
borderSelected = PhotonColors.Ink20, borderSelected = PhotonColors.Ink20,
borderDisabled = PhotonColors.LightGrey70, borderDisabled = PhotonColors.LightGrey70,
borderWarning = PhotonColors.Red80, borderWarning = PhotonColors.Red80
borderDivider = PhotonColors.LightGrey40,
) )
/** /**
@ -182,11 +182,11 @@ class FirefoxColors(
iconAccentYellow: Color, iconAccentYellow: Color,
iconGradientStart: Color, iconGradientStart: Color,
iconGradientEnd: Color, iconGradientEnd: Color,
borderDefault: Color,
borderFormDefault: Color, borderFormDefault: Color,
borderSelected: Color, borderSelected: Color,
borderDisabled: Color, borderDisabled: Color,
borderWarning: Color, borderWarning: Color
borderDivider: Color
) { ) {
// Layers // Layers
@ -313,6 +313,9 @@ class FirefoxColors(
// Border // Border
// Default, Divider, Dotted
var borderDefault by mutableStateOf(borderDefault)
private set
// Form parts // Form parts
var borderFormDefault by mutableStateOf(borderFormDefault) var borderFormDefault by mutableStateOf(borderFormDefault)
private set private set
@ -325,8 +328,6 @@ class FirefoxColors(
// Form parts // Form parts
var borderWarning by mutableStateOf(borderWarning) var borderWarning by mutableStateOf(borderWarning)
private set private set
var borderDivider by mutableStateOf(borderDivider)
private set
fun update(other: FirefoxColors) { fun update(other: FirefoxColors) {
layer1 = other.layer1 layer1 = other.layer1
@ -369,11 +370,11 @@ class FirefoxColors(
iconAccentYellow = other.iconAccentYellow iconAccentYellow = other.iconAccentYellow
iconGradientStart = other.iconGradientStart iconGradientStart = other.iconGradientStart
iconGradientEnd = other.iconGradientEnd iconGradientEnd = other.iconGradientEnd
borderDefault = other.borderDefault
borderFormDefault = other.borderFormDefault borderFormDefault = other.borderFormDefault
borderSelected = other.borderSelected borderSelected = other.borderSelected
borderDisabled = other.borderDisabled borderDisabled = other.borderDisabled
borderWarning = other.borderWarning borderWarning = other.borderWarning
borderDivider = other.borderDivider
} }
fun copy(): FirefoxColors = FirefoxColors( fun copy(): FirefoxColors = FirefoxColors(
@ -417,11 +418,11 @@ class FirefoxColors(
iconAccentYellow = iconAccentYellow, iconAccentYellow = iconAccentYellow,
iconGradientStart = iconGradientStart, iconGradientStart = iconGradientStart,
iconGradientEnd = iconGradientEnd, iconGradientEnd = iconGradientEnd,
borderDefault = borderDefault,
borderFormDefault = borderFormDefault, borderFormDefault = borderFormDefault,
borderSelected = borderSelected, borderSelected = borderSelected,
borderDisabled = borderDisabled, borderDisabled = borderDisabled,
borderWarning = borderWarning, borderWarning = borderWarning
borderDivider = borderDivider
) )
} }

@ -85,6 +85,8 @@
<color name="fx_mobile_icon_color_gradient_end">@color/photonBlue20</color> <color name="fx_mobile_icon_color_gradient_end">@color/photonBlue20</color>
<!-- Border --> <!-- Border -->
<!-- Default, Divider, Dotted -->
<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 --> <!-- Selected tab -->
@ -93,7 +95,6 @@
<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 -->
<color name="fx_mobile_border_color_warning" tools:ignore="UnusedResources">@color/photonRed40</color> <color name="fx_mobile_border_color_warning" tools:ignore="UnusedResources">@color/photonRed40</color>
<color name="fx_mobile_border_color_divider" tools:ignore="UnusedResources">@color/photonDarkGrey05</color>
<!-- Normal theme colors for dark mode --> <!-- Normal theme colors for dark mode -->
<color name="primary_text_normal_theme">@color/fx_mobile_text_color_primary</color> <color name="primary_text_normal_theme">@color/fx_mobile_text_color_primary</color>

@ -85,6 +85,8 @@
<color name="fx_mobile_icon_color_gradient_end">@color/photonBlue60</color> <color name="fx_mobile_icon_color_gradient_end">@color/photonBlue60</color>
<!-- Border --> <!-- Border -->
<!-- Default, Divider, Dotted -->
<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 --> <!-- Selected tab -->
@ -93,7 +95,6 @@
<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 -->
<color name="fx_mobile_border_color_warning" tools:ignore="UnusedResources">@color/photonRed80</color> <color name="fx_mobile_border_color_warning" tools:ignore="UnusedResources">@color/photonRed80</color>
<color name="fx_mobile_border_color_divider" tools:ignore="UnusedResources">@color/photonLightGrey40</color>
<!-- Private theme color variables --> <!-- Private theme color variables -->

Loading…
Cancel
Save