From a1239c907ab8a65115e13fb5643e241f2f5d11f1 Mon Sep 17 00:00:00 2001 From: Barnabas Balogh Date: Fri, 24 Apr 2026 09:31:30 +0200 Subject: [PATCH] refactor: reorganize package structure and remove unused files (remove old core parent package) in domain module --- .../home/components/TvHomeContentTest.kt | 6 ++--- .../components/TvPlayerControlsOverlayTest.kt | 9 ++++--- .../purefin/modules/TvNavigationModule.kt | 2 +- .../purefin/navigation/NavigationLocals.kt | 2 -- .../purefin/navigation/TvRouteEntryBuilder.kt | 1 - .../java/hu/bbara/purefin/tv/TvActivity.kt | 6 ++--- .../purefin/ui/common/card/PosterCard.kt | 8 +++---- .../ui/screen/episode/TvEpisodeScreen.kt | 4 ++-- .../purefin/ui/screen/home/TvHomeScreen.kt | 4 ++-- .../home/components/TvFocusedItemHero.kt | 2 +- .../screen/home/components/TvHomeContent.kt | 2 +- .../screen/home/components/TvHomeSections.kt | 2 +- .../ui/screen/library/TvLibraryScreen.kt | 4 ++-- .../purefin/ui/screen/movie/TvMovieScreen.kt | 2 +- .../ui/screen/player/TvPlayerScreen.kt | 4 ++-- .../components/TvPlayerControlsOverlay.kt | 2 +- .../components/TvPlayerLoadingErrorEndCard.kt | 2 +- .../player/components/TvPlayerQueuePanel.kt | 4 ++-- .../player/components/TvPlayerSeekBar.kt | 3 +-- .../components/TvTrackSelectionButtons.kt | 4 ++-- .../ui/screen/series/TvSeriesScreen.kt | 2 +- app/src/main/AndroidManifest.xml | 2 +- .../java/hu/bbara/purefin/PurefinActivity.kt | 6 ++--- .../bbara/purefin/modules/NavigationModule.kt | 2 +- .../purefin/navigation/NavigationLocals.kt | 2 -- .../purefin/navigation/RouteEntryBuilder.kt | 1 - .../hu/bbara/purefin/player/PlayerActivity.kt | 2 +- .../purefin/ui/common/card/PosterCard.kt | 8 +++---- .../ui/screen/episode/EpisodeScreen.kt | 6 ++--- .../episode/components/EpisodeComponents.kt | 2 +- .../purefin/ui/screen/home/HomeScreen.kt | 2 +- .../ui/screen/home/components/HomeContent.kt | 2 +- .../continuewatching/ContinueWatchingCard.kt | 2 +- .../ContinueWatchingSection.kt | 2 +- .../components/featured/SuggestionCard.kt | 2 +- .../components/featured/SuggestionsSection.kt | 2 +- .../home/components/library/HomeBrowseCard.kt | 6 ++--- .../library/LibraryPosterSection.kt | 2 +- .../home/components/nextup/NextUpCard.kt | 2 +- .../home/components/nextup/NextUpSection.kt | 2 +- .../ui/screen/library/LibraryScreen.kt | 4 ++-- .../purefin/ui/screen/movie/MovieScreen.kt | 4 ++-- .../movie/components/MovieComponents.kt | 2 +- .../purefin/ui/screen/player/PlayerScreen.kt | 2 +- .../components/PlayerControlsOverlay.kt | 4 ++-- .../components/PlayerLoadingErrorEndCard.kt | 2 +- .../player/components/PlayerQueuePanel.kt | 2 +- .../screen/player/components/PlayerSeekBar.kt | 4 +--- .../components/TrackSelectionButtons.kt | 2 +- .../purefin/ui/screen/series/SeriesScreen.kt | 4 ++-- .../series/components/SeriesComponents.kt | 6 ++--- .../download/DownloadControllerModule.kt | 3 +-- .../{core => }/download/DownloadModule.kt | 2 +- .../{core => }/download/DownloadState.kt | 2 +- .../download/MediaDownloadController.kt | 2 +- .../download/MediaDownloadManager.kt | 2 +- .../download/PurefinDownloadService.kt | 3 ++- .../feature/browse/home/AppViewModel.kt | 22 ++++++++--------- .../browse/library/LibraryViewModel.kt | 14 +++++------ .../content/episode/EpisodeScreenViewModel.kt | 10 ++++---- .../content/movie/MovieScreenViewModel.kt | 8 +++---- .../feature/content/series/SeriesViewModel.kt | 10 ++++---- .../feature/downloads/DownloadsViewModel.kt | 14 +++++------ .../{core => }/navigation/EpisodeDto.kt | 2 +- .../{core => }/navigation/LibraryDto.kt | 2 +- .../purefin/{core => }/navigation/MovieDto.kt | 2 +- .../navigation/NavigationManager.kt | 2 +- .../navigation/NavigationManagerModule.kt | 2 +- .../purefin/{core => }/navigation/Route.kt | 2 +- .../{core => }/navigation/SeriesDto.kt | 2 +- .../player/manager/MediaSegmentManager.kt | 4 ++-- .../player/manager/PlayerManager.kt | 24 +++++++++---------- .../player/manager/ProgressManager.kt | 8 +++---- .../{core => }/player/manager/TrackMapper.kt | 6 ++--- .../{core => }/player/model/MediaContext.kt | 4 ++-- .../{core => }/player/model/MetadataState.kt | 2 +- .../player/model/PlaybackProgressSnapshot.kt | 2 +- .../player/model/PlaybackStateSnapshot.kt | 2 +- .../{core => }/player/model/PlayerUiModels.kt | 2 +- .../{core => }/player/model/SegmentStatus.kt | 2 +- .../player/module/PlaybackNetworkModule.kt | 2 +- .../player/module/VideoPlayerModule.kt | 2 +- .../player/preference/TrackMatcher.kt | 6 ++--- .../player/preference/TrackPreference.kt | 3 +-- .../preference/TrackPreferencesModule.kt | 2 +- .../preference/TrackPreferencesRepository.kt | 2 +- .../preference/TrackPreferencesSerializer.kt | 2 +- .../viewmodel/ControlsAutoHidePolicy.kt | 2 +- .../player/viewmodel/PlayerViewModel.kt | 14 +++++------ .../{core => }/ui/model/MediaUiModel.kt | 2 +- .../core/download/DownloadModuleTest.kt | 1 + .../core/navigation/RouteSerializationTest.kt | 7 ++++-- .../viewmodel/ControlsAutoHidePolicyTest.kt | 3 +++ .../PlayerLoadingErrorEndCardContent.kt | 2 +- .../player/components/PlayerSeekBarTrack.kt | 4 ++-- 95 files changed, 189 insertions(+), 193 deletions(-) rename domain/src/main/java/hu/bbara/purefin/{core => }/download/DownloadControllerModule.kt (79%) rename domain/src/main/java/hu/bbara/purefin/{core => }/download/DownloadModule.kt (98%) rename domain/src/main/java/hu/bbara/purefin/{core => }/download/DownloadState.kt (85%) rename domain/src/main/java/hu/bbara/purefin/{core => }/download/MediaDownloadController.kt (94%) rename domain/src/main/java/hu/bbara/purefin/{core => }/download/MediaDownloadManager.kt (99%) rename domain/src/main/java/hu/bbara/purefin/{core => }/download/PurefinDownloadService.kt (98%) rename domain/src/main/java/hu/bbara/purefin/{core => }/navigation/EpisodeDto.kt (89%) rename domain/src/main/java/hu/bbara/purefin/{core => }/navigation/LibraryDto.kt (85%) rename domain/src/main/java/hu/bbara/purefin/{core => }/navigation/MovieDto.kt (84%) rename domain/src/main/java/hu/bbara/purefin/{core => }/navigation/NavigationManager.kt (96%) rename domain/src/main/java/hu/bbara/purefin/{core => }/navigation/NavigationManagerModule.kt (89%) rename domain/src/main/java/hu/bbara/purefin/{core => }/navigation/Route.kt (93%) rename domain/src/main/java/hu/bbara/purefin/{core => }/navigation/SeriesDto.kt (84%) rename domain/src/main/java/hu/bbara/purefin/{core => }/player/manager/MediaSegmentManager.kt (95%) rename domain/src/main/java/hu/bbara/purefin/{core => }/player/manager/PlayerManager.kt (94%) rename domain/src/main/java/hu/bbara/purefin/{core => }/player/manager/ProgressManager.kt (95%) rename domain/src/main/java/hu/bbara/purefin/{core => }/player/manager/TrackMapper.kt (97%) rename domain/src/main/java/hu/bbara/purefin/{core => }/player/model/MediaContext.kt (61%) rename domain/src/main/java/hu/bbara/purefin/{core => }/player/model/MetadataState.kt (84%) rename domain/src/main/java/hu/bbara/purefin/{core => }/player/model/PlaybackProgressSnapshot.kt (79%) rename domain/src/main/java/hu/bbara/purefin/{core => }/player/model/PlaybackStateSnapshot.kt (80%) rename domain/src/main/java/hu/bbara/purefin/{core => }/player/model/PlayerUiModels.kt (97%) rename domain/src/main/java/hu/bbara/purefin/{core => }/player/model/SegmentStatus.kt (52%) rename domain/src/main/java/hu/bbara/purefin/{core => }/player/module/PlaybackNetworkModule.kt (93%) rename domain/src/main/java/hu/bbara/purefin/{core => }/player/module/VideoPlayerModule.kt (98%) rename domain/src/main/java/hu/bbara/purefin/{core => }/player/preference/TrackMatcher.kt (95%) rename domain/src/main/java/hu/bbara/purefin/{core => }/player/preference/TrackPreference.kt (89%) rename domain/src/main/java/hu/bbara/purefin/{core => }/player/preference/TrackPreferencesModule.kt (96%) rename domain/src/main/java/hu/bbara/purefin/{core => }/player/preference/TrackPreferencesRepository.kt (97%) rename domain/src/main/java/hu/bbara/purefin/{core => }/player/preference/TrackPreferencesSerializer.kt (95%) rename domain/src/main/java/hu/bbara/purefin/{core => }/player/viewmodel/ControlsAutoHidePolicy.kt (97%) rename domain/src/main/java/hu/bbara/purefin/{core => }/player/viewmodel/PlayerViewModel.kt (95%) rename domain/src/main/java/hu/bbara/purefin/{core => }/ui/model/MediaUiModel.kt (99%) diff --git a/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/home/components/TvHomeContentTest.kt b/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/home/components/TvHomeContentTest.kt index 30db41bb..eb7fa58e 100644 --- a/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/home/components/TvHomeContentTest.kt +++ b/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.core.ui.model.MediaUiModel -import hu.bbara.purefin.core.ui.model.MovieUiModel +import hu.bbara.purefin.ui.model.EpisodeUiModel +import hu.bbara.purefin.ui.model.MediaUiModel +import hu.bbara.purefin.ui.model.MovieUiModel import hu.bbara.purefin.feature.browse.home.LibraryItem import hu.bbara.purefin.ui.screen.home.TvHomeScreen import hu.bbara.purefin.ui.theme.AppTheme diff --git a/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerControlsOverlayTest.kt b/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerControlsOverlayTest.kt index 12e08d3f..733b8c1c 100644 --- a/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerControlsOverlayTest.kt +++ b/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerControlsOverlayTest.kt @@ -33,17 +33,16 @@ import androidx.compose.ui.test.assertIsNotEnabled import androidx.compose.ui.test.junit4.createAndroidComposeRule import androidx.compose.ui.test.onAllNodesWithContentDescription import androidx.compose.ui.test.onAllNodesWithTag -import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performKeyInput import androidx.compose.ui.test.performSemanticsAction import androidx.compose.ui.test.pressKey import androidx.compose.ui.unit.dp -import hu.bbara.purefin.core.player.model.PlayerUiState -import hu.bbara.purefin.core.player.model.QueueItemUi -import hu.bbara.purefin.core.player.model.TrackOption -import hu.bbara.purefin.core.player.model.TrackType +import hu.bbara.purefin.player.model.PlayerUiState +import hu.bbara.purefin.player.model.QueueItemUi +import hu.bbara.purefin.player.model.TrackOption +import hu.bbara.purefin.player.model.TrackType import hu.bbara.purefin.ui.screen.player.TV_HIDDEN_STOP_FEEDBACK_MS import hu.bbara.purefin.ui.screen.player.TvPlayerHiddenStopFeedback import hu.bbara.purefin.ui.screen.player.TvPlayerHiddenStopFeedbackTag diff --git a/app-tv/src/main/java/hu/bbara/purefin/modules/TvNavigationModule.kt b/app-tv/src/main/java/hu/bbara/purefin/modules/TvNavigationModule.kt index ca1d736e..60a62bab 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/modules/TvNavigationModule.kt +++ b/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 diff --git a/app-tv/src/main/java/hu/bbara/purefin/navigation/NavigationLocals.kt b/app-tv/src/main/java/hu/bbara/purefin/navigation/NavigationLocals.kt index de0cc1c8..3a2723fd 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/navigation/NavigationLocals.kt +++ b/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 = staticCompositionLocalOf { error("NavigationManager not provided") } diff --git a/app-tv/src/main/java/hu/bbara/purefin/navigation/TvRouteEntryBuilder.kt b/app-tv/src/main/java/hu/bbara/purefin/navigation/TvRouteEntryBuilder.kt index 8695a2ac..96a7e058 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/navigation/TvRouteEntryBuilder.kt +++ b/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 diff --git a/app-tv/src/main/java/hu/bbara/purefin/tv/TvActivity.kt b/app-tv/src/main/java/hu/bbara/purefin/tv/TvActivity.kt index db918923..93ee4c9a 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/tv/TvActivity.kt +++ b/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.core.navigation.NavigationManager -import hu.bbara.purefin.core.navigation.Route +import hu.bbara.purefin.navigation.NavigationCommand +import hu.bbara.purefin.navigation.NavigationManager +import hu.bbara.purefin.navigation.Route import hu.bbara.purefin.data.jellyfin.client.JellyfinAuthInterceptor import hu.bbara.purefin.navigation.LocalNavigationBackStack import hu.bbara.purefin.navigation.LocalNavigationManager diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/common/card/PosterCard.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/common/card/PosterCard.kt index c266c8a6..694b84ce 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/common/card/PosterCard.kt +++ b/app-tv/src/main/java/hu/bbara/purefin/ui/common/card/PosterCard.kt @@ -29,10 +29,10 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import hu.bbara.purefin.core.ui.model.EpisodeUiModel -import hu.bbara.purefin.core.ui.model.MediaUiModel -import hu.bbara.purefin.core.ui.model.MovieUiModel -import hu.bbara.purefin.core.ui.model.SeriesUiModel +import hu.bbara.purefin.ui.model.EpisodeUiModel +import hu.bbara.purefin.ui.model.MediaUiModel +import hu.bbara.purefin.ui.model.MovieUiModel +import hu.bbara.purefin.ui.model.SeriesUiModel import hu.bbara.purefin.ui.common.badge.WatchStateBadge import hu.bbara.purefin.ui.common.image.PurefinAsyncImage import java.util.UUID diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/episode/TvEpisodeScreen.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/episode/TvEpisodeScreen.kt index 085f7f8a..ff5e7009 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/episode/TvEpisodeScreen.kt +++ b/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 diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/TvHomeScreen.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/TvHomeScreen.kt index 69b2b20f..37cf1d01 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/TvHomeScreen.kt +++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/TvHomeScreen.kt @@ -11,8 +11,8 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import hu.bbara.purefin.core.ui.model.MediaUiModel -import hu.bbara.purefin.core.ui.model.MovieUiModel +import hu.bbara.purefin.ui.model.MediaUiModel +import hu.bbara.purefin.ui.model.MovieUiModel import hu.bbara.purefin.feature.browse.home.LibraryItem import hu.bbara.purefin.ui.screen.home.components.TvFocusedItemHero import hu.bbara.purefin.ui.screen.home.components.TvHomeContent diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvFocusedItemHero.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvFocusedItemHero.kt index a320590a..f06f9b46 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvFocusedItemHero.kt +++ b/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" diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvHomeContent.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvHomeContent.kt index 7f690681..da75f5c9 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvHomeContent.kt +++ b/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 diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvHomeSections.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvHomeSections.kt index ce302f33..e782a66c 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvHomeSections.kt +++ b/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 diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/library/TvLibraryScreen.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/library/TvLibraryScreen.kt index e45fbfa0..e3b91321 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/library/TvLibraryScreen.kt +++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/library/TvLibraryScreen.kt @@ -22,8 +22,8 @@ import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import hu.bbara.purefin.core.navigation.LibraryDto -import hu.bbara.purefin.core.ui.model.MediaUiModel +import hu.bbara.purefin.navigation.LibraryDto +import hu.bbara.purefin.ui.model.MediaUiModel import hu.bbara.purefin.feature.browse.library.LibraryViewModel import hu.bbara.purefin.ui.common.button.PurefinIconButton import hu.bbara.purefin.ui.common.card.PosterCard diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/movie/TvMovieScreen.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/movie/TvMovieScreen.kt index 92780fcf..1913184c 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/movie/TvMovieScreen.kt +++ b/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 diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/TvPlayerScreen.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/TvPlayerScreen.kt index 177f5aa4..e7acba83 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/TvPlayerScreen.kt +++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/TvPlayerScreen.kt @@ -48,8 +48,8 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.media3.common.util.UnstableApi import androidx.media3.ui.AspectRatioFrameLayout import androidx.media3.ui.PlayerView -import hu.bbara.purefin.core.player.viewmodel.ControlsAutoHideBlocker -import hu.bbara.purefin.core.player.viewmodel.PlayerViewModel +import hu.bbara.purefin.player.viewmodel.ControlsAutoHideBlocker +import hu.bbara.purefin.player.viewmodel.PlayerViewModel import hu.bbara.purefin.ui.screen.player.components.TvPlayerControlsOverlay import hu.bbara.purefin.ui.screen.player.components.TvPlayerLoadingErrorEndCard import hu.bbara.purefin.ui.screen.player.components.TvTrackPanelType diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerControlsOverlay.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerControlsOverlay.kt index eb529aad..35e2caf7 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerControlsOverlay.kt +++ b/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" diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerLoadingErrorEndCard.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerLoadingErrorEndCard.kt index b0c098f1..e8933ae7 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerLoadingErrorEndCard.kt +++ b/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( diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerQueuePanel.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerQueuePanel.kt index 8ac451a9..7cbe9801 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerQueuePanel.kt +++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerQueuePanel.kt @@ -41,8 +41,8 @@ import androidx.compose.ui.platform.testTag import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import hu.bbara.purefin.core.player.model.PlayerUiState -import hu.bbara.purefin.core.player.model.QueueItemUi +import hu.bbara.purefin.player.model.PlayerUiState +import hu.bbara.purefin.player.model.QueueItemUi import coil3.compose.AsyncImage internal const val TvPlayerPlaylistRowTag = "tv_player_playlist_row" diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerSeekBar.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerSeekBar.kt index fbe62453..3abf4abe 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerSeekBar.kt +++ b/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( diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvTrackSelectionButtons.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvTrackSelectionButtons.kt index f68ad62d..32267e91 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvTrackSelectionButtons.kt +++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvTrackSelectionButtons.kt @@ -44,8 +44,8 @@ import androidx.compose.ui.input.key.type import androidx.compose.ui.platform.testTag import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -import hu.bbara.purefin.core.player.model.PlayerUiState -import hu.bbara.purefin.core.player.model.TrackOption +import hu.bbara.purefin.player.model.PlayerUiState +import hu.bbara.purefin.player.model.TrackOption internal const val TvPlayerQualityButtonTag = "tv_player_quality_button" internal const val TvPlayerAudioButtonTag = "tv_player_audio_button" diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/series/TvSeriesScreen.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/series/TvSeriesScreen.kt index 957e4bfd..561d2e78 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/series/TvSeriesScreen.kt +++ b/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 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f644fbc8..0a035584 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -33,7 +33,7 @@ android:exported="false" android:theme="@style/Theme.Purefin" /> diff --git a/app/src/main/java/hu/bbara/purefin/PurefinActivity.kt b/app/src/main/java/hu/bbara/purefin/PurefinActivity.kt index 957b8497..1463187e 100644 --- a/app/src/main/java/hu/bbara/purefin/PurefinActivity.kt +++ b/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.core.navigation.NavigationManager -import hu.bbara.purefin.core.navigation.Route +import hu.bbara.purefin.navigation.NavigationCommand +import hu.bbara.purefin.navigation.NavigationManager +import hu.bbara.purefin.navigation.Route import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen import hu.bbara.purefin.ui.screen.login.LoginScreen import hu.bbara.purefin.ui.theme.AppTheme diff --git a/app/src/main/java/hu/bbara/purefin/modules/NavigationModule.kt b/app/src/main/java/hu/bbara/purefin/modules/NavigationModule.kt index 06fd732a..86c835c7 100644 --- a/app/src/main/java/hu/bbara/purefin/modules/NavigationModule.kt +++ b/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 diff --git a/app/src/main/java/hu/bbara/purefin/navigation/NavigationLocals.kt b/app/src/main/java/hu/bbara/purefin/navigation/NavigationLocals.kt index de0cc1c8..3a2723fd 100644 --- a/app/src/main/java/hu/bbara/purefin/navigation/NavigationLocals.kt +++ b/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 = staticCompositionLocalOf { error("NavigationManager not provided") } diff --git a/app/src/main/java/hu/bbara/purefin/navigation/RouteEntryBuilder.kt b/app/src/main/java/hu/bbara/purefin/navigation/RouteEntryBuilder.kt index 4a776d8b..61217d75 100644 --- a/app/src/main/java/hu/bbara/purefin/navigation/RouteEntryBuilder.kt +++ b/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 diff --git a/app/src/main/java/hu/bbara/purefin/player/PlayerActivity.kt b/app/src/main/java/hu/bbara/purefin/player/PlayerActivity.kt index a1644600..8af7257b 100644 --- a/app/src/main/java/hu/bbara/purefin/player/PlayerActivity.kt +++ b/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 diff --git a/app/src/main/java/hu/bbara/purefin/ui/common/card/PosterCard.kt b/app/src/main/java/hu/bbara/purefin/ui/common/card/PosterCard.kt index d2ba6227..438984d4 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/common/card/PosterCard.kt +++ b/app/src/main/java/hu/bbara/purefin/ui/common/card/PosterCard.kt @@ -29,10 +29,10 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import hu.bbara.purefin.core.ui.model.EpisodeUiModel -import hu.bbara.purefin.core.ui.model.MediaUiModel -import hu.bbara.purefin.core.ui.model.MovieUiModel -import hu.bbara.purefin.core.ui.model.SeriesUiModel +import hu.bbara.purefin.ui.model.EpisodeUiModel +import hu.bbara.purefin.ui.model.MediaUiModel +import hu.bbara.purefin.ui.model.MovieUiModel +import hu.bbara.purefin.ui.model.SeriesUiModel import hu.bbara.purefin.ui.common.badge.WatchStateBadge import hu.bbara.purefin.ui.common.image.PurefinAsyncImage import java.util.UUID diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/episode/EpisodeScreen.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/episode/EpisodeScreen.kt index 55081deb..290c91fc 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/episode/EpisodeScreen.kt +++ b/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 diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/episode/components/EpisodeComponents.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/episode/components/EpisodeComponents.kt index a825b744..24201f02 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/episode/components/EpisodeComponents.kt +++ b/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 diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/home/HomeScreen.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/home/HomeScreen.kt index 856e3380..f91d6f34 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/HomeScreen.kt +++ b/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 diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/HomeContent.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/HomeContent.kt index 3588fab0..df1d2a3f 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/HomeContent.kt +++ b/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 diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/continuewatching/ContinueWatchingCard.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/continuewatching/ContinueWatchingCard.kt index b19a1387..c8e43ccc 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/continuewatching/ContinueWatchingCard.kt +++ b/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 diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/continuewatching/ContinueWatchingSection.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/continuewatching/ContinueWatchingSection.kt index 0c05447f..5b253466 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/continuewatching/ContinueWatchingSection.kt +++ b/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 diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/featured/SuggestionCard.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/featured/SuggestionCard.kt index 0f0cb470..2ec09787 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/featured/SuggestionCard.kt +++ b/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 diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/featured/SuggestionsSection.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/featured/SuggestionsSection.kt index 2e42e57b..63239263 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/featured/SuggestionsSection.kt +++ b/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( diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/library/HomeBrowseCard.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/library/HomeBrowseCard.kt index 57be895c..29898652 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/library/HomeBrowseCard.kt +++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/library/HomeBrowseCard.kt @@ -23,9 +23,9 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import hu.bbara.purefin.core.ui.model.EpisodeUiModel -import hu.bbara.purefin.core.ui.model.MediaUiModel -import hu.bbara.purefin.core.ui.model.MovieUiModel +import hu.bbara.purefin.ui.model.EpisodeUiModel +import hu.bbara.purefin.ui.model.MediaUiModel +import hu.bbara.purefin.ui.model.MovieUiModel import hu.bbara.purefin.ui.common.badge.WatchStateBadge import hu.bbara.purefin.ui.common.image.PurefinAsyncImage diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/library/LibraryPosterSection.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/library/LibraryPosterSection.kt index 2c3abb72..ccc2afd8 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/library/LibraryPosterSection.kt +++ b/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 diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/nextup/NextUpCard.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/nextup/NextUpCard.kt index 10da3add..9acda2d1 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/nextup/NextUpCard.kt +++ b/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 diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/nextup/NextUpSection.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/nextup/NextUpSection.kt index 2b29793f..17c63525 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/nextup/NextUpSection.kt +++ b/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 diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/library/LibraryScreen.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/library/LibraryScreen.kt index 5968bc97..8cf5839c 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/library/LibraryScreen.kt +++ b/app/src/main/java/hu/bbara/purefin/ui/screen/library/LibraryScreen.kt @@ -21,8 +21,8 @@ import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import hu.bbara.purefin.core.navigation.LibraryDto -import hu.bbara.purefin.core.ui.model.MediaUiModel +import hu.bbara.purefin.navigation.LibraryDto +import hu.bbara.purefin.ui.model.MediaUiModel import hu.bbara.purefin.feature.browse.library.LibraryViewModel import hu.bbara.purefin.ui.common.button.PurefinIconButton import hu.bbara.purefin.ui.common.card.PosterCard diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/movie/MovieScreen.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/movie/MovieScreen.kt index 4aa1ac56..8090a3e8 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/movie/MovieScreen.kt +++ b/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 diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/movie/components/MovieComponents.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/movie/components/MovieComponents.kt index c2bb9c93..39955057 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/movie/components/MovieComponents.kt +++ b/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 diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/player/PlayerScreen.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/player/PlayerScreen.kt index 1b4a48cf..a32c05b6 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/player/PlayerScreen.kt +++ b/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 diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerControlsOverlay.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerControlsOverlay.kt index 79e55152..db06e520 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerControlsOverlay.kt +++ b/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerControlsOverlay.kt @@ -37,8 +37,8 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import hu.bbara.purefin.ui.common.button.GhostIconButton import hu.bbara.purefin.ui.common.button.PurefinIconButton -import hu.bbara.purefin.core.player.model.PlayerUiState -import hu.bbara.purefin.core.player.model.TrackOption +import hu.bbara.purefin.player.model.PlayerUiState +import hu.bbara.purefin.player.model.TrackOption @Composable fun PlayerControlsOverlay( diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerLoadingErrorEndCard.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerLoadingErrorEndCard.kt index d058f4e5..518333c0 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerLoadingErrorEndCard.kt +++ b/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( diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerQueuePanel.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerQueuePanel.kt index 51a23bab..bb0897ac 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerQueuePanel.kt +++ b/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( diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerSeekBar.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerSeekBar.kt index fded0b1b..d9bfcfce 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerSeekBar.kt +++ b/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( diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/TrackSelectionButtons.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/TrackSelectionButtons.kt index 0da40b24..d9f10057 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/TrackSelectionButtons.kt +++ b/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( diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/series/SeriesScreen.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/series/SeriesScreen.kt index 4cf3bd86..a680ab8d 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/series/SeriesScreen.kt +++ b/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 diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/series/components/SeriesComponents.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/series/components/SeriesComponents.kt index c613120e..67d95a30 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/series/components/SeriesComponents.kt +++ b/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 diff --git a/domain/src/main/java/hu/bbara/purefin/core/download/DownloadControllerModule.kt b/domain/src/main/java/hu/bbara/purefin/download/DownloadControllerModule.kt similarity index 79% rename from domain/src/main/java/hu/bbara/purefin/core/download/DownloadControllerModule.kt rename to domain/src/main/java/hu/bbara/purefin/download/DownloadControllerModule.kt index 38f7550e..60314e1a 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/download/DownloadControllerModule.kt +++ b/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 diff --git a/domain/src/main/java/hu/bbara/purefin/core/download/DownloadModule.kt b/domain/src/main/java/hu/bbara/purefin/download/DownloadModule.kt similarity index 98% rename from domain/src/main/java/hu/bbara/purefin/core/download/DownloadModule.kt rename to domain/src/main/java/hu/bbara/purefin/download/DownloadModule.kt index a28d7b16..1e64d966 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/download/DownloadModule.kt +++ b/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 diff --git a/domain/src/main/java/hu/bbara/purefin/core/download/DownloadState.kt b/domain/src/main/java/hu/bbara/purefin/download/DownloadState.kt similarity index 85% rename from domain/src/main/java/hu/bbara/purefin/core/download/DownloadState.kt rename to domain/src/main/java/hu/bbara/purefin/download/DownloadState.kt index 7ee38b80..4ec0e7d8 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/download/DownloadState.kt +++ b/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() diff --git a/domain/src/main/java/hu/bbara/purefin/core/download/MediaDownloadController.kt b/domain/src/main/java/hu/bbara/purefin/download/MediaDownloadController.kt similarity index 94% rename from domain/src/main/java/hu/bbara/purefin/core/download/MediaDownloadController.kt rename to domain/src/main/java/hu/bbara/purefin/download/MediaDownloadController.kt index 13aa3d9b..52210a90 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/download/MediaDownloadController.kt +++ b/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 diff --git a/domain/src/main/java/hu/bbara/purefin/core/download/MediaDownloadManager.kt b/domain/src/main/java/hu/bbara/purefin/download/MediaDownloadManager.kt similarity index 99% rename from domain/src/main/java/hu/bbara/purefin/core/download/MediaDownloadManager.kt rename to domain/src/main/java/hu/bbara/purefin/download/MediaDownloadManager.kt index 473e281e..dbb18d59 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/download/MediaDownloadManager.kt +++ b/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 diff --git a/domain/src/main/java/hu/bbara/purefin/core/download/PurefinDownloadService.kt b/domain/src/main/java/hu/bbara/purefin/download/PurefinDownloadService.kt similarity index 98% rename from domain/src/main/java/hu/bbara/purefin/core/download/PurefinDownloadService.kt rename to domain/src/main/java/hu/bbara/purefin/download/PurefinDownloadService.kt index 5ab3549b..22444699 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/download/PurefinDownloadService.kt +++ b/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( diff --git a/domain/src/main/java/hu/bbara/purefin/feature/browse/home/AppViewModel.kt b/domain/src/main/java/hu/bbara/purefin/feature/browse/home/AppViewModel.kt index 93456e3d..2fd709ef 100644 --- a/domain/src/main/java/hu/bbara/purefin/feature/browse/home/AppViewModel.kt +++ b/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.core.navigation.LibraryDto -import hu.bbara.purefin.core.navigation.MovieDto -import hu.bbara.purefin.core.navigation.NavigationManager -import hu.bbara.purefin.core.navigation.Route -import hu.bbara.purefin.core.navigation.SeriesDto -import hu.bbara.purefin.core.ui.model.EpisodeUiModel -import hu.bbara.purefin.core.ui.model.MediaUiModel -import hu.bbara.purefin.core.ui.model.MovieUiModel -import hu.bbara.purefin.core.ui.model.SeriesUiModel +import hu.bbara.purefin.navigation.EpisodeDto +import hu.bbara.purefin.navigation.LibraryDto +import hu.bbara.purefin.navigation.MovieDto +import hu.bbara.purefin.navigation.NavigationManager +import hu.bbara.purefin.navigation.Route +import hu.bbara.purefin.navigation.SeriesDto +import hu.bbara.purefin.ui.model.EpisodeUiModel +import hu.bbara.purefin.ui.model.MediaUiModel +import hu.bbara.purefin.ui.model.MovieUiModel +import hu.bbara.purefin.ui.model.SeriesUiModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow diff --git a/domain/src/main/java/hu/bbara/purefin/feature/browse/library/LibraryViewModel.kt b/domain/src/main/java/hu/bbara/purefin/feature/browse/library/LibraryViewModel.kt index f42be826..91dd547e 100644 --- a/domain/src/main/java/hu/bbara/purefin/feature/browse/library/LibraryViewModel.kt +++ b/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.core.navigation.NavigationManager -import hu.bbara.purefin.core.navigation.Route -import hu.bbara.purefin.core.navigation.SeriesDto -import hu.bbara.purefin.core.ui.model.MediaUiModel -import hu.bbara.purefin.core.ui.model.MovieUiModel -import hu.bbara.purefin.core.ui.model.SeriesUiModel +import hu.bbara.purefin.navigation.MovieDto +import hu.bbara.purefin.navigation.NavigationManager +import hu.bbara.purefin.navigation.Route +import hu.bbara.purefin.navigation.SeriesDto +import hu.bbara.purefin.ui.model.MediaUiModel +import hu.bbara.purefin.ui.model.MovieUiModel +import hu.bbara.purefin.ui.model.SeriesUiModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow diff --git a/domain/src/main/java/hu/bbara/purefin/feature/content/episode/EpisodeScreenViewModel.kt b/domain/src/main/java/hu/bbara/purefin/feature/content/episode/EpisodeScreenViewModel.kt index 91edc088..4a374828 100644 --- a/domain/src/main/java/hu/bbara/purefin/feature/content/episode/EpisodeScreenViewModel.kt +++ b/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.core.download.MediaDownloadController +import hu.bbara.purefin.download.DownloadState +import hu.bbara.purefin.download.MediaDownloadController import hu.bbara.purefin.model.Episode -import hu.bbara.purefin.core.navigation.NavigationManager -import hu.bbara.purefin.core.navigation.Route -import hu.bbara.purefin.core.navigation.SeriesDto +import hu.bbara.purefin.navigation.NavigationManager +import hu.bbara.purefin.navigation.Route +import hu.bbara.purefin.navigation.SeriesDto import java.util.UUID import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted diff --git a/domain/src/main/java/hu/bbara/purefin/feature/content/movie/MovieScreenViewModel.kt b/domain/src/main/java/hu/bbara/purefin/feature/content/movie/MovieScreenViewModel.kt index 637001ba..faa0b077 100644 --- a/domain/src/main/java/hu/bbara/purefin/feature/content/movie/MovieScreenViewModel.kt +++ b/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.core.download.MediaDownloadController +import hu.bbara.purefin.download.DownloadState +import hu.bbara.purefin.download.MediaDownloadController import hu.bbara.purefin.model.Movie -import hu.bbara.purefin.core.navigation.NavigationManager -import hu.bbara.purefin.core.navigation.Route +import hu.bbara.purefin.navigation.NavigationManager +import hu.bbara.purefin.navigation.Route import java.util.UUID import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted diff --git a/domain/src/main/java/hu/bbara/purefin/feature/content/series/SeriesViewModel.kt b/domain/src/main/java/hu/bbara/purefin/feature/content/series/SeriesViewModel.kt index 96234615..2ad237dd 100644 --- a/domain/src/main/java/hu/bbara/purefin/feature/content/series/SeriesViewModel.kt +++ b/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.core.download.MediaDownloadController +import hu.bbara.purefin.download.DownloadState +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.core.navigation.NavigationManager -import hu.bbara.purefin.core.navigation.Route +import hu.bbara.purefin.navigation.EpisodeDto +import hu.bbara.purefin.navigation.NavigationManager +import hu.bbara.purefin.navigation.Route import java.util.UUID import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.MutableStateFlow diff --git a/domain/src/main/java/hu/bbara/purefin/feature/downloads/DownloadsViewModel.kt b/domain/src/main/java/hu/bbara/purefin/feature/downloads/DownloadsViewModel.kt index 2f3fbdb3..974d3bfb 100644 --- a/domain/src/main/java/hu/bbara/purefin/feature/downloads/DownloadsViewModel.kt +++ b/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.core.navigation.NavigationManager -import hu.bbara.purefin.core.navigation.Route -import hu.bbara.purefin.core.navigation.SeriesDto -import hu.bbara.purefin.core.ui.model.MovieUiModel -import hu.bbara.purefin.core.ui.model.SeriesUiModel +import hu.bbara.purefin.navigation.MovieDto +import hu.bbara.purefin.navigation.NavigationManager +import hu.bbara.purefin.navigation.Route +import hu.bbara.purefin.navigation.SeriesDto +import hu.bbara.purefin.ui.model.MovieUiModel +import hu.bbara.purefin.ui.model.SeriesUiModel import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.stateIn diff --git a/domain/src/main/java/hu/bbara/purefin/core/navigation/EpisodeDto.kt b/domain/src/main/java/hu/bbara/purefin/navigation/EpisodeDto.kt similarity index 89% rename from domain/src/main/java/hu/bbara/purefin/core/navigation/EpisodeDto.kt rename to domain/src/main/java/hu/bbara/purefin/navigation/EpisodeDto.kt index 78529687..0af1c308 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/navigation/EpisodeDto.kt +++ b/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 diff --git a/domain/src/main/java/hu/bbara/purefin/core/navigation/LibraryDto.kt b/domain/src/main/java/hu/bbara/purefin/navigation/LibraryDto.kt similarity index 85% rename from domain/src/main/java/hu/bbara/purefin/core/navigation/LibraryDto.kt rename to domain/src/main/java/hu/bbara/purefin/navigation/LibraryDto.kt index e50f6d8f..338b9c20 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/navigation/LibraryDto.kt +++ b/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 diff --git a/domain/src/main/java/hu/bbara/purefin/core/navigation/MovieDto.kt b/domain/src/main/java/hu/bbara/purefin/navigation/MovieDto.kt similarity index 84% rename from domain/src/main/java/hu/bbara/purefin/core/navigation/MovieDto.kt rename to domain/src/main/java/hu/bbara/purefin/navigation/MovieDto.kt index 822e4f3a..a4ea9c1c 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/navigation/MovieDto.kt +++ b/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 diff --git a/domain/src/main/java/hu/bbara/purefin/core/navigation/NavigationManager.kt b/domain/src/main/java/hu/bbara/purefin/navigation/NavigationManager.kt similarity index 96% rename from domain/src/main/java/hu/bbara/purefin/core/navigation/NavigationManager.kt rename to domain/src/main/java/hu/bbara/purefin/navigation/NavigationManager.kt index 2d2a3ed8..bbf268bb 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/navigation/NavigationManager.kt +++ b/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 diff --git a/domain/src/main/java/hu/bbara/purefin/core/navigation/NavigationManagerModule.kt b/domain/src/main/java/hu/bbara/purefin/navigation/NavigationManagerModule.kt similarity index 89% rename from domain/src/main/java/hu/bbara/purefin/core/navigation/NavigationManagerModule.kt rename to domain/src/main/java/hu/bbara/purefin/navigation/NavigationManagerModule.kt index e7503ad9..e5c87b04 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/navigation/NavigationManagerModule.kt +++ b/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 diff --git a/domain/src/main/java/hu/bbara/purefin/core/navigation/Route.kt b/domain/src/main/java/hu/bbara/purefin/navigation/Route.kt similarity index 93% rename from domain/src/main/java/hu/bbara/purefin/core/navigation/Route.kt rename to domain/src/main/java/hu/bbara/purefin/navigation/Route.kt index 9ede65df..150bde89 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/navigation/Route.kt +++ b/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 diff --git a/domain/src/main/java/hu/bbara/purefin/core/navigation/SeriesDto.kt b/domain/src/main/java/hu/bbara/purefin/navigation/SeriesDto.kt similarity index 84% rename from domain/src/main/java/hu/bbara/purefin/core/navigation/SeriesDto.kt rename to domain/src/main/java/hu/bbara/purefin/navigation/SeriesDto.kt index 1e1f4332..ac7e5498 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/navigation/SeriesDto.kt +++ b/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 diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/manager/MediaSegmentManager.kt b/domain/src/main/java/hu/bbara/purefin/player/manager/MediaSegmentManager.kt similarity index 95% rename from domain/src/main/java/hu/bbara/purefin/core/player/manager/MediaSegmentManager.kt rename to domain/src/main/java/hu/bbara/purefin/player/manager/MediaSegmentManager.kt index 59d185f6..35b5ca55 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/manager/MediaSegmentManager.kt +++ b/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) { diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/manager/PlayerManager.kt b/domain/src/main/java/hu/bbara/purefin/player/manager/PlayerManager.kt similarity index 94% rename from domain/src/main/java/hu/bbara/purefin/core/player/manager/PlayerManager.kt rename to domain/src/main/java/hu/bbara/purefin/player/manager/PlayerManager.kt index 3b96ecfa..981005de 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/manager/PlayerManager.kt +++ b/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.core.player.model.MetadataState -import hu.bbara.purefin.core.player.model.PlaybackProgressSnapshot -import hu.bbara.purefin.core.player.model.PlaybackStateSnapshot -import hu.bbara.purefin.core.player.model.QueueItemUi -import hu.bbara.purefin.core.player.model.TrackOption -import hu.bbara.purefin.core.player.model.TrackType -import hu.bbara.purefin.core.player.preference.AudioTrackProperties -import hu.bbara.purefin.core.player.preference.SubtitleTrackProperties -import hu.bbara.purefin.core.player.preference.TrackMatcher -import hu.bbara.purefin.core.player.preference.TrackPreferencesRepository +import hu.bbara.purefin.player.model.MediaContext +import hu.bbara.purefin.player.model.MetadataState +import hu.bbara.purefin.player.model.PlaybackProgressSnapshot +import hu.bbara.purefin.player.model.PlaybackStateSnapshot +import hu.bbara.purefin.player.model.QueueItemUi +import hu.bbara.purefin.player.model.TrackOption +import hu.bbara.purefin.player.model.TrackType +import hu.bbara.purefin.player.preference.AudioTrackProperties +import hu.bbara.purefin.player.preference.SubtitleTrackProperties +import hu.bbara.purefin.player.preference.TrackMatcher +import hu.bbara.purefin.player.preference.TrackPreferencesRepository import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/manager/ProgressManager.kt b/domain/src/main/java/hu/bbara/purefin/player/manager/ProgressManager.kt similarity index 95% rename from domain/src/main/java/hu/bbara/purefin/core/player/manager/ProgressManager.kt rename to domain/src/main/java/hu/bbara/purefin/player/manager/ProgressManager.kt index c72136fb..e8bb4d8d 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/manager/ProgressManager.kt +++ b/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.core.player.model.PlaybackProgressSnapshot -import hu.bbara.purefin.core.player.model.PlaybackStateSnapshot +import hu.bbara.purefin.player.model.MetadataState +import hu.bbara.purefin.player.model.PlaybackProgressSnapshot +import hu.bbara.purefin.player.model.PlaybackStateSnapshot import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/manager/TrackMapper.kt b/domain/src/main/java/hu/bbara/purefin/player/manager/TrackMapper.kt similarity index 97% rename from domain/src/main/java/hu/bbara/purefin/core/player/manager/TrackMapper.kt rename to domain/src/main/java/hu/bbara/purefin/player/manager/TrackMapper.kt index 6747807b..3941afc0 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/manager/TrackMapper.kt +++ b/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.core.player.model.TrackType +import hu.bbara.purefin.player.model.TrackOption +import hu.bbara.purefin.player.model.TrackType import javax.inject.Inject data class TrackSelectionState( diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/model/MediaContext.kt b/domain/src/main/java/hu/bbara/purefin/player/model/MediaContext.kt similarity index 61% rename from domain/src/main/java/hu/bbara/purefin/core/player/model/MediaContext.kt rename to domain/src/main/java/hu/bbara/purefin/player/model/MediaContext.kt index 29bcc58c..ca01fec2 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/model/MediaContext.kt +++ b/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, diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/model/MetadataState.kt b/domain/src/main/java/hu/bbara/purefin/player/model/MetadataState.kt similarity index 84% rename from domain/src/main/java/hu/bbara/purefin/core/player/model/MetadataState.kt rename to domain/src/main/java/hu/bbara/purefin/player/model/MetadataState.kt index 88ec733b..98dcc07e 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/model/MetadataState.kt +++ b/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 diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/model/PlaybackProgressSnapshot.kt b/domain/src/main/java/hu/bbara/purefin/player/model/PlaybackProgressSnapshot.kt similarity index 79% rename from domain/src/main/java/hu/bbara/purefin/core/player/model/PlaybackProgressSnapshot.kt rename to domain/src/main/java/hu/bbara/purefin/player/model/PlaybackProgressSnapshot.kt index ef09734f..dcff4548 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/model/PlaybackProgressSnapshot.kt +++ b/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, diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/model/PlaybackStateSnapshot.kt b/domain/src/main/java/hu/bbara/purefin/player/model/PlaybackStateSnapshot.kt similarity index 80% rename from domain/src/main/java/hu/bbara/purefin/core/player/model/PlaybackStateSnapshot.kt rename to domain/src/main/java/hu/bbara/purefin/player/model/PlaybackStateSnapshot.kt index 06721653..174be0c6 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/model/PlaybackStateSnapshot.kt +++ b/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, diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/model/PlayerUiModels.kt b/domain/src/main/java/hu/bbara/purefin/player/model/PlayerUiModels.kt similarity index 97% rename from domain/src/main/java/hu/bbara/purefin/core/player/model/PlayerUiModels.kt rename to domain/src/main/java/hu/bbara/purefin/player/model/PlayerUiModels.kt index a35868e9..c96592d9 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/model/PlayerUiModels.kt +++ b/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, diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/model/SegmentStatus.kt b/domain/src/main/java/hu/bbara/purefin/player/model/SegmentStatus.kt similarity index 52% rename from domain/src/main/java/hu/bbara/purefin/core/player/model/SegmentStatus.kt rename to domain/src/main/java/hu/bbara/purefin/player/model/SegmentStatus.kt index d5616b5d..fae23751 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/model/SegmentStatus.kt +++ b/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, diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/module/PlaybackNetworkModule.kt b/domain/src/main/java/hu/bbara/purefin/player/module/PlaybackNetworkModule.kt similarity index 93% rename from domain/src/main/java/hu/bbara/purefin/core/player/module/PlaybackNetworkModule.kt rename to domain/src/main/java/hu/bbara/purefin/player/module/PlaybackNetworkModule.kt index 7627a3c9..6dffb45a 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/module/PlaybackNetworkModule.kt +++ b/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 diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/module/VideoPlayerModule.kt b/domain/src/main/java/hu/bbara/purefin/player/module/VideoPlayerModule.kt similarity index 98% rename from domain/src/main/java/hu/bbara/purefin/core/player/module/VideoPlayerModule.kt rename to domain/src/main/java/hu/bbara/purefin/player/module/VideoPlayerModule.kt index b3052d24..0b44ea75 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/module/VideoPlayerModule.kt +++ b/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 diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/preference/TrackMatcher.kt b/domain/src/main/java/hu/bbara/purefin/player/preference/TrackMatcher.kt similarity index 95% rename from domain/src/main/java/hu/bbara/purefin/core/player/preference/TrackMatcher.kt rename to domain/src/main/java/hu/bbara/purefin/player/preference/TrackMatcher.kt index 975730d4..1def1b08 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/preference/TrackMatcher.kt +++ b/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.core.player.model.TrackType +import hu.bbara.purefin.player.model.TrackOption +import hu.bbara.purefin.player.model.TrackType import javax.inject.Inject class TrackMatcher @Inject constructor() { diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreference.kt b/domain/src/main/java/hu/bbara/purefin/player/preference/TrackPreference.kt similarity index 89% rename from domain/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreference.kt rename to domain/src/main/java/hu/bbara/purefin/player/preference/TrackPreference.kt index 51625b4f..bdd9d281 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreference.kt +++ b/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 diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreferencesModule.kt b/domain/src/main/java/hu/bbara/purefin/player/preference/TrackPreferencesModule.kt similarity index 96% rename from domain/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreferencesModule.kt rename to domain/src/main/java/hu/bbara/purefin/player/preference/TrackPreferencesModule.kt index cce6e269..7f46b71b 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreferencesModule.kt +++ b/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 diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreferencesRepository.kt b/domain/src/main/java/hu/bbara/purefin/player/preference/TrackPreferencesRepository.kt similarity index 97% rename from domain/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreferencesRepository.kt rename to domain/src/main/java/hu/bbara/purefin/player/preference/TrackPreferencesRepository.kt index 61a9ea4b..0e562050 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreferencesRepository.kt +++ b/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 diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreferencesSerializer.kt b/domain/src/main/java/hu/bbara/purefin/player/preference/TrackPreferencesSerializer.kt similarity index 95% rename from domain/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreferencesSerializer.kt rename to domain/src/main/java/hu/bbara/purefin/player/preference/TrackPreferencesSerializer.kt index 02435e3d..6e58bc13 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreferencesSerializer.kt +++ b/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 diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/viewmodel/ControlsAutoHidePolicy.kt b/domain/src/main/java/hu/bbara/purefin/player/viewmodel/ControlsAutoHidePolicy.kt similarity index 97% rename from domain/src/main/java/hu/bbara/purefin/core/player/viewmodel/ControlsAutoHidePolicy.kt rename to domain/src/main/java/hu/bbara/purefin/player/viewmodel/ControlsAutoHidePolicy.kt index 795d751b..da73391b 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/viewmodel/ControlsAutoHidePolicy.kt +++ b/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, diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/viewmodel/PlayerViewModel.kt b/domain/src/main/java/hu/bbara/purefin/player/viewmodel/PlayerViewModel.kt similarity index 95% rename from domain/src/main/java/hu/bbara/purefin/core/player/viewmodel/PlayerViewModel.kt rename to domain/src/main/java/hu/bbara/purefin/player/viewmodel/PlayerViewModel.kt index 3f8e1da5..9cf04c83 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/viewmodel/PlayerViewModel.kt +++ b/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.core.player.manager.ProgressManager -import hu.bbara.purefin.core.player.model.MediaContext -import hu.bbara.purefin.core.player.model.PlayerUiState -import hu.bbara.purefin.core.player.model.TrackOption -import hu.bbara.purefin.core.player.preference.TrackPreferencesRepository +import hu.bbara.purefin.player.manager.PlayerManager +import hu.bbara.purefin.player.manager.ProgressManager +import hu.bbara.purefin.player.model.MediaContext +import hu.bbara.purefin.player.model.PlayerUiState +import hu.bbara.purefin.player.model.TrackOption +import hu.bbara.purefin.player.preference.TrackPreferencesRepository import hu.bbara.purefin.data.PlayableMediaRepository import kotlinx.coroutines.Job import kotlinx.coroutines.delay diff --git a/domain/src/main/java/hu/bbara/purefin/core/ui/model/MediaUiModel.kt b/domain/src/main/java/hu/bbara/purefin/ui/model/MediaUiModel.kt similarity index 99% rename from domain/src/main/java/hu/bbara/purefin/core/ui/model/MediaUiModel.kt rename to domain/src/main/java/hu/bbara/purefin/ui/model/MediaUiModel.kt index 8d9a0774..f0960af3 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/ui/model/MediaUiModel.kt +++ b/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 diff --git a/domain/src/test/java/hu/bbara/purefin/core/download/DownloadModuleTest.kt b/domain/src/test/java/hu/bbara/purefin/core/download/DownloadModuleTest.kt index d5602423..bbf20eac 100644 --- a/domain/src/test/java/hu/bbara/purefin/core/download/DownloadModuleTest.kt +++ b/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 diff --git a/domain/src/test/java/hu/bbara/purefin/core/navigation/RouteSerializationTest.kt b/domain/src/test/java/hu/bbara/purefin/core/navigation/RouteSerializationTest.kt index 0d4759aa..043cf77a 100644 --- a/domain/src/test/java/hu/bbara/purefin/core/navigation/RouteSerializationTest.kt +++ b/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 diff --git a/domain/src/test/java/hu/bbara/purefin/core/player/viewmodel/ControlsAutoHidePolicyTest.kt b/domain/src/test/java/hu/bbara/purefin/core/player/viewmodel/ControlsAutoHidePolicyTest.kt index f184b621..33ea830c 100644 --- a/domain/src/test/java/hu/bbara/purefin/core/player/viewmodel/ControlsAutoHidePolicyTest.kt +++ b/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 diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerLoadingErrorEndCardContent.kt b/ui-common/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerLoadingErrorEndCardContent.kt index 7ddf51e7..15edb4cc 100644 --- a/ui-common/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerLoadingErrorEndCardContent.kt +++ b/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( diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerSeekBarTrack.kt b/ui-common/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerSeekBarTrack.kt index 26496e9a..73c5f739 100644 --- a/ui-common/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerSeekBarTrack.kt +++ b/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.core.player.model.TimedMarker +import hu.bbara.purefin.player.model.MarkerType +import hu.bbara.purefin.player.model.TimedMarker @Composable fun PlayerSeekBarTrack(