tor-browser

commit 1e1105d9670c094e165c9ddccd283c71c7190b64
parent 57e6d9296f8e2fd8b3f307d36ea7a68e0ac6f6bc
Author: Gabriel Luong <gabriel.luong@gmail.com>
Date:   Thu, 23 Oct 2025 21:00:38 +0000

Bug 1993655 - Part 8: Migrate SubmenuHeader to use M3 color tokens r=android-reviewers,007

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

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

Diffstat:
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/header/SubmenuHeader.kt
 | 
49
++++++++++++++++++++++++++-----------------------

1 file changed, 26 insertions(+), 23 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/header/SubmenuHeader.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/header/SubmenuHeader.kt
@@ -15,8 +15,11 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
@@ -43,29 +46,29 @@ internal fun SubmenuHeader(
             .verticalScroll(rememberScrollState()),
         verticalAlignment = Alignment.CenterVertically,
     ) {
-        IconButton(
-            onClick = { onClick() },
-            modifier = Modifier.semantics {
-                backButtonContentDescription?.also { this.contentDescription = it }
-            },
-        ) {
-            Icon(
-                painter = painterResource(id = iconsR.drawable.mozac_ic_back_24),
-                contentDescription = null,
-                tint = FirefoxTheme.colors.iconPrimary,
-            )
-        }
+        CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.onSurface) {
+            IconButton(
+                onClick = { onClick() },
+                modifier = Modifier.semantics {
+                    backButtonContentDescription?.also { this.contentDescription = it }
+                },
+            ) {
+                Icon(
+                    painter = painterResource(id = iconsR.drawable.mozac_ic_back_24),
+                    contentDescription = null,
+                )
+            }
 
-        Spacer(modifier = Modifier.width(4.dp))
+            Spacer(modifier = Modifier.width(4.dp))
 
-        Text(
-            text = header,
-            modifier = Modifier
-                .weight(1f)
-                .semantics { heading() },
-            color = FirefoxTheme.colors.textSecondary,
-            style = FirefoxTheme.typography.headline7,
-        )
+            Text(
+                text = header,
+                modifier = Modifier
+                    .weight(1f)
+                    .semantics { heading() },
+                style = FirefoxTheme.typography.headline7,
+            )
+        }
     }
 }
 
@@ -75,7 +78,7 @@ private fun SubmenuHeaderPreview() {
     FirefoxTheme {
         Column(
             modifier = Modifier
-                .background(color = FirefoxTheme.colors.layer3),
+                .background(color = MaterialTheme.colorScheme.surface),
         ) {
             SubmenuHeader(
                 header = "sub-menu header",
@@ -91,7 +94,7 @@ private fun SubmenuMenuHeaderPrivatePreview() {
     FirefoxTheme(theme = Theme.Private) {
         Column(
             modifier = Modifier
-                .background(color = FirefoxTheme.colors.layer3),
+                .background(color = MaterialTheme.colorScheme.surface),
         ) {
             SubmenuHeader(
                 header = "sub-menu header",