Code cleanup

app/src/main/java/hu/bbara/purefin/app/content/ContentMockData.kt

@@ -1,177 +0,0 @@
-package hu.bbara.purefin.app.content
-
-import hu.bbara.purefin.feature.shared.content.episode.EpisodeUiModel
-import hu.bbara.purefin.feature.shared.content.movie.MovieUiModel
-import hu.bbara.purefin.feature.shared.content.series.SeriesCastMemberUiModel
-import hu.bbara.purefin.feature.shared.content.series.SeriesEpisodeUiModel
-import hu.bbara.purefin.feature.shared.content.series.SeriesSeasonUiModel
-import hu.bbara.purefin.feature.shared.content.series.SeriesUiModel
-import org.jellyfin.sdk.model.UUID
-import hu.bbara.purefin.feature.shared.content.episode.CastMember as EpisodeCastMember
-import hu.bbara.purefin.feature.shared.content.movie.CastMember as MovieCastMember
-
-object ContentMockData {
-    fun series(): SeriesUiModel {
-        val heroUrl = "https://lh3.googleusercontent.com/aida-public/AB6AXuD3hBjDpw00tDCQsK5xNcnJra301k1T4LksWVZzHieH9KHQItEQkVzhwevJvf8RkaQKdVKvObzRlfDDqa3_PNwLUlUQc1LpDih8p94VTGobEV62qi7QrmNyQm_o55KRMNWiTG3zLLpblGqo3uUNQcYmPFqfNML95dClXQ4lQNl85-zgerPPAbGPr23dswbIYCigyTAaXgrmdV_nbNQ5LdDB0Wh5cMHtP0uxz6k3ARjNom6clhphGIUF9e6YSvKuwuiZ-1lMYFg8C_4"
-        val episode1 = SeriesEpisodeUiModel(
-            id = "1",
-            title = "E1: The Beginning",
-            seasonNumber = 1,
-            episodeNumber = 1,
-            description = "The crew assembles for the first time as the anomaly begins to expand rapidly near Saturn's rings.",
-            duration = "58m",
-            imageUrl = "https://lh3.googleusercontent.com/aida-public/AB6AXuC6OPszCXCIP_FMO3BJJUrjpCtDNw9aeHYOGyOAXdqF078hDFNrH7KXbaQ7qtipz6aIPLivd8VBBffNMbeAiYIjjWjn5GMb6Xn9iiJz0D2rzhCKi0TBeFrN6tC1IXJkzQyQKJNhTnyokWy9dd-YtN65V7er7RT6hP5jdVBXhtK1xZMjlgrm1bk_FTTmKd8Afu3zPtJCaaC98Z608vav5zhYlkrdA1wKNSTWTpzwMSyDIY3pNQNPFauWf0n-iEu7QsYTAwhCG_zfxz0",
-            progress = 40.0,
-            watched = false
-        )
-        val episode2 = SeriesEpisodeUiModel(
-            id = "2",
-            title = "E2: Event Horizon",
-            seasonNumber = 1,
-            episodeNumber = 2,
-            description = "Dr. Cole discovers a frequency embedded in the rift's radiation that suggests intelligent design.",
-            duration = "54m",
-            imageUrl = "https://lh3.googleusercontent.com/aida-public/AB6AXuBExsf-wEzAVjMxasU2ImGhlreqQo9biBSN1yHyAbW8MyuhuppRw9ho7OD3vsbySSJ3kNluEgH1Qun45PmLnZWixZsFU4Qc7UGGJNKMS5Nkm4GZAsKdFvb3z_i1tkCvaXXvGpqmwI0qjFuo1QyjjhYPA5Yp3I8ZhrnDYdQv_GxbhR6Vl3mY1rbxd2BIUEE5oMTwTF-QmJztUEaViZkSGSG2VgVXZ5VAREn4xWE902OH2sysllvXQJQIaj439JIC2_Vg61m0-F-F1Vc",
-            progress = 100.0,
-            watched = true
-        )
-        val episode3 = SeriesEpisodeUiModel(
-            id = "3",
-            title = "E3: Singularity",
-            seasonNumber = 1,
-            episodeNumber = 3,
-            description = "Tension rises as the ship approaches the event horizon, and the AI begins to behave erratically.",
-            duration = "1h 02m",
-            imageUrl = "https://lh3.googleusercontent.com/aida-public/AB6AXuA5CFDWsWYO4YxdRoLd2QfH5Su2KLhtj5xSDb8qmzWHvPE888ac_HAAj1wu1uqdFNSncdmmJ-bWsc--h6NYKxVXkhd4vHaFWi0XTJXgsR0F3cBu_l2SynSX4TMNSy5C3XWDurgeSH789byOe1HvoxHCHTJYaSf3OyEbil-NOp9g_9mZ24CIZOI79nx57CRzmooxoswycqssPpfTNkrnoYrrAczt5qbncwLM9NVU442YxyBFisr2Ds9H-CNBOakiCtaKnoJ6npznM7U",
-            progress = 40.0,
-            watched = false
-        )
-        return SeriesUiModel(
-            title = "Interstellar Horizon: The Series",
-            year = "2024",
-            rating = "TV-MA",
-            seasons = "3 Seasons",
-            format = "4K HDR",
-            synopsis = "When a mysterious cosmic rift appears near Saturn, a team of seasoned astronauts and theoretical physicists must embark on a high-stakes voyage across dimensions. They seek to unlock the secrets of time-dilated anomalies that threaten the very fabric of human existence on Earth.",
-            heroImageUrl = heroUrl,
-            seasonTabs = listOf(
-                SeriesSeasonUiModel(
-                    name = "Season 1",
-                    episodes = listOf(episode1, episode2, episode3),
-                    unplayedCount = 2
-                ),
-                SeriesSeasonUiModel(
-                    name = "Season 2",
-                    episodes = listOf(episode1, episode2, episode3),
-                    unplayedCount = 0
-                ),
-                SeriesSeasonUiModel(
-                    name = "Season 3",
-                    episodes = listOf(episode1, episode2, episode3),
-                    unplayedCount = 1
-                )
-            ),
-            cast = listOf(
-                SeriesCastMemberUiModel(
-                    name = "Marcus Thorne",
-                    role = "Cmdr. Vance",
-                    imageUrl = "https://lh3.googleusercontent.com/aida-public/AB6AXuC6OPszCXCIP_FMO3BJJUrjpCtDNw9aeHYOGyOAXdqF078hDFNrH7KXbaQ7qtipz6aIPLivd8VBBffNMbeAiYIjjWjn5GMb6Xn9iiJz0D2rzhCKi0TBeFrN6tC1IXJkzQyQKJNhTnyokWy9dd-YtN65V7er7RT6hP5jdVBXhtK1xZMjlgrm1bk_FTTmKd8Afu3zPtJCaaC98Z608vav5zhYlkrdA1wKNSTWTpzwMSyDIY3pNQNPFauWf0n-iEu7QsYTAwhCG_zfxz0"
-                ),
-                SeriesCastMemberUiModel(
-                    name = "Elena Rossi",
-                    role = "Dr. Sarah Cole",
-                    imageUrl = "https://lh3.googleusercontent.com/aida-public/AB6AXuBExsf-wEzAVjMxasU2ImGhlreqQo9biBSN1yHyAbW8MyuhuppRw9ho7OD3vsbySSJ3kNluEgH1Qun45PmLnZWixZsFU4Qc7UGGJNKMS5Nkm4GZAsKdFvb3z_i1tkCvaXXvGpqmwI0qjFuo1QyjjhYPA5Yp3I8ZhrnDYdQv_GxbhR6Vl3mY1rbxd2BIUEE5oMTwTF-QmJztUEaViZkSGSG2VgVXZ5VAREn4xWE902OH2sysllvXQJQIaj439JIC2_Vg61m0-F-F1Vc"
-                ),
-                SeriesCastMemberUiModel(
-                    name = "Julian Chen",
-                    role = "Tech Officer Lin",
-                    imageUrl = "https://lh3.googleusercontent.com/aida-public/AB6AXuA5CFDWsWYO4YxdRoLd2QfH5Su2KLhtj5xSDb8qmzWHvPE888ac_HAAj1wu1uqdFNSncdmmJ-bWsc--h6NYKxVXkhd4vHaFWi0XTJXgsR0F3cBu_l2SynSX4TMNSy5C3XWDurgeSH789byOe1HvoxHCHTJYaSf3OyEbil-NOp9g_9mZ24CIZOI79nx57CRzmooxoswycqssPpfTNkrnoYrrAczt5qbncwLM9NVU442YxyBFisr2Ds9H-CNBOakiCtaKnoJ6npznM7U"
-                ),
-                SeriesCastMemberUiModel(
-                    name = "Sarah Jenkins",
-                    role = "Mission Pilot",
-                    imageUrl = "https://lh3.googleusercontent.com/aida-public/AB6AXuBN6_72VggBdNx7ITLvEvIA6OSre5iJI6kQiUVMpKAlYgd8TpT-Jx6DzZwGsGACLnAXOUuzT2R7mx9A9DNZcqi5BF_jSaEdeYpfcBvJttmVPAwiCiq1_PI2BwoZZH_Ccmq2AHV5lQqcYaA2rPkf4e7YLLLgpmVbGjKhncTotQtxiZvmLNzCbLUdlEb7XLgHKfjS6FU6djV9ocOo9bxZ_YtrQj-mMFvYGzCxeFYC8OF0kIV2NN3kQYH8x1X-rYMqu2-d7klJfQdhKHw"
-                ),
-                SeriesCastMemberUiModel(
-                    name = "David Wu",
-                    role = "The AI (Voice)",
-                    imageUrl = "https://lh3.googleusercontent.com/aida-public/AB6AXuCnNkjaBc2hU2zJ5hAF8iZZ_ZZvMlU79o4JtPNCP2MEfttpF0fe_BHWsMMl6h3S37FJ1dTLk8AQuvRQ_ggy1u-71xlQWULB76rT8pdZiRE7TkInQ8gwpigs84KNWbTRxVUI7Nia9RPyJeFE7egZqnT46TQWUeN8llWF9EDQ6mpfVLH0vHhKUlko39iDgMnBIequYntugSFgWJQc1jH-AxZ4OpJr_-uZGkwtQ_CVYNV69u9y107gk5BwaUFwPeipe8Bn9I655kyHIuQ"
-                ),
-                SeriesCastMemberUiModel(
-                    name = "Alex Reed",
-                    role = "Engineer",
-                    imageUrl = null
-                )
-            )
-        )
-    }
-
-    fun movie(): MovieUiModel {
-        val castMembers = listOf(
-            MovieCastMember(
-                name = "Elena Rossi",
-                role = "Dr. Sarah Cole",
-                imageUrl = "https://lh3.googleusercontent.com/aida-public/AB6AXuBExsf-wEzAVjMxasU2ImGhlreqQo9biBSN1yHyAbW8MyuhuppRw9ho7OD3vsbySSJ3kNluEgH1Qun45PmLnZWixZsFU4Qc7UGGJNKMS5Nkm4GZAsKdFvb3z_i1tkCvaXXvGpqmwI0qjFuo1QyjjhYPA5Yp3I8ZhrnDYdQv_GxbhR6Vl3mY1rbxd2BIUEE5oMTwTF-QmJztUEaViZkSGSG2VgVXZ5VAREn4xWE902OH2sysllvXQJQIaj439JIC2_Vg61m0-F-F1Vc"
-            ),
-            MovieCastMember(
-                name = "Marcus Thorne",
-                role = "Cmdr. Vance",
-                imageUrl = "https://lh3.googleusercontent.com/aida-public/AB6AXuC6OPszCXCIP_FMO3BJJUrjpCtDNw9aeHYOGyOAXdqF078hDFNrH7KXbaQ7qtipz6aIPLivd8VBBffNMbeAiYIjjWjn5GMb6Xn9iiJz0D2rzhCKi0TBeFrN6tC1IXJkzQyQKJNhTnyokWy9dd-YtN65V7er7RT6hP5jdVBXhtK1xZMjlgrm1bk_FTTmKd8Afu3zPtJCaaC98Z608vav5zhYlkrdA1wKNSTWTpzwMSyDIY3pNQNPFauWf0n-iEu7QsYTAwhCG_zfxz0"
-            ),
-            MovieCastMember(
-                name = "Julian Chen",
-                role = "Tech Officer Lin",
-                imageUrl = "https://lh3.googleusercontent.com/aida-public/AB6AXuA5CFDWsWYO4YxdRoLd2QfH5Su2KLhtj5xSDb8qmzWHvPE888ac_HAAj1wu1uqdFNSncdmmJ-bWsc--h6NYKxVXkhd4vHaFWi0XTJXgsR0F3cBu_l2SynSX4TMNSy5C3XWDurgeSH789byOe1HvoxHCHTJYaSf3OyEbil-NOp9g_9mZ24CIZOI79nx57CRzmooxoswycqssPpfTNkrnoYrrAczt5qbncwLM9NVU442YxyBFisr2Ds9H-CNBOakiCtaKnoJ6npznM7U"
-            )
-        )
-        return MovieUiModel(
-            id = UUID.randomUUID(),
-            title = "Interstellar Horizon",
-            year = "2024",
-            rating = "PG-13",
-            runtime = "2h 14m",
-            format = "4K HDR",
-            synopsis = "A deep-space rescue crew is dispatched to intercept a derelict vessel drifting back from a temporal rift. As timelines fracture around them, they must decide which reality is worth saving.",
-            heroImageUrl = "https://lh3.googleusercontent.com/aida-public/AB6AXuD3hBjDpw00tDCQsK5xNcnJra301k1T4LksWVZzHieH9KHQItEQkVzhwevJvf8RkaQKdVKvObzRlfDDqa3_PNwLUlUQc1LpDih8p94VTGobEV62qi7QrmNyQm_o55KRMNWiTG3zLLpblGqo3uUNQcYmPFqfNML95dClXQ4lQNl85-zgerPPAbGPr23dswbIYCigyTAaXgrmdV_nbNQ5LdDB0Wh5cMHtP0uxz6k3ARjNom6clhphGIUF9e6YSvKuwuiZ-1lMYFg8C_4",
-            audioTrack = "English (Dolby Atmos)",
-            subtitles = "English, Spanish, French",
-            progress = 45.0,
-            cast = castMembers
-        )
-    }
-
-    fun episode(): EpisodeUiModel {
-        val castMembers = listOf(
-            EpisodeCastMember(
-                name = "Elena Rossi",
-                role = "Dr. Sarah Cole",
-                imageUrl = "https://lh3.googleusercontent.com/aida-public/AB6AXuBExsf-wEzAVjMxasU2ImGhlreqQo9biBSN1yHyAbW8MyuhuppRw9ho7OD3vsbySSJ3kNluEgH1Qun45PmLnZWixZsFU4Qc7UGGJNKMS5Nkm4GZAsKdFvb3z_i1tkCvaXXvGpqmwI0qjFuo1QyjjhYPA5Yp3I8ZhrnDYdQv_GxbhR6Vl3mY1rbxd2BIUEE5oMTwTF-QmJztUEaViZkSGSG2VgVXZ5VAREn4xWE902OH2sysllvXQJQIaj439JIC2_Vg61m0-F-F1Vc"
-            ),
-            EpisodeCastMember(
-                name = "Marcus Thorne",
-                role = "Cmdr. Vance",
-                imageUrl = "https://lh3.googleusercontent.com/aida-public/AB6AXuC6OPszCXCIP_FMO3BJJUrjpCtDNw9aeHYOGyOAXdqF078hDFNrH7KXbaQ7qtipz6aIPLivd8VBBffNMbeAiYIjjWjn5GMb6Xn9iiJz0D2rzhCKi0TBeFrN6tC1IXJkzQyQKJNhTnyokWy9dd-YtN65V7er7RT6hP5jdVBXhtK1xZMjlgrm1bk_FTTmKd8Afu3zPtJCaaC98Z608vav5zhYlkrdA1wKNSTWTpzwMSyDIY3pNQNPFauWf0n-iEu7QsYTAwhCG_zfxz0"
-            ),
-            EpisodeCastMember(
-                name = "David Wu",
-                role = "The AI (Voice)",
-                imageUrl = "https://lh3.googleusercontent.com/aida-public/AB6AXuCnNkjaBc2hU2zJ5hAF8iZZ_ZZvMlU79o4JtPNCP2MEfttpF0fe_BHWsMMl6h3S37FJ1dTLk8AQuvRQ_ggy1u-71xlQWULB76rT8pdZiRE7TkInQ8gwpigs84KNWbTRxVUI7Nia9RPyJeFE7egZqnT46TQWUeN8llWF9EDQ6mpfVLH0vHhKUlko39iDgMnBIequYntugSFgWJQc1jH-AxZ4OpJr_-uZGkwtQ_CVYNV69u9y107gk5BwaUFwPeipe8Bn9I655kyHIuQ"
-            )
-        )
-        return EpisodeUiModel(
-            id = UUID.randomUUID(),
-            title = "S1E1 · Event Horizon",
-            seasonNumber = 1,
-            episodeNumber = 1,
-            releaseDate = "Oct 12, 2024",
-            rating = "TV-MA",
-            runtime = "58m",
-            format = "4K HDR",
-            synopsis = "As the anomaly near Saturn destabilizes, the crew boards the research vessel Helios to intercept what might be a distress signal from another timeline.",
-            heroImageUrl = "https://lh3.googleusercontent.com/aida-public/AB6AXuC6OPszCXCIP_FMO3BJJUrjpCtDNw9aeHYOGyOAXdqF078hDFNrH7KXbaQ7qtipz6aIPLivd8VBBffNMbeAiYIjjWjn5GMb6Xn9iiJz0D2rzhCKi0TBeFrN6tC1IXJkzQyQKJNhTnyokWy9dd-YtN65V7er7RT6hP5jdVBXhtK1xZMjlgrm1bk_FTTmKd8Afu3zPtJCaaC98Z608vav5zhYlkrdA1wKNSTWTpzwMSyDIY3pNQNPFauWf0n-iEu7QsYTAwhCG_zfxz0",
-            audioTrack = "English (Dolby Atmos)",
-            subtitles = "English, Spanish, German",
-            cast = castMembers
-        )
-    }
-}

app/src/main/java/hu/bbara/purefin/app/content/episode/EpisodeComponents.kt

@@ -180,16 +180,17 @@ internal fun EpisodeDetails(
         )
         Spacer(modifier = Modifier.height(24.dp))
 
-        Text(
-            text = "Cast",
-            color = scheme.onBackground,
-            fontSize = 18.sp,
-            fontWeight = FontWeight.Bold
-        )
-        Spacer(modifier = Modifier.height(12.dp))
-        MediaCastRow(
-            //TODO fix it
-            cast = emptyList()
-        )
+        if (episode.cast.isNotEmpty()) {
+            Text(
+                text = "Cast",
+                color = scheme.onBackground,
+                fontSize = 18.sp,
+                fontWeight = FontWeight.Bold
+            )
+            Spacer(modifier = Modifier.height(12.dp))
+            MediaCastRow(
+                cast = episode.cast
+            )
+        }
     }
 }

app/src/main/java/hu/bbara/purefin/app/content/movie/MovieComponents.kt

@@ -39,8 +39,8 @@ import hu.bbara.purefin.common.ui.components.GhostIconButton
 import hu.bbara.purefin.common.ui.components.MediaActionButton
 import hu.bbara.purefin.common.ui.components.MediaPlaybackSettings
 import hu.bbara.purefin.common.ui.components.MediaResumeButton
+import hu.bbara.purefin.core.model.Movie
 import hu.bbara.purefin.feature.download.DownloadState
-import hu.bbara.purefin.feature.shared.content.movie.MovieUiModel
 import hu.bbara.purefin.player.PlayerActivity
 
 @Composable
@@ -72,7 +72,7 @@ internal fun MovieTopBar(
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
 internal fun MovieDetails(
-    movie: MovieUiModel,
+    movie: Movie,
     downloadState: DownloadState,
     onDownloadClick: () -> Unit,
     modifier: Modifier = Modifier
@@ -163,17 +163,18 @@ internal fun MovieDetails(
             subtitles = movie.subtitles
         )
 
-        Spacer(modifier = Modifier.height(24.dp))
-        Text(
-            text = "Cast",
-            color = scheme.onBackground,
-            fontSize = 18.sp,
-            fontWeight = FontWeight.Bold
-        )
-        Spacer(modifier = Modifier.height(12.dp))
-        MediaCastRow(
-            //TODO fix it
-            cast = emptyList()
-        )
+        if (movie.cast.isNotEmpty()) {
+            Spacer(modifier = Modifier.height(24.dp))
+            Text(
+                text = "Cast",
+                color = scheme.onBackground,
+                fontSize = 18.sp,
+                fontWeight = FontWeight.Bold
+            )
+            Spacer(modifier = Modifier.height(12.dp))
+            MediaCastRow(
+                cast = movie.cast,
+            )
+        }
     }
 }

app/src/main/java/hu/bbara/purefin/app/content/movie/MovieScreen.kt

@@ -16,16 +16,14 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 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.core.data.navigation.MovieDto
+import hu.bbara.purefin.core.model.Movie
 import hu.bbara.purefin.feature.download.DownloadState
 import hu.bbara.purefin.feature.shared.content.movie.MovieScreenViewModel
-import hu.bbara.purefin.feature.shared.content.movie.MovieUiModel
 
 @Composable
 fun MovieScreen(
@@ -70,7 +68,7 @@ fun MovieScreen(
 
 @Composable
 private fun MovieScreenInternal(
-    movie: MovieUiModel,
+    movie: Movie,
     downloadState: DownloadState = DownloadState.NotDownloaded,
     onDownloadClick: () -> Unit = {},
     onBack: () -> Unit,
@@ -109,13 +107,3 @@ private fun MovieScreenInternal(
         }
     }
 }
-
-
-@Preview
-@Composable
-fun MovieScreenPreview() {
-    MovieScreenInternal(
-        movie = ContentMockData.movie(),
-        onBack = {}
-    )
-}

app/src/main/java/hu/bbara/purefin/app/content/series/SeriesScreen.kt

@@ -131,14 +131,16 @@ private fun SeriesScreenInternal(
                     episodes = selectedSeason.value.episodes,
                 )
                 Spacer(modifier = Modifier.height(16.dp))
-                Text(
-                    text = "Cast",
-                    color = scheme.onBackground,
-                    fontSize = 18.sp,
-                    fontWeight = FontWeight.Bold
-                )
-                Spacer(modifier = Modifier.height(12.dp))
-                CastRow(cast = series.cast)
+                if(series.cast.isNotEmpty()) {
+                    Text(
+                        text = "Cast",
+                        color = scheme.onBackground,
+                        fontSize = 18.sp,
+                        fontWeight = FontWeight.Bold
+                    )
+                    Spacer(modifier = Modifier.height(12.dp))
+                    CastRow(cast = series.cast)
+                }
             }
         }
     }