commit bd361c6603e26a7f3b1229dc6136046034a614b5
parent 7a05b609862e96eadde2c6f0d8524e6891171266
Author: Gabriel Luong <gabriel.luong@gmail.com>
Date: Thu, 4 Dec 2025 05:30:50 +0000
Bug 1993368 - Part 44: Migrate ContextualMenu to use M3 color tokens r=android-reviewers,007
- Migrated the colors in ContextualMenu to the M3 color token equivalents.
- Menu: https://www.figma.com/design/MjufE1X5fvkxZ0YneX4kRd/Android-Library--2025-?node-id=63982-27054&m=dev
Differential Revision: https://phabricator.services.mozilla.com/D274717
Diffstat:
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/Menu.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/Menu.kt
@@ -83,7 +83,7 @@ private fun Menu(
offset = offset,
scrollState = ScrollState(with(localDensity) { columnHeightDp.toPx() * selectedItemIndex }.toInt()),
modifier = Modifier
- .background(color = FirefoxTheme.colors.layer2)
+ .background(color = MaterialTheme.colorScheme.surfaceContainerLowest)
.then(modifier),
) {
val hasCheckedItems = menuItems.any { it.isChecked }
@@ -109,7 +109,7 @@ private fun Menu(
modifier = Modifier
.size(24.dp),
contentDescription = null,
- tint = FirefoxTheme.colors.iconPrimary,
+ tint = MaterialTheme.colorScheme.onSurface,
)
}
} else {
@@ -120,9 +120,9 @@ private fun Menu(
text = {
Text(
text = item.title,
- color = item.color ?: FirefoxTheme.colors.textPrimary,
+ color = item.color ?: MaterialTheme.colorScheme.onSurface,
maxLines = 1,
- style = FirefoxTheme.typography.subtitle1,
+ style = FirefoxTheme.typography.body1,
)
},
modifier = Modifier