From 41fd47fc064f15692ed8a21b78d847a9417fcf86 Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Fri, 10 Dec 2021 14:04:04 -0500 Subject: [PATCH] For #22793 - Update the colors for Scrim Start/End design tokens --- app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt | 8 ++++---- app/src/main/res/values-night/colors.xml | 4 ++-- app/src/main/res/values/colors.xml | 4 ++-- buildSrc/src/main/java/AndroidComponents.kt | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) 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 a159064308..d20446dd8e 100644 --- a/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt +++ b/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt @@ -47,8 +47,8 @@ private val darkColorPalette = FirefoxColors( layerAccent = PhotonColors.Violet40, layerNonOpaque = PhotonColors.Violet40A12, scrim = PhotonColors.DarkGrey05A45, - scrimAccentStart = PhotonColors.DarkGrey90, - scrimAccentEnd = PhotonColors.DarkGrey30, + scrimAccentStart = PhotonColors.Ink80A96, + scrimAccentEnd = PhotonColors.DarkGrey90A96, gradientStart = PhotonColors.Violet70, gradientEnd = PhotonColors.Violet40, actionPrimary = PhotonColors.Violet60, @@ -93,8 +93,8 @@ private val lightColorPalette = FirefoxColors( layerAccent = PhotonColors.Violet90, layerNonOpaque = PhotonColors.Violet90A20, scrim = PhotonColors.DarkGrey05A45, - scrimAccentStart = PhotonColors.DarkGrey90, - scrimAccentEnd = PhotonColors.DarkGrey30, + scrimAccentStart = PhotonColors.DarkGrey90A96, + scrimAccentEnd = PhotonColors.DarkGrey30A96, gradientStart = PhotonColors.Violet70, gradientEnd = PhotonColors.Violet40, actionPrimary = PhotonColors.Violet90, diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index da4d081828..a728e24aa8 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -17,8 +17,8 @@ @color/photonViolet40A12 @color/photonDarkGrey05A45 - @color/photonDarkGrey90 - @color/photonDarkGrey30 + @color/photonInk80A96 + @color/photonDarkGrey90A96 @color/photonViolet70 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 43dd25ddac..f0b888c73b 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -17,8 +17,8 @@ @color/photonViolet90A20 @color/photonDarkGrey05A45 - @color/photonDarkGrey90 - @color/photonDarkGrey30 + @color/photonDarkGrey90A96 + @color/photonDarkGrey30A96 @color/photonViolet70 diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt index 7946b2bed9..52b2a27215 100644 --- a/buildSrc/src/main/java/AndroidComponents.kt +++ b/buildSrc/src/main/java/AndroidComponents.kt @@ -3,5 +3,5 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ object AndroidComponents { - const val VERSION = "97.0.20211209143429" + const val VERSION = "97.0.20211210210313" }