From 06ee40540e98a10fdc7bbb5e2fdef54cee27716c Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Fri, 4 Mar 2022 11:58:15 -0500 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/24102 - Rename layerNonOpaque to layerAccentNonOpaque in FirefoxThemes --- .../src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt index 1a2d4bcc2531..3b0e1bf77618 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt @@ -45,7 +45,7 @@ private val darkColorPalette = FirefoxColors( layer2 = PhotonColors.DarkGrey30, layer3 = PhotonColors.DarkGrey30, layerAccent = PhotonColors.Violet40, - layerNonOpaque = PhotonColors.Violet50A32, + layerAccentNonOpaque = PhotonColors.Violet50A32, scrim = PhotonColors.DarkGrey90A95, gradientStart = PhotonColors.Violet70, gradientEnd = PhotonColors.Violet40, @@ -104,7 +104,7 @@ private val lightColorPalette = FirefoxColors( layer2 = PhotonColors.White, layer3 = PhotonColors.LightGrey20, layerAccent = PhotonColors.Ink20, - layerNonOpaque = PhotonColors.Violet70A12, + layerAccentNonOpaque = PhotonColors.Violet70A12, scrim = PhotonColors.DarkGrey30A95, gradientStart = PhotonColors.Violet70, gradientEnd = PhotonColors.Violet40, @@ -168,7 +168,7 @@ class FirefoxColors( layer2: Color, layer3: Color, layerAccent: Color, - layerNonOpaque: Color, + layerAccentNonOpaque: Color, scrim: Color, gradientStart: Color, gradientEnd: Color, @@ -236,7 +236,7 @@ class FirefoxColors( var layerAccent by mutableStateOf(layerAccent) private set // Selected tab - var layerNonOpaque by mutableStateOf(layerNonOpaque) + var layerAccentNonOpaque by mutableStateOf(layerAccentNonOpaque) private set var scrim by mutableStateOf(scrim) private set @@ -402,7 +402,7 @@ class FirefoxColors( layer2 = other.layer2 layer3 = other.layer3 layerAccent = other.layerAccent - layerNonOpaque = other.layerNonOpaque + layerAccentNonOpaque = other.layerAccentNonOpaque scrim = other.scrim gradientStart = other.gradientStart gradientEnd = other.gradientEnd @@ -461,7 +461,7 @@ class FirefoxColors( layer2 = layer2, layer3 = layer3, layerAccent = layerAccent, - layerNonOpaque = layerNonOpaque, + layerAccentNonOpaque = layerAccentNonOpaque, scrim = scrim, gradientStart = gradientStart, gradientEnd = gradientEnd, -- 2.11.4.GIT