tor-browser

commit c0447496b9e1f44ddc7836b87b8b312de49daeca
parent 3dd7f49c30c700728d15d0f4178432caac33f819
Author: Akhil Pindiprolu <apindiprolu@mozilla.com>
Date:   Mon, 24 Nov 2025 18:35:00 +0000

Bug 1983180 - [WebCompat Reporter v2] Update the background colour to use M3 tokens r=android-reviewers,jdelorenzo

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

Diffstat:
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/webcompat/ui/WebCompatReporter.kt
 | 
17
+++++++++++++++--

1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/webcompat/ui/WebCompatReporter.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/webcompat/ui/WebCompatReporter.kt
@@ -5,6 +5,7 @@
 package org.mozilla.fenix.webcompat.ui
 
 import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.ScrollState
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -29,6 +30,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -90,6 +92,8 @@ fun WebCompatReporter(
 
     var previewSheetVisible by remember { mutableStateOf(false) }
 
+    val scrollState = rememberScrollState()
+
     BackHandler {
         store.dispatch(WebCompatReporterAction.BackPressed)
     }
@@ -100,12 +104,14 @@ fun WebCompatReporter(
                 onBackClick = {
                     store.dispatch(WebCompatReporterAction.BackPressed)
                 },
+                scrollState = scrollState,
             )
         },
+        containerColor = MaterialTheme.colorScheme.background,
     ) { paddingValues ->
         Column(
             modifier = Modifier
-                .verticalScroll(rememberScrollState())
+                .verticalScroll(scrollState)
                 .padding(paddingValues)
                 .imePadding()
                 .padding(horizontal = 16.dp, vertical = 12.dp),
@@ -256,7 +262,6 @@ fun WebCompatReporter(
                     style = FirefoxTheme.typography.subtitle2,
 
                 )
-
                 Icon(
                     painter = painterResource(R.drawable.ic_arrowhead_right),
                     contentDescription = "",
@@ -356,6 +361,7 @@ private fun WebCompatReporterState.toDropdownItems(
 @Composable
 private fun TempAppBar(
     onBackClick: () -> Unit,
+    scrollState: ScrollState,
 ) {
     TopAppBar(
         title = {
@@ -376,6 +382,13 @@ private fun TempAppBar(
             top = 0.dp,
             bottom = 0.dp,
         ),
+        colors = TopAppBarDefaults.topAppBarColors(
+            containerColor = if (scrollState.canScrollBackward) {
+                MaterialTheme.colorScheme.surfaceContainerHigh
+            } else {
+                MaterialTheme.colorScheme.surface
+            },
+        ),
     )
 }