feat: introduce core data models and interfaces for playback and downloads

app-tv/build.gradle.kts

@@ -52,9 +52,19 @@ kotlin {
 
 dependencies {
     implementation(project(":core:model"))
+    implementation(project(":core:image"))
     implementation(project(":core:data"))
+    implementation(project(":core:navigation"))
+    implementation(project(":core:download"))
     implementation(project(":core:player"))
-    implementation(project(":feature:shared"))
+    implementation(project(":data:jellyfin"))
+    implementation(project(":data:offline"))
+    implementation(project(":data:catalog"))
+    implementation(project(":feature:browse"))
+    implementation(project(":feature:search"))
+    implementation(project(":feature:content"))
+    implementation(project(":feature:downloads"))
+    implementation(project(":feature:login"))
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
@@ -83,8 +93,6 @@ dependencies {
     implementation(libs.media3.datasource.okhttp)
     implementation(libs.androidx.navigation3.runtime)
     implementation(libs.androidx.navigation3.ui)
-    implementation(libs.androidx.room.ktx)
-    ksp(libs.androidx.room.compiler)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)

app-tv/src/androidTest/java/hu/bbara/purefin/tv/home/ui/TvHomeContentTest.kt

@@ -18,10 +18,10 @@ import androidx.compose.ui.input.key.Key
 import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.core.model.Episode
 import hu.bbara.purefin.core.model.Movie
-import hu.bbara.purefin.feature.shared.home.ContinueWatchingItem
-import hu.bbara.purefin.feature.shared.home.LibraryItem
-import hu.bbara.purefin.feature.shared.home.NextUpItem
-import hu.bbara.purefin.feature.shared.home.PosterItem
+import hu.bbara.purefin.feature.browse.home.ContinueWatchingItem
+import hu.bbara.purefin.feature.browse.home.LibraryItem
+import hu.bbara.purefin.feature.browse.home.NextUpItem
+import hu.bbara.purefin.feature.browse.home.PosterItem
 import hu.bbara.purefin.tv.home.TvHomeScreen
 import hu.bbara.purefin.ui.theme.AppTheme
 import org.jellyfin.sdk.model.api.BaseItemKind

app-tv/src/androidTest/java/hu/bbara/purefin/tv/library/ui/TvLibrariesOverviewScreenTest.kt

@@ -4,7 +4,7 @@ import androidx.activity.ComponentActivity
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
-import hu.bbara.purefin.feature.shared.home.LibraryItem
+import hu.bbara.purefin.feature.browse.home.LibraryItem
 import hu.bbara.purefin.ui.theme.AppTheme
 import org.jellyfin.sdk.model.api.CollectionType
 import org.junit.Assert.assertEquals

app-tv/src/main/java/hu/bbara/purefin/app/content/episode/TvEpisodeScreen.kt

@@ -20,13 +20,13 @@ import hu.bbara.purefin.common.ui.components.MediaDetailPlaybackSection
 import hu.bbara.purefin.common.ui.components.MediaDetailSectionTitle
 import hu.bbara.purefin.common.ui.components.TvMediaDetailBodyBox
 import hu.bbara.purefin.common.ui.components.TvMediaDetailScaffold
-import hu.bbara.purefin.core.data.image.JellyfinImageHelper
-import hu.bbara.purefin.feature.shared.navigation.EpisodeDto
+import hu.bbara.purefin.core.image.ImageUrlBuilder
+import hu.bbara.purefin.core.navigation.EpisodeDto
 import hu.bbara.purefin.tv.navigation.LocalNavigationManager
-import hu.bbara.purefin.feature.shared.navigation.Route
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.core.model.Episode
-import hu.bbara.purefin.feature.shared.content.episode.EpisodeScreenViewModel
-import org.jellyfin.sdk.model.api.ImageType
+import hu.bbara.purefin.feature.content.episode.EpisodeScreenViewModel
+import hu.bbara.purefin.core.image.ArtworkKind
 
 @Composable
 fun TvEpisodeScreen(
@@ -87,7 +87,7 @@ internal fun TvEpisodeScreenContent(
     ) {
         item {
             TvMediaDetailBodyBox(
-                backgroundImageUrl = JellyfinImageHelper.finishImageUrl(episode.imageUrlPrefix, ImageType.PRIMARY),
+                backgroundImageUrl = ImageUrlBuilder.finishImageUrl(episode.imageUrlPrefix, ArtworkKind.PRIMARY),
                 modifier = it
             ) {
                 TvEpisodeHeroSection(

app-tv/src/main/java/hu/bbara/purefin/app/content/movie/TvMovieScreen.kt

@@ -21,9 +21,9 @@ import hu.bbara.purefin.common.ui.components.MediaDetailSectionTitle
 import hu.bbara.purefin.common.ui.components.TvMediaDetailBodyBox
 import hu.bbara.purefin.common.ui.components.TvMediaDetailScaffold
 import hu.bbara.purefin.common.ui.components.tvMediaDetailBackgroundImageUrl
-import hu.bbara.purefin.feature.shared.navigation.MovieDto
+import hu.bbara.purefin.core.navigation.MovieDto
 import hu.bbara.purefin.core.model.Movie
-import hu.bbara.purefin.feature.shared.content.movie.MovieScreenViewModel
+import hu.bbara.purefin.feature.content.movie.MovieScreenViewModel
 
 @Composable
 fun TvMovieScreen(

app-tv/src/main/java/hu/bbara/purefin/app/content/series/TvSeriesComponents.kt

@@ -59,13 +59,13 @@ import hu.bbara.purefin.common.ui.components.MediaProgressBar
 import hu.bbara.purefin.common.ui.components.MediaResumeButton
 import hu.bbara.purefin.common.ui.components.PurefinAsyncImage
 import hu.bbara.purefin.common.ui.components.WatchStateIndicator
-import hu.bbara.purefin.core.data.image.JellyfinImageHelper
+import hu.bbara.purefin.core.image.ImageUrlBuilder
 import hu.bbara.purefin.core.model.CastMember
 import hu.bbara.purefin.core.model.Episode
 import hu.bbara.purefin.core.model.Season
 import hu.bbara.purefin.core.model.Series
-import hu.bbara.purefin.feature.shared.content.series.SeriesViewModel
-import org.jellyfin.sdk.model.api.ImageType
+import hu.bbara.purefin.feature.content.series.SeriesViewModel
+import hu.bbara.purefin.core.image.ArtworkKind
 
 internal const val SeriesPlayButtonTag = "series-play-button"
 internal const val SeriesFirstSeasonTabTag = "series-first-season-tab"
@@ -296,7 +296,7 @@ private fun TvEpisodeCard(
                 )
         ) {
             PurefinAsyncImage(
-                model = JellyfinImageHelper.finishImageUrl(episode.imageUrlPrefix, ImageType.PRIMARY),
+                model = ImageUrlBuilder.finishImageUrl(episode.imageUrlPrefix, ArtworkKind.PRIMARY),
                 contentDescription = null,
                 modifier = Modifier.fillMaxSize(),
                 contentScale = ContentScale.Crop

app-tv/src/main/java/hu/bbara/purefin/app/content/series/TvSeriesScreen.kt

@@ -22,10 +22,10 @@ import hu.bbara.purefin.common.ui.components.MediaDetailSectionTitle
 import hu.bbara.purefin.common.ui.components.TvMediaDetailBodyBox
 import hu.bbara.purefin.common.ui.components.TvMediaDetailScaffold
 import hu.bbara.purefin.common.ui.components.tvMediaDetailBackgroundImageUrl
-import hu.bbara.purefin.feature.shared.navigation.SeriesDto
+import hu.bbara.purefin.core.navigation.SeriesDto
 import hu.bbara.purefin.core.model.Season
 import hu.bbara.purefin.core.model.Series
-import hu.bbara.purefin.feature.shared.content.series.SeriesViewModel
+import hu.bbara.purefin.feature.content.series.SeriesViewModel
 import java.util.UUID
 
 @Composable

app-tv/src/main/java/hu/bbara/purefin/common/ui/PosterCard.kt

@@ -32,8 +32,8 @@ import androidx.compose.ui.unit.sp
 import hu.bbara.purefin.common.ui.components.PurefinAsyncImage
 import hu.bbara.purefin.common.ui.components.UnwatchedEpisodeIndicator
 import hu.bbara.purefin.common.ui.components.WatchStateIndicator
-import hu.bbara.purefin.feature.shared.home.FocusableItem
-import hu.bbara.purefin.feature.shared.home.PosterItem
+import hu.bbara.purefin.feature.browse.home.FocusableItem
+import hu.bbara.purefin.feature.browse.home.PosterItem
 import java.util.UUID
 import hu.bbara.purefin.core.model.MediaKind
 

app-tv/src/main/java/hu/bbara/purefin/common/ui/components/MediaDetailShell.kt

@@ -32,8 +32,8 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import hu.bbara.purefin.common.ui.MediaSynopsis
-import hu.bbara.purefin.core.data.image.JellyfinImageHelper
-import org.jellyfin.sdk.model.api.ImageType
+import hu.bbara.purefin.core.image.ImageUrlBuilder
+import hu.bbara.purefin.core.image.ArtworkKind
 
 internal val MediaDetailHorizontalPadding = 48.dp
 private val MediaDetailHeaderTopPadding = 104.dp
@@ -151,8 +151,8 @@ internal fun TvMediaDetailBodyBox(
 }
 
 internal fun tvMediaDetailBackgroundImageUrl(imageUrlPrefix: String?): String {
-    val primaryImageUrl = JellyfinImageHelper.finishImageUrl(imageUrlPrefix, ImageType.PRIMARY)
-    val backdropImageUrl = JellyfinImageHelper.finishImageUrl(imageUrlPrefix, ImageType.BACKDROP)
+    val primaryImageUrl = ImageUrlBuilder.finishImageUrl(imageUrlPrefix, ArtworkKind.PRIMARY)
+    val backdropImageUrl = ImageUrlBuilder.finishImageUrl(imageUrlPrefix, ArtworkKind.BACKDROP)
     return backdropImageUrl.ifBlank { primaryImageUrl }
 }
 

app-tv/src/main/java/hu/bbara/purefin/login/ui/LoginScreen.kt

@@ -41,7 +41,7 @@ import hu.bbara.purefin.common.ui.PurefinComplexTextField
 import hu.bbara.purefin.common.ui.PurefinPasswordField
 import hu.bbara.purefin.common.ui.PurefinTextButton
 import hu.bbara.purefin.common.ui.PurefinWaitingScreen
-import hu.bbara.purefin.feature.shared.login.LoginViewModel
+import hu.bbara.purefin.feature.login.LoginViewModel
 import kotlinx.coroutines.launch
 
 @Composable

app-tv/src/main/java/hu/bbara/purefin/tv/TvActivity.kt

@@ -37,13 +37,13 @@ import coil3.request.crossfade
 import coil3.util.DebugLogger
 import dagger.hilt.android.AndroidEntryPoint
 import hu.bbara.purefin.common.ui.PurefinWaitingScreen
-import hu.bbara.purefin.core.data.client.JellyfinApiClient
-import hu.bbara.purefin.core.data.client.JellyfinAuthInterceptor
+import hu.bbara.purefin.core.data.SessionBootstrapper
+import hu.bbara.purefin.data.jellyfin.client.JellyfinAuthInterceptor
 import hu.bbara.purefin.core.data.session.UserSessionRepository
-import hu.bbara.purefin.feature.shared.navigation.NavigationCommand
-import hu.bbara.purefin.feature.shared.navigation.NavigationManager
-import hu.bbara.purefin.feature.shared.navigation.Route
 import hu.bbara.purefin.login.ui.LoginScreen
+import hu.bbara.purefin.core.navigation.NavigationCommand
+import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.tv.navigation.LocalNavigationBackStack
 import hu.bbara.purefin.tv.navigation.LocalNavigationManager
 import hu.bbara.purefin.ui.theme.AppTheme
@@ -66,7 +66,7 @@ class TvActivity : ComponentActivity() {
     lateinit var navigationManager: NavigationManager
 
     @Inject
-    lateinit var jellyfinApiClient: JellyfinApiClient
+    lateinit var sessionBootstrapper: SessionBootstrapper
 
     @Inject
     lateinit var authInterceptor: JellyfinAuthInterceptor
@@ -94,7 +94,7 @@ class TvActivity : ComponentActivity() {
     }
 
     private suspend fun init() {
-        jellyfinApiClient.updateApiClient()
+        sessionBootstrapper.initialize()
     }
 
     private fun configureImageLoader() {

app-tv/src/main/java/hu/bbara/purefin/tv/TvAppScreen.kt

@@ -15,7 +15,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.LifecycleResumeEffect
-import hu.bbara.purefin.feature.shared.home.AppViewModel
+import hu.bbara.purefin.feature.browse.home.AppViewModel
 import hu.bbara.purefin.tv.home.TvHomeScreen
 import hu.bbara.purefin.tv.home.ui.TvDrawerDestination
 import hu.bbara.purefin.tv.home.ui.TvDrawerDestinationItem

app-tv/src/main/java/hu/bbara/purefin/tv/di/TvPlaybackModule.kt

@@ -1,56 +0,0 @@
-package hu.bbara.purefin.tv.di
-
-import androidx.media3.datasource.DataSource
-import androidx.media3.datasource.okhttp.OkHttpDataSource
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import hu.bbara.purefin.core.data.download.DownloadState
-import hu.bbara.purefin.core.data.download.MediaDownloadController
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.flowOf
-import java.util.UUID
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-object TvPlaybackModule {
-
-    @Provides
-    @Singleton
-    fun providePlaybackDataSourceFactory(
-        okHttpDataSourceFactory: OkHttpDataSource.Factory
-    ): DataSource.Factory {
-        return okHttpDataSourceFactory
-    }
-
-    @Provides
-    @Singleton
-    fun provideMediaDownloadController(): MediaDownloadController {
-        return TvNoOpMediaDownloadController
-    }
-}
-
-internal object TvNoOpMediaDownloadController : MediaDownloadController {
-    private val notDownloaded = MutableStateFlow<DownloadState>(DownloadState.NotDownloaded)
-
-    override fun observeActiveDownloads(): Flow<Map<String, Float>> = flowOf(emptyMap())
-
-    override fun observeDownloadState(contentId: String) = notDownloaded
-
-    override suspend fun downloadMovie(movieId: UUID) = Unit
-
-    override suspend fun cancelDownload(movieId: UUID) = Unit
-
-    override suspend fun downloadEpisode(episodeId: UUID) = Unit
-
-    override suspend fun downloadEpisodes(episodeIds: List<UUID>) = Unit
-
-    override suspend fun cancelEpisodeDownload(episodeId: UUID) = Unit
-
-    override suspend fun enableSmartDownload(seriesId: UUID) = Unit
-
-    override suspend fun syncSmartDownloads() = Unit
-}

app-tv/src/main/java/hu/bbara/purefin/tv/di/TvPlaybackProfileFamilyModule.kt

@@ -4,7 +4,7 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import hu.bbara.purefin.core.data.client.PlaybackProfileFamily
+import hu.bbara.purefin.core.data.PlaybackProfileFamily
 
 @Module
 @InstallIn(SingletonComponent::class)

app-tv/src/main/java/hu/bbara/purefin/tv/home/TvHomeScreen.kt

@@ -9,10 +9,10 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.feature.shared.home.ContinueWatchingItem
-import hu.bbara.purefin.feature.shared.home.LibraryItem
-import hu.bbara.purefin.feature.shared.home.NextUpItem
-import hu.bbara.purefin.feature.shared.home.PosterItem
+import hu.bbara.purefin.feature.browse.home.ContinueWatchingItem
+import hu.bbara.purefin.feature.browse.home.LibraryItem
+import hu.bbara.purefin.feature.browse.home.NextUpItem
+import hu.bbara.purefin.feature.browse.home.PosterItem
 import hu.bbara.purefin.tv.home.ui.TvFocusedItemHero
 import hu.bbara.purefin.tv.home.ui.TvHomeContent
 import hu.bbara.purefin.tv.home.ui.rememberTvHomeHeroState

app-tv/src/main/java/hu/bbara/purefin/tv/home/ui/TvFocusedHeroModel.kt

@@ -1,16 +1,16 @@
 package hu.bbara.purefin.tv.home.ui
 
-import hu.bbara.purefin.core.data.image.JellyfinImageHelper
+import hu.bbara.purefin.core.image.ImageUrlBuilder
 import hu.bbara.purefin.core.model.Episode
 import hu.bbara.purefin.core.model.Movie
 import hu.bbara.purefin.core.model.Series
-import hu.bbara.purefin.feature.shared.home.ContinueWatchingItem
-import hu.bbara.purefin.feature.shared.home.FocusableItem
-import hu.bbara.purefin.feature.shared.home.NextUpItem
-import hu.bbara.purefin.feature.shared.home.PosterItem
+import hu.bbara.purefin.feature.browse.home.ContinueWatchingItem
+import hu.bbara.purefin.feature.browse.home.FocusableItem
+import hu.bbara.purefin.feature.browse.home.NextUpItem
+import hu.bbara.purefin.feature.browse.home.PosterItem
 import java.util.UUID
 import hu.bbara.purefin.core.model.MediaKind
-import org.jellyfin.sdk.model.api.ImageType
+import hu.bbara.purefin.core.image.ArtworkKind
 import kotlin.math.roundToInt
 
 internal data class TvFocusedHeroModel(
@@ -42,7 +42,7 @@ internal fun FocusableItem.toTvFocusedHeroModel(): TvFocusedHeroModel {
 }
 
 internal fun backdropImageUrl(imageUrlPrefix: String?, fallbackImageUrl: String): String {
-    val backdropImageUrl = JellyfinImageHelper.finishImageUrl(imageUrlPrefix, ImageType.BACKDROP)
+    val backdropImageUrl = ImageUrlBuilder.finishImageUrl(imageUrlPrefix, ArtworkKind.BACKDROP)
     return backdropImageUrl.ifBlank { fallbackImageUrl }
 }
 
@@ -51,7 +51,7 @@ private fun Movie.toTvFocusedHeroModel(): TvFocusedHeroModel {
         id = id,
         backdropImageUrl = backdropImageUrl(
             imageUrlPrefix = imageUrlPrefix,
-            fallbackImageUrl = JellyfinImageHelper.finishImageUrl(imageUrlPrefix, ImageType.PRIMARY)
+            fallbackImageUrl = ImageUrlBuilder.finishImageUrl(imageUrlPrefix, ArtworkKind.PRIMARY)
         ),
         title = title,
         metadata = listOf(year, rating, runtime, format).compactMetadata(),
@@ -63,7 +63,7 @@ private fun Episode.toTvFocusedHeroModel(): TvFocusedHeroModel {
         id = id,
         backdropImageUrl = backdropImageUrl(
             imageUrlPrefix = imageUrlPrefix,
-            fallbackImageUrl = JellyfinImageHelper.finishImageUrl(imageUrlPrefix, ImageType.PRIMARY)
+            fallbackImageUrl = ImageUrlBuilder.finishImageUrl(imageUrlPrefix, ArtworkKind.PRIMARY)
         ),
         title = title,
         metadata = listOf(
@@ -87,7 +87,7 @@ private fun Series.toTvFocusedHeroModel(): TvFocusedHeroModel {
         id = id,
         backdropImageUrl = backdropImageUrl(
             imageUrlPrefix = imageUrlPrefix,
-            fallbackImageUrl = JellyfinImageHelper.finishImageUrl(imageUrlPrefix, ImageType.PRIMARY)
+            fallbackImageUrl = ImageUrlBuilder.finishImageUrl(imageUrlPrefix, ArtworkKind.PRIMARY)
         ),
         title = name,
         metadata = listOf(year, seasonLabel(seasonCount), unwatchedText).compactMetadata(),

app-tv/src/main/java/hu/bbara/purefin/tv/home/ui/TvHomeContent.kt

@@ -24,11 +24,11 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.feature.shared.home.ContinueWatchingItem
-import hu.bbara.purefin.feature.shared.home.FocusableItem
-import hu.bbara.purefin.feature.shared.home.LibraryItem
-import hu.bbara.purefin.feature.shared.home.NextUpItem
-import hu.bbara.purefin.feature.shared.home.PosterItem
+import hu.bbara.purefin.feature.browse.home.ContinueWatchingItem
+import hu.bbara.purefin.feature.browse.home.FocusableItem
+import hu.bbara.purefin.feature.browse.home.LibraryItem
+import hu.bbara.purefin.feature.browse.home.NextUpItem
+import hu.bbara.purefin.feature.browse.home.PosterItem
 import java.util.UUID
 
 internal const val TvHomeInitialFocusTag = "tv-home-initial-focus-item"

app-tv/src/main/java/hu/bbara/purefin/tv/home/ui/TvHomeHeroState.kt

@@ -5,11 +5,11 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import hu.bbara.purefin.feature.shared.home.ContinueWatchingItem
-import hu.bbara.purefin.feature.shared.home.FocusableItem
-import hu.bbara.purefin.feature.shared.home.LibraryItem
-import hu.bbara.purefin.feature.shared.home.NextUpItem
-import hu.bbara.purefin.feature.shared.home.PosterItem
+import hu.bbara.purefin.feature.browse.home.ContinueWatchingItem
+import hu.bbara.purefin.feature.browse.home.FocusableItem
+import hu.bbara.purefin.feature.browse.home.LibraryItem
+import hu.bbara.purefin.feature.browse.home.NextUpItem
+import hu.bbara.purefin.feature.browse.home.PosterItem
 import java.util.UUID
 
 internal data class TvHomeItemRegistry(

app-tv/src/main/java/hu/bbara/purefin/tv/home/ui/TvHomeSections.kt

@@ -47,14 +47,14 @@ import androidx.compose.ui.unit.sp
 import hu.bbara.purefin.common.ui.PosterCard
 import hu.bbara.purefin.common.ui.components.MediaProgressBar
 import hu.bbara.purefin.common.ui.components.PurefinAsyncImage
-import hu.bbara.purefin.core.data.image.JellyfinImageHelper
-import hu.bbara.purefin.feature.shared.home.ContinueWatchingItem
-import hu.bbara.purefin.feature.shared.home.FocusableItem
-import hu.bbara.purefin.feature.shared.home.NextUpItem
-import hu.bbara.purefin.feature.shared.home.PosterItem
+import hu.bbara.purefin.core.image.ImageUrlBuilder
+import hu.bbara.purefin.feature.browse.home.ContinueWatchingItem
+import hu.bbara.purefin.feature.browse.home.FocusableItem
+import hu.bbara.purefin.feature.browse.home.NextUpItem
+import hu.bbara.purefin.feature.browse.home.PosterItem
 import java.util.UUID
 import hu.bbara.purefin.core.model.MediaKind
-import org.jellyfin.sdk.model.api.ImageType
+import hu.bbara.purefin.core.image.ArtworkKind
 
 private val TvHomeSectionsThumbShape = RoundedCornerShape(20.dp)
 private val TvHomeSectionsHorizontalPadding = 32.dp
@@ -93,14 +93,14 @@ fun TvContinueWatchingSection(
                 title = item.primaryText,
                 supporting = item.secondaryText,
                 imageUrl = when (item.type) {
-                    MediaKind.MOVIE -> JellyfinImageHelper.finishImageUrl(
+                    MediaKind.MOVIE -> ImageUrlBuilder.finishImageUrl(
                         prefixImageUrl = item.movie?.imageUrlPrefix,
-                        imageType = ImageType.PRIMARY
+                        artworkKind = ArtworkKind.PRIMARY
                     )
 
-                    MediaKind.EPISODE -> JellyfinImageHelper.finishImageUrl(
+                    MediaKind.EPISODE -> ImageUrlBuilder.finishImageUrl(
                         prefixImageUrl = item.episode?.imageUrlPrefix,
-                        imageType = ImageType.PRIMARY
+                        artworkKind = ArtworkKind.PRIMARY
                     )
 
                     else -> null

app-tv/src/main/java/hu/bbara/purefin/tv/library/ui/TvLibrariesOverviewScreen.kt

@@ -44,7 +44,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.common.ui.components.PurefinAsyncImage
-import hu.bbara.purefin.feature.shared.home.LibraryItem
+import hu.bbara.purefin.feature.browse.home.LibraryItem
 import hu.bbara.purefin.core.model.LibraryKind
 
 internal const val TvLibrariesOverviewItemTagPrefix = "tv-libraries-overview-item-"

app-tv/src/main/java/hu/bbara/purefin/tv/library/ui/TvLibraryScreen.kt

@@ -24,9 +24,9 @@ import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import hu.bbara.purefin.common.ui.PosterCard
 import hu.bbara.purefin.common.ui.components.PurefinIconButton
-import hu.bbara.purefin.feature.shared.navigation.LibraryDto
-import hu.bbara.purefin.feature.shared.home.PosterItem
-import hu.bbara.purefin.feature.shared.library.LibraryViewModel
+import hu.bbara.purefin.core.navigation.LibraryDto
+import hu.bbara.purefin.feature.browse.home.PosterItem
+import hu.bbara.purefin.feature.browse.library.LibraryViewModel
 import java.util.UUID
 
 @Composable

app-tv/src/main/java/hu/bbara/purefin/tv/navigation/NavigationLocals.kt

@@ -3,8 +3,8 @@ package hu.bbara.purefin.tv.navigation
 import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.staticCompositionLocalOf
-import hu.bbara.purefin.feature.shared.navigation.NavigationManager
-import hu.bbara.purefin.feature.shared.navigation.Route
+import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.core.navigation.Route
 
 val LocalNavigationManager: ProvidableCompositionLocal<NavigationManager> =
     staticCompositionLocalOf { error("NavigationManager not provided") }

app-tv/src/main/java/hu/bbara/purefin/tv/navigation/TvNavigationModule.kt

@@ -6,7 +6,7 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ActivityRetainedComponent
 import dagger.multibindings.IntoSet
-import hu.bbara.purefin.feature.shared.navigation.Route
+import hu.bbara.purefin.core.navigation.Route
 
 @Module
 @InstallIn(ActivityRetainedComponent::class)

app-tv/src/main/java/hu/bbara/purefin/tv/navigation/TvRouteEntryBuilder.kt

@@ -4,7 +4,7 @@ import androidx.navigation3.runtime.EntryProviderScope
 import hu.bbara.purefin.app.content.episode.TvEpisodeScreen
 import hu.bbara.purefin.app.content.movie.TvMovieScreen
 import hu.bbara.purefin.app.content.series.TvSeriesScreen
-import hu.bbara.purefin.feature.shared.navigation.Route
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.login.ui.LoginScreen
 import hu.bbara.purefin.tv.TvAppScreen
 import hu.bbara.purefin.tv.library.ui.TvLibraryScreen

app-tv/src/test/java/hu/bbara/purefin/tv/di/TvNoOpMediaDownloadControllerTest.kt

@@ -1,19 +0,0 @@
-package hu.bbara.purefin.tv.di
-
-import hu.bbara.purefin.core.data.download.DownloadState
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-class TvNoOpMediaDownloadControllerTest {
-
-    @Test
-    fun `tv no-op download controller always reports no downloads`() = runBlocking {
-        assertEquals(emptyMap<String, Float>(), TvNoOpMediaDownloadController.observeActiveDownloads().first())
-        assertEquals(
-            DownloadState.NotDownloaded,
-            TvNoOpMediaDownloadController.observeDownloadState("movie-1").value
-        )
-    }
-}

app-tv/src/test/java/hu/bbara/purefin/tv/home/ui/TvFocusedItemHeroTest.kt

@@ -1,14 +1,14 @@
 package hu.bbara.purefin.tv.home.ui
 
-import hu.bbara.purefin.core.data.image.JellyfinImageHelper
+import hu.bbara.purefin.core.image.ImageUrlBuilder
 import hu.bbara.purefin.core.model.Episode
 import hu.bbara.purefin.core.model.Movie
 import hu.bbara.purefin.core.model.Series
-import hu.bbara.purefin.feature.shared.home.ContinueWatchingItem
-import hu.bbara.purefin.feature.shared.home.NextUpItem
-import hu.bbara.purefin.feature.shared.home.PosterItem
+import hu.bbara.purefin.feature.browse.home.ContinueWatchingItem
+import hu.bbara.purefin.feature.browse.home.NextUpItem
+import hu.bbara.purefin.feature.browse.home.PosterItem
 import org.jellyfin.sdk.model.api.BaseItemKind
-import org.jellyfin.sdk.model.api.ImageType
+import hu.bbara.purefin.core.image.ArtworkKind
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Test
@@ -33,7 +33,7 @@ class TvFocusedItemHeroTest {
         assertEquals("42%", hero.progressLabel)
         assertNull(hero.watchedText)
         assertEquals(
-            JellyfinImageHelper.finishImageUrl(movie.imageUrlPrefix, ImageType.BACKDROP),
+            ImageUrlBuilder.finishImageUrl(movie.imageUrlPrefix, ArtworkKind.BACKDROP),
             hero.backdropImageUrl
         )
     }

app-tv/src/test/java/hu/bbara/purefin/tv/home/ui/TvHomeHeroStateTest.kt

@@ -2,10 +2,10 @@ package hu.bbara.purefin.tv.home.ui
 
 import hu.bbara.purefin.core.model.Episode
 import hu.bbara.purefin.core.model.Movie
-import hu.bbara.purefin.feature.shared.home.ContinueWatchingItem
-import hu.bbara.purefin.feature.shared.home.LibraryItem
-import hu.bbara.purefin.feature.shared.home.NextUpItem
-import hu.bbara.purefin.feature.shared.home.PosterItem
+import hu.bbara.purefin.feature.browse.home.ContinueWatchingItem
+import hu.bbara.purefin.feature.browse.home.LibraryItem
+import hu.bbara.purefin.feature.browse.home.NextUpItem
+import hu.bbara.purefin.feature.browse.home.PosterItem
 import org.jellyfin.sdk.model.api.BaseItemKind
 import org.jellyfin.sdk.model.api.CollectionType
 import org.junit.Assert.assertEquals