[fenix] For https://github.com/mozilla-mobile/fenix/issues/23761 - Rename Text On Color to Text On Color Primary

pull/600/head
Gabriel Luong 3 years ago committed by mergify[bot]
parent 2b7ceef777
commit 5e009d3d1a

@ -134,7 +134,7 @@ private fun WallpaperSnackbar(
modifier = Modifier.padding(start = 16.dp, end = 16.dp, top = 8.dp, bottom = 8.dp),
text = stringResource(R.string.wallpaper_updated_snackbar_message),
textAlign = TextAlign.Start,
color = FirefoxTheme.colors.textOnColor,
color = FirefoxTheme.colors.textOnColorPrimary,
fontFamily = FontFamily(Font(R.font.metropolis_semibold)),
fontSize = 18.sp,
overflow = TextOverflow.Ellipsis,
@ -150,7 +150,7 @@ private fun WallpaperSnackbar(
text = stringResource(R.string.wallpaper_updated_snackbar_action).uppercase(
Locale.getDefault()
),
color = FirefoxTheme.colors.textOnColor,
color = FirefoxTheme.colors.textOnColorPrimary,
fontFamily = FontFamily(Font(R.font.metropolis_medium)),
fontSize = 14.sp,
)

@ -221,7 +221,7 @@ fun SyncedTabsErrorButton(buttonText: String, onClick: () -> Unit) {
Icon(
painter = painterResource(R.drawable.ic_sign_in),
contentDescription = null,
tint = FirefoxTheme.colors.textOnColor,
tint = FirefoxTheme.colors.textOnColorPrimary,
)
Spacer(Modifier.width(8.dp))
@ -229,7 +229,7 @@ fun SyncedTabsErrorButton(buttonText: String, onClick: () -> Unit) {
Text(
text = buttonText,
modifier = Modifier.align(Alignment.CenterVertically),
color = FirefoxTheme.colors.textOnColor,
color = FirefoxTheme.colors.textOnColorPrimary,
fontSize = 14.sp,
fontFamily = FontFamily(Font(R.font.metropolis_semibold)),
maxLines = 2

@ -69,7 +69,7 @@ private val darkColorPalette = FirefoxColors(
textWarning = PhotonColors.Red20,
textAccent = PhotonColors.Violet20,
textAccentDisabled = PhotonColors.Violet20A60,
textOnColor = PhotonColors.LightGrey05,
textOnColorPrimary = PhotonColors.LightGrey05,
textActionPrimary = PhotonColors.LightGrey05,
textActionSecondary = PhotonColors.DarkGrey90,
textActionTertiary = PhotonColors.LightGrey05,
@ -127,7 +127,7 @@ private val lightColorPalette = FirefoxColors(
textWarning = PhotonColors.Red80,
textAccent = PhotonColors.Violet70,
textAccentDisabled = PhotonColors.Violet70A80,
textOnColor = PhotonColors.LightGrey05,
textOnColorPrimary = PhotonColors.LightGrey05,
textActionPrimary = PhotonColors.LightGrey05,
textActionSecondary = PhotonColors.DarkGrey90,
textActionTertiary = PhotonColors.DarkGrey90,
@ -190,7 +190,7 @@ class FirefoxColors(
textWarning: Color,
textAccent: Color,
textAccentDisabled: Color,
textOnColor: Color,
textOnColorPrimary: Color,
textActionPrimary: Color,
textActionSecondary: Color,
textActionTertiary: Color,
@ -308,7 +308,7 @@ class FirefoxColors(
var textAccentDisabled by mutableStateOf(textAccentDisabled)
private set
// Text Inverted/On Color
var textOnColor by mutableStateOf(textOnColor)
var textOnColorPrimary by mutableStateOf(textOnColorPrimary)
private set
// Action Primary text
var textActionPrimary by mutableStateOf(textActionPrimary)
@ -418,7 +418,7 @@ class FirefoxColors(
textWarning = other.textWarning
textAccent = other.textAccent
textAccentDisabled = other.textAccentDisabled
textOnColor = other.textOnColor
textOnColorPrimary = other.textOnColorPrimary
textActionPrimary = other.textActionPrimary
textActionSecondary = other.textSecondary
textActionTertiary = other.textActionTertiary
@ -476,7 +476,7 @@ class FirefoxColors(
textWarning = textWarning,
textAccent = textAccent,
textAccentDisabled = textAccentDisabled,
textOnColor = textOnColor,
textOnColorPrimary = textOnColorPrimary,
textActionPrimary = textActionPrimary,
textActionSecondary = textActionSecondary,
textActionTertiary = textActionTertiary,

@ -64,7 +64,7 @@
<!-- 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>
<color name="fx_mobile_text_color_oncolor_primary" 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 -->

@ -64,7 +64,7 @@
<!-- 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>
<color name="fx_mobile_text_color_oncolor_primary" 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 -->

Loading…
Cancel
Save