commit ade0267883db9ec99a2d6f0050a4af77b115e1e2
parent b0fcb0700b9f1d0ecd40560132abe6ebdb33349d
Author: Gabriel Luong <gabriel.luong@gmail.com>
Date: Wed, 10 Dec 2025 15:33:09 +0000
Bug 2004511 - Part 16: Remove layerScrim in AcornColors r=android-reviewers,007
Differential Revision: https://phabricator.services.mozilla.com/D275393
Diffstat:
3 files changed, 39 insertions(+), 41 deletions(-)
diff --git a/mobile/android/android-components/components/compose/base/src/main/java/mozilla/components/compose/base/theme/AcornColors.kt b/mobile/android/android-components/components/compose/base/src/main/java/mozilla/components/compose/base/theme/AcornColors.kt
@@ -26,7 +26,6 @@ class AcornColors(
layer3: Color,
layerAccent: Color,
layerAccentNonOpaque: Color,
- layerScrim: Color,
layerGradientStart: Color,
layerGradientEnd: Color,
layerWarning: Color,
@@ -76,9 +75,6 @@ class AcornColors(
var layerAccentNonOpaque by mutableStateOf(layerAccentNonOpaque)
private set
- var layerScrim by mutableStateOf(layerScrim)
- private set
-
// Tooltip
var layerGradientStart by mutableStateOf(layerGradientStart)
private set
@@ -226,7 +222,6 @@ class AcornColors(
layer3 = other.layer3
layerAccent = other.layerAccent
layerAccentNonOpaque = other.layerAccentNonOpaque
- layerScrim = other.layerScrim
layerGradientStart = other.layerGradientStart
layerGradientEnd = other.layerGradientEnd
layerWarning = other.layerWarning
@@ -267,7 +262,6 @@ class AcornColors(
layer3: Color = this.layer3,
layerAccent: Color = this.layerAccent,
layerAccentNonOpaque: Color = this.layerAccentNonOpaque,
- layerScrim: Color = this.layerScrim,
layerGradientStart: Color = this.layerGradientStart,
layerGradientEnd: Color = this.layerGradientEnd,
layerWarning: Color = this.layerWarning,
@@ -303,7 +297,6 @@ class AcornColors(
layer3 = layer3,
layerAccent = layerAccent,
layerAccentNonOpaque = layerAccentNonOpaque,
- layerScrim = layerScrim,
layerGradientStart = layerGradientStart,
layerGradientEnd = layerGradientEnd,
layerWarning = layerWarning,
@@ -342,7 +335,6 @@ val darkColorPalette = AcornColors(
layer3 = PhotonColors.DarkGrey80,
layerAccent = PhotonColors.Violet40,
layerAccentNonOpaque = PhotonColors.Violet50A32,
- layerScrim = PhotonColors.DarkGrey90A95,
layerGradientStart = PhotonColors.Violet70,
layerGradientEnd = PhotonColors.Violet60,
layerWarning = PhotonColors.Yellow70A77,
@@ -380,7 +372,6 @@ val lightColorPalette = AcornColors(
layer3 = PhotonColors.LightGrey20,
layerAccent = PhotonColors.Ink20,
layerAccentNonOpaque = PhotonColors.Violet70A12,
- layerScrim = PhotonColors.DarkGrey30A95,
layerGradientStart = PhotonColors.Violet70,
layerGradientEnd = PhotonColors.Violet60,
layerWarning = PhotonColors.Yellow20,
@@ -436,6 +427,7 @@ private fun AcornColors.toM3ColorScheme(
errorContainer: Color,
outline: Color,
outlineVariant: Color,
+ scrim: Color,
surfaceBright: Color,
surfaceDim: Color,
surfaceContainer: Color,
@@ -472,7 +464,7 @@ private fun AcornColors.toM3ColorScheme(
onErrorContainer = onSurface,
outline = outline,
outlineVariant = outlineVariant,
- scrim = layerScrim,
+ scrim = scrim,
surfaceBright = surfaceBright,
surfaceDim = surfaceDim,
surfaceContainer = surfaceContainer,
@@ -511,6 +503,7 @@ fun acornDarkColorScheme(): ColorScheme = darkColorPalette.toM3ColorScheme(
errorContainer = PhotonColors.Red80,
outline = PhotonColors.LightGrey80,
outlineVariant = PhotonColors.DarkGrey05,
+ scrim = PhotonColors.DarkGrey90A95,
surfaceBright = PhotonColors.DarkGrey40,
surfaceDim = PhotonColors.DarkGrey80,
surfaceContainer = PhotonColors.DarkGrey60,
@@ -537,6 +530,7 @@ fun acornLightColorScheme(): ColorScheme = lightColorPalette.toM3ColorScheme(
errorContainer = PhotonColors.Red05,
outline = PhotonColors.LightGrey90,
outlineVariant = PhotonColors.LightGrey30,
+ scrim = PhotonColors.DarkGrey30A95,
surfaceBright = PhotonColors.White,
surfaceDim = PhotonColors.LightGrey30,
surfaceContainer = PhotonColors.LightGrey10,
@@ -563,6 +557,7 @@ fun acornPrivateColorScheme(): ColorScheme = privateColorPalette.toM3ColorScheme
errorContainer = PhotonColors.Red80,
outline = PhotonColors.LightGrey80,
outlineVariant = PhotonColors.DarkGrey05,
+ scrim = PhotonColors.DarkGrey90A95,
surfaceBright = Color(0xFF413857),
surfaceDim = PhotonColors.Ink90,
surfaceContainer = Color(0xFF342B4A),
diff --git a/mobile/android/android-components/components/compose/base/src/main/java/mozilla/components/compose/base/theme/layout/AcornLayout.kt b/mobile/android/android-components/components/compose/base/src/main/java/mozilla/components/compose/base/theme/layout/AcornLayout.kt
@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Surface
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
@@ -86,38 +87,39 @@ private const val GRID_ITEMS = 200
@Composable
private fun AcornLayoutPreview() {
AcornTheme {
- FlowRow(
- modifier = Modifier
- .background(color = AcornTheme.colors.layerScrim)
- .fillMaxSize()
- .verticalScroll(rememberScrollState()),
- horizontalArrangement = Arrangement.spacedBy(AcornTheme.layout.space.dynamic400),
- verticalArrangement = Arrangement.spacedBy(AcornTheme.layout.space.dynamic400),
- ) {
- repeat(GRID_ITEMS) {
- val color = Color(
- red = it,
- green = 0,
- blue = it,
- )
+ Surface {
+ FlowRow(
+ modifier = Modifier
+ .fillMaxSize()
+ .verticalScroll(rememberScrollState()),
+ horizontalArrangement = Arrangement.spacedBy(AcornTheme.layout.space.dynamic400),
+ verticalArrangement = Arrangement.spacedBy(AcornTheme.layout.space.dynamic400),
+ ) {
+ repeat(GRID_ITEMS) {
+ val color = Color(
+ red = it,
+ green = 0,
+ blue = it,
+ )
- Box(
- modifier = Modifier
- .size(size = AcornTheme.layout.size.static800)
- .background(
- color = color,
- shape = RoundedCornerShape(size = AcornTheme.layout.corner.small),
- )
- .border(
- width = AcornTheme.layout.border.normal,
- color = Color(
- red = color.red * 0.8f,
- green = color.green * 0.8f,
- blue = color.blue * 0.8f,
+ Box(
+ modifier = Modifier
+ .size(size = AcornTheme.layout.size.static800)
+ .background(
+ color = color,
+ shape = RoundedCornerShape(size = AcornTheme.layout.corner.small),
+ )
+ .border(
+ width = AcornTheme.layout.border.normal,
+ color = Color(
+ red = color.red * 0.8f,
+ green = color.green * 0.8f,
+ blue = color.blue * 0.8f,
+ ),
+ shape = RoundedCornerShape(size = AcornTheme.layout.corner.small),
),
- shape = RoundedCornerShape(size = AcornTheme.layout.corner.small),
- ),
- )
+ )
+ }
}
}
}
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/ui/MiddleSearchHomepage.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/ui/MiddleSearchHomepage.kt
@@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Alignment
@@ -148,7 +149,7 @@ internal fun MiddleSearchHomepage(
private fun Scrim(onDismiss: () -> Unit) {
Box(
modifier = Modifier
- .background(FirefoxTheme.colors.layerScrim.copy(alpha = 0.75f))
+ .background(MaterialTheme.colorScheme.scrim.copy(alpha = 0.75f))
.fillMaxSize()
.pointerInput(Unit) {
detectTapGestures(onTap = { onDismiss() })
