refactor: moved packages from data/core into /data in the data module

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.model.CastMember
-import hu.bbara.purefin.core.model.Episode
+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,9 +16,9 @@ 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.model.Episode
-import hu.bbara.purefin.core.model.LibraryKind
+import hu.bbara.purefin.model.LibraryKind
-import hu.bbara.purefin.core.model.Movie
+import hu.bbara.purefin.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

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.model.CastMember
-import hu.bbara.purefin.core.model.Movie
+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/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.model.CastMember
-import hu.bbara.purefin.core.model.Episode
+import hu.bbara.purefin.model.Episode
-import hu.bbara.purefin.core.model.Season
+import hu.bbara.purefin.model.Season
-import hu.bbara.purefin.core.model.Series
+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/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/tv/TvActivity.kt

@@ -36,8 +36,8 @@ 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.SessionBootstrapper
-import hu.bbara.purefin.core.data.session.UserSessionRepository
+import hu.bbara.purefin.data.session.UserSessionRepository
 import hu.bbara.purefin.core.navigation.NavigationCommand
 import hu.bbara.purefin.core.navigation.NavigationManager
 import hu.bbara.purefin.core.navigation.Route

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.image.ImageUrlBuilder
-import hu.bbara.purefin.core.image.ArtworkKind
+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.image.ImageUrlBuilder
 import hu.bbara.purefin.core.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.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/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/movie/TvMovieScreen.kt

@@ -23,7 +23,7 @@ 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.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/series/TvSeriesScreen.kt

@@ -28,8 +28,8 @@ 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.model.Season
-import hu.bbara.purefin.core.model.Series
+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.image.ImageUrlBuilder
-import hu.bbara.purefin.core.model.CastMember
+import hu.bbara.purefin.model.CastMember
-import hu.bbara.purefin.core.model.Episode
+import hu.bbara.purefin.model.Episode
-import hu.bbara.purefin.core.model.Season
+import hu.bbara.purefin.model.Season
-import hu.bbara.purefin.core.model.Series
+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.image.ImageUrlBuilder
-import hu.bbara.purefin.core.model.Episode
+import hu.bbara.purefin.model.Episode
-import hu.bbara.purefin.core.model.MediaKind
+import hu.bbara.purefin.model.MediaKind
-import hu.bbara.purefin.core.model.Movie
+import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.core.model.Series
+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.model.Episode
-import hu.bbara.purefin.core.model.LibraryKind
+import hu.bbara.purefin.model.LibraryKind
-import hu.bbara.purefin.core.model.MediaKind
+import hu.bbara.purefin.model.MediaKind
-import hu.bbara.purefin.core.model.Movie
+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/src/main/java/hu/bbara/purefin/PurefinActivity.kt

@@ -36,9 +36,9 @@ 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.SessionBootstrapper
 import hu.bbara.purefin.data.jellyfin.client.JellyfinAuthInterceptor
-import hu.bbara.purefin.core.data.session.UserSessionRepository
+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

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/ui/screen/episode/EpisodeScreen.kt

@@ -35,18 +35,18 @@ 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.image.ImageUrlBuilder
 import hu.bbara.purefin.core.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.model.CastMember
-import hu.bbara.purefin.core.model.Episode
+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

@@ -43,7 +43,7 @@ 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.model.Episode
 import hu.bbara.purefin.player.PlayerActivity
 
 internal sealed interface EpisodeTopBarShortcut {

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/movie/MovieScreen.kt

@@ -34,15 +34,15 @@ 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.image.ImageUrlBuilder
 import hu.bbara.purefin.core.navigation.MovieDto
-import hu.bbara.purefin.core.model.CastMember
+import hu.bbara.purefin.model.CastMember
-import hu.bbara.purefin.core.model.Movie
+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

@@ -38,7 +38,7 @@ 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.model.Movie
 import hu.bbara.purefin.player.PlayerActivity
 
 @Composable

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

@@ -34,12 +34,12 @@ 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.image.ImageUrlBuilder
 import hu.bbara.purefin.core.navigation.SeriesDto
-import hu.bbara.purefin.core.model.CastMember
+import hu.bbara.purefin.model.CastMember
-import hu.bbara.purefin.core.model.Episode
+import hu.bbara.purefin.model.Episode
-import hu.bbara.purefin.core.model.Season
+import hu.bbara.purefin.model.Season
-import hu.bbara.purefin.core.model.Series
+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

@@ -66,17 +66,17 @@ 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.image.ImageUrlBuilder
 import hu.bbara.purefin.core.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.model.CastMember
-import hu.bbara.purefin.core.model.Episode
+import hu.bbara.purefin.model.Episode
-import hu.bbara.purefin.core.model.Season
+import hu.bbara.purefin.model.Season
-import hu.bbara.purefin.core.model.Series
+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(

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.model.Episode
-import hu.bbara.purefin.core.model.Movie
+import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.core.model.Season
+import hu.bbara.purefin.model.Season
-import hu.bbara.purefin.core.model.Series
+import hu.bbara.purefin.model.Series
 import java.util.UUID
 
 interface DownloadMediaSourceResolver {

data/src/main/java/hu/bbara/purefin/data/EpisodeSeriesLookup.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/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.model.Library
-import hu.bbara.purefin.core.model.Media
+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,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.model.Episode
-import hu.bbara.purefin.core.model.Movie
+import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.core.model.Series
+import hu.bbara.purefin.model.Series
 import java.util.UUID
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow

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.model.Episode
-import hu.bbara.purefin.core.model.Movie
+import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.core.model.Series
+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.model.Episode
-import hu.bbara.purefin.core.model.Movie
+import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.core.model.Season
+import hu.bbara.purefin.model.Season
-import hu.bbara.purefin.core.model.Series
+import hu.bbara.purefin.model.Series
 import java.util.UUID
 
 interface OfflineCatalogStore {

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

@@ -1,7 +1,7 @@
-package hu.bbara.purefin.core.data
+package hu.bbara.purefin.data
 
 import androidx.media3.common.MediaItem
-import hu.bbara.purefin.core.model.MediaSegment
+import hu.bbara.purefin.model.MediaSegment
 import java.util.UUID
 
 interface PlayableMediaRepository {

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/CompositeMediaRepository.kt

@@ -1,14 +1,11 @@
 package hu.bbara.purefin.data.catalog
 
-import hu.bbara.purefin.core.data.MediaCatalogReader
+import hu.bbara.purefin.data.MediaCatalogReader
-import hu.bbara.purefin.core.data.MediaProgressWriter
+import hu.bbara.purefin.data.MediaProgressWriter
-import hu.bbara.purefin.core.data.NetworkMonitor
+import hu.bbara.purefin.data.NetworkMonitor
-import hu.bbara.purefin.core.model.Episode
+import hu.bbara.purefin.model.Episode
-import hu.bbara.purefin.core.model.Movie
+import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.core.model.Series
+import hu.bbara.purefin.model.Series
-import java.util.UUID
-import javax.inject.Inject
-import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -20,6 +17,9 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.stateIn
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Singleton
 
 @OptIn(ExperimentalCoroutinesApi::class)
 @Singleton

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

@@ -1,7 +1,7 @@
 package hu.bbara.purefin.data.catalog
 
-import hu.bbara.purefin.core.data.EpisodeSeriesLookup
+import hu.bbara.purefin.data.EpisodeSeriesLookup
-import hu.bbara.purefin.core.data.MediaCatalogReader
+import hu.bbara.purefin.data.MediaCatalogReader
 import java.util.UUID
 import javax.inject.Inject
 import javax.inject.Singleton

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.data.HomeRepository
-import hu.bbara.purefin.core.data.NetworkMonitor
+import hu.bbara.purefin.data.NetworkMonitor
-import hu.bbara.purefin.core.data.session.UserSessionRepository
+import hu.bbara.purefin.data.session.UserSessionRepository
-import hu.bbara.purefin.core.image.ArtworkKind
+import hu.bbara.purefin.image.ArtworkKind
-import hu.bbara.purefin.core.image.ImageUrlBuilder
+import hu.bbara.purefin.image.ImageUrlBuilder
-import hu.bbara.purefin.core.model.Episode
+import hu.bbara.purefin.model.Episode
-import hu.bbara.purefin.core.model.Library
+import hu.bbara.purefin.model.Library
-import hu.bbara.purefin.core.model.LibraryKind
+import hu.bbara.purefin.model.LibraryKind
-import hu.bbara.purefin.core.model.Media
+import hu.bbara.purefin.model.Media
-import hu.bbara.purefin.core.model.Movie
+import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.core.model.Season
+import hu.bbara.purefin.model.Season
-import hu.bbara.purefin.core.model.Series
+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.data.MediaCatalogReader
-import hu.bbara.purefin.core.data.MediaProgressWriter
+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.image.ImageUrlBuilder
-import hu.bbara.purefin.core.data.session.UserSessionRepository
+import hu.bbara.purefin.data.session.UserSessionRepository
-import hu.bbara.purefin.core.model.Episode
+import hu.bbara.purefin.model.Episode
-import hu.bbara.purefin.core.model.Movie
+import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.core.model.Season
+import hu.bbara.purefin.model.Season
-import hu.bbara.purefin.core.model.Series
+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/MediaRepositoryModule.kt

@@ -4,11 +4,11 @@ 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.data.EpisodeSeriesLookup
-import hu.bbara.purefin.core.data.HomeRepository
+import hu.bbara.purefin.data.HomeRepository
-import hu.bbara.purefin.core.data.MediaCatalogReader
+import hu.bbara.purefin.data.MediaCatalogReader
-import hu.bbara.purefin.core.data.MediaProgressWriter
+import hu.bbara.purefin.data.MediaProgressWriter
-import hu.bbara.purefin.core.data.OfflineCatalogReader
+import hu.bbara.purefin.data.OfflineCatalogReader
 
 @Module
 @InstallIn(SingletonComponent::class)

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.data.MediaCatalogReader
-import hu.bbara.purefin.core.data.MediaProgressWriter
+import hu.bbara.purefin.data.MediaProgressWriter
-import hu.bbara.purefin.core.data.OfflineCatalogReader
+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.model.Episode
-import hu.bbara.purefin.core.model.Movie
+import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.core.model.Series
+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

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

@@ -6,13 +6,13 @@ import androidx.core.net.toUri
 import androidx.media3.common.MediaItem
 import androidx.media3.common.MediaMetadata
 import androidx.media3.common.util.UnstableApi
-import hu.bbara.purefin.core.data.PlayableMediaRepository
+import hu.bbara.purefin.data.PlayableMediaRepository
-import hu.bbara.purefin.core.data.PlaybackReportContext
+import hu.bbara.purefin.data.PlaybackReportContext
-import hu.bbara.purefin.core.data.session.UserSessionRepository
+import hu.bbara.purefin.data.session.UserSessionRepository
-import hu.bbara.purefin.core.image.ArtworkKind
+import hu.bbara.purefin.image.ArtworkKind
-import hu.bbara.purefin.core.image.ImageUrlBuilder
+import hu.bbara.purefin.image.ImageUrlBuilder
-import hu.bbara.purefin.core.model.MediaSegment
+import hu.bbara.purefin.model.MediaSegment
-import hu.bbara.purefin.core.model.SegmentType
+import hu.bbara.purefin.model.SegmentType
 import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient
 import hu.bbara.purefin.data.jellyfin.playback.JellyfinPlaybackResolver
 import hu.bbara.purefin.data.jellyfin.playback.PlaybackDecision

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

@@ -4,12 +4,12 @@ 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.data.AuthenticationRepository
-import hu.bbara.purefin.core.data.DownloadMediaSourceResolver
+import hu.bbara.purefin.data.DownloadMediaSourceResolver
-import hu.bbara.purefin.core.data.NetworkMonitor
+import hu.bbara.purefin.data.NetworkMonitor
-import hu.bbara.purefin.core.data.PlayableMediaRepository
+import hu.bbara.purefin.data.PlayableMediaRepository
-import hu.bbara.purefin.core.data.PlaybackProgressReporter
+import hu.bbara.purefin.data.PlaybackProgressReporter
-import hu.bbara.purefin.core.data.SessionBootstrapper
+import hu.bbara.purefin.data.SessionBootstrapper
 import hu.bbara.purefin.data.jellyfin.download.JellyfinDownloadMediaSourceResolver
 import hu.bbara.purefin.data.jellyfin.session.JellyfinAuthenticationRepository
 import hu.bbara.purefin.data.jellyfin.session.JellyfinSessionBootstrapper

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

@@ -1,8 +1,8 @@
 package hu.bbara.purefin.data.jellyfin
 
-import hu.bbara.purefin.core.data.PlaybackProgressReporter
+import hu.bbara.purefin.data.PlaybackProgressReporter
 import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient
-import hu.bbara.purefin.core.data.PlaybackReportContext
+import hu.bbara.purefin.data.PlaybackReportContext
 import java.util.UUID
 import javax.inject.Inject
 import javax.inject.Singleton

data/src/main/java/hu/bbara/purefin/data/jellyfin/client/JellyfinApiClient.kt

@@ -3,9 +3,9 @@ package hu.bbara.purefin.data.jellyfin.client
 import android.content.Context
 import android.util.Log
 import dagger.hilt.android.qualifiers.ApplicationContext
-import hu.bbara.purefin.core.data.PlaybackMethod
+import hu.bbara.purefin.data.PlaybackMethod
-import hu.bbara.purefin.core.data.PlaybackReportContext
+import hu.bbara.purefin.data.PlaybackReportContext
-import hu.bbara.purefin.core.data.session.UserSessionRepository
+import hu.bbara.purefin.data.session.UserSessionRepository
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withContext

data/src/main/java/hu/bbara/purefin/data/jellyfin/client/JellyfinAuthInterceptor.kt

@@ -1,6 +1,6 @@
 package hu.bbara.purefin.data.jellyfin.client
 
-import hu.bbara.purefin.core.data.session.UserSessionRepository
+import hu.bbara.purefin.data.session.UserSessionRepository
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob

data/src/main/java/hu/bbara/purefin/data/jellyfin/download/JellyfinDownloadMappers.kt

@@ -1,10 +1,10 @@
 package hu.bbara.purefin.data.jellyfin.download
 
-import hu.bbara.purefin.core.image.ImageUrlBuilder
+import hu.bbara.purefin.image.ImageUrlBuilder
-import hu.bbara.purefin.core.model.Episode
+import hu.bbara.purefin.model.Episode
-import hu.bbara.purefin.core.model.Movie
+import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.core.model.Season
+import hu.bbara.purefin.model.Season
-import hu.bbara.purefin.core.model.Series
+import hu.bbara.purefin.model.Series
 import java.util.UUID
 import java.util.concurrent.TimeUnit
 import org.jellyfin.sdk.model.api.BaseItemDto

data/src/main/java/hu/bbara/purefin/data/jellyfin/download/JellyfinDownloadMediaSourceResolver.kt

@@ -1,10 +1,10 @@
 package hu.bbara.purefin.data.jellyfin.download
 
-import hu.bbara.purefin.core.data.DownloadMediaSourceResolver
+import hu.bbara.purefin.data.DownloadMediaSourceResolver
-import hu.bbara.purefin.core.data.EpisodeDownloadSource
+import hu.bbara.purefin.data.EpisodeDownloadSource
-import hu.bbara.purefin.core.data.MovieDownloadSource
+import hu.bbara.purefin.data.MovieDownloadSource
-import hu.bbara.purefin.core.data.PlaybackMethod
+import hu.bbara.purefin.data.PlaybackMethod
-import hu.bbara.purefin.core.data.session.UserSessionRepository
+import hu.bbara.purefin.data.session.UserSessionRepository
 import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient
 import hu.bbara.purefin.data.jellyfin.playback.PlaybackDecisionResolver
 import hu.bbara.purefin.data.jellyfin.playback.playbackCustomCacheKey

data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/JellyfinPlaybackResolver.kt

@@ -1,7 +1,7 @@
 package hu.bbara.purefin.data.jellyfin.playback
 
 import android.util.Log
-import hu.bbara.purefin.core.data.session.UserSessionRepository
+import hu.bbara.purefin.data.session.UserSessionRepository
 import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap

data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackCacheKeys.kt

@@ -1,6 +1,6 @@
 package hu.bbara.purefin.data.jellyfin.playback
 
-import hu.bbara.purefin.core.data.PlaybackMethod
+import hu.bbara.purefin.data.PlaybackMethod
 
 fun playbackCustomCacheKey(
     mediaId: String,

data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackDecision.kt

@@ -1,6 +1,6 @@
 package hu.bbara.purefin.data.jellyfin.playback
 
-import hu.bbara.purefin.core.data.PlaybackReportContext
+import hu.bbara.purefin.data.PlaybackReportContext
 import org.jellyfin.sdk.model.api.MediaSourceInfo
 
 data class PlaybackDecision(

data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackDecisionResolver.kt

@@ -1,10 +1,9 @@
 package hu.bbara.purefin.data.jellyfin.playback
 
-import hu.bbara.purefin.core.data.PlaybackMethod
+import hu.bbara.purefin.data.PlaybackMethod
-import hu.bbara.purefin.core.data.PlaybackReportContext
+import hu.bbara.purefin.data.PlaybackReportContext
 import org.jellyfin.sdk.model.api.MediaProtocol
 import org.jellyfin.sdk.model.api.MediaSourceInfo
-import org.jellyfin.sdk.model.api.PlayMethod
 
 internal object PlaybackDecisionResolver {
     fun resolve(

data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackProfileModule.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
 import javax.inject.Singleton
 
 @Module

data/src/main/java/hu/bbara/purefin/data/jellyfin/session/JellyfinAuthenticationRepository.kt

@@ -1,8 +1,8 @@
 package hu.bbara.purefin.data.jellyfin.session
 
 import android.util.Log
-import hu.bbara.purefin.core.data.AuthenticationRepository
+import hu.bbara.purefin.data.AuthenticationRepository
-import hu.bbara.purefin.core.data.session.UserSessionRepository
+import hu.bbara.purefin.data.session.UserSessionRepository
 import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient
 import javax.inject.Inject
 import javax.inject.Singleton

data/src/main/java/hu/bbara/purefin/data/jellyfin/session/JellyfinSessionBootstrapper.kt

@@ -1,6 +1,6 @@
 package hu.bbara.purefin.data.jellyfin.session
 
-import hu.bbara.purefin.core.data.SessionBootstrapper
+import hu.bbara.purefin.data.SessionBootstrapper
 import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient
 import javax.inject.Inject
 import javax.inject.Singleton

data/src/main/java/hu/bbara/purefin/data/jellyfin/session/UserSession.kt

@@ -1,7 +1,7 @@
 package hu.bbara.purefin.data.jellyfin.session
 
 import kotlinx.serialization.Serializable
-import hu.bbara.purefin.core.navigation.UuidSerializer
+import hu.bbara.purefin.navigation.UuidSerializer
 import java.util.UUID
 
 @Serializable

data/src/main/java/hu/bbara/purefin/data/jellyfin/session/UserSessionModule.kt

@@ -10,7 +10,7 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import hu.bbara.purefin.core.data.session.UserSessionRepository
+import hu.bbara.purefin.data.session.UserSessionRepository
 import javax.inject.Singleton
 
 @Module

data/src/main/java/hu/bbara/purefin/data/jellyfin/session/UserSessionRepository.kt

@@ -1,7 +1,7 @@
 package hu.bbara.purefin.data.jellyfin.session
 
 import androidx.datastore.core.DataStore
-import hu.bbara.purefin.core.data.session.UserSessionRepository
+import hu.bbara.purefin.data.session.UserSessionRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.first

data/src/main/java/hu/bbara/purefin/data/offline/OfflineBindingsModule.kt

@@ -4,8 +4,8 @@ import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import hu.bbara.purefin.core.data.OfflineCatalogStore
+import hu.bbara.purefin.data.OfflineCatalogStore
-import hu.bbara.purefin.core.data.SmartDownloadStore
+import hu.bbara.purefin.data.SmartDownloadStore
 
 @Module
 @InstallIn(SingletonComponent::class)

data/src/main/java/hu/bbara/purefin/data/offline/RoomOfflineCatalogStore.kt

@@ -1,11 +1,11 @@
 package hu.bbara.purefin.data.offline
 
-import hu.bbara.purefin.core.data.OfflineCatalogStore
+import hu.bbara.purefin.data.OfflineCatalogStore
 import hu.bbara.purefin.data.offline.room.offline.OfflineRoomMediaLocalDataSource
-import hu.bbara.purefin.core.model.Episode
+import hu.bbara.purefin.model.Episode
-import hu.bbara.purefin.core.model.Movie
+import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.core.model.Season
+import hu.bbara.purefin.model.Season
-import hu.bbara.purefin.core.model.Series
+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/offline/RoomSmartDownloadStore.kt

@@ -1,6 +1,6 @@
 package hu.bbara.purefin.data.offline
 
-import hu.bbara.purefin.core.data.SmartDownloadStore
+import hu.bbara.purefin.data.SmartDownloadStore
 import hu.bbara.purefin.data.offline.room.dao.SmartDownloadDao
 import hu.bbara.purefin.data.offline.room.entity.SmartDownloadEntity
 import java.util.UUID

data/src/main/java/hu/bbara/purefin/data/offline/cache/HomeCache.kt

@@ -1,12 +1,12 @@
 package hu.bbara.purefin.data.offline.cache
 
-import hu.bbara.purefin.core.model.CastMember
+import hu.bbara.purefin.model.CastMember
-import hu.bbara.purefin.core.model.Episode
+import hu.bbara.purefin.model.Episode
-import hu.bbara.purefin.core.model.Library
+import hu.bbara.purefin.model.Library
-import hu.bbara.purefin.core.model.LibraryKind
+import hu.bbara.purefin.model.LibraryKind
-import hu.bbara.purefin.core.model.Media
+import hu.bbara.purefin.model.Media
-import hu.bbara.purefin.core.model.Movie
+import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.core.model.Series
+import hu.bbara.purefin.model.Series
 import kotlinx.serialization.Serializable
 import java.util.UUID
 

data/src/main/java/hu/bbara/purefin/data/offline/room/offline/OfflineRoomMediaLocalDataSource.kt

@@ -9,10 +9,10 @@ import hu.bbara.purefin.data.offline.room.entity.EpisodeEntity
 import hu.bbara.purefin.data.offline.room.entity.MovieEntity
 import hu.bbara.purefin.data.offline.room.entity.SeasonEntity
 import hu.bbara.purefin.data.offline.room.entity.SeriesEntity
-import hu.bbara.purefin.core.model.Episode
+import hu.bbara.purefin.model.Episode
-import hu.bbara.purefin.core.model.Movie
+import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.core.model.Season
+import hu.bbara.purefin.model.Season
-import hu.bbara.purefin.core.model.Series
+import hu.bbara.purefin.model.Series
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import java.util.UUID

data/src/main/java/hu/bbara/purefin/data/session/UserSessionRepository.kt

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

data/src/main/java/hu/bbara/purefin/image/ArtworkKind.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.image
+package hu.bbara.purefin.image
 
 enum class ArtworkKind(
     internal val pathSegment: String,

data/src/main/java/hu/bbara/purefin/image/ImageUrlBuilder.kt

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

data/src/main/java/hu/bbara/purefin/model/CastMember.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.model
+package hu.bbara.purefin.model
 
 data class CastMember(
     val name: String,

data/src/main/java/hu/bbara/purefin/model/Episode.kt

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

data/src/main/java/hu/bbara/purefin/model/Library.kt

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

data/src/main/java/hu/bbara/purefin/model/LibraryKind.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.model
+package hu.bbara.purefin.model
 
 enum class LibraryKind {
     MOVIES,

data/src/main/java/hu/bbara/purefin/model/Media.kt

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

data/src/main/java/hu/bbara/purefin/model/MediaKind.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.model
+package hu.bbara.purefin.model
 
 enum class MediaKind {
     MOVIE,

data/src/main/java/hu/bbara/purefin/model/MediaSegment.kt

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

data/src/main/java/hu/bbara/purefin/model/Movie.kt

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

data/src/main/java/hu/bbara/purefin/model/Season.kt

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

data/src/main/java/hu/bbara/purefin/model/Series.kt

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

data/src/main/java/hu/bbara/purefin/navigation/UuidSerializer.kt

@@ -1,12 +1,12 @@
-package hu.bbara.purefin.core.navigation
+package hu.bbara.purefin.navigation
 
-import java.util.UUID
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.descriptors.PrimitiveKind
 import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
+import java.util.UUID
 
 object UuidSerializer : KSerializer<UUID> {
     override val descriptor: SerialDescriptor =
@@ -17,4 +17,4 @@ object UuidSerializer : KSerializer<UUID> {
     override fun serialize(encoder: Encoder, value: UUID) {
         encoder.encodeString(value.toString())
     }
-}
+}

data/src/test/java/hu/bbara/purefin/data/catalog/DefaultEpisodeSeriesLookupTest.kt

@@ -1,9 +1,9 @@
 package hu.bbara.purefin.data.catalog
 
-import hu.bbara.purefin.core.data.MediaCatalogReader
+import hu.bbara.purefin.data.MediaCatalogReader
-import hu.bbara.purefin.core.model.Episode
+import hu.bbara.purefin.model.Episode
-import hu.bbara.purefin.core.model.Movie
+import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.core.model.Series
+import hu.bbara.purefin.model.Series
 import java.util.UUID
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow

data/src/test/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackCacheKeysTest.kt

@@ -1,6 +1,6 @@
 package hu.bbara.purefin.data.jellyfin.playback
 
-import hu.bbara.purefin.core.data.PlaybackMethod
+import hu.bbara.purefin.data.PlaybackMethod
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Test

data/src/test/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackDecisionResolverTest.kt

@@ -1,6 +1,6 @@
 package hu.bbara.purefin.data.jellyfin.playback
 
-import hu.bbara.purefin.core.data.PlaybackMethod
+import hu.bbara.purefin.data.PlaybackMethod
 import org.jellyfin.sdk.model.api.MediaProtocol
 import org.jellyfin.sdk.model.api.MediaSourceInfo
 import org.jellyfin.sdk.model.api.MediaSourceType

domain/src/main/java/hu/bbara/purefin/core/download/MediaDownloadManager.kt

@@ -9,9 +9,9 @@ import androidx.media3.exoplayer.offline.Download
 import androidx.media3.exoplayer.offline.DownloadManager
 import androidx.media3.exoplayer.offline.DownloadRequest
 import dagger.hilt.android.qualifiers.ApplicationContext
-import hu.bbara.purefin.core.data.DownloadMediaSourceResolver
+import hu.bbara.purefin.data.DownloadMediaSourceResolver
-import hu.bbara.purefin.core.data.OfflineCatalogStore
+import hu.bbara.purefin.data.OfflineCatalogStore
-import hu.bbara.purefin.core.data.SmartDownloadStore
+import hu.bbara.purefin.data.SmartDownloadStore
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
@@ -19,7 +19,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.launch

domain/src/main/java/hu/bbara/purefin/core/navigation/EpisodeDto.kt

@@ -2,7 +2,7 @@ package hu.bbara.purefin.core.navigation
 
 import java.util.UUID
 import kotlinx.serialization.Serializable
-import hu.bbara.purefin.core.navigation.UuidSerializer
+import hu.bbara.purefin.navigation.UuidSerializer
 
 @Serializable
 data class EpisodeDto(

domain/src/main/java/hu/bbara/purefin/core/navigation/LibraryDto.kt

@@ -2,7 +2,7 @@ package hu.bbara.purefin.core.navigation
 
 import java.util.UUID
 import kotlinx.serialization.Serializable
-import hu.bbara.purefin.core.navigation.UuidSerializer
+import hu.bbara.purefin.navigation.UuidSerializer
 
 @Serializable
 data class LibraryDto(

domain/src/main/java/hu/bbara/purefin/core/navigation/MovieDto.kt

@@ -2,7 +2,7 @@ package hu.bbara.purefin.core.navigation
 
 import java.util.UUID
 import kotlinx.serialization.Serializable
-import hu.bbara.purefin.core.navigation.UuidSerializer
+import hu.bbara.purefin.navigation.UuidSerializer
 
 @Serializable
 data class MovieDto(

domain/src/main/java/hu/bbara/purefin/core/navigation/SeriesDto.kt

@@ -2,7 +2,7 @@ package hu.bbara.purefin.core.navigation
 
 import java.util.UUID
 import kotlinx.serialization.Serializable
-import hu.bbara.purefin.core.navigation.UuidSerializer
+import hu.bbara.purefin.navigation.UuidSerializer
 
 @Serializable
 data class SeriesDto(

domain/src/main/java/hu/bbara/purefin/core/player/manager/MediaSegmentManager.kt

@@ -6,8 +6,8 @@ import androidx.annotation.OptIn
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.exoplayer.PlayerMessage
-import hu.bbara.purefin.core.model.MediaSegment
+import hu.bbara.purefin.model.MediaSegment
-import hu.bbara.purefin.core.model.SegmentType
+import hu.bbara.purefin.model.SegmentType
 import hu.bbara.purefin.core.player.model.SegmentStatus
 
 @OptIn(UnstableApi::class)

domain/src/main/java/hu/bbara/purefin/core/player/manager/PlayerManager.kt

@@ -9,8 +9,8 @@ import androidx.media3.common.TrackSelectionOverride
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.ExoPlayer
 import dagger.hilt.android.scopes.ViewModelScoped
-import hu.bbara.purefin.core.data.PlaybackReportContext
+import hu.bbara.purefin.data.PlaybackReportContext
-import hu.bbara.purefin.core.model.MediaSegment
+import hu.bbara.purefin.model.MediaSegment
 import hu.bbara.purefin.core.player.model.MediaContext
 import hu.bbara.purefin.core.player.model.MetadataState
 import hu.bbara.purefin.core.player.model.PlaybackProgressSnapshot

domain/src/main/java/hu/bbara/purefin/core/player/manager/ProgressManager.kt

@@ -2,9 +2,9 @@ package hu.bbara.purefin.core.player.manager
 
 import android.util.Log
 import dagger.hilt.android.scopes.ViewModelScoped
-import hu.bbara.purefin.core.data.MediaProgressWriter
+import hu.bbara.purefin.data.MediaProgressWriter
-import hu.bbara.purefin.core.data.PlaybackProgressReporter
+import hu.bbara.purefin.data.PlaybackProgressReporter
-import hu.bbara.purefin.core.data.PlaybackReportContext
+import hu.bbara.purefin.data.PlaybackReportContext
 import hu.bbara.purefin.core.player.model.MetadataState
 import hu.bbara.purefin.core.player.model.PlaybackProgressSnapshot
 import hu.bbara.purefin.core.player.model.PlaybackStateSnapshot

domain/src/main/java/hu/bbara/purefin/core/player/model/MediaContext.kt

@@ -1,6 +1,6 @@
 package hu.bbara.purefin.core.player.model
 
-import hu.bbara.purefin.core.model.MediaSegment
+import hu.bbara.purefin.model.MediaSegment
 import hu.bbara.purefin.core.player.preference.MediaTrackPreferences
 
 data class MediaContext(

domain/src/main/java/hu/bbara/purefin/core/player/model/MetadataState.kt

@@ -1,6 +1,6 @@
 package hu.bbara.purefin.core.player.model
 
-import hu.bbara.purefin.core.data.PlaybackReportContext
+import hu.bbara.purefin.data.PlaybackReportContext
 
 data class MetadataState(
     val mediaId: String? = null,