tor-browser

commit 7a05b609862e96eadde2c6f0d8524e6891171266
parent 62d1629fbd27d55b17a054e4ed72a946e36a5a1d
Author: Gabriel Luong <gabriel.luong@gmail.com>
Date:   Thu,  4 Dec 2025 05:30:49 +0000

Bug 1993368 - Part 42: Migrate BetaLabel to use M3 specs r=android-reviewers,007

- Figma: https://www.figma.com/design/ctk1Pw1TBxUwVgTTOvjHb4/2025-Android-Fundamentals?node-id=975-21038&m=dev

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

Diffstat:
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/BetaLabel.kt
 | 
29
++++++-----------------------

1 file changed, 6 insertions(+), 23 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/BetaLabel.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/BetaLabel.kt
@@ -5,13 +5,12 @@
 package org.mozilla.fenix.compose
 
 import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.background
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -19,7 +18,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.unit.dp
-import mozilla.components.ui.colors.PhotonColors
 import org.mozilla.fenix.R
 import org.mozilla.fenix.theme.FirefoxTheme
 
@@ -30,27 +28,16 @@ import org.mozilla.fenix.theme.FirefoxTheme
  */
 @Composable
 fun BetaLabel(modifier: Modifier = Modifier) {
-    val borderColor: Color
-    val textColor: Color
-
-    if (isSystemInDarkTheme()) {
-        borderColor = PhotonColors.LightGrey10
-        textColor = FirefoxTheme.colors.textActionPrimary
-    } else {
-        borderColor = FirefoxTheme.colors.actionTertiary
-        textColor = FirefoxTheme.colors.textSecondary
-    }
-
     Card(
         modifier = modifier,
-        shape = RoundedCornerShape(8.dp),
+        shape = RoundedCornerShape(16.dp),
         colors = CardDefaults.cardColors(containerColor = Color.Transparent),
-        border = BorderStroke(width = 2.dp, color = borderColor),
+        border = BorderStroke(width = 1.dp, color = MaterialTheme.colorScheme.outlineVariant),
     ) {
         Text(
             text = stringResource(R.string.beta_feature),
             modifier = Modifier.padding(horizontal = 12.dp, vertical = 4.dp),
-            color = textColor,
+            color = MaterialTheme.colorScheme.onSurface,
             style = FirefoxTheme.typography.body2,
         )
     }
@@ -60,11 +47,7 @@ fun BetaLabel(modifier: Modifier = Modifier) {
 @Composable
 private fun HeaderPreview() {
     FirefoxTheme {
-        Box(
-            modifier = Modifier
-                .background(color = FirefoxTheme.colors.layer2)
-                .padding(16.dp),
-        ) {
+        Surface {
             BetaLabel()
         }
     }