Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-19 09:25:34 +00:00
Code Issues Releases Wiki Activity

[fenix] For https://github.com/mozilla-mobile/fenix/issues/23374 - Update Text Inverted, Icon Inverted to Text On Color, Icon On Color

Browse Source
This commit is contained in:
Gabriel Luong 2022-01-24 13:39:56 -05:00 committed by mergify[bot]
parent de628fa635
commit 0219f0f456
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettings.kt
View File

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

24
app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
View File

@ -68,13 +68,13 @@ private val darkColorPalette = FirefoxColors(
textDisabled = PhotonColors.LightGrey05A40, textDisabled = PhotonColors.LightGrey05A40,
textWarning = PhotonColors.Red20, textWarning = PhotonColors.Red20,
textAccent = PhotonColors.Violet20, textAccent = PhotonColors.Violet20,
textInverted = PhotonColors.White, textOnColor = PhotonColors.LightGrey05,
iconPrimary = PhotonColors.LightGrey05, iconPrimary = PhotonColors.LightGrey05,
iconPrimaryInactive = PhotonColors.LightGrey05A60, iconPrimaryInactive = PhotonColors.LightGrey05A60,
iconSecondary = PhotonColors.LightGrey40, iconSecondary = PhotonColors.LightGrey40,
iconActive = PhotonColors.Violet40, iconActive = PhotonColors.Violet40,
iconDisabled = PhotonColors.LightGrey05A40, iconDisabled = PhotonColors.LightGrey05A40,
iconInverted = PhotonColors.White, iconOnColor = PhotonColors.LightGrey05,
iconNotice = PhotonColors.Blue30, iconNotice = PhotonColors.Blue30,
iconButton = PhotonColors.LightGrey05, iconButton = PhotonColors.LightGrey05,
iconWarning = PhotonColors.Red20, iconWarning = PhotonColors.Red20,
@ -121,13 +121,13 @@ private val lightColorPalette = FirefoxColors(
textDisabled = PhotonColors.DarkGrey90A40, textDisabled = PhotonColors.DarkGrey90A40,
textWarning = PhotonColors.Red80, textWarning = PhotonColors.Red80,
textAccent = PhotonColors.Violet70, textAccent = PhotonColors.Violet70,
textInverted = PhotonColors.White, textOnColor = PhotonColors.LightGrey05,
iconPrimary = PhotonColors.DarkGrey90, iconPrimary = PhotonColors.DarkGrey90,
iconPrimaryInactive = PhotonColors.DarkGrey90A60, iconPrimaryInactive = PhotonColors.DarkGrey90A60,
iconSecondary = PhotonColors.DarkGrey05, iconSecondary = PhotonColors.DarkGrey05,
iconActive = PhotonColors.Ink20, iconActive = PhotonColors.Ink20,
iconDisabled = PhotonColors.DarkGrey90A40, iconDisabled = PhotonColors.DarkGrey90A40,
iconInverted = PhotonColors.White, iconOnColor = PhotonColors.LightGrey05,
iconNotice = PhotonColors.Blue30, iconNotice = PhotonColors.Blue30,
iconButton = PhotonColors.Ink20, iconButton = PhotonColors.Ink20,
iconWarning = PhotonColors.Red80, iconWarning = PhotonColors.Red80,
@ -179,13 +179,13 @@ class FirefoxColors(
textDisabled: Color, textDisabled: Color,
textWarning: Color, textWarning: Color,
textAccent: Color, textAccent: Color,
textInverted: Color, textOnColor: Color,
iconPrimary: Color, iconPrimary: Color,
iconPrimaryInactive: Color, iconPrimaryInactive: Color,
iconSecondary: Color, iconSecondary: Color,
iconActive: Color, iconActive: Color,
iconDisabled: Color, iconDisabled: Color,
iconInverted: Color, iconOnColor: Color,
iconNotice: Color, iconNotice: Color,
iconButton: Color, iconButton: Color,
iconWarning: Color, iconWarning: Color,
@ -290,7 +290,7 @@ class FirefoxColors(
var textAccent by mutableStateOf(textAccent) var textAccent by mutableStateOf(textAccent)
private set private set
// Text Inverted/On Color // Text Inverted/On Color
var textInverted by mutableStateOf(textInverted) var textOnColor by mutableStateOf(textOnColor)
private set private set
// Icon // Icon
@ -311,7 +311,7 @@ class FirefoxColors(
var iconDisabled by mutableStateOf(iconDisabled) var iconDisabled by mutableStateOf(iconDisabled)
private set private set
// Icon inverted (on color) // Icon inverted (on color)
var iconInverted by mutableStateOf(iconInverted) var iconOnColor by mutableStateOf(iconOnColor)
private set private set
// New // New
var iconNotice by mutableStateOf(iconNotice) var iconNotice by mutableStateOf(iconNotice)
@ -387,13 +387,13 @@ class FirefoxColors(
textDisabled = other.textDisabled textDisabled = other.textDisabled
textWarning = other.textWarning textWarning = other.textWarning
textAccent = other.textAccent textAccent = other.textAccent
textInverted = other.textInverted textOnColor = other.textOnColor
iconPrimary = other.iconPrimary iconPrimary = other.iconPrimary
iconPrimaryInactive = other.iconPrimaryInactive iconPrimaryInactive = other.iconPrimaryInactive
iconSecondary = other.iconSecondary iconSecondary = other.iconSecondary
iconActive = other.iconActive iconActive = other.iconActive
iconDisabled = other.iconDisabled iconDisabled = other.iconDisabled
iconInverted = other.iconInverted iconOnColor = other.iconOnColor
iconNotice = other.iconNotice iconNotice = other.iconNotice
iconButton = other.iconButton iconButton = other.iconButton
iconWarning = other.iconWarning iconWarning = other.iconWarning
@ -440,13 +440,13 @@ class FirefoxColors(
textDisabled = textDisabled, textDisabled = textDisabled,
textWarning = textWarning, textWarning = textWarning,
textAccent = textAccent, textAccent = textAccent,
textInverted = textInverted, textOnColor = textOnColor,
iconPrimary = iconPrimary, iconPrimary = iconPrimary,
iconPrimaryInactive = iconPrimaryInactive, iconPrimaryInactive = iconPrimaryInactive,
iconSecondary = iconSecondary, iconSecondary = iconSecondary,
iconActive = iconActive, iconActive = iconActive,
iconDisabled = iconDisabled, iconDisabled = iconDisabled,
iconInverted = iconInverted, iconOnColor = iconOnColor,
iconNotice = iconNotice, iconNotice = iconNotice,
iconButton = iconButton, iconButton = iconButton,
iconWarning = iconWarning, iconWarning = iconWarning,

4
app/src/main/res/values-night/colors.xml
View File

@ -62,7 +62,7 @@
<!-- Small heading, Text link --> <!-- Small heading, Text link -->
<color name="fx_mobile_text_color_accent">@color/photonViolet20</color> <color name="fx_mobile_text_color_accent">@color/photonViolet20</color>
<!-- Text Inverted/On Color --> <!-- Text Inverted/On Color -->
<color name="fx_mobile_text_color_inverted" tools:ignore="UnusedResources">@color/photonWhite</color> <color name="fx_mobile_text_color_oncolor" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Icon --> <!-- Icon -->
<!-- Primary icon --> <!-- Primary icon -->
@ -76,7 +76,7 @@
<!-- Disabled icon --> <!-- Disabled icon -->
<color name="fx_mobile_icon_color_disabled" tools:ignore="UnusedResources">@color/photonLightGrey05A40</color> <color name="fx_mobile_icon_color_disabled" tools:ignore="UnusedResources">@color/photonLightGrey05A40</color>
<!-- Icon inverted (on color) --> <!-- Icon inverted (on color) -->
<color name="fx_mobile_icon_color_inverted" tools:ignore="UnusedResources">@color/photonWhite</color> <color name="fx_mobile_icon_color_oncolor" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Information --> <!-- Information -->
<color name="fx_mobile_icon_color_information">@color/photonBlue30</color> <color name="fx_mobile_icon_color_information">@color/photonBlue30</color>
<!-- Icon button --> <!-- Icon button -->

4
app/src/main/res/values/colors.xml
View File

@ -62,7 +62,7 @@
<!-- Small heading, Text link --> <!-- Small heading, Text link -->
<color name="fx_mobile_text_color_accent">@color/photonViolet70</color> <color name="fx_mobile_text_color_accent">@color/photonViolet70</color>
<!-- Text Inverted/On Color --> <!-- Text Inverted/On Color -->
<color name="fx_mobile_text_color_inverted" tools:ignore="UnusedResources">@color/photonWhite</color> <color name="fx_mobile_text_color_oncolor" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Icon --> <!-- Icon -->
<!-- Primary icon --> <!-- Primary icon -->
@ -76,7 +76,7 @@
<!-- Disabled icon --> <!-- Disabled icon -->
<color name="fx_mobile_icon_color_disabled" tools:ignore="UnusedResources">@color/photonDarkGrey90A40</color> <color name="fx_mobile_icon_color_disabled" tools:ignore="UnusedResources">@color/photonDarkGrey90A40</color>
<!-- Icon inverted (on color) --> <!-- Icon inverted (on color) -->
<color name="fx_mobile_icon_color_inverted" tools:ignore="UnusedResources">@color/photonWhite</color> <color name="fx_mobile_icon_color_oncolor" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Information --> <!-- Information -->
<color name="fx_mobile_icon_color_information">@color/photonBlue30</color> <color name="fx_mobile_icon_color_information">@color/photonBlue30</color>
<!-- Icon button --> <!-- Icon button -->