refactor: reorganize package structure and remove unused files (remove old core parent package) in domain module

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

@@ -19,9 +19,9 @@ import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.model.LibraryKind
 import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.core.ui.model.EpisodeUiModel
+import hu.bbara.purefin.ui.model.EpisodeUiModel
-import hu.bbara.purefin.core.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MediaUiModel
-import hu.bbara.purefin.core.ui.model.MovieUiModel
+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/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.player.model.PlayerUiState
-import hu.bbara.purefin.core.player.model.QueueItemUi
+import hu.bbara.purefin.player.model.QueueItemUi
-import hu.bbara.purefin.core.player.model.TrackOption
+import hu.bbara.purefin.player.model.TrackOption
-import hu.bbara.purefin.core.player.model.TrackType
+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/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/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

@@ -38,9 +38,9 @@ import coil3.util.DebugLogger
 import dagger.hilt.android.AndroidEntryPoint
 import hu.bbara.purefin.data.SessionBootstrapper
 import hu.bbara.purefin.data.session.UserSessionRepository
-import hu.bbara.purefin.core.navigation.NavigationCommand
+import hu.bbara.purefin.navigation.NavigationCommand
-import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.navigation.NavigationManager
-import hu.bbara.purefin.core.navigation.Route
+import hu.bbara.purefin.navigation.Route
 import hu.bbara.purefin.data.jellyfin.client.JellyfinAuthInterceptor
 import hu.bbara.purefin.navigation.LocalNavigationBackStack
 import hu.bbara.purefin.navigation.LocalNavigationManager

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.ui.model.EpisodeUiModel
-import hu.bbara.purefin.core.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MediaUiModel
-import hu.bbara.purefin.core.ui.model.MovieUiModel
+import hu.bbara.purefin.ui.model.MovieUiModel
-import hu.bbara.purefin.core.ui.model.SeriesUiModel
+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/screen/episode/TvEpisodeScreen.kt

@@ -22,9 +22,9 @@ 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.image.ImageUrlBuilder
-import hu.bbara.purefin.core.navigation.EpisodeDto
+import hu.bbara.purefin.navigation.EpisodeDto
 import hu.bbara.purefin.navigation.LocalNavigationManager
-import hu.bbara.purefin.core.navigation.Route
+import hu.bbara.purefin.navigation.Route
 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.feature.content.episode.EpisodeScreenViewModel
 import hu.bbara.purefin.image.ArtworkKind

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.ui.model.MediaUiModel
-import hu.bbara.purefin.core.ui.model.MovieUiModel
+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/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.navigation.LibraryDto
-import hu.bbara.purefin.core.ui.model.MediaUiModel
+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,7 +22,7 @@ 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.navigation.MovieDto
 import hu.bbara.purefin.model.Movie
 import hu.bbara.purefin.feature.content.movie.MovieScreenViewModel
 

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.player.viewmodel.ControlsAutoHideBlocker
-import hu.bbara.purefin.core.player.viewmodel.PlayerViewModel
+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.player.model.PlayerUiState
-import hu.bbara.purefin.core.player.model.QueueItemUi
+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.player.model.PlayerUiState
-import hu.bbara.purefin.core.player.model.TrackOption
+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,7 +27,7 @@ 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.navigation.SeriesDto
 import hu.bbara.purefin.model.Season
 import hu.bbara.purefin.model.Series
 import hu.bbara.purefin.feature.content.series.SeriesViewModel

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

@@ -41,9 +41,9 @@ import hu.bbara.purefin.data.jellyfin.client.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.navigation.NavigationCommand
-import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.navigation.NavigationManager
-import hu.bbara.purefin.core.navigation.Route
+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/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.ui.model.EpisodeUiModel
-import hu.bbara.purefin.core.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MediaUiModel
-import hu.bbara.purefin.core.ui.model.MovieUiModel
+import hu.bbara.purefin.ui.model.MovieUiModel
-import hu.bbara.purefin.core.ui.model.SeriesUiModel
+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,11 +34,11 @@ 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.download.DownloadState
 import hu.bbara.purefin.image.ImageUrlBuilder
-import hu.bbara.purefin.core.navigation.EpisodeDto
+import hu.bbara.purefin.navigation.EpisodeDto
 import hu.bbara.purefin.navigation.LocalNavigationBackStack
-import hu.bbara.purefin.core.navigation.Route
+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

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

@@ -42,7 +42,7 @@ 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.download.DownloadState
 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.player.PlayerActivity
 

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

@@ -11,7 +11,7 @@ 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

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.ui.model.EpisodeUiModel
-import hu.bbara.purefin.core.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MediaUiModel
-import hu.bbara.purefin.core.ui.model.MovieUiModel
+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

@@ -11,7 +11,7 @@ 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
 

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

@@ -11,7 +11,7 @@ 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

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.navigation.LibraryDto
-import hu.bbara.purefin.core.ui.model.MediaUiModel
+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,9 +33,9 @@ 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.download.DownloadState
 import hu.bbara.purefin.image.ImageUrlBuilder
-import hu.bbara.purefin.core.navigation.MovieDto
+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

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

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

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.player.model.PlayerUiState
-import hu.bbara.purefin.core.player.model.TrackOption
+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,9 +33,9 @@ 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.download.DownloadState
 import hu.bbara.purefin.image.ImageUrlBuilder
-import hu.bbara.purefin.core.navigation.SeriesDto
+import hu.bbara.purefin.navigation.SeriesDto
 import hu.bbara.purefin.model.CastMember
 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.model.Season

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

@@ -65,11 +65,11 @@ 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.download.DownloadState
 import hu.bbara.purefin.image.ImageUrlBuilder
-import hu.bbara.purefin.core.navigation.EpisodeDto
+import hu.bbara.purefin.navigation.EpisodeDto
 import hu.bbara.purefin.navigation.LocalNavigationManager
-import hu.bbara.purefin.core.navigation.Route
+import hu.bbara.purefin.navigation.Route
 import hu.bbara.purefin.model.CastMember
 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.model.Season

domain/src/main/java/hu/bbara/purefin/download/DownloadControllerModule.kt

@@ -1,10 +1,9 @@
-package hu.bbara.purefin.core.download
+package hu.bbara.purefin.download
 
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import hu.bbara.purefin.core.download.MediaDownloadController
 import javax.inject.Singleton
 
 @Module

domain/src/main/java/hu/bbara/purefin/download/DownloadModule.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.download
+package hu.bbara.purefin.download
 
 import android.content.Context
 import androidx.annotation.OptIn

domain/src/main/java/hu/bbara/purefin/download/DownloadState.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.download
+package hu.bbara.purefin.download
 
 sealed class DownloadState {
     data object NotDownloaded : DownloadState()

domain/src/main/java/hu/bbara/purefin/download/MediaDownloadController.kt

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

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

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.download
+package hu.bbara.purefin.download
 
 import android.content.Context
 import android.util.Log

domain/src/main/java/hu/bbara/purefin/download/PurefinDownloadService.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.download
+package hu.bbara.purefin.download
 
 import android.app.Notification
 import android.content.Context
@@ -15,6 +15,7 @@ import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
 import dagger.hilt.android.EntryPointAccessors
 import dagger.hilt.components.SingletonComponent
+import hu.bbara.purefin.core.download.R
 
 @OptIn(UnstableApi::class)
 class PurefinDownloadService : DownloadService(

domain/src/main/java/hu/bbara/purefin/feature/browse/home/AppViewModel.kt

@@ -6,19 +6,19 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import hu.bbara.purefin.data.HomeRepository
 import hu.bbara.purefin.data.MediaCatalogReader
 import hu.bbara.purefin.data.session.UserSessionRepository
-import hu.bbara.purefin.core.download.MediaDownloadController
+import hu.bbara.purefin.download.MediaDownloadController
 import hu.bbara.purefin.model.LibraryKind
 import hu.bbara.purefin.model.Media
-import hu.bbara.purefin.core.navigation.EpisodeDto
+import hu.bbara.purefin.navigation.EpisodeDto
-import hu.bbara.purefin.core.navigation.LibraryDto
+import hu.bbara.purefin.navigation.LibraryDto
-import hu.bbara.purefin.core.navigation.MovieDto
+import hu.bbara.purefin.navigation.MovieDto
-import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.navigation.NavigationManager
-import hu.bbara.purefin.core.navigation.Route
+import hu.bbara.purefin.navigation.Route
-import hu.bbara.purefin.core.navigation.SeriesDto
+import hu.bbara.purefin.navigation.SeriesDto
-import hu.bbara.purefin.core.ui.model.EpisodeUiModel
+import hu.bbara.purefin.ui.model.EpisodeUiModel
-import hu.bbara.purefin.core.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MediaUiModel
-import hu.bbara.purefin.core.ui.model.MovieUiModel
+import hu.bbara.purefin.ui.model.MovieUiModel
-import hu.bbara.purefin.core.ui.model.SeriesUiModel
+import hu.bbara.purefin.ui.model.SeriesUiModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow

domain/src/main/java/hu/bbara/purefin/feature/browse/library/LibraryViewModel.kt

@@ -5,13 +5,13 @@ import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import hu.bbara.purefin.data.HomeRepository
 import hu.bbara.purefin.model.LibraryKind
-import hu.bbara.purefin.core.navigation.MovieDto
+import hu.bbara.purefin.navigation.MovieDto
-import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.navigation.NavigationManager
-import hu.bbara.purefin.core.navigation.Route
+import hu.bbara.purefin.navigation.Route
-import hu.bbara.purefin.core.navigation.SeriesDto
+import hu.bbara.purefin.navigation.SeriesDto
-import hu.bbara.purefin.core.ui.model.MediaUiModel
+import hu.bbara.purefin.ui.model.MediaUiModel
-import hu.bbara.purefin.core.ui.model.MovieUiModel
+import hu.bbara.purefin.ui.model.MovieUiModel
-import hu.bbara.purefin.core.ui.model.SeriesUiModel
+import hu.bbara.purefin.ui.model.SeriesUiModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow

domain/src/main/java/hu/bbara/purefin/feature/content/episode/EpisodeScreenViewModel.kt

@@ -4,12 +4,12 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import hu.bbara.purefin.data.MediaCatalogReader
-import hu.bbara.purefin.core.download.DownloadState
+import hu.bbara.purefin.download.DownloadState
-import hu.bbara.purefin.core.download.MediaDownloadController
+import hu.bbara.purefin.download.MediaDownloadController
 import hu.bbara.purefin.model.Episode
-import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.navigation.NavigationManager
-import hu.bbara.purefin.core.navigation.Route
+import hu.bbara.purefin.navigation.Route
-import hu.bbara.purefin.core.navigation.SeriesDto
+import hu.bbara.purefin.navigation.SeriesDto
 import java.util.UUID
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted

domain/src/main/java/hu/bbara/purefin/feature/content/movie/MovieScreenViewModel.kt

@@ -4,11 +4,11 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import hu.bbara.purefin.data.MediaCatalogReader
-import hu.bbara.purefin.core.download.DownloadState
+import hu.bbara.purefin.download.DownloadState
-import hu.bbara.purefin.core.download.MediaDownloadController
+import hu.bbara.purefin.download.MediaDownloadController
 import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.navigation.NavigationManager
-import hu.bbara.purefin.core.navigation.Route
+import hu.bbara.purefin.navigation.Route
 import java.util.UUID
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted

domain/src/main/java/hu/bbara/purefin/feature/content/series/SeriesViewModel.kt

@@ -4,13 +4,13 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import hu.bbara.purefin.data.MediaCatalogReader
-import hu.bbara.purefin.core.download.DownloadState
+import hu.bbara.purefin.download.DownloadState
-import hu.bbara.purefin.core.download.MediaDownloadController
+import hu.bbara.purefin.download.MediaDownloadController
 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.model.Series
-import hu.bbara.purefin.core.navigation.EpisodeDto
+import hu.bbara.purefin.navigation.EpisodeDto
-import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.navigation.NavigationManager
-import hu.bbara.purefin.core.navigation.Route
+import hu.bbara.purefin.navigation.Route
 import java.util.UUID
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow

domain/src/main/java/hu/bbara/purefin/feature/downloads/DownloadsViewModel.kt

@@ -4,15 +4,15 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import hu.bbara.purefin.data.OfflineCatalogReader
-import hu.bbara.purefin.core.download.MediaDownloadController
+import hu.bbara.purefin.download.MediaDownloadController
 import hu.bbara.purefin.image.ArtworkKind
 import hu.bbara.purefin.image.ImageUrlBuilder
-import hu.bbara.purefin.core.navigation.MovieDto
+import hu.bbara.purefin.navigation.MovieDto
-import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.navigation.NavigationManager
-import hu.bbara.purefin.core.navigation.Route
+import hu.bbara.purefin.navigation.Route
-import hu.bbara.purefin.core.navigation.SeriesDto
+import hu.bbara.purefin.navigation.SeriesDto
-import hu.bbara.purefin.core.ui.model.MovieUiModel
+import hu.bbara.purefin.ui.model.MovieUiModel
-import hu.bbara.purefin.core.ui.model.SeriesUiModel
+import hu.bbara.purefin.ui.model.SeriesUiModel
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn

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

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.navigation
+package hu.bbara.purefin.navigation
 
 import java.util.UUID
 import kotlinx.serialization.Serializable

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

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.navigation
+package hu.bbara.purefin.navigation
 
 import java.util.UUID
 import kotlinx.serialization.Serializable

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

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.navigation
+package hu.bbara.purefin.navigation
 
 import java.util.UUID
 import kotlinx.serialization.Serializable

domain/src/main/java/hu/bbara/purefin/navigation/NavigationManager.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.navigation
+package hu.bbara.purefin.navigation
 
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.MutableSharedFlow

domain/src/main/java/hu/bbara/purefin/navigation/NavigationManagerModule.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.navigation
+package hu.bbara.purefin.navigation
 
 import dagger.Module
 import dagger.Provides

domain/src/main/java/hu/bbara/purefin/navigation/Route.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.navigation
+package hu.bbara.purefin.navigation
 
 import androidx.navigation3.runtime.NavKey
 import kotlinx.serialization.Serializable

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

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.navigation
+package hu.bbara.purefin.navigation
 
 import java.util.UUID
 import kotlinx.serialization.Serializable

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

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.player.manager
+package hu.bbara.purefin.player.manager
 
 import android.os.Looper
 import android.util.Log
@@ -8,7 +8,7 @@ import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.exoplayer.PlayerMessage
 import hu.bbara.purefin.model.MediaSegment
 import hu.bbara.purefin.model.SegmentType
-import hu.bbara.purefin.core.player.model.SegmentStatus
+import hu.bbara.purefin.player.model.SegmentStatus
 
 @OptIn(UnstableApi::class)
 class MediaSegmentManager(private val player: ExoPlayer) {

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

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.player.manager
+package hu.bbara.purefin.player.manager
 
 import androidx.annotation.OptIn
 import androidx.media3.common.C
@@ -11,17 +11,17 @@ import androidx.media3.exoplayer.ExoPlayer
 import dagger.hilt.android.scopes.ViewModelScoped
 import hu.bbara.purefin.data.PlaybackReportContext
 import hu.bbara.purefin.model.MediaSegment
-import hu.bbara.purefin.core.player.model.MediaContext
+import hu.bbara.purefin.player.model.MediaContext
-import hu.bbara.purefin.core.player.model.MetadataState
+import hu.bbara.purefin.player.model.MetadataState
-import hu.bbara.purefin.core.player.model.PlaybackProgressSnapshot
+import hu.bbara.purefin.player.model.PlaybackProgressSnapshot
-import hu.bbara.purefin.core.player.model.PlaybackStateSnapshot
+import hu.bbara.purefin.player.model.PlaybackStateSnapshot
-import hu.bbara.purefin.core.player.model.QueueItemUi
+import hu.bbara.purefin.player.model.QueueItemUi
-import hu.bbara.purefin.core.player.model.TrackOption
+import hu.bbara.purefin.player.model.TrackOption
-import hu.bbara.purefin.core.player.model.TrackType
+import hu.bbara.purefin.player.model.TrackType
-import hu.bbara.purefin.core.player.preference.AudioTrackProperties
+import hu.bbara.purefin.player.preference.AudioTrackProperties
-import hu.bbara.purefin.core.player.preference.SubtitleTrackProperties
+import hu.bbara.purefin.player.preference.SubtitleTrackProperties
-import hu.bbara.purefin.core.player.preference.TrackMatcher
+import hu.bbara.purefin.player.preference.TrackMatcher
-import hu.bbara.purefin.core.player.preference.TrackPreferencesRepository
+import hu.bbara.purefin.player.preference.TrackPreferencesRepository
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob

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

@@ -1,13 +1,13 @@
-package hu.bbara.purefin.core.player.manager
+package hu.bbara.purefin.player.manager
 
 import android.util.Log
 import dagger.hilt.android.scopes.ViewModelScoped
 import hu.bbara.purefin.data.MediaProgressWriter
 import hu.bbara.purefin.data.PlaybackProgressReporter
 import hu.bbara.purefin.data.PlaybackReportContext
-import hu.bbara.purefin.core.player.model.MetadataState
+import hu.bbara.purefin.player.model.MetadataState
-import hu.bbara.purefin.core.player.model.PlaybackProgressSnapshot
+import hu.bbara.purefin.player.model.PlaybackProgressSnapshot
-import hu.bbara.purefin.core.player.model.PlaybackStateSnapshot
+import hu.bbara.purefin.player.model.PlaybackStateSnapshot
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job

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

@@ -1,12 +1,12 @@
-package hu.bbara.purefin.core.player.manager
+package hu.bbara.purefin.player.manager
 
 import androidx.annotation.OptIn
 import androidx.media3.common.C
 import androidx.media3.common.Format
 import androidx.media3.common.Tracks
 import androidx.media3.common.util.UnstableApi
-import hu.bbara.purefin.core.player.model.TrackOption
+import hu.bbara.purefin.player.model.TrackOption
-import hu.bbara.purefin.core.player.model.TrackType
+import hu.bbara.purefin.player.model.TrackType
 import javax.inject.Inject
 
 data class TrackSelectionState(

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

@@ -1,7 +1,7 @@
-package hu.bbara.purefin.core.player.model
+package hu.bbara.purefin.player.model
 
 import hu.bbara.purefin.model.MediaSegment
-import hu.bbara.purefin.core.player.preference.MediaTrackPreferences
+import hu.bbara.purefin.player.preference.MediaTrackPreferences
 
 data class MediaContext(
     val mediaId: String,

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

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.player.model
+package hu.bbara.purefin.player.model
 
 import hu.bbara.purefin.data.PlaybackReportContext
 

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

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.player.model
+package hu.bbara.purefin.player.model
 
 data class PlaybackProgressSnapshot(
     val durationMs: Long = 0L,

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

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.player.model
+package hu.bbara.purefin.player.model
 
 data class PlaybackStateSnapshot(
     val isPlaying: Boolean = false,

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

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.player.model
+package hu.bbara.purefin.player.model
 
 data class PlayerUiState(
     val isPlaying: Boolean = false,

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

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.player.model
+package hu.bbara.purefin.player.model
 
 enum class SegmentStatus {
     START,

domain/src/main/java/hu/bbara/purefin/player/module/PlaybackNetworkModule.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.player.module
+package hu.bbara.purefin.player.module
 
 import androidx.annotation.OptIn
 import androidx.media3.common.util.UnstableApi

domain/src/main/java/hu/bbara/purefin/player/module/VideoPlayerModule.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.player.module
+package hu.bbara.purefin.player.module
 
 import android.app.Application
 import androidx.annotation.OptIn

domain/src/main/java/hu/bbara/purefin/player/preference/TrackMatcher.kt

@@ -1,7 +1,7 @@
-package hu.bbara.purefin.core.player.preference
+package hu.bbara.purefin.player.preference
 
-import hu.bbara.purefin.core.player.model.TrackOption
+import hu.bbara.purefin.player.model.TrackOption
-import hu.bbara.purefin.core.player.model.TrackType
+import hu.bbara.purefin.player.model.TrackType
 import javax.inject.Inject
 
 class TrackMatcher @Inject constructor() {

domain/src/main/java/hu/bbara/purefin/player/preference/TrackPreference.kt

@@ -1,6 +1,5 @@
-package hu.bbara.purefin.core.player.preference
+package hu.bbara.purefin.player.preference
 
-import kotlinx.serialization.InternalSerializationApi
 import kotlinx.serialization.Serializable
 
 @Serializable

domain/src/main/java/hu/bbara/purefin/player/preference/TrackPreferencesModule.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.player.preference
+package hu.bbara.purefin.player.preference
 
 import android.content.Context
 import androidx.datastore.core.DataStore

domain/src/main/java/hu/bbara/purefin/player/preference/TrackPreferencesRepository.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.player.preference
+package hu.bbara.purefin.player.preference
 
 import androidx.datastore.core.DataStore
 import kotlinx.coroutines.flow.Flow

domain/src/main/java/hu/bbara/purefin/player/preference/TrackPreferencesSerializer.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.player.preference
+package hu.bbara.purefin.player.preference
 
 import androidx.datastore.core.CorruptionException
 import androidx.datastore.core.Serializer

domain/src/main/java/hu/bbara/purefin/player/viewmodel/ControlsAutoHidePolicy.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.player.viewmodel
+package hu.bbara.purefin.player.viewmodel
 
 enum class ControlsAutoHideBlocker {
     PLAYLIST,

domain/src/main/java/hu/bbara/purefin/player/viewmodel/PlayerViewModel.kt

@@ -1,15 +1,15 @@
-package hu.bbara.purefin.core.player.viewmodel
+package hu.bbara.purefin.player.viewmodel
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import hu.bbara.purefin.core.player.manager.PlayerManager
+import hu.bbara.purefin.player.manager.PlayerManager
-import hu.bbara.purefin.core.player.manager.ProgressManager
+import hu.bbara.purefin.player.manager.ProgressManager
-import hu.bbara.purefin.core.player.model.MediaContext
+import hu.bbara.purefin.player.model.MediaContext
-import hu.bbara.purefin.core.player.model.PlayerUiState
+import hu.bbara.purefin.player.model.PlayerUiState
-import hu.bbara.purefin.core.player.model.TrackOption
+import hu.bbara.purefin.player.model.TrackOption
-import hu.bbara.purefin.core.player.preference.TrackPreferencesRepository
+import hu.bbara.purefin.player.preference.TrackPreferencesRepository
 import hu.bbara.purefin.data.PlayableMediaRepository
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay

domain/src/main/java/hu/bbara/purefin/ui/model/MediaUiModel.kt

@@ -1,4 +1,4 @@
-package hu.bbara.purefin.core.ui.model
+package hu.bbara.purefin.ui.model
 
 import hu.bbara.purefin.image.ArtworkKind
 import hu.bbara.purefin.image.ImageUrlBuilder

domain/src/test/java/hu/bbara/purefin/core/download/DownloadModuleTest.kt

@@ -3,6 +3,7 @@ package hu.bbara.purefin.core.download
 import androidx.media3.datasource.DataSource
 import androidx.media3.datasource.cache.CacheDataSource
 import androidx.media3.datasource.cache.NoOpCacheEvictor
+import hu.bbara.purefin.download.DownloadModuleFactories
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertSame
 import org.junit.Assert.assertTrue

domain/src/test/java/hu/bbara/purefin/core/navigation/RouteSerializationTest.kt

@@ -1,8 +1,11 @@
 package hu.bbara.purefin.core.navigation
 
+import hu.bbara.purefin.navigation.EpisodeDto
+import hu.bbara.purefin.navigation.LibraryDto
+import hu.bbara.purefin.navigation.MovieDto
+import hu.bbara.purefin.navigation.Route
+import hu.bbara.purefin.navigation.SeriesDto
 import java.util.UUID
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import org.junit.Assert.assertEquals
 import org.junit.Test

domain/src/test/java/hu/bbara/purefin/core/player/viewmodel/ControlsAutoHidePolicyTest.kt

@@ -1,5 +1,8 @@
 package hu.bbara.purefin.core.player.viewmodel
 
+import hu.bbara.purefin.player.viewmodel.ControlsAutoHideBlocker
+import hu.bbara.purefin.player.viewmodel.ControlsAutoHideCommand
+import hu.bbara.purefin.player.viewmodel.ControlsAutoHidePolicy
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test

ui-common/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerLoadingErrorEndCardContent.kt

@@ -21,7 +21,7 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.core.player.model.PlayerUiState
+import hu.bbara.purefin.player.model.PlayerUiState
 
 @Composable
 fun PlayerLoadingErrorEndCardContent(

ui-common/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerSeekBarTrack.kt

@@ -10,8 +10,8 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.core.player.model.MarkerType
+import hu.bbara.purefin.player.model.MarkerType
-import hu.bbara.purefin.core.player.model.TimedMarker
+import hu.bbara.purefin.player.model.TimedMarker
 
 @Composable
 fun PlayerSeekBarTrack(