Change container colors of Scaffold and TopAppBar (#321)

Moop-App · Jan 3, 2025 · c3b1602 · c3b1602
1 parent d56ec31
commit c3b1602
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 2 deletions.
diff --git a/feature/detail/impl/src/main/java/soup/movie/feature/detail/impl/DetailContent.kt b/feature/detail/impl/src/main/java/soup/movie/feature/detail/impl/DetailContent.kt
@@ -30,6 +30,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
+import soup.movie.core.designsystem.theme.MovieTheme
 import soup.movie.resources.R
 
 @Composable
@@ -47,6 +48,7 @@ internal fun DetailContent(
         snackbarHost = {
             SnackbarHost(hostState = snackbarHostState)
         },
+        containerColor = MovieTheme.colorScheme.surfaceContainerLowest,
     ) { paddingValues ->
         when (uiModel) {
             is DetailUiModel.None -> {}

diff --git a/feature/home/impl/src/main/java/soup/movie/feature/home/impl/HomeScreen.kt b/feature/home/impl/src/main/java/soup/movie/feature/home/impl/HomeScreen.kt
@@ -33,6 +33,7 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.SheetValue
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.VerticalDivider
 import androidx.compose.material3.rememberBottomSheetScaffoldState
 import androidx.compose.runtime.Composable
@@ -97,13 +98,17 @@ fun HomeScreen(
         }
     }
     BottomSheetScaffold(
+        containerColor = MovieTheme.colorScheme.surfaceContainerLowest,
         scaffoldState = bottomSheetScaffoldState,
         sheetPeekHeight = 0.dp,
         sheetContent = {
             HomeFilterScreen(viewModel = hiltViewModel())
         },
         topBar = {
             TopAppBar(
+                colors = TopAppBarDefaults.topAppBarColors(
+                    containerColor = MovieTheme.colorScheme.surfaceContainerLowest,
+                ),
                 actions = {
                     IconButton(onClick = { onSearchClick() }) {
                         Icon(

diff --git a/feature/home/impl/src/main/java/soup/movie/feature/home/impl/favorite/HomeFavoriteScreen.kt b/feature/home/impl/src/main/java/soup/movie/feature/home/impl/favorite/HomeFavoriteScreen.kt
@@ -29,6 +29,7 @@ import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
@@ -40,6 +41,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import kotlinx.coroutines.launch
 import soup.movie.core.designsystem.icon.MovieIcons
+import soup.movie.core.designsystem.theme.MovieTheme
 import soup.movie.feature.home.impl.tab.MovieList
 import soup.movie.feature.home.impl.tab.NoMovieItems
 import soup.movie.model.MovieModel
@@ -69,9 +71,13 @@ fun HomeFavoriteScreen(
         }
     }
     Scaffold(
+        containerColor = MovieTheme.colorScheme.surfaceContainerLowest,
         modifier = modifier,
         topBar = {
             TopAppBar(
+                colors = TopAppBarDefaults.topAppBarColors(
+                    containerColor = MovieTheme.colorScheme.surfaceContainerLowest,
+                ),
                 title = {
                     Text(text = stringResource(R.string.menu_favorite))
                 },

diff --git a/feature/search/impl/src/main/java/soup/movie/feature/search/impl/SearchScreen.kt b/feature/search/impl/src/main/java/soup/movie/feature/search/impl/SearchScreen.kt
@@ -71,6 +71,7 @@ fun SearchScreen(
     val uiModel by viewModel.uiModel.collectAsState()
 
     Scaffold(
+        containerColor = MovieTheme.colorScheme.surfaceContainerLowest,
         topBar = {
             SearchTopBar(
                 upPress = upPress,
@@ -123,7 +124,7 @@ private fun SearchTopBar(
         modifier = modifier.windowInsetsPadding(windowInsets)
             .fillMaxWidth()
             .height(56.dp),
-        color = MovieTheme.colorScheme.primary,
+        color = MovieTheme.colorScheme.surfaceContainerLowest,
     ) {
         val focusManager = LocalFocusManager.current
         val focusRequester = FocusRequester()

diff --git a/feature/settings/impl/src/main/java/soup/movie/feature/settings/impl/home/SettingsScreen.kt b/feature/settings/impl/src/main/java/soup/movie/feature/settings/impl/home/SettingsScreen.kt
@@ -35,6 +35,7 @@ import androidx.compose.material3.IconButton
 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.collectAsState
 import androidx.compose.runtime.getValue
@@ -74,9 +75,13 @@ private fun SettingsScreen(
 ) {
     Scaffold(
         modifier = modifier,
+        containerColor = MovieTheme.colorScheme.surfaceContainerLowest,
         topBar = {
             TopAppBar(
                 title = { Text(text = stringResource(R.string.menu_settings)) },
+                colors = TopAppBarDefaults.topAppBarColors(
+                    containerColor = MovieTheme.colorScheme.surfaceContainerLowest,
+                ),
             )
         },
     ) { paddingValues ->

diff --git a/...e/settings/impl/src/main/java/soup/movie/feature/settings/impl/theme/ThemeOptionScreen.kt b/...e/settings/impl/src/main/java/soup/movie/feature/settings/impl/theme/ThemeOptionScreen.kt
@@ -27,6 +27,7 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 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.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -45,8 +46,14 @@ fun ThemeOptionScreen(
     modifier: Modifier = Modifier,
 ) {
     Scaffold(
+        containerColor = MovieTheme.colorScheme.surfaceContainerLowest,
         topBar = {
-            TopAppBar(title = { Text(stringResource(R.string.theme_option_title)) })
+            TopAppBar(
+                title = { Text(stringResource(R.string.theme_option_title)) },
+                colors = TopAppBarDefaults.topAppBarColors(
+                    containerColor = MovieTheme.colorScheme.surfaceContainerLowest,
+                ),
+            )
         },
         modifier = modifier,
     ) { paddingValues ->