[fenix] For https://github.com/mozilla-mobile/fenix/issues/23450 - Add Text Accent Disabled design token

pull/600/head
Gabriel Luong 3 years ago committed by mergify[bot]
parent 3f96c59777
commit 1788f302fe

@ -68,6 +68,7 @@ private val darkColorPalette = FirefoxColors(
textDisabled = PhotonColors.LightGrey05A40,
textWarning = PhotonColors.Red20,
textAccent = PhotonColors.Violet20,
textAccentDisabled = PhotonColors.Violet20A60,
textOnColor = PhotonColors.LightGrey05,
textActionPrimary = PhotonColors.LightGrey05,
textActionSecondary = PhotonColors.DarkGrey90,
@ -125,6 +126,7 @@ private val lightColorPalette = FirefoxColors(
textDisabled = PhotonColors.DarkGrey90A40,
textWarning = PhotonColors.Red80,
textAccent = PhotonColors.Violet70,
textAccentDisabled = PhotonColors.Violet70A80,
textOnColor = PhotonColors.LightGrey05,
textActionPrimary = PhotonColors.LightGrey05,
textActionSecondary = PhotonColors.DarkGrey90,
@ -187,6 +189,7 @@ class FirefoxColors(
textDisabled: Color,
textWarning: Color,
textAccent: Color,
textAccentDisabled: Color,
textOnColor: Color,
textActionPrimary: Color,
textActionSecondary: Color,
@ -301,6 +304,9 @@ class FirefoxColors(
// Small heading, Text link
var textAccent by mutableStateOf(textAccent)
private set
// Small heading, Text link
var textAccentDisabled by mutableStateOf(textAccentDisabled)
private set
// Text Inverted/On Color
var textOnColor by mutableStateOf(textOnColor)
private set
@ -411,6 +417,7 @@ class FirefoxColors(
textDisabled = other.textDisabled
textWarning = other.textWarning
textAccent = other.textAccent
textAccentDisabled = other.textAccentDisabled
textOnColor = other.textOnColor
textActionPrimary = other.textActionPrimary
textActionSecondary = other.textSecondary
@ -468,6 +475,7 @@ class FirefoxColors(
textDisabled = textDisabled,
textWarning = textWarning,
textAccent = textAccent,
textAccentDisabled = textAccentDisabled,
textOnColor = textOnColor,
textActionPrimary = textActionPrimary,
textActionSecondary = textActionSecondary,

@ -61,6 +61,8 @@
<color name="fx_mobile_text_color_warning" tools:ignore="UnusedResources">@color/photonRed20</color>
<!-- Small heading, Text link -->
<color name="fx_mobile_text_color_accent">@color/photonViolet20</color>
<!-- Small heading, Text link -->
<color name="fx_mobile_text_color_accent_disabled" tools:ignore="UnusedResources">@color/photonViolet20A60</color>
<!-- Text Inverted/On Color -->
<color name="fx_mobile_text_color_oncolor" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Action Primary text -->

@ -61,6 +61,8 @@
<color name="fx_mobile_text_color_warning" tools:ignore="UnusedResources">@color/photonRed80</color>
<!-- Small heading, Text link -->
<color name="fx_mobile_text_color_accent">@color/photonViolet70</color>
<!-- Small heading, Text link -->
<color name="fx_mobile_text_color_accent_disabled" tools:ignore="UnusedResources">@color/photonViolet70A80</color>
<!-- Text Inverted/On Color -->
<color name="fx_mobile_text_color_oncolor" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Action Primary text -->

Loading…
Cancel
Save