From a0086c6f62272fdf7fca5e76e7adc61444526ac8 Mon Sep 17 00:00:00 2001 From: Barnabas Balogh Date: Sun, 19 Apr 2026 20:08:41 +0200 Subject: [PATCH] refactor: rename imageUrl to primaryImageUrl for consistency across components --- .../ui/screen/home/components/TvFocusedItemHero.kt | 2 +- .../ui/screen/home/components/TvHomeSections.kt | 4 ++-- .../continuewatching/ContinueWatchingCard.kt | 2 +- .../home/components/library/HomeBrowseCard.kt | 2 +- .../ui/screen/home/components/nextup/NextUpCard.kt | 2 +- .../hu/bbara/purefin/core/ui/model/MediaUiModel.kt | 14 +++++++------- .../purefin/ui/common/card/PosterCardContent.kt | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvFocusedItemHero.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvFocusedItemHero.kt index 0737b95d..ca74d0c5 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvFocusedItemHero.kt +++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvFocusedItemHero.kt @@ -45,7 +45,7 @@ internal fun TvFocusedItemHero( .background(scheme.background) ) { Crossfade( - targetState = item.imageUrl, + targetState = item.primaryImageUrl, animationSpec = tween(durationMillis = TvHomeHeroAnimationMillis), label = "tv-home-hero-background" ) { imageUrl -> diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvHomeSections.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvHomeSections.kt index 1971e85e..615be76a 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvHomeSections.kt +++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvHomeSections.kt @@ -86,7 +86,7 @@ fun TvContinueWatchingSection( TvHomeLandscapeCard( title = item.primaryText, supporting = item.secondaryText, - imageUrl = item.imageUrl, + imageUrl = item.primaryImageUrl, progress = item.progress ?: 0f, imageModifier = Modifier .then( @@ -138,7 +138,7 @@ fun TvNextUpSection( TvHomeLandscapeCard( title = item.primaryText, supporting = item.secondaryText, - imageUrl = item.imageUrl, + imageUrl = item.primaryImageUrl, imageModifier = Modifier .then( if (index == 0 && firstItemFocusRequester != null) { diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/continuewatching/ContinueWatchingCard.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/continuewatching/ContinueWatchingCard.kt index 399966a3..5f3deeb5 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/continuewatching/ContinueWatchingCard.kt +++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/continuewatching/ContinueWatchingCard.kt @@ -63,7 +63,7 @@ internal fun ContinueWatchingCard( .background(scheme.surfaceContainer) ) { PurefinAsyncImage( - model = item.imageUrl, + model = item.primaryImageUrl, contentDescription = item.primaryText, modifier = Modifier.fillMaxSize(), contentScale = ContentScale.Crop diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/library/HomeBrowseCard.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/library/HomeBrowseCard.kt index b0bd3fc2..93d51cd7 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/library/HomeBrowseCard.kt +++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/library/HomeBrowseCard.kt @@ -66,7 +66,7 @@ internal fun HomeBrowseCard( .background(scheme.surface) ) { PurefinAsyncImage( - model = uiModel.imageUrl, + model = uiModel.primaryImageUrl, contentDescription = uiModel.primaryText, modifier = Modifier.fillMaxSize(), contentScale = ContentScale.Crop diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/nextup/NextUpCard.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/nextup/NextUpCard.kt index fbac8798..9f346511 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/nextup/NextUpCard.kt +++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/nextup/NextUpCard.kt @@ -58,7 +58,7 @@ internal fun NextUpCard( .background(scheme.surface) ) { PurefinAsyncImage( - model = uiModel.imageUrl, + model = uiModel.primaryImageUrl, contentDescription = uiModel.primaryText, modifier = Modifier.fillMaxSize(), contentScale = ContentScale.Crop diff --git a/core/model/src/main/java/hu/bbara/purefin/core/ui/model/MediaUiModel.kt b/core/model/src/main/java/hu/bbara/purefin/core/ui/model/MediaUiModel.kt index b0f4ff77..ffab95c7 100644 --- a/core/model/src/main/java/hu/bbara/purefin/core/ui/model/MediaUiModel.kt +++ b/core/model/src/main/java/hu/bbara/purefin/core/ui/model/MediaUiModel.kt @@ -12,7 +12,7 @@ sealed interface MediaUiModel { val primaryText: String val secondaryText: String val description: String - val imageUrl: String + val primaryImageUrl: String val progress: Float? get() = null val watched: Boolean @@ -24,7 +24,7 @@ class MovieUiModel: MediaUiModel { override val primaryText: String override val secondaryText: String override val description: String - override val imageUrl: String + override val primaryImageUrl: String override val progress: Float? constructor(movie: Movie) { @@ -32,7 +32,7 @@ class MovieUiModel: MediaUiModel { primaryText = movie.title secondaryText = movie.year description = movie.synopsis - imageUrl = ImageUrlBuilder.finishImageUrl( + primaryImageUrl = ImageUrlBuilder.finishImageUrl( prefixImageUrl = movie.imageUrlPrefix, artworkKind = ArtworkKind.PRIMARY ) @@ -68,14 +68,14 @@ class SeriesUiModel : MediaUiModel { override val primaryText: String override val secondaryText: String override val description: String - override val imageUrl: String + override val primaryImageUrl: String constructor(series: Series) { id = series.id primaryText = series.name secondaryText = "${series.seasonCount} seasons" description = series.synopsis - imageUrl = ImageUrlBuilder.finishImageUrl( + primaryImageUrl = ImageUrlBuilder.finishImageUrl( prefixImageUrl = series.imageUrlPrefix, artworkKind = ArtworkKind.PRIMARY ) @@ -87,7 +87,7 @@ class EpisodeUiModel : MediaUiModel { override val primaryText: String override val secondaryText: String override val description: String - override val imageUrl: String + override val primaryImageUrl: String override val progress: Float? val seriesId: UUID val seasonId: UUID @@ -97,7 +97,7 @@ class EpisodeUiModel : MediaUiModel { primaryText = episode.title secondaryText = episode.releaseDate description = episode.synopsis - imageUrl = ImageUrlBuilder.finishImageUrl( + primaryImageUrl = ImageUrlBuilder.finishImageUrl( prefixImageUrl = episode.imageUrlPrefix, artworkKind = ArtworkKind.PRIMARY ) diff --git a/core/ui/src/main/java/hu/bbara/purefin/ui/common/card/PosterCardContent.kt b/core/ui/src/main/java/hu/bbara/purefin/ui/common/card/PosterCardContent.kt index e0f96e2a..289447a3 100644 --- a/core/ui/src/main/java/hu/bbara/purefin/ui/common/card/PosterCardContent.kt +++ b/core/ui/src/main/java/hu/bbara/purefin/ui/common/card/PosterCardContent.kt @@ -90,7 +90,7 @@ fun PosterCardContent( ) { Box { PurefinAsyncImage( - model = model.imageUrl, + model = model.primaryImageUrl, contentDescription = null, modifier = imageModifier .aspectRatio(2f / 3f)