Skip to content

Change container colors of Scaffold and TopAppBar #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fornewid merged 1 commit into from
Jan 3, 2025
Merged

Change container colors of Scaffold and TopAppBar #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions feature/detail/impl/src/main/java/soup/movie/feature/detail/impl/DetailContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -47,6 +48,7 @@ internal fun DetailContent(
snackbarHost = {
SnackbarHost(hostState = snackbarHostState)
},
containerColor = MovieTheme.colorScheme.surfaceContainerLowest,
) { paddingValues ->
when (uiModel) {
is DetailUiModel.None -> {}
Expand Down
5 changes: 5 additions & 0 deletions feature/home/impl/src/main/java/soup/movie/feature/home/impl/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down
6 changes: 6 additions & 0 deletions feature/home/impl/src/main/java/soup/movie/feature/home/impl/favorite/HomeFavoriteScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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))
},
Expand Down
3 changes: 2 additions & 1 deletion feature/search/impl/src/main/java/soup/movie/feature/search/impl/SearchScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ fun SearchScreen(
val uiModel by viewModel.uiModel.collectAsState()

Scaffold(
containerColor = MovieTheme.colorScheme.surfaceContainerLowest,
topBar = {
SearchTopBar(
upPress = upPress,
Expand Down Expand Up @@ -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()
Expand Down
5 changes: 5 additions & 0 deletions feature/settings/impl/src/main/java/soup/movie/feature/settings/impl/home/SettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 ->
Expand Down
9 changes: 8 additions & 1 deletion ...e/settings/impl/src/main/java/soup/movie/feature/settings/impl/theme/ThemeOptionScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 ->
Expand Down
Loading