tor-browser

commit a5364770cd7aeed59df04e35b6295ad30c033c23
parent 2cbee83350a337a86a537b582c6e0fc510c57f10
Author: Gabriel Luong <gabriel.luong@gmail.com>
Date:   Fri, 21 Nov 2025 06:23:37 +0000

Bug 1993368 - Part 8: Migrate SaveToPDFItem and PrintItem to use M3 Acorn color tokens r=android-reviewers,007

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

Diffstat:
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/share/PrintItem.kt
 | 
42
+++++++++++++++++++++---------------------
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/share/SaveToPDFItem.kt
 | 
44
++++++++++++++++++++++----------------------

2 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/share/PrintItem.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/share/PrintItem.kt
@@ -11,17 +11,18 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.width
 import androidx.compose.material3.Icon
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-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 mozilla.components.ui.icons.R as iconsR
 
 /**
  * A Print item.
@@ -32,33 +33,32 @@ import org.mozilla.fenix.theme.FirefoxTheme
 fun PrintItem(
     onClick: () -> Unit,
 ) {
-    Row(
-        modifier = Modifier
-            .height(56.dp)
-            .fillMaxWidth()
-            .clickable(onClick = onClick),
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        Spacer(Modifier.width(16.dp))
+    Surface {
+        Row(
+            modifier = Modifier
+                .height(56.dp)
+                .fillMaxWidth()
+                .clickable(onClick = onClick),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Spacer(Modifier.width(16.dp))
 
-        Icon(
-            painter = painterResource(R.drawable.ic_print),
-            contentDescription = null,
-            tint = FirefoxTheme.colors.iconPrimary,
-        )
+            Icon(
+                painter = painterResource(iconsR.drawable.mozac_ic_print_24),
+                contentDescription = null,
+            )
 
-        Spacer(Modifier.width(32.dp))
+            Spacer(Modifier.width(32.dp))
 
-        Text(
-            color = FirefoxTheme.colors.textPrimary,
-            text = stringResource(R.string.menu_print),
-            style = FirefoxTheme.typography.subtitle1,
-        )
+            Text(
+                text = stringResource(R.string.menu_print),
+                style = FirefoxTheme.typography.subtitle1,
+            )
+        }
     }
 }
 
 @Composable
-@Preview
 @PreviewLightDark
 private fun PrintItemPreview() {
     FirefoxTheme {
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/share/SaveToPDFItem.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/share/SaveToPDFItem.kt
@@ -11,54 +11,54 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.width
 import androidx.compose.material3.Icon
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-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 mozilla.components.ui.icons.R as iconsR
 
 /**
  * A save to PDF item.
  *
- *  @param onClick event handler when the save to PDF item is clicked.
+ * @param onClick event handler when the save to PDF item is clicked.
  */
 @Composable
 fun SaveToPDFItem(
     onClick: () -> Unit,
 ) {
-    Row(
-        modifier = Modifier
-            .height(56.dp)
-            .fillMaxWidth()
-            .clickable(onClick = onClick),
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        Spacer(Modifier.width(16.dp))
+    Surface {
+        Row(
+            modifier = Modifier
+                .height(56.dp)
+                .fillMaxWidth()
+                .clickable(onClick = onClick),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Spacer(Modifier.width(16.dp))
 
-        Icon(
-            painter = painterResource(R.drawable.ic_download),
-            contentDescription = null,
-            tint = FirefoxTheme.colors.iconPrimary,
-        )
+            Icon(
+                painter = painterResource(iconsR.drawable.mozac_ic_download_24),
+                contentDescription = null,
+            )
 
-        Spacer(Modifier.width(32.dp))
+            Spacer(Modifier.width(32.dp))
 
-        Text(
-            color = FirefoxTheme.colors.textPrimary,
-            text = stringResource(R.string.share_save_to_pdf),
-            style = FirefoxTheme.typography.subtitle1,
-        )
+            Text(
+                text = stringResource(R.string.share_save_to_pdf),
+                style = FirefoxTheme.typography.subtitle1,
+            )
+        }
     }
 }
 
 @Composable
-@Preview
 @PreviewLightDark
 private fun SaveToPDFItemPreview() {
     FirefoxTheme {