refactor: move JellyfinAuthInterceptor and JellyfinNetworkModule to the domain module

app-tv/build.gradle.kts

@@ -51,21 +51,9 @@ kotlin {
 }
 
 dependencies {
-    implementation(project(":core:model"))
-    implementation(project(":core:image"))
-    implementation(project(":core:ui"))
-    implementation(project(":core:data"))
-    implementation(project(":core:navigation"))
-    implementation(project(":core:download"))
-    implementation(project(":core:player"))
-    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(project(":data"))
+    implementation(project(":domain"))
+    implementation(project(":ui-common"))
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.lifecycle.viewmodel.compose)

app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/episode/EpisodeScreenContentTest.kt

@@ -13,8 +13,8 @@ import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performKeyInput
 import androidx.compose.ui.test.pressKey
 import androidx.compose.ui.input.key.Key
-import hu.bbara.purefin.core.model.CastMember
-import hu.bbara.purefin.core.model.Episode
+import hu.bbara.purefin.model.CastMember
+import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.ui.theme.AppTheme
 import hu.bbara.purefin.ui.screen.episode.components.EpisodePlayButtonTag
 import org.junit.Assert.assertEquals

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

@@ -16,12 +16,12 @@ import androidx.compose.ui.test.performKeyInput
 import androidx.compose.ui.test.pressKey
 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.LibraryKind
-import hu.bbara.purefin.core.model.Movie
-import hu.bbara.purefin.core.ui.model.EpisodeUiModel
-import hu.bbara.purefin.core.ui.model.MediaUiModel
-import hu.bbara.purefin.core.ui.model.MovieUiModel
+import hu.bbara.purefin.model.Episode
+import hu.bbara.purefin.model.LibraryKind
+import hu.bbara.purefin.model.Movie
+import hu.bbara.purefin.ui.model.EpisodeUiModel
+import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MovieUiModel
 import hu.bbara.purefin.feature.browse.home.LibraryItem
 import hu.bbara.purefin.ui.screen.home.TvHomeScreen
 import hu.bbara.purefin.ui.theme.AppTheme

app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/libraries/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.core.model.LibraryKind
+import hu.bbara.purefin.model.LibraryKind
 import hu.bbara.purefin.feature.browse.home.LibraryItem
 import hu.bbara.purefin.ui.theme.AppTheme
 import org.junit.Assert.assertEquals

app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/movie/MovieScreenContentTest.kt

@@ -13,8 +13,8 @@ import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performKeyInput
 import androidx.compose.ui.test.pressKey
 import androidx.compose.ui.input.key.Key
-import hu.bbara.purefin.core.model.CastMember
-import hu.bbara.purefin.core.model.Movie
+import hu.bbara.purefin.model.CastMember
+import hu.bbara.purefin.model.Movie
 import hu.bbara.purefin.ui.theme.AppTheme
 import hu.bbara.purefin.ui.screen.movie.components.MoviePlayButtonTag
 import org.junit.Assert.assertEquals

app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerControlsOverlayTest.kt

@@ -33,17 +33,16 @@ import androidx.compose.ui.test.assertIsNotEnabled
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onAllNodesWithContentDescription
 import androidx.compose.ui.test.onAllNodesWithTag
-import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performKeyInput
 import androidx.compose.ui.test.performSemanticsAction
 import androidx.compose.ui.test.pressKey
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.core.player.model.PlayerUiState
-import hu.bbara.purefin.core.player.model.QueueItemUi
-import hu.bbara.purefin.core.player.model.TrackOption
-import hu.bbara.purefin.core.player.model.TrackType
+import hu.bbara.purefin.player.model.PlayerUiState
+import hu.bbara.purefin.player.model.QueueItemUi
+import hu.bbara.purefin.player.model.TrackOption
+import hu.bbara.purefin.player.model.TrackType
 import hu.bbara.purefin.ui.screen.player.TV_HIDDEN_STOP_FEEDBACK_MS
 import hu.bbara.purefin.ui.screen.player.TvPlayerHiddenStopFeedback
 import hu.bbara.purefin.ui.screen.player.TvPlayerHiddenStopFeedbackTag

app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/series/SeriesScreenContentTest.kt

@@ -11,10 +11,10 @@ import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performKeyInput
 import androidx.compose.ui.test.pressKey
 import androidx.compose.ui.input.key.Key
-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.model.CastMember
+import hu.bbara.purefin.model.Episode
+import hu.bbara.purefin.model.Season
+import hu.bbara.purefin.model.Series
 import hu.bbara.purefin.ui.theme.AppTheme
 import hu.bbara.purefin.ui.screen.series.components.SeriesFirstSeasonTabTag
 import hu.bbara.purefin.ui.screen.series.components.SeriesPlayButtonTag

app-tv/src/main/java/hu/bbara/purefin/modules/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.core.navigation.Route
+import hu.bbara.purefin.navigation.Route
 import hu.bbara.purefin.navigation.tvEpisodeSection
 import hu.bbara.purefin.navigation.tvHomeSection
 import hu.bbara.purefin.navigation.tvLibrarySection

app-tv/src/main/java/hu/bbara/purefin/modules/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.PlaybackProfileFamily
+import hu.bbara.purefin.data.PlaybackProfileFamily
 
 @Module
 @InstallIn(SingletonComponent::class)

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

@@ -3,8 +3,6 @@ package hu.bbara.purefin.navigation
 import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.staticCompositionLocalOf
-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/navigation/TvRouteEntryBuilder.kt

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

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

@@ -36,12 +36,12 @@ import coil3.network.okhttp.OkHttpNetworkFetcherFactory
 import coil3.request.crossfade
 import coil3.util.DebugLogger
 import dagger.hilt.android.AndroidEntryPoint
-import hu.bbara.purefin.core.data.SessionBootstrapper
-import hu.bbara.purefin.core.data.session.UserSessionRepository
-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.data.jellyfin.client.JellyfinAuthInterceptor
+import hu.bbara.purefin.data.SessionBootstrapper
+import hu.bbara.purefin.data.session.UserSessionRepository
+import hu.bbara.purefin.navigation.NavigationCommand
+import hu.bbara.purefin.navigation.NavigationManager
+import hu.bbara.purefin.navigation.Route
+import hu.bbara.purefin.jellyfin.JellyfinAuthInterceptor
 import hu.bbara.purefin.navigation.LocalNavigationBackStack
 import hu.bbara.purefin.navigation.LocalNavigationManager
 import hu.bbara.purefin.ui.screen.login.LoginScreen

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

@@ -29,10 +29,10 @@ 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 hu.bbara.purefin.core.ui.model.EpisodeUiModel
-import hu.bbara.purefin.core.ui.model.MediaUiModel
-import hu.bbara.purefin.core.ui.model.MovieUiModel
-import hu.bbara.purefin.core.ui.model.SeriesUiModel
+import hu.bbara.purefin.ui.model.EpisodeUiModel
+import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MovieUiModel
+import hu.bbara.purefin.ui.model.SeriesUiModel
 import hu.bbara.purefin.ui.common.badge.WatchStateBadge
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 import java.util.UUID

app-tv/src/main/java/hu/bbara/purefin/ui/common/media/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.ui.common.image.PurefinAsyncImage
-import hu.bbara.purefin.core.image.ImageUrlBuilder
-import hu.bbara.purefin.core.image.ArtworkKind
+import hu.bbara.purefin.image.ImageUrlBuilder
+import hu.bbara.purefin.image.ArtworkKind
 
 internal val MediaDetailHorizontalPadding = 48.dp
 private val MediaDetailHeaderTopPadding = 104.dp

app-tv/src/main/java/hu/bbara/purefin/ui/screen/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.core.model.LibraryKind
+import hu.bbara.purefin.model.LibraryKind
 import hu.bbara.purefin.feature.browse.home.AppViewModel
 import hu.bbara.purefin.ui.screen.home.TvHomeScreen
 import hu.bbara.purefin.ui.screen.home.components.TvDrawerDestination

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

@@ -21,13 +21,13 @@ import hu.bbara.purefin.ui.common.media.MediaDetailSectionTitle
 import hu.bbara.purefin.ui.common.media.TvMediaDetailBodyBox
 import hu.bbara.purefin.ui.common.media.TvMediaDetailScaffold
 import hu.bbara.purefin.ui.screen.episode.components.TvEpisodeHeroSection
-import hu.bbara.purefin.core.image.ImageUrlBuilder
-import hu.bbara.purefin.core.navigation.EpisodeDto
+import hu.bbara.purefin.image.ImageUrlBuilder
+import hu.bbara.purefin.navigation.EpisodeDto
 import hu.bbara.purefin.navigation.LocalNavigationManager
-import hu.bbara.purefin.core.navigation.Route
-import hu.bbara.purefin.core.model.Episode
+import hu.bbara.purefin.navigation.Route
+import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.feature.content.episode.EpisodeScreenViewModel
-import hu.bbara.purefin.core.image.ArtworkKind
+import hu.bbara.purefin.image.ArtworkKind
 
 @Composable
 fun TvEpisodeScreen(

app-tv/src/main/java/hu/bbara/purefin/ui/screen/episode/components/TvEpisodeComponents.kt

@@ -1,6 +1,5 @@
 package hu.bbara.purefin.ui.screen.episode.components
 
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -22,7 +21,7 @@ import hu.bbara.purefin.ui.common.button.MediaResumeButton
 import hu.bbara.purefin.ui.common.media.MediaMetadataFlowRow
 import hu.bbara.purefin.ui.common.media.mediaPlaybackProgress
 import hu.bbara.purefin.ui.common.media.mediaPlayButtonText
-import hu.bbara.purefin.core.model.Episode
+import hu.bbara.purefin.model.Episode
 
 internal const val EpisodePlayButtonTag = "episode-play-button"
 

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

@@ -11,8 +11,8 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.core.ui.model.MediaUiModel
-import hu.bbara.purefin.core.ui.model.MovieUiModel
+import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MovieUiModel
 import hu.bbara.purefin.feature.browse.home.LibraryItem
 import hu.bbara.purefin.ui.screen.home.components.TvFocusedItemHero
 import hu.bbara.purefin.ui.screen.home.components.TvHomeContent

app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvFocusedItemHero.kt

@@ -23,7 +23,7 @@ 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 hu.bbara.purefin.core.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MediaUiModel
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 
 internal const val TvHomeHeroTitleTag = "tv-home-hero-title"

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

@@ -23,7 +23,7 @@ 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.core.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MediaUiModel
 import hu.bbara.purefin.feature.browse.home.LibraryItem
 import java.util.UUID
 

app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvHomeSections.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 androidx.compose.ui.unit.sp
-import hu.bbara.purefin.core.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MediaUiModel
 import hu.bbara.purefin.ui.common.bar.MediaProgressBar
 import hu.bbara.purefin.ui.common.card.PosterCardContent
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage

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

@@ -18,7 +18,6 @@ import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.itemsIndexed
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Collections
 import androidx.compose.material.icons.outlined.Movie
 import androidx.compose.material.icons.outlined.Tv
 import androidx.compose.material3.Icon
@@ -45,7 +44,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 import hu.bbara.purefin.feature.browse.home.LibraryItem
-import hu.bbara.purefin.core.model.LibraryKind
+import hu.bbara.purefin.model.LibraryKind
 
 internal const val TvLibrariesOverviewItemTagPrefix = "tv-libraries-overview-item-"
 

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

@@ -22,8 +22,8 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.core.navigation.LibraryDto
-import hu.bbara.purefin.core.ui.model.MediaUiModel
+import hu.bbara.purefin.navigation.LibraryDto
+import hu.bbara.purefin.ui.model.MediaUiModel
 import hu.bbara.purefin.feature.browse.library.LibraryViewModel
 import hu.bbara.purefin.ui.common.button.PurefinIconButton
 import hu.bbara.purefin.ui.common.card.PosterCard

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

@@ -22,8 +22,8 @@ import hu.bbara.purefin.ui.common.media.TvMediaDetailBodyBox
 import hu.bbara.purefin.ui.common.media.TvMediaDetailScaffold
 import hu.bbara.purefin.ui.common.media.tvMediaDetailBackgroundImageUrl
 import hu.bbara.purefin.ui.screen.movie.components.TvMovieHeroSection
-import hu.bbara.purefin.core.navigation.MovieDto
-import hu.bbara.purefin.core.model.Movie
+import hu.bbara.purefin.navigation.MovieDto
+import hu.bbara.purefin.model.Movie
 import hu.bbara.purefin.feature.content.movie.MovieScreenViewModel
 
 @Composable

app-tv/src/main/java/hu/bbara/purefin/ui/screen/movie/components/TvMovieComponents.kt

@@ -1,6 +1,5 @@
 package hu.bbara.purefin.ui.screen.movie.components
 
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -22,7 +21,7 @@ import hu.bbara.purefin.ui.common.button.MediaResumeButton
 import hu.bbara.purefin.ui.common.media.MediaMetadataFlowRow
 import hu.bbara.purefin.ui.common.media.mediaPlaybackProgress
 import hu.bbara.purefin.ui.common.media.mediaPlayButtonText
-import hu.bbara.purefin.core.model.Movie
+import hu.bbara.purefin.model.Movie
 
 internal const val MoviePlayButtonTag = "movie-play-button"
 

app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/TvPlayerScreen.kt

@@ -48,8 +48,8 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.ui.AspectRatioFrameLayout
 import androidx.media3.ui.PlayerView
-import hu.bbara.purefin.core.player.viewmodel.ControlsAutoHideBlocker
-import hu.bbara.purefin.core.player.viewmodel.PlayerViewModel
+import hu.bbara.purefin.player.viewmodel.ControlsAutoHideBlocker
+import hu.bbara.purefin.player.viewmodel.PlayerViewModel
 import hu.bbara.purefin.ui.screen.player.components.TvPlayerControlsOverlay
 import hu.bbara.purefin.ui.screen.player.components.TvPlayerLoadingErrorEndCard
 import hu.bbara.purefin.ui.screen.player.components.TvTrackPanelType

app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerControlsOverlay.kt

@@ -47,7 +47,7 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.stateDescription
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.core.player.model.PlayerUiState
+import hu.bbara.purefin.player.model.PlayerUiState
 
 internal const val TvPlayerPlaylistStateTag = "tv_player_playlist_state"
 internal const val TvPlayerPlayPauseButtonTag = "tv_player_play_pause_button"

app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerLoadingErrorEndCard.kt

@@ -4,7 +4,7 @@ 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.core.player.model.PlayerUiState
+import hu.bbara.purefin.player.model.PlayerUiState
 
 @Composable
 internal fun TvPlayerLoadingErrorEndCard(

app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerQueuePanel.kt

@@ -41,8 +41,8 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.core.player.model.PlayerUiState
-import hu.bbara.purefin.core.player.model.QueueItemUi
+import hu.bbara.purefin.player.model.PlayerUiState
+import hu.bbara.purefin.player.model.QueueItemUi
 import coil3.compose.AsyncImage
 
 internal const val TvPlayerPlaylistRowTag = "tv_player_playlist_row"

app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerSeekBar.kt

@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -23,7 +22,7 @@ import androidx.compose.ui.input.key.key
 import androidx.compose.ui.input.key.onPreviewKeyEvent
 import androidx.compose.ui.input.key.type
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.core.player.model.TimedMarker
+import hu.bbara.purefin.player.model.TimedMarker
 
 @Composable
 internal fun TvPlayerSeekBar(

app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvTrackSelectionButtons.kt

@@ -44,8 +44,8 @@ import androidx.compose.ui.input.key.type
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.core.player.model.PlayerUiState
-import hu.bbara.purefin.core.player.model.TrackOption
+import hu.bbara.purefin.player.model.PlayerUiState
+import hu.bbara.purefin.player.model.TrackOption
 
 internal const val TvPlayerQualityButtonTag = "tv_player_quality_button"
 internal const val TvPlayerAudioButtonTag = "tv_player_audio_button"

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

@@ -27,9 +27,9 @@ import hu.bbara.purefin.ui.screen.series.components.SeriesFirstSeasonTabTag
 import hu.bbara.purefin.ui.screen.series.components.TvEpisodeCarousel
 import hu.bbara.purefin.ui.screen.series.components.TvSeasonTabs
 import hu.bbara.purefin.ui.screen.series.components.TvSeriesHeroSection
-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.navigation.SeriesDto
+import hu.bbara.purefin.model.Season
+import hu.bbara.purefin.model.Series
 import hu.bbara.purefin.feature.content.series.SeriesViewModel
 import java.util.UUID
 

app-tv/src/main/java/hu/bbara/purefin/ui/screen/series/components/TvSeriesComponents.kt

@@ -59,13 +59,13 @@ import hu.bbara.purefin.ui.common.badge.WatchStateBadge
 import hu.bbara.purefin.ui.common.media.MediaMetadataFlowRow
 import hu.bbara.purefin.ui.common.media.mediaPlaybackProgress
 import hu.bbara.purefin.ui.common.media.mediaPlayButtonText
-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.image.ImageUrlBuilder
+import hu.bbara.purefin.model.CastMember
+import hu.bbara.purefin.model.Episode
+import hu.bbara.purefin.model.Season
+import hu.bbara.purefin.model.Series
 import hu.bbara.purefin.feature.content.series.SeriesViewModel
-import hu.bbara.purefin.core.image.ArtworkKind
+import hu.bbara.purefin.image.ArtworkKind
 
 internal const val SeriesPlayButtonTag = "series-play-button"
 internal const val SeriesFirstSeasonTabTag = "series-first-season-tab"

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

@@ -1,14 +1,14 @@
 package hu.bbara.purefin.ui.screen.home.components
 
-import hu.bbara.purefin.core.image.ImageUrlBuilder
-import hu.bbara.purefin.core.model.Episode
-import hu.bbara.purefin.core.model.MediaKind
-import hu.bbara.purefin.core.model.Movie
-import hu.bbara.purefin.core.model.Series
+import hu.bbara.purefin.image.ImageUrlBuilder
+import hu.bbara.purefin.model.Episode
+import hu.bbara.purefin.model.MediaKind
+import hu.bbara.purefin.model.Movie
+import hu.bbara.purefin.model.Series
 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 hu.bbara.purefin.core.image.ArtworkKind
+import hu.bbara.purefin.image.ArtworkKind
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import java.util.UUID

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

@@ -1,9 +1,9 @@
 package hu.bbara.purefin.ui.screen.home.components
 
-import hu.bbara.purefin.core.model.Episode
-import hu.bbara.purefin.core.model.LibraryKind
-import hu.bbara.purefin.core.model.MediaKind
-import hu.bbara.purefin.core.model.Movie
+import hu.bbara.purefin.model.Episode
+import hu.bbara.purefin.model.LibraryKind
+import hu.bbara.purefin.model.MediaKind
+import hu.bbara.purefin.model.Movie
 import hu.bbara.purefin.feature.browse.home.ContinueWatchingItem
 import hu.bbara.purefin.feature.browse.home.LibraryItem
 import hu.bbara.purefin.feature.browse.home.NextUpItem

app/build.gradle.kts

@@ -50,21 +50,9 @@ kotlin {
 }
 
 dependencies {
-    implementation(project(":core:model"))
-    implementation(project(":core:image"))
-    implementation(project(":core:ui"))
-    implementation(project(":core:data"))
-    implementation(project(":core:navigation"))
-    implementation(project(":core:download"))
-    implementation(project(":core:player"))
-    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(project(":data"))
+    implementation(project(":domain"))
+    implementation(project(":ui-common"))
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.lifecycle.viewmodel.compose)

app/src/main/AndroidManifest.xml

@@ -33,7 +33,7 @@
             android:exported="false"
             android:theme="@style/Theme.Purefin" />
         <service
-            android:name="hu.bbara.purefin.core.download.PurefinDownloadService"
+            android:name="hu.bbara.purefin.download.PurefinDownloadService"
             android:exported="false"
             android:foregroundServiceType="dataSync" />
     </application>

app/src/main/java/hu/bbara/purefin/PurefinActivity.kt

@@ -36,14 +36,14 @@ import coil3.network.okhttp.OkHttpNetworkFetcherFactory
 import coil3.request.crossfade
 import coil3.util.DebugLogger
 import dagger.hilt.android.AndroidEntryPoint
-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.data.SessionBootstrapper
+import hu.bbara.purefin.jellyfin.JellyfinAuthInterceptor
+import hu.bbara.purefin.data.session.UserSessionRepository
 import hu.bbara.purefin.navigation.LocalNavigationBackStack
 import hu.bbara.purefin.navigation.LocalNavigationManager
-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.navigation.NavigationCommand
+import hu.bbara.purefin.navigation.NavigationManager
+import hu.bbara.purefin.navigation.Route
 import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
 import hu.bbara.purefin.ui.screen.login.LoginScreen
 import hu.bbara.purefin.ui.theme.AppTheme

app/src/main/java/hu/bbara/purefin/modules/NavigationModule.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.core.navigation.Route
+import hu.bbara.purefin.navigation.Route
 import hu.bbara.purefin.navigation.appRouteEntryBuilder
 
 @Module

app/src/main/java/hu/bbara/purefin/modules/PlaybackProfileFamilyModule.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.PlaybackProfileFamily
+import hu.bbara.purefin.data.PlaybackProfileFamily
 
 @Module
 @InstallIn(SingletonComponent::class)

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

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

app/src/main/java/hu/bbara/purefin/navigation/RouteEntryBuilder.kt

@@ -1,7 +1,6 @@
 package hu.bbara.purefin.navigation
 
 import androidx.navigation3.runtime.EntryProviderScope
-import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.ui.screen.library.LibraryScreen
 import hu.bbara.purefin.ui.screen.login.LoginScreen
 import hu.bbara.purefin.ui.screen.AppScreen

app/src/main/java/hu/bbara/purefin/player/PlayerActivity.kt

@@ -11,7 +11,7 @@ import androidx.core.view.WindowInsetsControllerCompat
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import dagger.hilt.android.AndroidEntryPoint
-import hu.bbara.purefin.core.player.viewmodel.PlayerViewModel
+import hu.bbara.purefin.player.viewmodel.PlayerViewModel
 import hu.bbara.purefin.ui.screen.player.PlayerScreen
 import hu.bbara.purefin.ui.theme.AppTheme
 

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

@@ -29,10 +29,10 @@ 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 hu.bbara.purefin.core.ui.model.EpisodeUiModel
-import hu.bbara.purefin.core.ui.model.MediaUiModel
-import hu.bbara.purefin.core.ui.model.MovieUiModel
-import hu.bbara.purefin.core.ui.model.SeriesUiModel
+import hu.bbara.purefin.ui.model.EpisodeUiModel
+import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MovieUiModel
+import hu.bbara.purefin.ui.model.SeriesUiModel
 import hu.bbara.purefin.ui.common.badge.WatchStateBadge
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 import java.util.UUID

app/src/main/java/hu/bbara/purefin/ui/screen/episode/EpisodeScreen.kt

@@ -34,19 +34,19 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
 import hu.bbara.purefin.ui.common.media.MediaHero
 import hu.bbara.purefin.ui.common.media.MediaMetadataFlowRow
-import hu.bbara.purefin.core.download.DownloadState
-import hu.bbara.purefin.core.image.ImageUrlBuilder
-import hu.bbara.purefin.core.navigation.EpisodeDto
+import hu.bbara.purefin.download.DownloadState
+import hu.bbara.purefin.image.ImageUrlBuilder
+import hu.bbara.purefin.navigation.EpisodeDto
 import hu.bbara.purefin.navigation.LocalNavigationBackStack
-import hu.bbara.purefin.core.navigation.Route
-import hu.bbara.purefin.core.model.CastMember
-import hu.bbara.purefin.core.model.Episode
+import hu.bbara.purefin.navigation.Route
+import hu.bbara.purefin.model.CastMember
+import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.feature.content.episode.EpisodeScreenViewModel
 import hu.bbara.purefin.ui.screen.episode.components.EpisodeDetails
 import hu.bbara.purefin.ui.screen.episode.components.EpisodeTopBar
 import hu.bbara.purefin.ui.screen.episode.components.EpisodeTopBarShortcut
 import hu.bbara.purefin.ui.theme.AppTheme
-import hu.bbara.purefin.core.image.ArtworkKind
+import hu.bbara.purefin.image.ArtworkKind
 import java.util.UUID
 
 @Composable

app/src/main/java/hu/bbara/purefin/ui/screen/episode/components/EpisodeComponents.kt

@@ -42,8 +42,8 @@ import hu.bbara.purefin.ui.common.button.GhostIconButton
 import hu.bbara.purefin.ui.common.button.MediaActionButton
 import hu.bbara.purefin.ui.common.media.MediaPlaybackSettings
 import hu.bbara.purefin.ui.common.button.MediaResumeButton
-import hu.bbara.purefin.core.download.DownloadState
-import hu.bbara.purefin.core.model.Episode
+import hu.bbara.purefin.download.DownloadState
+import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.player.PlayerActivity
 
 internal sealed interface EpisodeTopBarShortcut {

app/src/main/java/hu/bbara/purefin/ui/screen/home/HomeScreen.kt

@@ -12,7 +12,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import hu.bbara.purefin.core.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MediaUiModel
 import hu.bbara.purefin.feature.browse.home.LibraryItem
 import hu.bbara.purefin.ui.screen.AppBottomBar
 import hu.bbara.purefin.ui.screen.home.components.HomeContent

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/HomeContent.kt

@@ -21,7 +21,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.core.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MediaUiModel
 import hu.bbara.purefin.feature.browse.home.LibraryItem
 import hu.bbara.purefin.ui.screen.home.components.continuewatching.ContinueWatchingSection
 import hu.bbara.purefin.ui.screen.home.components.featured.SuggestionsSection

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/continuewatching/ContinueWatchingCard.kt

@@ -23,7 +23,7 @@ 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 hu.bbara.purefin.core.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MediaUiModel
 import hu.bbara.purefin.ui.common.bar.MediaProgressBar
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/continuewatching/ContinueWatchingSection.kt

@@ -6,10 +6,12 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.core.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MediaUiModel
 import hu.bbara.purefin.ui.common.header.SectionHeader
 
 @Composable
@@ -20,6 +22,12 @@ fun ContinueWatchingSection(
 ) {
     if (items.isEmpty()) return
 
+    val listState = rememberLazyListState()
+
+    LaunchedEffect(items) {
+        listState.scrollToItem(index = 0)
+    }
+
     Column(
         verticalArrangement = Arrangement.spacedBy(4.dp),
         modifier = modifier
@@ -28,7 +36,8 @@ fun ContinueWatchingSection(
         LazyRow(
             contentPadding = PaddingValues(horizontal = 16.dp),
             horizontalArrangement = Arrangement.spacedBy(16.dp),
-            modifier = Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth(),
+            state = listState
         ) {
             items(items = items, key = { item -> item.id }) { item ->
                 ContinueWatchingCard(

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/featured/SuggestionCard.kt

@@ -24,7 +24,7 @@ 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 hu.bbara.purefin.core.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MediaUiModel
 import hu.bbara.purefin.ui.common.bar.MediaProgressBar
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/featured/SuggestionsSection.kt

@@ -22,7 +22,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.core.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MediaUiModel
 
 @Composable
 fun SuggestionsSection(

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/library/HomeBrowseCard.kt

@@ -23,9 +23,9 @@ 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 hu.bbara.purefin.core.ui.model.EpisodeUiModel
-import hu.bbara.purefin.core.ui.model.MediaUiModel
-import hu.bbara.purefin.core.ui.model.MovieUiModel
+import hu.bbara.purefin.ui.model.EpisodeUiModel
+import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MovieUiModel
 import hu.bbara.purefin.ui.common.badge.WatchStateBadge
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/library/LibraryPosterSection.kt

@@ -6,10 +6,12 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.core.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MediaUiModel
 import hu.bbara.purefin.feature.browse.home.LibraryItem
 import hu.bbara.purefin.ui.common.header.SectionHeader
 
@@ -23,6 +25,12 @@ fun LibraryPosterSection(
 ) {
     if (items.isEmpty()) return
 
+    val listState = rememberLazyListState()
+
+    LaunchedEffect(items) {
+        listState.scrollToItem(index = 0)
+    }
+
     Column(
         verticalArrangement = Arrangement.spacedBy(4.dp),
         modifier = modifier
@@ -35,7 +43,8 @@ fun LibraryPosterSection(
         LazyRow(
             contentPadding = PaddingValues(horizontal = 16.dp),
             horizontalArrangement = Arrangement.spacedBy(14.dp),
-            modifier = Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth(),
+            state = listState
         ) {
             items(items = items, key = { item -> item.id }) { item ->
                 HomeBrowseCard(

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/nextup/NextUpCard.kt

@@ -22,7 +22,7 @@ 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 hu.bbara.purefin.core.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MediaUiModel
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 
 @Composable

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/nextup/NextUpSection.kt

@@ -6,10 +6,12 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.core.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MediaUiModel
 import hu.bbara.purefin.ui.common.header.SectionHeader
 
 @Composable
@@ -20,6 +22,12 @@ fun NextUpSection(
 ) {
     if (items.isEmpty()) return
 
+    val listState = rememberLazyListState()
+
+    LaunchedEffect(items) {
+        listState.scrollToItem(index = 0)
+    }
+
     Column(
         verticalArrangement = Arrangement.spacedBy(4.dp),
         modifier = modifier
@@ -28,7 +36,8 @@ fun NextUpSection(
         LazyRow(
             contentPadding = PaddingValues(horizontal = 16.dp),
             horizontalArrangement = Arrangement.spacedBy(14.dp),
-            modifier = Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth(),
+            state = listState
         ) {
             items(items = items, key = { item -> item.id }) { item ->
                 NextUpCard(

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/HomeSearchOverlay.kt

@@ -37,7 +37,7 @@ import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import hu.bbara.purefin.feature.search.SearchViewModel
 import java.util.UUID
-import hu.bbara.purefin.core.model.MediaKind
+import hu.bbara.purefin.model.MediaKind
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable

app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/HomeSearchResultCard.kt

@@ -17,7 +17,7 @@ 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 hu.bbara.purefin.core.model.MediaKind
+import hu.bbara.purefin.model.MediaKind
 import hu.bbara.purefin.feature.search.SearchResult
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 

app/src/main/java/hu/bbara/purefin/ui/screen/library/LibraryScreen.kt

@@ -21,8 +21,8 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.core.navigation.LibraryDto
-import hu.bbara.purefin.core.ui.model.MediaUiModel
+import hu.bbara.purefin.navigation.LibraryDto
+import hu.bbara.purefin.ui.model.MediaUiModel
 import hu.bbara.purefin.feature.browse.library.LibraryViewModel
 import hu.bbara.purefin.ui.common.button.PurefinIconButton
 import hu.bbara.purefin.ui.common.card.PosterCard

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

@@ -33,16 +33,16 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
 import hu.bbara.purefin.ui.common.media.MediaHero
 import hu.bbara.purefin.ui.common.media.MediaMetadataFlowRow
-import hu.bbara.purefin.core.download.DownloadState
-import hu.bbara.purefin.core.image.ImageUrlBuilder
-import hu.bbara.purefin.core.navigation.MovieDto
-import hu.bbara.purefin.core.model.CastMember
-import hu.bbara.purefin.core.model.Movie
+import hu.bbara.purefin.download.DownloadState
+import hu.bbara.purefin.image.ImageUrlBuilder
+import hu.bbara.purefin.navigation.MovieDto
+import hu.bbara.purefin.model.CastMember
+import hu.bbara.purefin.model.Movie
 import hu.bbara.purefin.feature.content.movie.MovieScreenViewModel
 import hu.bbara.purefin.ui.screen.movie.components.MovieDetails
 import hu.bbara.purefin.ui.screen.movie.components.MovieTopBar
 import hu.bbara.purefin.ui.theme.AppTheme
-import hu.bbara.purefin.core.image.ArtworkKind
+import hu.bbara.purefin.image.ArtworkKind
 import java.util.UUID
 
 @Composable

app/src/main/java/hu/bbara/purefin/ui/screen/movie/components/MovieComponents.kt

@@ -37,8 +37,8 @@ import hu.bbara.purefin.ui.common.button.GhostIconButton
 import hu.bbara.purefin.ui.common.button.MediaActionButton
 import hu.bbara.purefin.ui.common.media.MediaPlaybackSettings
 import hu.bbara.purefin.ui.common.button.MediaResumeButton
-import hu.bbara.purefin.core.download.DownloadState
-import hu.bbara.purefin.core.model.Movie
+import hu.bbara.purefin.download.DownloadState
+import hu.bbara.purefin.model.Movie
 import hu.bbara.purefin.player.PlayerActivity
 
 @Composable

app/src/main/java/hu/bbara/purefin/ui/screen/player/PlayerScreen.kt

@@ -37,7 +37,7 @@ import androidx.compose.ui.viewinterop.AndroidView
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.ui.AspectRatioFrameLayout
 import androidx.media3.ui.PlayerView
-import hu.bbara.purefin.core.player.viewmodel.PlayerViewModel
+import hu.bbara.purefin.player.viewmodel.PlayerViewModel
 import hu.bbara.purefin.ui.common.visual.EmptyValueTimedVisibility
 import hu.bbara.purefin.ui.common.visual.ValueChangeTimedVisibility
 import hu.bbara.purefin.ui.screen.player.components.PersistentOverlayContainer

app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerControlsOverlay.kt

@@ -37,8 +37,8 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.ui.common.button.GhostIconButton
 import hu.bbara.purefin.ui.common.button.PurefinIconButton
-import hu.bbara.purefin.core.player.model.PlayerUiState
-import hu.bbara.purefin.core.player.model.TrackOption
+import hu.bbara.purefin.player.model.PlayerUiState
+import hu.bbara.purefin.player.model.TrackOption
 
 @Composable
 fun PlayerControlsOverlay(

app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerLoadingErrorEndCard.kt

@@ -3,7 +3,7 @@ package hu.bbara.purefin.ui.screen.player.components
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import hu.bbara.purefin.core.player.model.PlayerUiState
+import hu.bbara.purefin.player.model.PlayerUiState
 
 @Composable
 fun PlayerLoadingErrorEndCard(

app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerQueuePanel.kt

@@ -31,7 +31,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.ui.common.image.PurefinAsyncImage
-import hu.bbara.purefin.core.player.model.PlayerUiState
+import hu.bbara.purefin.player.model.PlayerUiState
 
 @Composable
 fun PlayerQueuePanel(

app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerSeekBar.kt

@@ -1,12 +1,10 @@
 package hu.bbara.purefin.ui.screen.player.components
 
-import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Slider
 import androidx.compose.material3.SliderDefaults
 import androidx.compose.runtime.Composable
@@ -19,7 +17,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.core.player.model.TimedMarker
+import hu.bbara.purefin.player.model.TimedMarker
 
 @Composable
 fun PlayerSeekBar(

app/src/main/java/hu/bbara/purefin/ui/screen/player/components/TrackSelectionButtons.kt

@@ -36,7 +36,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.ui.common.button.PurefinIconButton
-import hu.bbara.purefin.core.player.model.TrackOption
+import hu.bbara.purefin.player.model.TrackOption
 
 @Composable
 fun QualitySelectionButton(

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

@@ -33,13 +33,13 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import hu.bbara.purefin.ui.common.media.MediaSynopsis
 import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
 import hu.bbara.purefin.ui.common.media.MediaHero
-import hu.bbara.purefin.core.download.DownloadState
-import hu.bbara.purefin.core.image.ImageUrlBuilder
-import hu.bbara.purefin.core.navigation.SeriesDto
-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.download.DownloadState
+import hu.bbara.purefin.image.ImageUrlBuilder
+import hu.bbara.purefin.navigation.SeriesDto
+import hu.bbara.purefin.model.CastMember
+import hu.bbara.purefin.model.Episode
+import hu.bbara.purefin.model.Season
+import hu.bbara.purefin.model.Series
 import hu.bbara.purefin.feature.content.series.SeriesViewModel
 import hu.bbara.purefin.ui.screen.series.components.CastRow
 import hu.bbara.purefin.ui.screen.series.components.EpisodeCarousel
@@ -49,7 +49,7 @@ import hu.bbara.purefin.ui.screen.series.components.SeriesDownloadOption
 import hu.bbara.purefin.ui.screen.series.components.SeriesMetaChips
 import hu.bbara.purefin.ui.screen.series.components.SeriesTopBar
 import hu.bbara.purefin.ui.theme.AppTheme
-import hu.bbara.purefin.core.image.ArtworkKind
+import hu.bbara.purefin.image.ArtworkKind
 import java.util.UUID
 
 @Composable

app/src/main/java/hu/bbara/purefin/ui/screen/series/components/SeriesComponents.kt

@@ -65,18 +65,18 @@ import hu.bbara.purefin.ui.common.bar.MediaProgressBar
 import hu.bbara.purefin.ui.common.button.MediaResumeButton
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 import hu.bbara.purefin.ui.common.badge.WatchStateBadge
-import hu.bbara.purefin.core.download.DownloadState
-import hu.bbara.purefin.core.image.ImageUrlBuilder
-import hu.bbara.purefin.core.navigation.EpisodeDto
+import hu.bbara.purefin.download.DownloadState
+import hu.bbara.purefin.image.ImageUrlBuilder
+import hu.bbara.purefin.navigation.EpisodeDto
 import hu.bbara.purefin.navigation.LocalNavigationManager
-import hu.bbara.purefin.core.navigation.Route
-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.navigation.Route
+import hu.bbara.purefin.model.CastMember
+import hu.bbara.purefin.model.Episode
+import hu.bbara.purefin.model.Season
+import hu.bbara.purefin.model.Series
 import hu.bbara.purefin.feature.content.series.SeriesViewModel
 import hu.bbara.purefin.player.PlayerActivity
-import hu.bbara.purefin.core.image.ArtworkKind
+import hu.bbara.purefin.image.ArtworkKind
 
 @Composable
 internal fun SeriesTopBar(

core/data/build.gradle.kts

@@ -1,33 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
-}
-
-android {
-    namespace = "hu.bbara.purefin.core.data"
-    compileSdk = 36
-
-    defaultConfig {
-        minSdk = 29
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-}
-
-kotlin {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_11)
-    }
-}
-
-dependencies {
-    implementation(project(":core:model"))
-    implementation(libs.media3.common)
-    implementation(libs.kotlinx.coroutines.core)
-    testImplementation(libs.junit)
-}

core/data/src/main/java/hu/bbara/purefin/core/data/EpisodeSeriesLookup.kt

@@ -1,7 +0,0 @@
-package hu.bbara.purefin.core.data
-
-import java.util.UUID
-
-interface EpisodeSeriesLookup {
-    suspend fun preferenceKeyFor(mediaId: UUID): String
-}

core/download/build.gradle.kts

@@ -1,40 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.hilt)
-    alias(libs.plugins.ksp)
-}
-
-android {
-    namespace = "hu.bbara.purefin.core.download"
-    compileSdk = 36
-
-    defaultConfig {
-        minSdk = 29
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-}
-
-kotlin {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_11)
-    }
-}
-
-dependencies {
-    implementation(project(":core:model"))
-    implementation(project(":core:data"))
-    implementation(libs.kotlinx.coroutines.core)
-    implementation(libs.hilt)
-    ksp(libs.hilt.compiler)
-    implementation(libs.medi3.exoplayer)
-    implementation(libs.media3.datasource.okhttp)
-    implementation(libs.okhttp)
-    testImplementation(libs.junit)
-}

core/image/build.gradle.kts

@@ -1,12 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    alias(libs.plugins.kotlin.jvm)
-}
-
-kotlin {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_11)
-    }
-    jvmToolchain(11)
-}

core/model/build.gradle.kts

@@ -1,16 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    alias(libs.plugins.kotlin.jvm)
-}
-
-kotlin {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_11)
-    }
-    jvmToolchain(11)
-}
-
-dependencies {
-    implementation(project(":core:image"))
-}

core/navigation/build.gradle.kts

@@ -1,38 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kotlin.serialization)
-    alias(libs.plugins.hilt)
-    alias(libs.plugins.ksp)
-}
-
-android {
-    namespace = "hu.bbara.purefin.core.navigation"
-    compileSdk = 36
-
-    defaultConfig {
-        minSdk = 29
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-}
-
-kotlin {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_11)
-    }
-}
-
-dependencies {
-    implementation(libs.androidx.navigation3.runtime)
-    implementation(libs.kotlinx.serialization.json)
-    implementation(libs.kotlinx.coroutines.core)
-    implementation(libs.hilt)
-    ksp(libs.hilt.compiler)
-    testImplementation(libs.junit)
-}

data/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 android {
-    namespace = "hu.bbara.purefin.data.jellyfin"
+    namespace = "hu.bbara.purefin.data"
     compileSdk = 36
 
     defaultConfig {
@@ -29,12 +29,9 @@ kotlin {
 }
 
 dependencies {
-    implementation(project(":core:model"))
-    implementation(project(":core:data"))
-    implementation(project(":core:image"))
-    implementation(project(":core:navigation"))
-    implementation(libs.jellyfin.core)
     implementation(libs.media3.common)
+    implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.jellyfin.core)
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.slf4j.api)
     implementation(libs.hilt)
@@ -42,5 +39,7 @@ dependencies {
     implementation(libs.datastore)
     implementation(libs.okhttp)
     implementation(libs.logging.interceptor)
+    implementation(libs.androidx.room.ktx)
+    ksp(libs.androidx.room.compiler)
     testImplementation(libs.junit)
 }

data/catalog/build.gradle.kts

@@ -1,41 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.hilt)
-    alias(libs.plugins.ksp)
-}
-
-android {
-    namespace = "hu.bbara.purefin.data.catalog"
-    compileSdk = 36
-
-    defaultConfig {
-        minSdk = 29
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-}
-
-kotlin {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_11)
-    }
-}
-
-dependencies {
-    implementation(project(":core:model"))
-    implementation(project(":core:data"))
-    implementation(project(":core:image"))
-    implementation(project(":data:jellyfin"))
-    implementation(project(":data:offline"))
-    implementation(libs.jellyfin.core)
-    implementation(libs.hilt)
-    ksp(libs.hilt.compiler)
-    implementation(libs.datastore)
-    testImplementation(libs.junit)
-}

data/catalog/src/main/java/hu/bbara/purefin/data/catalog/DefaultEpisodeSeriesLookup.kt

@@ -1,16 +0,0 @@
-package hu.bbara.purefin.data.catalog
-
-import hu.bbara.purefin.core.data.EpisodeSeriesLookup
-import hu.bbara.purefin.core.data.MediaCatalogReader
-import java.util.UUID
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class DefaultEpisodeSeriesLookup @Inject constructor(
-    private val mediaCatalogReader: MediaCatalogReader,
-) : EpisodeSeriesLookup {
-    override suspend fun preferenceKeyFor(mediaId: UUID): String {
-        return mediaCatalogReader.episodes.value[mediaId]?.seriesId?.toString() ?: mediaId.toString()
-    }
-}

data/catalog/src/main/java/hu/bbara/purefin/data/catalog/MediaRepositoryModule.kt

@@ -1,31 +0,0 @@
-package hu.bbara.purefin.data.catalog
-
-import dagger.Binds
-import dagger.Module
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import hu.bbara.purefin.core.data.EpisodeSeriesLookup
-import hu.bbara.purefin.core.data.HomeRepository
-import hu.bbara.purefin.core.data.MediaCatalogReader
-import hu.bbara.purefin.core.data.MediaProgressWriter
-import hu.bbara.purefin.core.data.OfflineCatalogReader
-
-@Module
-@InstallIn(SingletonComponent::class)
-abstract class MediaRepositoryModule {
-
-    @Binds
-    abstract fun bindHomeRepository(impl: InMemoryAppContentRepository): HomeRepository
-
-    @Binds
-    abstract fun bindMediaCatalogReader(impl: CompositeMediaRepository): MediaCatalogReader
-
-    @Binds
-    abstract fun bindMediaProgressWriter(impl: CompositeMediaRepository): MediaProgressWriter
-
-    @Binds
-    abstract fun bindOfflineCatalogReader(impl: OfflineMediaRepository): OfflineCatalogReader
-
-    @Binds
-    abstract fun bindEpisodeSeriesLookup(impl: DefaultEpisodeSeriesLookup): EpisodeSeriesLookup
-}

data/jellyfin/src/main/java/hu/bbara/purefin/data/jellyfin/JellyfinBindingsModule.kt

@@ -1,41 +0,0 @@
-package hu.bbara.purefin.data.jellyfin
-
-import dagger.Binds
-import dagger.Module
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import hu.bbara.purefin.core.data.AuthenticationRepository
-import hu.bbara.purefin.core.data.DownloadMediaSourceResolver
-import hu.bbara.purefin.core.data.NetworkMonitor
-import hu.bbara.purefin.core.data.PlayableMediaRepository
-import hu.bbara.purefin.core.data.PlaybackProgressReporter
-import hu.bbara.purefin.core.data.SessionBootstrapper
-import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-abstract class JellyfinBindingsModule {
-
-    @Binds
-    @Singleton
-    abstract fun bindSessionBootstrapper(impl: JellyfinApiClient): SessionBootstrapper
-
-    @Binds
-    @Singleton
-    abstract fun bindAuthenticationRepository(impl: JellyfinApiClient): AuthenticationRepository
-
-    @Binds
-    @Singleton
-    abstract fun bindDownloadMediaSourceResolver(impl: JellyfinApiClient): DownloadMediaSourceResolver
-
-    @Binds
-    abstract fun bindPlayableMediaRepository(impl: DefaultPlayableMediaRepository): PlayableMediaRepository
-
-    @Binds
-    abstract fun bindPlaybackProgressReporter(impl: JellyfinPlaybackProgressReporter): PlaybackProgressReporter
-
-    @Binds
-    @Singleton
-    abstract fun bindNetworkMonitor(impl: ConnectivityNetworkMonitor): NetworkMonitor
-}

data/offline/build.gradle.kts

@@ -1,41 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kotlin.serialization)
-    alias(libs.plugins.hilt)
-    alias(libs.plugins.ksp)
-}
-
-android {
-    namespace = "hu.bbara.purefin.data.offline"
-    compileSdk = 36
-
-    defaultConfig {
-        minSdk = 29
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-}
-
-kotlin {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_11)
-    }
-}
-
-dependencies {
-    implementation(project(":core:model"))
-    implementation(project(":core:data"))
-    implementation(libs.kotlinx.serialization.json)
-    implementation(libs.hilt)
-    ksp(libs.hilt.compiler)
-    implementation(libs.datastore)
-    implementation(libs.androidx.room.ktx)
-    ksp(libs.androidx.room.compiler)
-    testImplementation(libs.junit)
-}

data/src/main/java/hu/bbara/purefin/data/AuthenticationRepository.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.data
+package hu.bbara.purefin.data
 
 interface AuthenticationRepository {
     suspend fun login(url: String, username: String, password: String): Boolean

data/src/main/java/hu/bbara/purefin/data/DownloadMediaSourceResolver.kt

@@ -1,9 +1,9 @@
-package hu.bbara.purefin.core.data
+package hu.bbara.purefin.data
 
-import hu.bbara.purefin.core.model.Episode
-import hu.bbara.purefin.core.model.Movie
-import hu.bbara.purefin.core.model.Season
-import hu.bbara.purefin.core.model.Series
+import hu.bbara.purefin.model.Episode
+import hu.bbara.purefin.model.Movie
+import hu.bbara.purefin.model.Season
+import hu.bbara.purefin.model.Series
 import java.util.UUID
 
 interface DownloadMediaSourceResolver {

data/src/main/java/hu/bbara/purefin/data/HomeRepository.kt

@@ -1,7 +1,7 @@
-package hu.bbara.purefin.core.data
+package hu.bbara.purefin.data
 
-import hu.bbara.purefin.core.model.Library
-import hu.bbara.purefin.core.model.Media
+import hu.bbara.purefin.model.Library
+import hu.bbara.purefin.model.Media
 import kotlinx.coroutines.flow.StateFlow
 import java.util.UUID
 

data/src/main/java/hu/bbara/purefin/data/MediaCatalogReader.kt

@@ -1,12 +1,13 @@
-package hu.bbara.purefin.core.data
+package hu.bbara.purefin.data
 
-import hu.bbara.purefin.core.model.Episode
-import hu.bbara.purefin.core.model.Movie
-import hu.bbara.purefin.core.model.Series
-import java.util.UUID
+import hu.bbara.purefin.model.Episode
+import hu.bbara.purefin.model.Movie
+import hu.bbara.purefin.model.Series
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
+import java.util.UUID
 
+//TODO rename MediaRepository
 interface MediaCatalogReader {
     val movies: StateFlow<Map<UUID, Movie>>
     val series: StateFlow<Map<UUID, Series>>

data/src/main/java/hu/bbara/purefin/data/MediaProgressWriter.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.data
+package hu.bbara.purefin.data
 
 import java.util.UUID
 

data/src/main/java/hu/bbara/purefin/data/NetworkMonitor.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.data
+package hu.bbara.purefin.data
 
 import kotlinx.coroutines.flow.Flow
 

data/src/main/java/hu/bbara/purefin/data/OfflineCatalogReader.kt

@@ -1,8 +1,8 @@
-package hu.bbara.purefin.core.data
+package hu.bbara.purefin.data
 
-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.model.Episode
+import hu.bbara.purefin.model.Movie
+import hu.bbara.purefin.model.Series
 import java.util.UUID
 import kotlinx.coroutines.flow.StateFlow
 

data/src/main/java/hu/bbara/purefin/data/OfflineCatalogStore.kt

@@ -1,9 +1,9 @@
-package hu.bbara.purefin.core.data
+package hu.bbara.purefin.data
 
-import hu.bbara.purefin.core.model.Episode
-import hu.bbara.purefin.core.model.Movie
-import hu.bbara.purefin.core.model.Season
-import hu.bbara.purefin.core.model.Series
+import hu.bbara.purefin.model.Episode
+import hu.bbara.purefin.model.Movie
+import hu.bbara.purefin.model.Season
+import hu.bbara.purefin.model.Series
 import java.util.UUID
 
 interface OfflineCatalogStore {

data/src/main/java/hu/bbara/purefin/data/PlayableMediaRepository.kt

@@ -1,10 +1,12 @@
-package hu.bbara.purefin.core.data
+package hu.bbara.purefin.data
 
 import androidx.media3.common.MediaItem
+import hu.bbara.purefin.model.MediaSegment
 import java.util.UUID
 
 interface PlayableMediaRepository {
     suspend fun getMediaItem(mediaId: UUID): Pair<MediaItem, Long?>?
+    suspend fun getMediaSegments(mediaId: UUID): List<MediaSegment>
     suspend fun getNextUpMediaItems(
         episodeId: UUID,
         existingIds: Set<String>,

data/src/main/java/hu/bbara/purefin/data/PlaybackMethod.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.data
+package hu.bbara.purefin.data
 
 enum class PlaybackMethod {
     DIRECT_PLAY,

data/src/main/java/hu/bbara/purefin/data/PlaybackProfileFamily.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.data
+package hu.bbara.purefin.data
 
 enum class PlaybackProfileFamily {
     MOBILE,

data/src/main/java/hu/bbara/purefin/data/PlaybackProgressReporter.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.data
+package hu.bbara.purefin.data
 
 import java.util.UUID
 

data/src/main/java/hu/bbara/purefin/data/PlaybackReportContext.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.data
+package hu.bbara.purefin.data
 
 data class PlaybackReportContext(
     val playMethod: PlaybackMethod,

data/src/main/java/hu/bbara/purefin/data/SessionBootstrapper.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.data
+package hu.bbara.purefin.data
 
 interface SessionBootstrapper {
     suspend fun initialize()

data/src/main/java/hu/bbara/purefin/data/SmartDownloadStore.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.data
+package hu.bbara.purefin.data
 
 import java.util.UUID
 import kotlinx.coroutines.flow.Flow

data/src/main/java/hu/bbara/purefin/data/catalog/InMemoryAppContentRepository.kt

@@ -2,18 +2,18 @@ package hu.bbara.purefin.data.catalog
 
 import android.util.Log
 import androidx.datastore.core.DataStore
-import hu.bbara.purefin.core.data.HomeRepository
-import hu.bbara.purefin.core.data.NetworkMonitor
-import hu.bbara.purefin.core.data.session.UserSessionRepository
-import hu.bbara.purefin.core.image.ArtworkKind
-import hu.bbara.purefin.core.image.ImageUrlBuilder
-import hu.bbara.purefin.core.model.Episode
-import hu.bbara.purefin.core.model.Library
-import hu.bbara.purefin.core.model.LibraryKind
-import hu.bbara.purefin.core.model.Media
-import hu.bbara.purefin.core.model.Movie
-import hu.bbara.purefin.core.model.Season
-import hu.bbara.purefin.core.model.Series
+import hu.bbara.purefin.data.HomeRepository
+import hu.bbara.purefin.data.NetworkMonitor
+import hu.bbara.purefin.data.session.UserSessionRepository
+import hu.bbara.purefin.image.ArtworkKind
+import hu.bbara.purefin.image.ImageUrlBuilder
+import hu.bbara.purefin.model.Episode
+import hu.bbara.purefin.model.Library
+import hu.bbara.purefin.model.LibraryKind
+import hu.bbara.purefin.model.Media
+import hu.bbara.purefin.model.Movie
+import hu.bbara.purefin.model.Season
+import hu.bbara.purefin.model.Series
 import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient
 import hu.bbara.purefin.data.offline.cache.HomeCache
 import hu.bbara.purefin.data.offline.cache.toCachedEpisode

data/src/main/java/hu/bbara/purefin/data/catalog/InMemoryMediaRepository.kt

@@ -1,14 +1,14 @@
 package hu.bbara.purefin.data.catalog
 
-import hu.bbara.purefin.core.data.MediaCatalogReader
-import hu.bbara.purefin.core.data.MediaProgressWriter
+import hu.bbara.purefin.data.MediaCatalogReader
+import hu.bbara.purefin.data.MediaProgressWriter
 import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient
-import hu.bbara.purefin.core.image.ImageUrlBuilder
-import hu.bbara.purefin.core.data.session.UserSessionRepository
-import hu.bbara.purefin.core.model.Episode
-import hu.bbara.purefin.core.model.Movie
-import hu.bbara.purefin.core.model.Season
-import hu.bbara.purefin.core.model.Series
+import hu.bbara.purefin.image.ImageUrlBuilder
+import hu.bbara.purefin.data.session.UserSessionRepository
+import hu.bbara.purefin.model.Episode
+import hu.bbara.purefin.model.Movie
+import hu.bbara.purefin.model.Season
+import hu.bbara.purefin.model.Series
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import java.util.Locale

data/src/main/java/hu/bbara/purefin/data/catalog/OfflineMediaRepository.kt

@@ -1,12 +1,12 @@
 package hu.bbara.purefin.data.catalog
 
-import hu.bbara.purefin.core.data.MediaCatalogReader
-import hu.bbara.purefin.core.data.MediaProgressWriter
-import hu.bbara.purefin.core.data.OfflineCatalogReader
+import hu.bbara.purefin.data.MediaCatalogReader
+import hu.bbara.purefin.data.MediaProgressWriter
+import hu.bbara.purefin.data.OfflineCatalogReader
 import hu.bbara.purefin.data.offline.room.offline.OfflineRoomMediaLocalDataSource
-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.model.Episode
+import hu.bbara.purefin.model.Movie
+import hu.bbara.purefin.model.Series
 import java.util.UUID
 import javax.inject.Inject
 import javax.inject.Singleton

data/src/main/java/hu/bbara/purefin/data/jellyfin/ConnectivityNetworkMonitor.kt

@@ -6,7 +6,7 @@ import android.net.Network
 import android.net.NetworkCapabilities
 import android.net.NetworkRequest
 import dagger.hilt.android.qualifiers.ApplicationContext
-import hu.bbara.purefin.core.data.NetworkMonitor
+import hu.bbara.purefin.data.NetworkMonitor
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow