tor-browser

commit eb94f1f7c52ef462ca06fc12c51990919e5a9d9c
parent 45231ed310edb225063ba674fcdbdc460b5e3ca9
Author: Gabriel Luong <gabriel.luong@gmail.com>
Date:   Tue, 18 Nov 2025 21:46:22 +0000

Bug 2000090 - Part 2: Migrate CfrTools to use M3 color tokens r=android-reviewers,007

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

Diffstat:
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/debugsettings/cfrs/CfrTools.kt
 | 
50
++++++++++++++++++++++++++++----------------------

1 file changed, 28 insertions(+), 22 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/debugsettings/cfrs/CfrTools.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/debugsettings/cfrs/CfrTools.kt
@@ -4,7 +4,6 @@
 
 package org.mozilla.fenix.debugsettings.cfrs
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -15,11 +14,13 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
 import mozilla.components.compose.base.annotation.FlexibleWindowLightDarkPreview
 import mozilla.components.compose.base.button.OutlinedButton
 import mozilla.components.lib.state.ext.observeAsState
@@ -27,6 +28,7 @@ import org.mozilla.fenix.R
 import org.mozilla.fenix.compose.SwitchWithLabel
 import org.mozilla.fenix.nimbus.FxNimbus
 import org.mozilla.fenix.theme.FirefoxTheme
+import org.mozilla.fenix.theme.Theme
 
 /**
  * CFR Tools UI that allows for the CFR states to be reset.
@@ -38,16 +40,18 @@ import org.mozilla.fenix.theme.FirefoxTheme
 fun CfrTools(
     cfrToolsStore: CfrToolsStore,
 ) {
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .verticalScroll(rememberScrollState())
-            .padding(vertical = FirefoxTheme.layout.space.dynamic400),
-        verticalArrangement = Arrangement.spacedBy(FirefoxTheme.layout.space.dynamic400),
-    ) {
-        ResetCfrTool(
-            cfrToolsStore = cfrToolsStore,
-        )
+    Surface {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .verticalScroll(rememberScrollState())
+                .padding(vertical = FirefoxTheme.layout.space.dynamic400),
+            verticalArrangement = Arrangement.spacedBy(FirefoxTheme.layout.space.dynamic400),
+        ) {
+            ResetCfrTool(
+                cfrToolsStore = cfrToolsStore,
+            )
+        }
     }
 }
 
@@ -72,7 +76,6 @@ private fun ResetCfrTool(
         ) {
             Text(
                 text = stringResource(R.string.debug_drawer_cfr_tools_reset_cfr_title),
-                color = FirefoxTheme.colors.textPrimary,
                 style = FirefoxTheme.typography.headline5,
             )
 
@@ -80,7 +83,6 @@ private fun ResetCfrTool(
 
             Text(
                 text = stringResource(R.string.debug_drawer_cfr_tools_reset_cfr_description),
-                color = FirefoxTheme.colors.textPrimary,
                 style = FirefoxTheme.typography.caption,
             )
 
@@ -220,14 +222,18 @@ private fun CfrSectionTitle(
 @FlexibleWindowLightDarkPreview
 private fun CfrToolsPreview() {
     FirefoxTheme {
-        Column(
-            modifier = Modifier.background(
-                color = FirefoxTheme.colors.layer1,
-            ),
-        ) {
-            CfrTools(
-                cfrToolsStore = CfrToolsStore(),
-            )
-        }
+        CfrTools(
+            cfrToolsStore = CfrToolsStore(),
+        )
+    }
+}
+
+@Composable
+@Preview
+private fun CfrToolsPrivatePreview() {
+    FirefoxTheme(theme = Theme.Private) {
+        CfrTools(
+            cfrToolsStore = CfrToolsStore(),
+        )
     }
 }