From 0219f0f4564ae04265f91803577cf62917439ab1 Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Mon, 24 Jan 2022 13:39:56 -0500 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/23374 - Update Text Inverted, Icon Inverted to Text On Color, Icon On Color --- .../settings/wallpaper/WallpaperSettings.kt | 4 ++-- .../org/mozilla/fenix/theme/FirefoxTheme.kt | 24 +++++++++---------- app/src/main/res/values-night/colors.xml | 4 ++-- app/src/main/res/values/colors.xml | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettings.kt b/app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettings.kt index 99350a48e6..a543646754 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettings.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettings.kt @@ -114,7 +114,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.textInverted, + color = FirefoxTheme.colors.textOnColor, fontFamily = FontFamily(Font(R.font.metropolis_semibold)), fontSize = 18.sp, overflow = TextOverflow.Ellipsis, @@ -130,7 +130,7 @@ private fun WallpaperSnackbar( text = stringResource(R.string.wallpaper_updated_snackbar_action).uppercase( Locale.getDefault() ), - color = FirefoxTheme.colors.textInverted, + color = FirefoxTheme.colors.textOnColor, fontFamily = FontFamily(Font(R.font.metropolis_medium)), fontSize = 14.sp, ) diff --git a/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt b/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt index a3038a1e0f..99f914029f 100644 --- a/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt +++ b/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt @@ -68,13 +68,13 @@ private val darkColorPalette = FirefoxColors( textDisabled = PhotonColors.LightGrey05A40, textWarning = PhotonColors.Red20, textAccent = PhotonColors.Violet20, - textInverted = PhotonColors.White, + textOnColor = PhotonColors.LightGrey05, iconPrimary = PhotonColors.LightGrey05, iconPrimaryInactive = PhotonColors.LightGrey05A60, iconSecondary = PhotonColors.LightGrey40, iconActive = PhotonColors.Violet40, iconDisabled = PhotonColors.LightGrey05A40, - iconInverted = PhotonColors.White, + iconOnColor = PhotonColors.LightGrey05, iconNotice = PhotonColors.Blue30, iconButton = PhotonColors.LightGrey05, iconWarning = PhotonColors.Red20, @@ -121,13 +121,13 @@ private val lightColorPalette = FirefoxColors( textDisabled = PhotonColors.DarkGrey90A40, textWarning = PhotonColors.Red80, textAccent = PhotonColors.Violet70, - textInverted = PhotonColors.White, + textOnColor = PhotonColors.LightGrey05, iconPrimary = PhotonColors.DarkGrey90, iconPrimaryInactive = PhotonColors.DarkGrey90A60, iconSecondary = PhotonColors.DarkGrey05, iconActive = PhotonColors.Ink20, iconDisabled = PhotonColors.DarkGrey90A40, - iconInverted = PhotonColors.White, + iconOnColor = PhotonColors.LightGrey05, iconNotice = PhotonColors.Blue30, iconButton = PhotonColors.Ink20, iconWarning = PhotonColors.Red80, @@ -179,13 +179,13 @@ class FirefoxColors( textDisabled: Color, textWarning: Color, textAccent: Color, - textInverted: Color, + textOnColor: Color, iconPrimary: Color, iconPrimaryInactive: Color, iconSecondary: Color, iconActive: Color, iconDisabled: Color, - iconInverted: Color, + iconOnColor: Color, iconNotice: Color, iconButton: Color, iconWarning: Color, @@ -290,7 +290,7 @@ class FirefoxColors( var textAccent by mutableStateOf(textAccent) private set // Text Inverted/On Color - var textInverted by mutableStateOf(textInverted) + var textOnColor by mutableStateOf(textOnColor) private set // Icon @@ -311,7 +311,7 @@ class FirefoxColors( var iconDisabled by mutableStateOf(iconDisabled) private set // Icon inverted (on color) - var iconInverted by mutableStateOf(iconInverted) + var iconOnColor by mutableStateOf(iconOnColor) private set // New var iconNotice by mutableStateOf(iconNotice) @@ -387,13 +387,13 @@ class FirefoxColors( textDisabled = other.textDisabled textWarning = other.textWarning textAccent = other.textAccent - textInverted = other.textInverted + textOnColor = other.textOnColor iconPrimary = other.iconPrimary iconPrimaryInactive = other.iconPrimaryInactive iconSecondary = other.iconSecondary iconActive = other.iconActive iconDisabled = other.iconDisabled - iconInverted = other.iconInverted + iconOnColor = other.iconOnColor iconNotice = other.iconNotice iconButton = other.iconButton iconWarning = other.iconWarning @@ -440,13 +440,13 @@ class FirefoxColors( textDisabled = textDisabled, textWarning = textWarning, textAccent = textAccent, - textInverted = textInverted, + textOnColor = textOnColor, iconPrimary = iconPrimary, iconPrimaryInactive = iconPrimaryInactive, iconSecondary = iconSecondary, iconActive = iconActive, iconDisabled = iconDisabled, - iconInverted = iconInverted, + iconOnColor = iconOnColor, iconNotice = iconNotice, iconButton = iconButton, iconWarning = iconWarning, diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 20226ef6ab..922f0aef24 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -62,7 +62,7 @@ @color/photonViolet20 - @color/photonWhite + @color/photonLightGrey05 @@ -76,7 +76,7 @@ @color/photonLightGrey05A40 - @color/photonWhite + @color/photonLightGrey05 @color/photonBlue30 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9b67ec499b..984a6149a3 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -62,7 +62,7 @@ @color/photonViolet70 - @color/photonWhite + @color/photonLightGrey05 @@ -76,7 +76,7 @@ @color/photonDarkGrey90A40 - @color/photonWhite + @color/photonLightGrey05 @color/photonBlue30