From bc6938fe93fadc18898b8edcaaa55586ac1f6e9f Mon Sep 17 00:00:00 2001 From: Barnabas Balogh Date: Sat, 24 Jan 2026 13:47:36 +0100 Subject: [PATCH] update MediaHero heights and refactor SeriesHero - Increase `MediaHero` height from 200dp to 300dp in `EpisodeScreen` and `MovieScreen`. - Replace `SeriesHero` with `MediaHero` in `SeriesScreen` and increase height to 350dp. - Remove redundant `SeriesHero` component from `SeriesComponents.kt`. - Update `SeriesViewModel` to use `ImageType.PRIMARY` for the hero image URL. - Remove comments from `MediaHero.kt`. --- .../purefin/app/content/episode/EpisodeScreen.kt | 2 +- .../purefin/app/content/movie/MovieScreen.kt | 2 +- .../app/content/series/SeriesComponents.kt | 16 ---------------- .../purefin/app/content/series/SeriesScreen.kt | 6 ++++-- .../app/content/series/SeriesViewModel.kt | 2 +- .../purefin/common/ui/components/MediaHero.kt | 1 - 6 files changed, 7 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/hu/bbara/purefin/app/content/episode/EpisodeScreen.kt b/app/src/main/java/hu/bbara/purefin/app/content/episode/EpisodeScreen.kt index 04197eb..2abb033 100644 --- a/app/src/main/java/hu/bbara/purefin/app/content/episode/EpisodeScreen.kt +++ b/app/src/main/java/hu/bbara/purefin/app/content/episode/EpisodeScreen.kt @@ -70,7 +70,7 @@ private fun EpisodeScreenInternal( MediaHero( imageUrl = episode.heroImageUrl, backgroundColor = MaterialTheme.colorScheme.background, - height = 200.dp, + height = 300.dp, modifier = Modifier.fillMaxWidth() ) EpisodeDetails( diff --git a/app/src/main/java/hu/bbara/purefin/app/content/movie/MovieScreen.kt b/app/src/main/java/hu/bbara/purefin/app/content/movie/MovieScreen.kt index b23015d..7d04f0d 100644 --- a/app/src/main/java/hu/bbara/purefin/app/content/movie/MovieScreen.kt +++ b/app/src/main/java/hu/bbara/purefin/app/content/movie/MovieScreen.kt @@ -65,7 +65,7 @@ private fun MovieScreenInternal( MediaHero( imageUrl = movie.heroImageUrl, backgroundColor = MaterialTheme.colorScheme.background, - height = 200.dp, + height = 300.dp, modifier = Modifier.fillMaxWidth() ) MovieDetails( diff --git a/app/src/main/java/hu/bbara/purefin/app/content/series/SeriesComponents.kt b/app/src/main/java/hu/bbara/purefin/app/content/series/SeriesComponents.kt index a302b01..08dd51b 100644 --- a/app/src/main/java/hu/bbara/purefin/app/content/series/SeriesComponents.kt +++ b/app/src/main/java/hu/bbara/purefin/app/content/series/SeriesComponents.kt @@ -42,7 +42,6 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow -import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel @@ -51,7 +50,6 @@ import hu.bbara.purefin.common.ui.MediaCastRow import hu.bbara.purefin.common.ui.MediaGhostIconButton import hu.bbara.purefin.common.ui.MediaMetaChip import hu.bbara.purefin.common.ui.components.MediaActionButton -import hu.bbara.purefin.common.ui.components.MediaHero import hu.bbara.purefin.common.ui.components.PurefinAsyncImage @Composable @@ -78,20 +76,6 @@ internal fun SeriesTopBar( } } -@Composable -internal fun SeriesHero( - imageUrl: String, - height: Dp, - modifier: Modifier = Modifier -) { - MediaHero( - imageUrl = imageUrl, - backgroundColor = MaterialTheme.colorScheme.background, - height = height, - modifier = modifier, - ) -} - @OptIn(ExperimentalLayoutApi::class) @Composable internal fun SeriesMetaChips(series: SeriesUiModel) { diff --git a/app/src/main/java/hu/bbara/purefin/app/content/series/SeriesScreen.kt b/app/src/main/java/hu/bbara/purefin/app/content/series/SeriesScreen.kt index 87d7c0d..c695d93 100644 --- a/app/src/main/java/hu/bbara/purefin/app/content/series/SeriesScreen.kt +++ b/app/src/main/java/hu/bbara/purefin/app/content/series/SeriesScreen.kt @@ -22,6 +22,7 @@ import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel import hu.bbara.purefin.app.content.ContentMockData import hu.bbara.purefin.common.ui.PurefinWaitingScreen +import hu.bbara.purefin.common.ui.components.MediaHero import hu.bbara.purefin.navigation.ItemDto @Composable @@ -71,9 +72,10 @@ private fun SeriesScreenInternal( .fillMaxSize() .verticalScroll(rememberScrollState()) ) { - SeriesHero( + MediaHero( imageUrl = series.heroImageUrl, - height = 200.dp, + height = 350.dp, + backgroundColor = MaterialTheme.colorScheme.background, modifier = Modifier.fillMaxWidth() ) Column( diff --git a/app/src/main/java/hu/bbara/purefin/app/content/series/SeriesViewModel.kt b/app/src/main/java/hu/bbara/purefin/app/content/series/SeriesViewModel.kt index 624b476..4f678af 100644 --- a/app/src/main/java/hu/bbara/purefin/app/content/series/SeriesViewModel.kt +++ b/app/src/main/java/hu/bbara/purefin/app/content/series/SeriesViewModel.kt @@ -99,7 +99,7 @@ class SeriesViewModel @Inject constructor( heroImageUrl = JellyfinImageHelper.toImageUrl( url = serverUrl, itemId = seriesItemResult.id, - type = ImageType.BACKDROP + type = ImageType.PRIMARY ), seasonTabs = seasonUiModels, cast = seriesItemResult.people.orEmpty().map { it.toCastMember() } diff --git a/app/src/main/java/hu/bbara/purefin/common/ui/components/MediaHero.kt b/app/src/main/java/hu/bbara/purefin/common/ui/components/MediaHero.kt index fb928eb..621170c 100644 --- a/app/src/main/java/hu/bbara/purefin/common/ui/components/MediaHero.kt +++ b/app/src/main/java/hu/bbara/purefin/common/ui/components/MediaHero.kt @@ -29,7 +29,6 @@ fun MediaHero( modifier = Modifier.fillMaxSize(), contentScale = ContentScale.Crop ) - // Vertical gradient for transition to content Box( modifier = Modifier .matchParentSize()