tor-browser

commit b0995591cde53ee75fc7512ba742212483a010c1
parent e49f4ce6b654aff7bdddb2a7caa08cf80ca87fe3
Author: Gabriel Luong <gabriel.luong@gmail.com>
Date:   Thu, 20 Nov 2025 01:11:19 +0000

Bug 1983833 - Part 14: Migrate menuItemComposable to use M3 Acorn color tokens r=android-reviewers,petru

Figma: https://www.figma.com/design/MjufE1X5fvkxZ0YneX4kRd/Android-Library--2025-?node-id=63982-26985&m=dev

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

Diffstat:
M
mobile/android/android-components/components/compose/browser-toolbar/src/main/java/mozilla/components/compose/browser/toolbar/ui/PopupToMenuItemsMapper.kt
 | 
13
++++++-------

1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/mobile/android/android-components/components/compose/browser-toolbar/src/main/java/mozilla/components/compose/browser/toolbar/ui/PopupToMenuItemsMapper.kt b/mobile/android/android-components/components/compose/browser-toolbar/src/main/java/mozilla/components/compose/browser/toolbar/ui/PopupToMenuItemsMapper.kt
@@ -19,6 +19,7 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.minimumInteractiveComponentSize
 import androidx.compose.material3.ripple
@@ -76,7 +77,7 @@ internal fun menuItemComposable(
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
                     modifier = Modifier
-                        .background(AcornTheme.colors.layer1)
+                        .background(MaterialTheme.colorScheme.surfaceContainerLowest)
                         .thenConditional(
                             Modifier.clickable(
                                 role = Role.Button,
@@ -106,7 +107,7 @@ internal fun menuItemComposable(
                                 modifier = Modifier.size(24.dp),
                                 contentScale = ContentScale.Crop,
                                 colorFilter = when (source.icon.shouldTint) {
-                                    true -> ColorFilter.tint(AcornTheme.colors.iconPrimary)
+                                    true -> ColorFilter.tint(MaterialTheme.colorScheme.onSurface)
                                     else -> null
                                 },
                             )
@@ -116,7 +117,7 @@ internal fun menuItemComposable(
                                 painter = painterResource(source.icon.resourceId),
                                 contentDescription = null,
                                 modifier = Modifier.size(24.dp),
-                                tint = AcornTheme.colors.iconPrimary,
+                                tint = MaterialTheme.colorScheme.onSurface,
                             )
                         }
                         null -> {}
@@ -131,7 +132,7 @@ internal fun menuItemComposable(
                         modifier = Modifier
                             .fillMaxSize()
                             .wrapContentSize(Alignment.CenterStart),
-                        color = AcornTheme.colors.textPrimary,
+                        color = MaterialTheme.colorScheme.onSurface,
                         maxLines = 1,
                         style = AcornTheme.typography.subtitle1,
                     )
@@ -141,9 +142,7 @@ internal fun menuItemComposable(
 
         is BrowserToolbarMenuDivider -> {
             @Composable {
-                HorizontalDivider(
-                    color = AcornTheme.colors.borderSecondary,
-                )
+                HorizontalDivider()
             }
         }
     }