tor-browser

commit 43fcfa103bfa33ab769e60cc0f61bd562b2bd038
parent b677b84e540078b543efe161d58a96e2001e5af1
Author: Gabriel Luong <gabriel.luong@gmail.com>
Date:   Wed, 19 Nov 2025 02:24:21 +0000

Bug 1993368 - Part 5: Remove the explicit setting of the Scaffold container color r=android-reviewers,007

- Removes the explicit setting of the `Scaffold` container color in favor of using the default value that is built into the `Scaffold` composable.
- The default value that is specified by the Scaffold composable is `background`

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

Diffstat:
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarksScreen.kt
 | 
5
-----
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/pocket/ui/StoriesScreen.kt
 | 
1
-
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/pbmlock/UnlockPrivateTabsTrayScreen.kt
 | 
2
--
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/ui/tabstray/TabsTray.kt
 | 
1
-

4 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarksScreen.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarksScreen.kt
@@ -368,7 +368,6 @@ private fun BookmarksList(
                 BookmarksListTopBar(store = store)
             }
         },
-        containerColor = MaterialTheme.colorScheme.surface,
     ) { paddingValues ->
         if (state.isLoading) {
             Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
@@ -926,7 +925,6 @@ private fun SelectFolderScreen(
         topBar = {
             SelectFolderTopBar(store = store)
         },
-        containerColor = MaterialTheme.colorScheme.surface,
     ) { paddingValues ->
         LazyColumn(
             modifier = Modifier
@@ -1390,7 +1388,6 @@ private fun EditFolderScreen(
                 onDeleteClick = { store.dispatch(EditFolderAction.DeleteClicked) },
             )
         },
-        containerColor = MaterialTheme.colorScheme.surface,
     ) { paddingValues ->
         Box(
             modifier = Modifier
@@ -1478,7 +1475,6 @@ private fun AddFolderScreen(
     val state by store.observeAsState(store.state.bookmarksAddFolderState) { it.bookmarksAddFolderState }
     Scaffold(
         topBar = { AddFolderTopBar(onBackClick = { store.dispatch(BackClicked) }) },
-        containerColor = MaterialTheme.colorScheme.surface,
     ) { paddingValues ->
         Box(
             modifier = Modifier
@@ -1566,7 +1562,6 @@ private fun EditBookmarkScreen(
                 onDeleteClicked = { store.dispatch(EditBookmarkAction.DeleteClicked) },
             )
         },
-        containerColor = MaterialTheme.colorScheme.surface,
     ) { paddingValues ->
         Box(
             modifier = Modifier
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/pocket/ui/StoriesScreen.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/pocket/ui/StoriesScreen.kt
@@ -87,7 +87,6 @@ fun StoriesScreen(
                 scrollBehavior = scrollBehavior,
             )
         },
-        containerColor = MaterialTheme.colorScheme.surface,
         modifier = Modifier
             .fillMaxSize()
             .nestedScroll(scrollBehavior.nestedScrollConnection),
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/pbmlock/UnlockPrivateTabsTrayScreen.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/pbmlock/UnlockPrivateTabsTrayScreen.kt
@@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -48,7 +47,6 @@ internal fun UnlockPrivateTabsTrayScreen(
 
     Scaffold(
         modifier = modifier,
-        containerColor = MaterialTheme.colorScheme.surface,
         bottomBar = {
             Row(
                 modifier = Modifier
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/ui/tabstray/TabsTray.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/ui/tabstray/TabsTray.kt
@@ -275,7 +275,6 @@ fun TabsTray(
             )
         },
         floatingActionButtonPosition = FabPosition.EndOverlay,
-        containerColor = MaterialTheme.colorScheme.surface,
     ) { paddingValues ->
         Box {
             HorizontalPager(