diff --git a/core/designsystem/src/main/java/soup/movie/core/designsystem/theme/Colors.kt b/core/designsystem/src/main/java/soup/movie/core/designsystem/theme/Colors.kt index 18df86c5..fdaba7ea 100644 --- a/core/designsystem/src/main/java/soup/movie/core/designsystem/theme/Colors.kt +++ b/core/designsystem/src/main/java/soup/movie/core/designsystem/theme/Colors.kt @@ -15,16 +15,12 @@ */ package soup.movie.core.designsystem.theme -import androidx.compose.material3.ColorScheme -import androidx.compose.material3.darkColorScheme -import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Stable import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.ui.graphics.Color @Stable data class MovieColors( - internal val material: ColorScheme, val star: Color, val dim: Color, val cgv: Color, @@ -39,19 +35,9 @@ data class MovieColors( val ageTag19: Color, val ageTagAll: Color, val ageTagUnknown: Color, -) { - val primary: Color get() = material.primary - val secondary: Color get() = material.secondary - val background: Color get() = material.background - val surface: Color get() = material.surface - val error: Color get() = material.error - val onBackground: Color get() = material.onBackground - val onSurface: Color get() = material.onSurface - val onError: Color get() = material.onError -} +) fun lightMovieColors( - material: ColorScheme = lightColorScheme(), star: Color = Color(0xFFFFC107), dim: Color = Color(0xDDFFFFFF), cgv: Color = Color.White, @@ -67,7 +53,6 @@ fun lightMovieColors( ageTagAll: Color = Color(0xFF4CAF50), ageTagUnknown: Color = Color(0xFF9E9E9E), ): MovieColors = MovieColors( - material = material, star = star, dim = dim, cgv = cgv, @@ -85,7 +70,6 @@ fun lightMovieColors( ) fun darkMovieColors( - material: ColorScheme = darkColorScheme(), star: Color = Color(0xFFFFC107), dim: Color = Color(0xAA000000), cgv: Color = Color.White, @@ -101,7 +85,6 @@ fun darkMovieColors( ageTagAll: Color = Color(0xFF81C784), ageTagUnknown: Color = Color(0xFFE0E0E0), ): MovieColors = MovieColors( - material = material, star = star, dim = dim, cgv = cgv, diff --git a/core/designsystem/src/main/java/soup/movie/core/designsystem/theme/Themes.kt b/core/designsystem/src/main/java/soup/movie/core/designsystem/theme/Themes.kt index d8a10d6b..a3392128 100644 --- a/core/designsystem/src/main/java/soup/movie/core/designsystem/theme/Themes.kt +++ b/core/designsystem/src/main/java/soup/movie/core/designsystem/theme/Themes.kt @@ -15,36 +15,51 @@ */ package soup.movie.core.designsystem.theme +import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.ColorScheme import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Shapes import androidx.compose.material3.Typography import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.ui.platform.LocalContext -private val LightMovieColors = lightMovieColors( - material = lightColorScheme(), -) +private val LightMovieColors = lightMovieColors() -private val DarkMovieColors = darkMovieColors( - material = darkColorScheme(), -) +private val DarkMovieColors = darkMovieColors() @Composable fun MovieTheme( darkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit, ) { - val colors = if (darkTheme) { + val movieColors = if (darkTheme) { DarkMovieColors } else { LightMovieColors } - CompositionLocalProvider(LocalMovieColors provides colors) { + val context = LocalContext.current + val colors = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + if (darkTheme) { + dynamicDarkColorScheme(context = context) + } else { + dynamicLightColorScheme(context = context) + } + } else { + if (darkTheme) { + darkColorScheme() + } else { + lightColorScheme() + } + } + CompositionLocalProvider(LocalMovieColors provides movieColors) { MaterialTheme( - colorScheme = colors.material, + colorScheme = colors, content = content, ) } @@ -56,6 +71,10 @@ object MovieTheme { @Composable get() = LocalMovieColors.current + val colorScheme: ColorScheme + @Composable + get() = MaterialTheme.colorScheme + val typography: Typography @Composable get() = MaterialTheme.typography diff --git a/feature/detail/impl/src/main/java/soup/movie/feature/detail/impl/BoxOffice.kt b/feature/detail/impl/src/main/java/soup/movie/feature/detail/impl/BoxOffice.kt index 66e3f4b1..837d6ebb 100644 --- a/feature/detail/impl/src/main/java/soup/movie/feature/detail/impl/BoxOffice.kt +++ b/feature/detail/impl/src/main/java/soup/movie/feature/detail/impl/BoxOffice.kt @@ -55,13 +55,10 @@ fun BoxOffice( ) { Text( text = "박스오피스", - color = MovieTheme.colors.onSurface, style = MovieTheme.typography.bodyMedium, - modifier = Modifier.alpha(0.7f), ) Text( text = stringResource(R.string.rank, uiModel.rank), - color = MovieTheme.colors.onSurface, style = MovieTheme.typography.titleMedium, fontSize = 18.sp, fontWeight = FontWeight.Bold, @@ -69,14 +66,14 @@ fun BoxOffice( ) Text( text = stringResource(R.string.rank_date, uiModel.rankDate), - color = MovieTheme.colors.surface, + color = MovieTheme.colorScheme.surface, style = MovieTheme.typography.bodyMedium, fontSize = 12.sp, fontWeight = FontWeight.Bold, modifier = Modifier .padding(top = 6.dp) .background( - color = MovieTheme.colors.onSurface, + color = MovieTheme.colorScheme.onSurface, shape = RoundedCornerShape(percent = 50), ) .padding(vertical = 1.dp, horizontal = 8.dp), @@ -88,13 +85,13 @@ fun BoxOffice( ) { Text( text = "누적 관객수", - color = MovieTheme.colors.onSurface, + color = MovieTheme.colorScheme.onSurface, style = MovieTheme.typography.bodyMedium, modifier = Modifier.alpha(0.7f), ) Text( text = stringResource(R.string.audience, uiModel.audience), - color = MovieTheme.colors.onSurface, + color = MovieTheme.colorScheme.onSurface, style = MovieTheme.typography.titleMedium, fontSize = 18.sp, fontWeight = FontWeight.Bold, @@ -102,14 +99,14 @@ fun BoxOffice( ) Text( text = stringResource(R.string.screen_days, uiModel.screenDays), - color = MovieTheme.colors.surface, + color = MovieTheme.colorScheme.surface, style = MovieTheme.typography.bodyMedium, fontSize = 12.sp, fontWeight = FontWeight.Bold, modifier = Modifier .padding(top = 6.dp) .background( - color = MovieTheme.colors.onSurface, + color = MovieTheme.colorScheme.onSurface, shape = RoundedCornerShape(percent = 50), ) .padding(vertical = 1.dp, horizontal = 8.dp), diff --git a/feature/detail/impl/src/main/java/soup/movie/feature/detail/impl/DetailError.kt b/feature/detail/impl/src/main/java/soup/movie/feature/detail/impl/DetailError.kt index ba9902c7..580d9d6b 100644 --- a/feature/detail/impl/src/main/java/soup/movie/feature/detail/impl/DetailError.kt +++ b/feature/detail/impl/src/main/java/soup/movie/feature/detail/impl/DetailError.kt @@ -70,7 +70,7 @@ internal fun DetailError( ) { Text( text = stringResource(R.string.common_retry), - color = MovieTheme.colors.secondary, + color = MovieTheme.colorScheme.secondary, modifier = Modifier.padding(horizontal = 16.dp), ) } diff --git a/feature/detail/impl/src/main/java/soup/movie/feature/detail/impl/DetailHeader.kt b/feature/detail/impl/src/main/java/soup/movie/feature/detail/impl/DetailHeader.kt index 783c6268..44d6cf49 100644 --- a/feature/detail/impl/src/main/java/soup/movie/feature/detail/impl/DetailHeader.kt +++ b/feature/detail/impl/src/main/java/soup/movie/feature/detail/impl/DetailHeader.kt @@ -68,7 +68,7 @@ internal fun DetailHeader( modifier = Modifier .weight(1f) .padding(end = 8.dp, top = 12.dp, bottom = 12.dp), - color = MovieTheme.colors.onBackground, + color = MovieTheme.colorScheme.onBackground, style = MovieTheme.typography.headlineSmall, fontSize = 18.sp, fontWeight = FontWeight.Bold, @@ -114,14 +114,14 @@ internal fun DetailHeader( Row { Text( text = "개봉", - color = MovieTheme.colors.onBackground, + color = MovieTheme.colorScheme.onBackground, style = MovieTheme.typography.bodyMedium, fontSize = 14.sp, modifier = Modifier.alpha(0.5f), ) Text( text = movie.openDate, - color = MovieTheme.colors.onBackground, + color = MovieTheme.colorScheme.onBackground, style = MovieTheme.typography.bodyMedium, fontSize = 14.sp, modifier = Modifier.fillMaxWidth().padding(start = 8.dp), @@ -133,7 +133,7 @@ internal fun DetailHeader( Row(modifier = Modifier.padding(top = 8.dp)) { Text( text = "등급", - color = MovieTheme.colors.onBackground, + color = MovieTheme.colorScheme.onBackground, style = MovieTheme.typography.bodyMedium, fontSize = 14.sp, modifier = Modifier.alpha(0.5f), @@ -148,7 +148,7 @@ internal fun DetailHeader( else -> R.string.movie_age_unknown }, ), - color = MovieTheme.colors.onBackground, + color = MovieTheme.colorScheme.onBackground, style = MovieTheme.typography.bodyMedium, fontSize = 14.sp, modifier = Modifier.fillMaxWidth().padding(start = 8.dp), @@ -161,14 +161,14 @@ internal fun DetailHeader( Row(modifier = Modifier.padding(top = 8.dp)) { Text( text = "장르", - color = MovieTheme.colors.onBackground, + color = MovieTheme.colorScheme.onBackground, style = MovieTheme.typography.bodyMedium, fontSize = 14.sp, modifier = Modifier.alpha(0.5f), ) Text( text = genres.joinToString(separator = ", "), - color = MovieTheme.colors.onBackground, + color = MovieTheme.colorScheme.onBackground, style = MovieTheme.typography.bodyMedium, fontSize = 14.sp, modifier = Modifier.fillMaxWidth().padding(start = 8.dp), @@ -182,14 +182,14 @@ internal fun DetailHeader( Row(modifier = Modifier.padding(top = 8.dp)) { Text( text = "국가", - color = MovieTheme.colors.onBackground, + color = MovieTheme.colorScheme.onBackground, style = MovieTheme.typography.bodyMedium, fontSize = 14.sp, modifier = Modifier.alpha(0.5f), ) Text( text = nations.joinToString(separator = ", "), - color = MovieTheme.colors.onBackground, + color = MovieTheme.colorScheme.onBackground, style = MovieTheme.typography.bodyMedium, fontSize = 14.sp, modifier = Modifier.fillMaxWidth().padding(start = 8.dp), @@ -203,14 +203,14 @@ internal fun DetailHeader( Row(modifier = Modifier.padding(top = 8.dp)) { Text( text = "러닝타임", - color = MovieTheme.colors.onBackground, + color = MovieTheme.colorScheme.onBackground, style = MovieTheme.typography.bodyMedium, fontSize = 14.sp, modifier = Modifier.alpha(0.5f), ) Text( text = stringResource(R.string.time_minute, uiModel.showTm), - color = MovieTheme.colors.onBackground, + color = MovieTheme.colorScheme.onBackground, style = MovieTheme.typography.bodyMedium, fontSize = 14.sp, modifier = Modifier.fillMaxWidth().padding(start = 8.dp), @@ -228,14 +228,14 @@ internal fun DetailHeader( Row(modifier = Modifier.padding(top = 8.dp)) { Text( text = "배급", - color = MovieTheme.colors.onBackground, + color = MovieTheme.colorScheme.onBackground, style = MovieTheme.typography.bodyMedium, fontSize = 14.sp, modifier = Modifier.alpha(0.5f), ) Text( text = companies, - color = MovieTheme.colors.onBackground, + color = MovieTheme.colorScheme.onBackground, style = MovieTheme.typography.bodyMedium, fontSize = 14.sp, modifier = Modifier.fillMaxWidth().padding(start = 8.dp), diff --git a/feature/detail/impl/src/main/java/soup/movie/feature/detail/impl/DetailList.kt b/feature/detail/impl/src/main/java/soup/movie/feature/detail/impl/DetailList.kt index 19173258..5594f12e 100644 --- a/feature/detail/impl/src/main/java/soup/movie/feature/detail/impl/DetailList.kt +++ b/feature/detail/impl/src/main/java/soup/movie/feature/detail/impl/DetailList.kt @@ -191,7 +191,7 @@ private fun Cgv( StarIcon(modifier = Modifier.requiredSize(width = 24.dp, height = 36.dp)) Text( text = uiModel.rating, - color = MovieTheme.colors.onSurface, + color = MovieTheme.colorScheme.onSurface, style = MovieTheme.typography.bodyMedium, fontWeight = FontWeight.Bold, modifier = Modifier.padding(start = 4.dp, end = 8.dp), @@ -237,7 +237,7 @@ private fun Lotte( StarIcon(modifier = Modifier.requiredSize(width = 24.dp, height = 36.dp)) Text( text = uiModel.rating, - color = MovieTheme.colors.onSurface, + color = MovieTheme.colorScheme.onSurface, style = MovieTheme.typography.bodyMedium, fontWeight = FontWeight.Bold, modifier = Modifier.padding(start = 4.dp, end = 8.dp), @@ -283,7 +283,7 @@ private fun Megabox( StarIcon(modifier = Modifier.requiredSize(width = 24.dp, height = 36.dp)) Text( text = uiModel.rating, - color = MovieTheme.colors.onSurface, + color = MovieTheme.colorScheme.onSurface, style = MovieTheme.typography.bodyMedium, fontWeight = FontWeight.Bold, modifier = Modifier.padding(start = 4.dp, end = 8.dp), @@ -317,7 +317,7 @@ private fun Plot( text = "줄거리", maxLines = 1, overflow = TextOverflow.Ellipsis, - color = MovieTheme.colors.onSurface, + color = MovieTheme.colorScheme.onSurface, style = MovieTheme.typography.titleMedium, fontWeight = FontWeight.Bold, modifier = Modifier.padding(start = 8.dp), @@ -328,7 +328,7 @@ private fun Plot( ReadMoreText( text = uiModel.plot, expanded = isExpanded, - color = MovieTheme.colors.onSurface, + color = MovieTheme.colorScheme.onSurface, style = MovieTheme.typography.bodyMedium, modifier = Modifier .clickable { @@ -338,7 +338,7 @@ private fun Plot( .fillMaxWidth() .animateContentSize(animationSpec = tween(durationMillis = 100)), readMoreText = "더보기", - readMoreColor = MovieTheme.colors.secondary, + readMoreColor = MovieTheme.colorScheme.secondary, readMoreFontWeight = FontWeight.Bold, readMoreMaxLines = 3, ) @@ -371,7 +371,7 @@ private fun Imdb( ) Text( text = uiModel.imdb, - color = MovieTheme.colors.onSurface, + color = MovieTheme.colorScheme.onSurface, style = MovieTheme.typography.bodyMedium, fontWeight = FontWeight.Bold, modifier = Modifier.padding(top = 6.dp), @@ -407,7 +407,7 @@ private fun Imdb( } Text( text = uiModel.rottenTomatoes, - color = MovieTheme.colors.onSurface, + color = MovieTheme.colorScheme.onSurface, style = MovieTheme.typography.bodyMedium, fontWeight = FontWeight.Bold, overflow = TextOverflow.Ellipsis, @@ -428,7 +428,7 @@ private fun Imdb( ) Text( text = uiModel.metascore, - color = MovieTheme.colors.onSurface, + color = MovieTheme.colorScheme.onSurface, style = MovieTheme.typography.bodyMedium, fontWeight = FontWeight.Bold, modifier = Modifier.padding(top = 6.dp), @@ -534,7 +534,7 @@ private fun TrailerHeader( contentDescription = null, modifier = Modifier.requiredSize(18.dp), contentScale = ContentScale.Inside, - colorFilter = ColorFilter.tint(color = MovieTheme.colors.onSurface), + colorFilter = ColorFilter.tint(color = MovieTheme.colorScheme.onSurface), ) } } @@ -559,7 +559,7 @@ private fun TrailerItem( ) { AsyncImage( uiModel.trailer.thumbnailUrl, - placeholder = ColorPainter(color = MovieTheme.colors.onSurface.copy(alpha = 0.1f)), + placeholder = ColorPainter(color = MovieTheme.colorScheme.onSurface.copy(alpha = 0.1f)), contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier @@ -607,7 +607,7 @@ private fun TrailerFooter( ) { Text( text = "더보기", - color = MovieTheme.colors.secondary, + color = MovieTheme.colorScheme.secondary, fontWeight = FontWeight.Bold, ) } diff --git a/feature/detail/impl/src/main/java/soup/movie/feature/detail/impl/DetailScreen.kt b/feature/detail/impl/src/main/java/soup/movie/feature/detail/impl/DetailScreen.kt index 2b790e5d..afead133 100644 --- a/feature/detail/impl/src/main/java/soup/movie/feature/detail/impl/DetailScreen.kt +++ b/feature/detail/impl/src/main/java/soup/movie/feature/detail/impl/DetailScreen.kt @@ -101,7 +101,7 @@ fun DetailScreen( url = url, styles = TextLinkStyles( style = SpanStyle( - color = MovieTheme.colors.secondary, + color = MovieTheme.colorScheme.secondary, textDecoration = TextDecoration.Underline, ), ), @@ -119,7 +119,7 @@ fun DetailScreen( TextButton( onClick = { showPrivacyDialog = false }, colors = ButtonDefaults.textButtonColors( - contentColor = MovieTheme.colors.secondary, + contentColor = MovieTheme.colorScheme.secondary, ), ) { Text(text = stringResource(R.string.trailer_dialog_button)) 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 index 67e6b800..737a80a3 100644 --- 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 @@ -124,7 +124,7 @@ fun HomeScreen( modifier = Modifier .padding(horizontal = 16.dp) .requiredHeight(16.dp), - color = MovieTheme.colors.onSurface, + color = MovieTheme.colorScheme.onSurface, ) } val selected = selectedTab == homeTab @@ -135,9 +135,9 @@ fun HomeScreen( Text( text = text, color = if (selected) { - MovieTheme.colors.onSurface + MovieTheme.colorScheme.onSurface } else { - MovieTheme.colors.onSurface.copy(alpha = 0.38f) + MovieTheme.colorScheme.onSurface.copy(alpha = 0.38f) }, modifier = Modifier .clickable { diff --git a/feature/home/impl/src/main/java/soup/movie/feature/home/impl/favorite/MovieAgeBadge.kt b/feature/home/impl/src/main/java/soup/movie/feature/home/impl/favorite/MovieAgeBadge.kt index f5d842c3..1c5fd23b 100644 --- a/feature/home/impl/src/main/java/soup/movie/feature/home/impl/favorite/MovieAgeBadge.kt +++ b/feature/home/impl/src/main/java/soup/movie/feature/home/impl/favorite/MovieAgeBadge.kt @@ -44,7 +44,7 @@ fun MovieAgeBadge( modifier = modifier .size(10.dp) .background(color = color, shape = RoundedCornerShape(5.dp)) - .border(1.dp, MovieTheme.colors.background, shape = RoundedCornerShape(5.dp)), + .border(1.dp, MovieTheme.colorScheme.background, shape = RoundedCornerShape(5.dp)), ) } diff --git a/feature/home/impl/src/main/java/soup/movie/feature/home/impl/favorite/MovieTextTag.kt b/feature/home/impl/src/main/java/soup/movie/feature/home/impl/favorite/MovieTextTag.kt index d3643363..8af8eb21 100644 --- a/feature/home/impl/src/main/java/soup/movie/feature/home/impl/favorite/MovieTextTag.kt +++ b/feature/home/impl/src/main/java/soup/movie/feature/home/impl/favorite/MovieTextTag.kt @@ -44,13 +44,13 @@ fun MovieTextTag( modifier = modifier .size(width = 36.dp, height = 18.dp) .background(color = tagBackgroundColor, shape = RoundedCornerShape(5.dp)) - .border(1.dp, MovieTheme.colors.background, shape = RoundedCornerShape(5.dp)), + .border(1.dp, MovieTheme.colorScheme.background, shape = RoundedCornerShape(5.dp)), contentAlignment = Alignment.Center, ) { Text( text = text, modifier = Modifier.wrapContentHeight(), - color = MovieTheme.colors.background, + color = MovieTheme.colorScheme.background, fontSize = fontSize, fontWeight = FontWeight.Bold, textAlign = TextAlign.Center, diff --git a/feature/home/impl/src/main/java/soup/movie/feature/home/impl/filter/HomeFilterCategory.kt b/feature/home/impl/src/main/java/soup/movie/feature/home/impl/filter/HomeFilterCategory.kt index d6f5422d..2144cf77 100644 --- a/feature/home/impl/src/main/java/soup/movie/feature/home/impl/filter/HomeFilterCategory.kt +++ b/feature/home/impl/src/main/java/soup/movie/feature/home/impl/filter/HomeFilterCategory.kt @@ -16,7 +16,6 @@ package soup.movie.feature.home.impl.filter import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -31,7 +30,7 @@ fun HomeFilterCategory( ) { Text( text = text, - style = MaterialTheme.typography.titleMedium, + style = MovieTheme.typography.titleMedium, modifier = modifier.fillMaxWidth(), ) } diff --git a/feature/home/impl/src/main/java/soup/movie/feature/home/impl/tab/CommonError.kt b/feature/home/impl/src/main/java/soup/movie/feature/home/impl/tab/CommonError.kt index 7474f022..dbb98646 100644 --- a/feature/home/impl/src/main/java/soup/movie/feature/home/impl/tab/CommonError.kt +++ b/feature/home/impl/src/main/java/soup/movie/feature/home/impl/tab/CommonError.kt @@ -26,13 +26,9 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp import soup.movie.core.designsystem.icon.MovieIcons import soup.movie.core.designsystem.theme.MovieTheme import soup.movie.resources.R @@ -47,7 +43,7 @@ fun CommonError( modifier = modifier .fillMaxWidth() .requiredHeight(40.dp), - color = MovieTheme.colors.error, + color = MovieTheme.colorScheme.error, ) { Row( horizontalArrangement = Arrangement.Center, @@ -56,17 +52,12 @@ fun CommonError( Icon( MovieIcons.Info, contentDescription = null, - tint = MovieTheme.colors.onError, ) Text( text = stringResource(R.string.common_network_error), - modifier = Modifier.padding(start = 20.dp, end = 16.dp), - color = Color.White, - fontSize = 14.sp, - fontWeight = FontWeight.Bold, - overflow = TextOverflow.Ellipsis, + modifier = Modifier.padding(start = 4.dp), maxLines = 1, - style = MovieTheme.typography.bodySmall, + style = MovieTheme.typography.titleSmall, ) } } diff --git a/feature/home/impl/src/main/java/soup/movie/feature/home/impl/tab/ContentLoadingProgressBar.kt b/feature/home/impl/src/main/java/soup/movie/feature/home/impl/tab/ContentLoadingProgressBar.kt index acc50028..9fdb216f 100644 --- a/feature/home/impl/src/main/java/soup/movie/feature/home/impl/tab/ContentLoadingProgressBar.kt +++ b/feature/home/impl/src/main/java/soup/movie/feature/home/impl/tab/ContentLoadingProgressBar.kt @@ -47,7 +47,7 @@ import soup.movie.core.designsystem.theme.MovieTheme @Composable fun ContentLoadingProgressBar( modifier: Modifier = Modifier, - backgroundColor: Color = MovieTheme.colors.surface, + backgroundColor: Color = MovieTheme.colorScheme.surface, contentColor: Color = contentColorFor(backgroundColor), shape: Shape = CircleShape, elevation: Dp = 12.dp, @@ -87,8 +87,8 @@ fun ContentLoadingProgressBar( brush = Brush.sweepGradient( listOf( Color.Transparent, - MovieTheme.colors.onSurface, - MovieTheme.colors.onSurface, + MovieTheme.colorScheme.onSurface, + MovieTheme.colorScheme.onSurface, ), ), shape = CircleShape, @@ -97,7 +97,7 @@ fun ContentLoadingProgressBar( Icon( painter = painterResource(MovieIcons.LoadingLogo), contentDescription = null, - tint = MovieTheme.colors.onSurface, + tint = MovieTheme.colorScheme.onSurface, ) } } diff --git a/feature/home/impl/src/main/java/soup/movie/feature/home/impl/tab/MovieList.kt b/feature/home/impl/src/main/java/soup/movie/feature/home/impl/tab/MovieList.kt index a5ab1375..58a8c4cc 100644 --- a/feature/home/impl/src/main/java/soup/movie/feature/home/impl/tab/MovieList.kt +++ b/feature/home/impl/src/main/java/soup/movie/feature/home/impl/tab/MovieList.kt @@ -26,7 +26,6 @@ import androidx.compose.foundation.lazy.grid.LazyGridState import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.foundation.lazy.grid.items import androidx.compose.foundation.lazy.grid.rememberLazyGridState -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -85,7 +84,7 @@ private fun MovieItem( ) { Surface( modifier = modifier, - color = MaterialTheme.colorScheme.surfaceVariant, + color = MovieTheme.colorScheme.surfaceVariant, shape = MovieTheme.shapes.small, ) { Box { 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 index ed428cfa..e0472b82 100644 --- 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 @@ -105,7 +105,7 @@ private fun SearchScaffold( modifier = Modifier .fillMaxWidth() .height(56.dp), - color = MovieTheme.colors.primary, + color = MovieTheme.colorScheme.primary, ) { 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 index e51bbdb1..b3c45163 100644 --- 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 @@ -32,9 +32,7 @@ import androidx.compose.material3.FilledTonalButton import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.IconButton -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold -import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar import androidx.compose.runtime.Composable @@ -43,7 +41,6 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp @@ -151,20 +148,10 @@ private fun SettingsCategory( Text( text = text, modifier = modifier.fillMaxWidth(), - style = MaterialTheme.typography.titleMedium, + style = MovieTheme.typography.titleMedium, ) } -@Preview -@Composable -private fun SettingsCategoryPreview() { - MaterialTheme { - Surface { - SettingsCategory(text = "Category") - } - } -} - @PreviewLightDark @Composable private fun SettingsScreenPreview() {