[fenix] For https://github.com/mozilla-mobile/fenix/issues/23374 - Add Text Action Primary, Secondary, Tertiary, Tertiary Active design tokens

pull/600/head
Gabriel Luong 2 years ago committed by mergify[bot]
parent 0219f0f456
commit 05274273e3

@ -69,6 +69,10 @@ private val darkColorPalette = FirefoxColors(
textWarning = PhotonColors.Red20,
textAccent = PhotonColors.Violet20,
textOnColor = PhotonColors.LightGrey05,
textActionPrimary = PhotonColors.LightGrey05,
textActionSecondary = PhotonColors.DarkGrey90,
textActionTertiary = PhotonColors.LightGrey05,
textActionTertiaryActive = PhotonColors.LightGrey05,
iconPrimary = PhotonColors.LightGrey05,
iconPrimaryInactive = PhotonColors.LightGrey05A60,
iconSecondary = PhotonColors.LightGrey40,
@ -122,6 +126,10 @@ private val lightColorPalette = FirefoxColors(
textWarning = PhotonColors.Red80,
textAccent = PhotonColors.Violet70,
textOnColor = PhotonColors.LightGrey05,
textActionPrimary = PhotonColors.LightGrey05,
textActionSecondary = PhotonColors.DarkGrey90,
textActionTertiary = PhotonColors.DarkGrey90,
textActionTertiaryActive = PhotonColors.LightGrey05,
iconPrimary = PhotonColors.DarkGrey90,
iconPrimaryInactive = PhotonColors.DarkGrey90A60,
iconSecondary = PhotonColors.DarkGrey05,
@ -180,6 +188,10 @@ class FirefoxColors(
textWarning: Color,
textAccent: Color,
textOnColor: Color,
textActionPrimary: Color,
textActionSecondary: Color,
textActionTertiary: Color,
textActionTertiaryActive: Color,
iconPrimary: Color,
iconPrimaryInactive: Color,
iconSecondary: Color,
@ -292,6 +304,18 @@ class FirefoxColors(
// Text Inverted/On Color
var textOnColor by mutableStateOf(textOnColor)
private set
// Action Primary text
var textActionPrimary by mutableStateOf(textActionPrimary)
private set
// Action Secondary text
var textActionSecondary by mutableStateOf(textActionSecondary)
private set
// Action Tertiary text
var textActionTertiary by mutableStateOf(textActionTertiary)
private set
// Action Tertiary Active text
var textActionTertiaryActive by mutableStateOf(textActionTertiaryActive)
private set
// Icon
@ -388,6 +412,10 @@ class FirefoxColors(
textWarning = other.textWarning
textAccent = other.textAccent
textOnColor = other.textOnColor
textActionPrimary = other.textActionPrimary
textActionSecondary = other.textSecondary
textActionTertiary = other.textActionTertiary
textActionTertiaryActive = other.textActionTertiaryActive
iconPrimary = other.iconPrimary
iconPrimaryInactive = other.iconPrimaryInactive
iconSecondary = other.iconSecondary
@ -441,6 +469,10 @@ class FirefoxColors(
textWarning = textWarning,
textAccent = textAccent,
textOnColor = textOnColor,
textActionPrimary = textActionPrimary,
textActionSecondary = textActionSecondary,
textActionTertiary = textActionTertiary,
textActionTertiaryActive = textActionTertiaryActive,
iconPrimary = iconPrimary,
iconPrimaryInactive = iconPrimaryInactive,
iconSecondary = iconSecondary,

@ -63,6 +63,14 @@
<color name="fx_mobile_text_color_accent">@color/photonViolet20</color>
<!-- Text Inverted/On Color -->
<color name="fx_mobile_text_color_oncolor" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Action Primary text -->
<color name="fx_mobile_text_color_action_primary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Action Secondary text -->
<color name="fx_mobile_text_color_action_secondary" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
<!-- Action Tertiary text -->
<color name="fx_mobile_text_color_action_tertiary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Action Tertiary Active text -->
<color name="fx_mobile_text_color_action_tertiary_active" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Icon -->
<!-- Primary icon -->

@ -63,6 +63,14 @@
<color name="fx_mobile_text_color_accent">@color/photonViolet70</color>
<!-- Text Inverted/On Color -->
<color name="fx_mobile_text_color_oncolor" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Action Primary text -->
<color name="fx_mobile_text_color_action_primary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Action Secondary text -->
<color name="fx_mobile_text_color_action_secondary" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
<!-- Action Tertiary text -->
<color name="fx_mobile_text_color_action_tertiary" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
<!-- Action Tertiary Active text -->
<color name="fx_mobile_text_color_action_tertiary_active" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Icon -->
<!-- Primary icon -->

Loading…
Cancel
Save