tor-browser

commit ac83682a4bb79a331262395ba5237ee621454275
parent 3668f545cf6d261d4fb39c761c8999815ba6e0c6
Author: Gabriel Luong <gabriel.luong@gmail.com>
Date:   Sun, 23 Nov 2025 16:53:27 +0000

Bug 1993368 - Part 17: Migrate TabStripTabCounterButton to use M3 Acorn color tokens r=android-reviewers,007

- Changes only affect the TabStripTabCounterButton preview

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

Diffstat:
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/tabstrip/TabStripTabCounterButton.kt
 | 
78
++++++++++++++++++++++++++++++++++++------------------------------------------

1 file changed, 36 insertions(+), 42 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/tabstrip/TabStripTabCounterButton.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/tabstrip/TabStripTabCounterButton.kt
@@ -4,16 +4,15 @@
 
 package org.mozilla.fenix.browser.tabstrip
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -91,50 +90,45 @@ fun TabStripTabCounterButton(
 @Composable
 private fun TabStripTabCounterButtonPreview() {
     FirefoxTheme {
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .background(FirefoxTheme.colors.layer1)
-                .padding(FirefoxTheme.layout.space.dynamic400),
-            verticalArrangement = Arrangement.spacedBy(FirefoxTheme.layout.space.dynamic400),
-        ) {
-            Text(
-                text = "TabStripTabCounterButton",
-                style = FirefoxTheme.typography.body1,
-                color = FirefoxTheme.colors.textPrimary,
-            )
+        Surface {
+            Column(
+                modifier = Modifier.padding(FirefoxTheme.layout.space.dynamic400),
+                horizontalAlignment = Alignment.CenterHorizontally,
+                verticalArrangement = Arrangement.spacedBy(FirefoxTheme.layout.space.dynamic200),
+            ) {
+                Text(
+                    text = "TabStripTabCounterButton",
+                    style = FirefoxTheme.typography.body1,
+                )
 
-            Text(
-                text = """
+                Text(
+                    text = """
                     Clicking the button will increment the tab count. Long press the button to open the dropdown menu.
-                """.trimIndent(),
-                style = FirefoxTheme.typography.caption,
-                color = FirefoxTheme.colors.textPrimary,
-            )
+                    """.trimIndent(),
+                    style = FirefoxTheme.typography.caption,
+                )
 
-            var privacyBadgeVisible by remember { mutableStateOf(false) }
-            var tabCount by remember { mutableIntStateOf(1) }
-            TabStripTabCounterButton(
-                tabCount = tabCount,
-                size = 56.dp,
-                menuItems = listOf(
-                    TabCounterMenuItem.IconItem.NewTab { },
-                    TabCounterMenuItem.IconItem.NewPrivateTab { },
-                    TabCounterMenuItem.Divider,
-                    TabCounterMenuItem.IconItem.CloseTab { },
-                ).map { it.toMenuItem() },
-                modifier = Modifier
-                    .align(Alignment.End)
-                    .background(FirefoxTheme.colors.layer2),
-                onClick = { tabCount++ },
-                privacyBadgeVisible = privacyBadgeVisible,
-            )
+                var privacyBadgeVisible by remember { mutableStateOf(false) }
+                var tabCount by remember { mutableIntStateOf(1) }
+                TabStripTabCounterButton(
+                    tabCount = tabCount,
+                    size = 56.dp,
+                    menuItems = listOf(
+                        TabCounterMenuItem.IconItem.NewTab { },
+                        TabCounterMenuItem.IconItem.NewPrivateTab { },
+                        TabCounterMenuItem.Divider,
+                        TabCounterMenuItem.IconItem.CloseTab { },
+                    ).map { it.toMenuItem() },
+                    onClick = { tabCount++ },
+                    privacyBadgeVisible = privacyBadgeVisible,
+                )
 
-            FilledButton(
-                text = "Toggle privacy badge",
-                modifier = Modifier.fillMaxWidth(),
-            ) {
-                privacyBadgeVisible = !privacyBadgeVisible
+                FilledButton(
+                    text = "Toggle privacy badge",
+                    modifier = Modifier.fillMaxWidth(),
+                ) {
+                    privacyBadgeVisible = !privacyBadgeVisible
+                }
             }
         }
     }