tor-browser

commit a2e4ac9ecd70d47a7fcf2ba3911135867397c883
parent ddcf5ec0787055978e20178a6ad4a92f4903cea5
Author: Gabriel Luong <gabriel.luong@gmail.com>
Date:   Tue,  2 Dec 2025 08:19:07 +0000

Bug 1993368 - Part 37: Migrate DismissibleItemBackground to M3 color tokens r=android-reviewers,007

Figma: https://www.figma.com/design/EWyFmiYienV32vUUeE0Im1/Tab-Management-for-Android?node-id=15797-17989&m=dev

Differential Revision: https://phabricator.services.mozilla.com/D274546

Diffstat:
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/DismissibleItemBackground.kt
 | 
38
+++++++++++++++++++++++++++-----------

1 file changed, 27 insertions(+), 11 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/DismissibleItemBackground.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/DismissibleItemBackground.kt
@@ -4,7 +4,6 @@
 
 package org.mozilla.fenix.compose
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -15,15 +14,19 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.unit.dp
-import org.mozilla.fenix.R
 import org.mozilla.fenix.theme.FirefoxTheme
+import org.mozilla.fenix.theme.Theme
+import mozilla.components.ui.icons.R as iconsR
 
 /**
  * The background of an item that is being swiped horizontally.
@@ -43,12 +46,12 @@ fun DismissibleItemBackground(
     if (isSwipeActive) {
         Card(
             modifier = modifier.fillMaxSize(),
-            colors = CardDefaults.cardColors(containerColor = FirefoxTheme.colors.layer3),
+            colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceContainerHigh),
             shape = shape,
         ) {
             Box(modifier = Modifier.fillMaxSize()) {
                 Icon(
-                    painter = painterResource(R.drawable.ic_delete),
+                    painter = painterResource(iconsR.drawable.mozac_ic_delete_24),
                     contentDescription = null,
                     modifier = Modifier
                         .padding(horizontal = 32.dp)
@@ -59,7 +62,7 @@ fun DismissibleItemBackground(
                                 Alignment.CenterStart
                             },
                         ),
-                    tint = FirefoxTheme.colors.iconCritical,
+                    tint = MaterialTheme.colorScheme.error,
                 )
             }
         }
@@ -67,12 +70,9 @@ fun DismissibleItemBackground(
 }
 
 @Composable
-@PreviewLightDark
-private fun DismissedTabBackgroundPreview() {
-    FirefoxTheme {
-        Column(
-            modifier = Modifier.background(color = FirefoxTheme.colors.layer1),
-        ) {
+private fun DismissibleItemBackgroundPreviewContent() {
+    Surface {
+        Column {
             Box(modifier = Modifier.height(56.dp)) {
                 DismissibleItemBackground(
                     isSwipeActive = true,
@@ -102,3 +102,19 @@ private fun DismissedTabBackgroundPreview() {
         }
     }
 }
+
+@Composable
+@PreviewLightDark
+private fun DismissedTabBackgroundPreview() {
+    FirefoxTheme {
+        DismissibleItemBackgroundPreviewContent()
+    }
+}
+
+@Composable
+@Preview
+private fun DismissedTabBackgroundPrivatePreview() {
+    FirefoxTheme(theme = Theme.Private) {
+        DismissibleItemBackgroundPreviewContent()
+    }
+}