diff --git a/app/src/main/java/com/owenlejeune/tvtime/ui/components/Cards.kt b/app/src/main/java/com/owenlejeune/tvtime/ui/components/Cards.kt index 7b5bcbe..83fa836 100644 --- a/app/src/main/java/com/owenlejeune/tvtime/ui/components/Cards.kt +++ b/app/src/main/java/com/owenlejeune/tvtime/ui/components/Cards.kt @@ -49,10 +49,10 @@ fun ContentCard( Card( modifier = modifier .fillMaxWidth() - .wrapContentHeight() - .background(color = backgroundColor), + .wrapContentHeight(), shape = RoundedCornerShape(10.dp), - elevation = CardDefaults.cardElevation(defaultElevation = 8.dp) + elevation = CardDefaults.cardElevation(defaultElevation = 8.dp), + colors = CardDefaults.cardColors(containerColor = backgroundColor) ) { Column(modifier = Modifier.fillMaxSize()) { title?.let { @@ -85,7 +85,6 @@ fun ExpandableContentCard( modifier = modifier .fillMaxWidth() .wrapContentHeight() - .background(color = backgroundColor) .animateContentSize( animationSpec = tween( durationMillis = 300, @@ -93,7 +92,8 @@ fun ExpandableContentCard( ) ), shape = RoundedCornerShape(10.dp), - elevation = CardDefaults.cardElevation(defaultElevation = 8.dp) + elevation = CardDefaults.cardElevation(defaultElevation = 8.dp), + colors = CardDefaults.cardColors(containerColor = backgroundColor) ) { Column(modifier = Modifier.fillMaxSize()) { title() diff --git a/app/src/main/java/com/owenlejeune/tvtime/ui/screens/main/MediaDetailView.kt b/app/src/main/java/com/owenlejeune/tvtime/ui/screens/main/MediaDetailView.kt index 12dfea7..d99272c 100644 --- a/app/src/main/java/com/owenlejeune/tvtime/ui/screens/main/MediaDetailView.kt +++ b/app/src/main/java/com/owenlejeune/tvtime/ui/screens/main/MediaDetailView.kt @@ -619,7 +619,12 @@ private fun RatingDialog(showDialog: MutableState, rating: Float, onVal } @Composable -private fun OverviewCard(itemId: Int?, mediaItem: MutableState, service: DetailService, modifier: Modifier = Modifier) { +private fun OverviewCard( + modifier: Modifier = Modifier, + itemId: Int?, + mediaItem: MutableState, + service: DetailService +) { val keywordResponse = remember { mutableStateOf(null) } if (itemId != null) { if (keywordResponse.value == null) { @@ -639,12 +644,14 @@ private fun OverviewCard(itemId: Int?, mediaItem: MutableState, s verticalArrangement = Arrangement.spacedBy(8.dp) ) { mi.tagline?.let { tagline -> - Text( - text = tagline, - color = MaterialTheme.colorScheme.primary, - style = MaterialTheme.typography.bodyLarge, - fontStyle = FontStyle.Italic, - ) + if (tagline.isNotEmpty()) { + Text( + text = tagline, + color = MaterialTheme.colorScheme.primary, + style = MaterialTheme.typography.bodyLarge, + fontStyle = FontStyle.Italic, + ) + } } Text( text = mi.overview ?: "", @@ -718,7 +725,7 @@ private fun AdditionalDetailsCard( subtext = mi.productionCountries.joinToString(separator = ", ") { it.name }, ) if (type == MediaViewType.MOVIE) { - AdditionalTvItems(movie = mi as DetailedMovie) + AdditionalMovieItems(movie = mi as DetailedMovie) } else { AdditionalTvItems(tv = mi as DetailedTv) } @@ -728,16 +735,16 @@ private fun AdditionalDetailsCard( } @Composable -private fun AdditionalTvItems( +private fun AdditionalMovieItems( movie: DetailedMovie ) { AdditionalDetailItem( title = stringResource(R.string.movie_budget_title), - subtext = "$${movie.budget}" + subtext = "$${"%,d".format(movie.budget)}" ) AdditionalDetailItem( title = stringResource(R.string.movie_revenue_title), - subtext = "$${movie.revenue}", + subtext = "$${"%,d".format(movie.revenue)}", includeDivider = movie.collection != null ) movie.collection?.let {