[fenix] For https://github.com/mozilla-mobile/fenix/issues/22793 - Add Icon Gradient Start/End color tokens

pull/600/head
Gabriel Luong 3 years ago committed by mergify[bot]
parent e0d4f0b496
commit eecb775f83

@ -77,6 +77,8 @@ private val darkColorPalette = FirefoxColors(
iconAccentPink = PhotonColors.Pink20, iconAccentPink = PhotonColors.Pink20,
iconAccentGreen = PhotonColors.Green20, iconAccentGreen = PhotonColors.Green20,
iconAccentYellow = PhotonColors.Yellow20, iconAccentYellow = PhotonColors.Yellow20,
iconGradientStart = PhotonColors.Violet20,
iconGradientEnd = PhotonColors.Blue20,
borderDefault = PhotonColors.LightGrey05, borderDefault = PhotonColors.LightGrey05,
borderSelected = PhotonColors.Violet40, borderSelected = PhotonColors.Violet40,
borderDisabled = PhotonColors.LightGrey70, borderDisabled = PhotonColors.LightGrey70,
@ -121,6 +123,8 @@ private val lightColorPalette = FirefoxColors(
iconAccentPink = PhotonColors.Pink60, iconAccentPink = PhotonColors.Pink60,
iconAccentGreen = PhotonColors.Green60, iconAccentGreen = PhotonColors.Green60,
iconAccentYellow = PhotonColors.Yellow60, iconAccentYellow = PhotonColors.Yellow60,
iconGradientStart = PhotonColors.Violet50,
iconGradientEnd = PhotonColors.Blue60,
borderDefault = PhotonColors.DarkGrey90, borderDefault = PhotonColors.DarkGrey90,
borderSelected = PhotonColors.Violet90, borderSelected = PhotonColors.Violet90,
borderDisabled = PhotonColors.LightGrey70, borderDisabled = PhotonColors.LightGrey70,
@ -170,6 +174,8 @@ class FirefoxColors(
iconAccentPink: Color, iconAccentPink: Color,
iconAccentGreen: Color, iconAccentGreen: Color,
iconAccentYellow: Color, iconAccentYellow: Color,
iconGradientStart: Color,
iconGradientEnd: Color,
borderDefault: Color, borderDefault: Color,
borderSelected: Color, borderSelected: Color,
borderDisabled: Color, borderDisabled: Color,
@ -286,6 +292,12 @@ class FirefoxColors(
private set private set
var iconAccentYellow by mutableStateOf(iconAccentYellow) var iconAccentYellow by mutableStateOf(iconAccentYellow)
private set private set
// Reader, ETP Shield
var iconGradientStart by mutableStateOf(iconGradientStart)
private set
// Reader, ETP Shield
var iconGradientEnd by mutableStateOf(iconGradientEnd)
private set
// Border // Border
@ -341,6 +353,8 @@ class FirefoxColors(
iconAccentPink = other.iconAccentPink iconAccentPink = other.iconAccentPink
iconAccentGreen = other.iconAccentGreen iconAccentGreen = other.iconAccentGreen
iconAccentYellow = other.iconAccentYellow iconAccentYellow = other.iconAccentYellow
iconGradientStart = other.iconGradientStart
iconGradientEnd = other.iconGradientEnd
borderDefault = other.borderDefault borderDefault = other.borderDefault
borderSelected = other.borderSelected borderSelected = other.borderSelected
borderDisabled = other.borderDisabled borderDisabled = other.borderDisabled
@ -385,6 +399,8 @@ class FirefoxColors(
iconAccentPink = iconAccentPink, iconAccentPink = iconAccentPink,
iconAccentGreen = iconAccentGreen, iconAccentGreen = iconAccentGreen,
iconAccentYellow = iconAccentYellow, iconAccentYellow = iconAccentYellow,
iconGradientStart = iconGradientStart,
iconGradientEnd = iconGradientEnd,
borderDefault = borderDefault, borderDefault = borderDefault,
borderSelected = borderSelected, borderSelected = borderSelected,
borderDisabled = borderDisabled, borderDisabled = borderDisabled,

@ -75,6 +75,10 @@
<color name="fx_mobile_icon_color_accent_pink" tools:ignore="UnusedResources">@color/photonPink20</color> <color name="fx_mobile_icon_color_accent_pink" tools:ignore="UnusedResources">@color/photonPink20</color>
<color name="fx_mobile_icon_color_accent_green" tools:ignore="UnusedResources">@color/photonGreen20</color> <color name="fx_mobile_icon_color_accent_green" tools:ignore="UnusedResources">@color/photonGreen20</color>
<color name="fx_mobile_icon_color_accent_yellow" tools:ignore="UnusedResources">@color/photonYellow20</color> <color name="fx_mobile_icon_color_accent_yellow" tools:ignore="UnusedResources">@color/photonYellow20</color>
<!-- Reader, ETP Shield -->
<color name="fx_mobile_icon_color_gradient_start" tools:ignore="UnusedResources">@color/photonViolet20</color>
<!-- Reader, ETP Shield -->
<color name="fx_mobile_icon_color_gradient_end" tools:ignore="UnusedResources">@color/photonBlue20</color>
<!-- Border --> <!-- Border -->
<!-- Form parts --> <!-- Form parts -->

@ -75,6 +75,10 @@
<color name="fx_mobile_icon_color_accent_pink" tools:ignore="UnusedResources">@color/photonPink60</color> <color name="fx_mobile_icon_color_accent_pink" tools:ignore="UnusedResources">@color/photonPink60</color>
<color name="fx_mobile_icon_color_accent_green" tools:ignore="UnusedResources">@color/photonGreen60</color> <color name="fx_mobile_icon_color_accent_green" tools:ignore="UnusedResources">@color/photonGreen60</color>
<color name="fx_mobile_icon_color_accent_yellow" tools:ignore="UnusedResources">@color/photonYellow60</color> <color name="fx_mobile_icon_color_accent_yellow" tools:ignore="UnusedResources">@color/photonYellow60</color>
<!-- Reader, ETP Shield -->
<color name="fx_mobile_icon_color_gradient_start" tools:ignore="UnusedResources">@color/photonViolet50</color>
<!-- Reader, ETP Shield -->
<color name="fx_mobile_icon_color_gradient_end" tools:ignore="UnusedResources">@color/photonBlue60</color>
<!-- Border --> <!-- Border -->
<!-- Form parts --> <!-- Form parts -->

Loading…
Cancel
Save