From 8423e63937fa43423a8c4fa330c28067af71d12d Mon Sep 17 00:00:00 2001 From: Barnabas Balogh Date: Fri, 24 Apr 2026 08:37:45 +0200 Subject: [PATCH] refactor: moved packages from data/core into /data in the data module --- .../episode/EpisodeScreenContentTest.kt | 4 ++-- .../home/components/TvHomeContentTest.kt | 6 ++--- .../TvLibrariesOverviewScreenTest.kt | 2 +- .../ui/screen/movie/MovieScreenContentTest.kt | 4 ++-- .../screen/series/SeriesScreenContentTest.kt | 8 +++---- .../modules/TvPlaybackProfileFamilyModule.kt | 2 +- .../java/hu/bbara/purefin/tv/TvActivity.kt | 4 ++-- .../ui/common/media/MediaDetailShell.kt | 4 ++-- .../hu/bbara/purefin/ui/screen/TvAppScreen.kt | 2 +- .../ui/screen/episode/TvEpisodeScreen.kt | 6 ++--- .../episode/components/TvEpisodeComponents.kt | 3 +-- .../libraries/TvLibrariesOverviewScreen.kt | 3 +-- .../purefin/ui/screen/movie/TvMovieScreen.kt | 2 +- .../movie/components/TvMovieComponents.kt | 3 +-- .../ui/screen/series/TvSeriesScreen.kt | 4 ++-- .../series/components/TvSeriesComponents.kt | 12 +++++----- .../home/components/TvFocusedItemHeroTest.kt | 12 +++++----- .../home/components/TvHomeHeroStateTest.kt | 8 +++---- .../java/hu/bbara/purefin/PurefinActivity.kt | 4 ++-- .../modules/PlaybackProfileFamilyModule.kt | 2 +- .../ui/screen/episode/EpisodeScreen.kt | 8 +++---- .../episode/components/EpisodeComponents.kt | 2 +- .../components/search/HomeSearchOverlay.kt | 2 +- .../components/search/HomeSearchResultCard.kt | 2 +- .../purefin/ui/screen/movie/MovieScreen.kt | 8 +++---- .../movie/components/MovieComponents.kt | 2 +- .../purefin/ui/screen/series/SeriesScreen.kt | 12 +++++----- .../series/components/SeriesComponents.kt | 12 +++++----- .../data/AuthenticationRepository.kt | 2 +- .../data/DownloadMediaSourceResolver.kt | 10 ++++---- .../{core => }/data/EpisodeSeriesLookup.kt | 2 +- .../purefin/{core => }/data/HomeRepository.kt | 6 ++--- .../{core => }/data/MediaCatalogReader.kt | 8 +++---- .../{core => }/data/MediaProgressWriter.kt | 2 +- .../purefin/{core => }/data/NetworkMonitor.kt | 2 +- .../{core => }/data/OfflineCatalogReader.kt | 8 +++---- .../{core => }/data/OfflineCatalogStore.kt | 10 ++++---- .../data/PlayableMediaRepository.kt | 4 ++-- .../purefin/{core => }/data/PlaybackMethod.kt | 2 +- .../{core => }/data/PlaybackProfileFamily.kt | 2 +- .../data/PlaybackProgressReporter.kt | 2 +- .../{core => }/data/PlaybackReportContext.kt | 2 +- .../{core => }/data/SessionBootstrapper.kt | 2 +- .../{core => }/data/SmartDownloadStore.kt | 2 +- .../data/catalog/CompositeMediaRepository.kt | 18 +++++++------- .../catalog/DefaultEpisodeSeriesLookup.kt | 4 ++-- .../catalog/InMemoryAppContentRepository.kt | 24 +++++++++---------- .../data/catalog/InMemoryMediaRepository.kt | 16 ++++++------- .../data/catalog/MediaRepositoryModule.kt | 10 ++++---- .../data/catalog/OfflineMediaRepository.kt | 12 +++++----- .../jellyfin/ConnectivityNetworkMonitor.kt | 2 +- .../DefaultPlayableMediaRepository.kt | 14 +++++------ .../data/jellyfin/JellyfinBindingsModule.kt | 12 +++++----- .../JellyfinPlaybackProgressReporter.kt | 4 ++-- .../data/jellyfin/client/JellyfinApiClient.kt | 6 ++--- .../client/JellyfinAuthInterceptor.kt | 2 +- .../download/JellyfinDownloadMappers.kt | 10 ++++---- .../JellyfinDownloadMediaSourceResolver.kt | 10 ++++---- .../playback/JellyfinPlaybackResolver.kt | 2 +- .../jellyfin/playback/PlaybackCacheKeys.kt | 2 +- .../jellyfin/playback/PlaybackDecision.kt | 2 +- .../playback/PlaybackDecisionResolver.kt | 5 ++-- .../playback/PlaybackProfileModule.kt | 2 +- .../JellyfinAuthenticationRepository.kt | 4 ++-- .../session/JellyfinSessionBootstrapper.kt | 2 +- .../data/jellyfin/session/UserSession.kt | 2 +- .../jellyfin/session/UserSessionModule.kt | 2 +- .../jellyfin/session/UserSessionRepository.kt | 2 +- .../data/offline/OfflineBindingsModule.kt | 4 ++-- .../data/offline/RoomOfflineCatalogStore.kt | 10 ++++---- .../data/offline/RoomSmartDownloadStore.kt | 2 +- .../purefin/data/offline/cache/HomeCache.kt | 14 +++++------ .../OfflineRoomMediaLocalDataSource.kt | 8 +++---- .../data/session/UserSessionRepository.kt | 2 +- .../purefin/{core => }/image/ArtworkKind.kt | 2 +- .../{core => }/image/ImageUrlBuilder.kt | 2 +- .../purefin/{core => }/model/CastMember.kt | 2 +- .../bbara/purefin/{core => }/model/Episode.kt | 2 +- .../bbara/purefin/{core => }/model/Library.kt | 2 +- .../purefin/{core => }/model/LibraryKind.kt | 2 +- .../bbara/purefin/{core => }/model/Media.kt | 2 +- .../purefin/{core => }/model/MediaKind.kt | 2 +- .../purefin/{core => }/model/MediaSegment.kt | 2 +- .../bbara/purefin/{core => }/model/Movie.kt | 2 +- .../bbara/purefin/{core => }/model/Season.kt | 2 +- .../bbara/purefin/{core => }/model/Series.kt | 2 +- .../{core => }/navigation/UuidSerializer.kt | 6 ++--- .../catalog/DefaultEpisodeSeriesLookupTest.kt | 8 +++---- .../playback/PlaybackCacheKeysTest.kt | 2 +- .../playback/PlaybackDecisionResolverTest.kt | 2 +- .../core/download/MediaDownloadManager.kt | 7 +++--- .../purefin/core/navigation/EpisodeDto.kt | 2 +- .../purefin/core/navigation/LibraryDto.kt | 2 +- .../bbara/purefin/core/navigation/MovieDto.kt | 2 +- .../purefin/core/navigation/SeriesDto.kt | 2 +- .../player/manager/MediaSegmentManager.kt | 4 ++-- .../core/player/manager/PlayerManager.kt | 4 ++-- .../core/player/manager/ProgressManager.kt | 6 ++--- .../purefin/core/player/model/MediaContext.kt | 2 +- .../core/player/model/MetadataState.kt | 2 +- .../core/player/viewmodel/PlayerViewModel.kt | 4 ++-- .../purefin/core/ui/model/MediaUiModel.kt | 10 ++++---- .../feature/browse/home/AppViewModel.kt | 10 ++++---- .../purefin/feature/browse/home/HomeModels.kt | 14 +++++------ .../browse/library/LibraryViewModel.kt | 4 ++-- .../content/episode/EpisodeScreenViewModel.kt | 4 ++-- .../content/movie/MovieScreenViewModel.kt | 4 ++-- .../feature/content/series/SeriesViewModel.kt | 6 ++--- .../feature/downloads/DownloadsViewModel.kt | 6 ++--- .../purefin/feature/login/LoginViewModel.kt | 4 ++-- .../purefin/feature/search/SearchResult.kt | 6 ++--- .../purefin/feature/search/SearchViewModel.kt | 8 +++---- .../ui/common/media/MediaDetailComponents.kt | 2 +- 113 files changed, 285 insertions(+), 290 deletions(-) rename data/src/main/java/hu/bbara/purefin/{core => }/data/AuthenticationRepository.kt (77%) rename data/src/main/java/hu/bbara/purefin/{core => }/data/DownloadMediaSourceResolver.kt (77%) rename data/src/main/java/hu/bbara/purefin/{core => }/data/EpisodeSeriesLookup.kt (76%) rename data/src/main/java/hu/bbara/purefin/{core => }/data/HomeRepository.kt (76%) rename data/src/main/java/hu/bbara/purefin/{core => }/data/MediaCatalogReader.kt (67%) rename data/src/main/java/hu/bbara/purefin/{core => }/data/MediaProgressWriter.kt (80%) rename data/src/main/java/hu/bbara/purefin/{core => }/data/NetworkMonitor.kt (73%) rename data/src/main/java/hu/bbara/purefin/{core => }/data/OfflineCatalogReader.kt (59%) rename data/src/main/java/hu/bbara/purefin/{core => }/data/OfflineCatalogStore.kt (71%) rename data/src/main/java/hu/bbara/purefin/{core => }/data/PlayableMediaRepository.kt (82%) rename data/src/main/java/hu/bbara/purefin/{core => }/data/PlaybackMethod.kt (70%) rename data/src/main/java/hu/bbara/purefin/{core => }/data/PlaybackProfileFamily.kt (62%) rename data/src/main/java/hu/bbara/purefin/{core => }/data/PlaybackProgressReporter.kt (92%) rename data/src/main/java/hu/bbara/purefin/{core => }/data/PlaybackReportContext.kt (87%) rename data/src/main/java/hu/bbara/purefin/{core => }/data/SessionBootstrapper.kt (64%) rename data/src/main/java/hu/bbara/purefin/{core => }/data/SmartDownloadStore.kt (88%) rename data/src/main/java/hu/bbara/purefin/{core => }/data/session/UserSessionRepository.kt (91%) rename data/src/main/java/hu/bbara/purefin/{core => }/image/ArtworkKind.kt (76%) rename data/src/main/java/hu/bbara/purefin/{core => }/image/ImageUrlBuilder.kt (96%) rename data/src/main/java/hu/bbara/purefin/{core => }/model/CastMember.kt (72%) rename data/src/main/java/hu/bbara/purefin/{core => }/model/Episode.kt (91%) rename data/src/main/java/hu/bbara/purefin/{core => }/model/Library.kt (93%) rename data/src/main/java/hu/bbara/purefin/{core => }/model/LibraryKind.kt (59%) rename data/src/main/java/hu/bbara/purefin/{core => }/model/Media.kt (92%) rename data/src/main/java/hu/bbara/purefin/{core => }/model/MediaKind.kt (67%) rename data/src/main/java/hu/bbara/purefin/{core => }/model/MediaSegment.kt (91%) rename data/src/main/java/hu/bbara/purefin/{core => }/model/Movie.kt (91%) rename data/src/main/java/hu/bbara/purefin/{core => }/model/Season.kt (86%) rename data/src/main/java/hu/bbara/purefin/{core => }/model/Series.kt (89%) rename data/src/main/java/hu/bbara/purefin/{core => }/navigation/UuidSerializer.kt (94%) diff --git a/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/episode/EpisodeScreenContentTest.kt b/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/episode/EpisodeScreenContentTest.kt index f0788838..a78ebba9 100644 --- a/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/episode/EpisodeScreenContentTest.kt +++ b/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/episode/EpisodeScreenContentTest.kt @@ -13,8 +13,8 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performKeyInput import androidx.compose.ui.test.pressKey import androidx.compose.ui.input.key.Key -import hu.bbara.purefin.core.model.CastMember -import hu.bbara.purefin.core.model.Episode +import hu.bbara.purefin.model.CastMember +import hu.bbara.purefin.model.Episode import hu.bbara.purefin.ui.theme.AppTheme import hu.bbara.purefin.ui.screen.episode.components.EpisodePlayButtonTag import org.junit.Assert.assertEquals 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 2553a2e4..30db41bb 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 @@ -16,9 +16,9 @@ import androidx.compose.ui.test.performKeyInput import androidx.compose.ui.test.pressKey import androidx.compose.ui.input.key.Key import androidx.compose.ui.unit.dp -import hu.bbara.purefin.core.model.Episode -import hu.bbara.purefin.core.model.LibraryKind -import hu.bbara.purefin.core.model.Movie +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 diff --git a/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/libraries/TvLibrariesOverviewScreenTest.kt b/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/libraries/TvLibrariesOverviewScreenTest.kt index dac12d14..d232df20 100644 --- a/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/libraries/TvLibrariesOverviewScreenTest.kt +++ b/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/libraries/TvLibrariesOverviewScreenTest.kt @@ -4,7 +4,7 @@ import androidx.activity.ComponentActivity import androidx.compose.ui.test.junit4.createAndroidComposeRule import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.performClick -import hu.bbara.purefin.core.model.LibraryKind +import hu.bbara.purefin.model.LibraryKind import hu.bbara.purefin.feature.browse.home.LibraryItem import hu.bbara.purefin.ui.theme.AppTheme import org.junit.Assert.assertEquals diff --git a/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/movie/MovieScreenContentTest.kt b/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/movie/MovieScreenContentTest.kt index 375de434..e880e690 100644 --- a/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/movie/MovieScreenContentTest.kt +++ b/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/movie/MovieScreenContentTest.kt @@ -13,8 +13,8 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performKeyInput import androidx.compose.ui.test.pressKey import androidx.compose.ui.input.key.Key -import hu.bbara.purefin.core.model.CastMember -import hu.bbara.purefin.core.model.Movie +import hu.bbara.purefin.model.CastMember +import hu.bbara.purefin.model.Movie import hu.bbara.purefin.ui.theme.AppTheme import hu.bbara.purefin.ui.screen.movie.components.MoviePlayButtonTag import org.junit.Assert.assertEquals diff --git a/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/series/SeriesScreenContentTest.kt b/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/series/SeriesScreenContentTest.kt index fca2c527..7876a957 100644 --- a/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/series/SeriesScreenContentTest.kt +++ b/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/series/SeriesScreenContentTest.kt @@ -11,10 +11,10 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performKeyInput import androidx.compose.ui.test.pressKey import androidx.compose.ui.input.key.Key -import hu.bbara.purefin.core.model.CastMember -import hu.bbara.purefin.core.model.Episode -import hu.bbara.purefin.core.model.Season -import hu.bbara.purefin.core.model.Series +import hu.bbara.purefin.model.CastMember +import hu.bbara.purefin.model.Episode +import hu.bbara.purefin.model.Season +import hu.bbara.purefin.model.Series import hu.bbara.purefin.ui.theme.AppTheme import hu.bbara.purefin.ui.screen.series.components.SeriesFirstSeasonTabTag import hu.bbara.purefin.ui.screen.series.components.SeriesPlayButtonTag diff --git a/app-tv/src/main/java/hu/bbara/purefin/modules/TvPlaybackProfileFamilyModule.kt b/app-tv/src/main/java/hu/bbara/purefin/modules/TvPlaybackProfileFamilyModule.kt index bc23ecaa..d79aa490 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/modules/TvPlaybackProfileFamilyModule.kt +++ b/app-tv/src/main/java/hu/bbara/purefin/modules/TvPlaybackProfileFamilyModule.kt @@ -4,7 +4,7 @@ import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import hu.bbara.purefin.core.data.PlaybackProfileFamily +import hu.bbara.purefin.data.PlaybackProfileFamily @Module @InstallIn(SingletonComponent::class) 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 199cf977..db918923 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 @@ -36,8 +36,8 @@ import coil3.network.okhttp.OkHttpNetworkFetcherFactory import coil3.request.crossfade import coil3.util.DebugLogger import dagger.hilt.android.AndroidEntryPoint -import hu.bbara.purefin.core.data.SessionBootstrapper -import hu.bbara.purefin.core.data.session.UserSessionRepository +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 diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailShell.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailShell.kt index 4f7f592c..fcfcab87 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailShell.kt +++ b/app-tv/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailShell.kt @@ -32,8 +32,8 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import hu.bbara.purefin.ui.common.image.PurefinAsyncImage -import hu.bbara.purefin.core.image.ImageUrlBuilder -import hu.bbara.purefin.core.image.ArtworkKind +import hu.bbara.purefin.image.ImageUrlBuilder +import hu.bbara.purefin.image.ArtworkKind internal val MediaDetailHorizontalPadding = 48.dp private val MediaDetailHeaderTopPadding = 104.dp diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/TvAppScreen.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/TvAppScreen.kt index b56468df..6bff0e88 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/TvAppScreen.kt +++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/TvAppScreen.kt @@ -15,7 +15,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.LifecycleResumeEffect -import hu.bbara.purefin.core.model.LibraryKind +import hu.bbara.purefin.model.LibraryKind import hu.bbara.purefin.feature.browse.home.AppViewModel import hu.bbara.purefin.ui.screen.home.TvHomeScreen import hu.bbara.purefin.ui.screen.home.components.TvDrawerDestination 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 143f376c..085f7f8a 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 @@ -21,13 +21,13 @@ import hu.bbara.purefin.ui.common.media.MediaDetailSectionTitle import hu.bbara.purefin.ui.common.media.TvMediaDetailBodyBox import hu.bbara.purefin.ui.common.media.TvMediaDetailScaffold import hu.bbara.purefin.ui.screen.episode.components.TvEpisodeHeroSection -import hu.bbara.purefin.core.image.ImageUrlBuilder +import hu.bbara.purefin.image.ImageUrlBuilder import hu.bbara.purefin.core.navigation.EpisodeDto import hu.bbara.purefin.navigation.LocalNavigationManager import hu.bbara.purefin.core.navigation.Route -import hu.bbara.purefin.core.model.Episode +import hu.bbara.purefin.model.Episode import hu.bbara.purefin.feature.content.episode.EpisodeScreenViewModel -import hu.bbara.purefin.core.image.ArtworkKind +import hu.bbara.purefin.image.ArtworkKind @Composable fun TvEpisodeScreen( diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/episode/components/TvEpisodeComponents.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/episode/components/TvEpisodeComponents.kt index 5755a450..6e1d61d9 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/episode/components/TvEpisodeComponents.kt +++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/episode/components/TvEpisodeComponents.kt @@ -1,6 +1,5 @@ package hu.bbara.purefin.ui.screen.episode.components -import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth @@ -22,7 +21,7 @@ import hu.bbara.purefin.ui.common.button.MediaResumeButton import hu.bbara.purefin.ui.common.media.MediaMetadataFlowRow import hu.bbara.purefin.ui.common.media.mediaPlaybackProgress import hu.bbara.purefin.ui.common.media.mediaPlayButtonText -import hu.bbara.purefin.core.model.Episode +import hu.bbara.purefin.model.Episode internal const val EpisodePlayButtonTag = "episode-play-button" diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/libraries/TvLibrariesOverviewScreen.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/libraries/TvLibrariesOverviewScreen.kt index 96ad64b2..a81f464b 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/libraries/TvLibrariesOverviewScreen.kt +++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/libraries/TvLibrariesOverviewScreen.kt @@ -18,7 +18,6 @@ import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.foundation.lazy.grid.itemsIndexed import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Collections import androidx.compose.material.icons.outlined.Movie import androidx.compose.material.icons.outlined.Tv import androidx.compose.material3.Icon @@ -45,7 +44,7 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import hu.bbara.purefin.ui.common.image.PurefinAsyncImage import hu.bbara.purefin.feature.browse.home.LibraryItem -import hu.bbara.purefin.core.model.LibraryKind +import hu.bbara.purefin.model.LibraryKind internal const val TvLibrariesOverviewItemTagPrefix = "tv-libraries-overview-item-" 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 6a17334a..92780fcf 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 @@ -23,7 +23,7 @@ import hu.bbara.purefin.ui.common.media.TvMediaDetailScaffold import hu.bbara.purefin.ui.common.media.tvMediaDetailBackgroundImageUrl import hu.bbara.purefin.ui.screen.movie.components.TvMovieHeroSection import hu.bbara.purefin.core.navigation.MovieDto -import hu.bbara.purefin.core.model.Movie +import hu.bbara.purefin.model.Movie import hu.bbara.purefin.feature.content.movie.MovieScreenViewModel @Composable diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/movie/components/TvMovieComponents.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/movie/components/TvMovieComponents.kt index 6d114b67..fbe9a943 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/movie/components/TvMovieComponents.kt +++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/movie/components/TvMovieComponents.kt @@ -1,6 +1,5 @@ package hu.bbara.purefin.ui.screen.movie.components -import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth @@ -22,7 +21,7 @@ import hu.bbara.purefin.ui.common.button.MediaResumeButton import hu.bbara.purefin.ui.common.media.MediaMetadataFlowRow import hu.bbara.purefin.ui.common.media.mediaPlaybackProgress import hu.bbara.purefin.ui.common.media.mediaPlayButtonText -import hu.bbara.purefin.core.model.Movie +import hu.bbara.purefin.model.Movie internal const val MoviePlayButtonTag = "movie-play-button" 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 61570f73..957e4bfd 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 @@ -28,8 +28,8 @@ import hu.bbara.purefin.ui.screen.series.components.TvEpisodeCarousel import hu.bbara.purefin.ui.screen.series.components.TvSeasonTabs import hu.bbara.purefin.ui.screen.series.components.TvSeriesHeroSection import hu.bbara.purefin.core.navigation.SeriesDto -import hu.bbara.purefin.core.model.Season -import hu.bbara.purefin.core.model.Series +import hu.bbara.purefin.model.Season +import hu.bbara.purefin.model.Series import hu.bbara.purefin.feature.content.series.SeriesViewModel import java.util.UUID diff --git a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/series/components/TvSeriesComponents.kt b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/series/components/TvSeriesComponents.kt index 2be31b49..c1304ee4 100644 --- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/series/components/TvSeriesComponents.kt +++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/series/components/TvSeriesComponents.kt @@ -59,13 +59,13 @@ import hu.bbara.purefin.ui.common.badge.WatchStateBadge import hu.bbara.purefin.ui.common.media.MediaMetadataFlowRow import hu.bbara.purefin.ui.common.media.mediaPlaybackProgress import hu.bbara.purefin.ui.common.media.mediaPlayButtonText -import hu.bbara.purefin.core.image.ImageUrlBuilder -import hu.bbara.purefin.core.model.CastMember -import hu.bbara.purefin.core.model.Episode -import hu.bbara.purefin.core.model.Season -import hu.bbara.purefin.core.model.Series +import hu.bbara.purefin.image.ImageUrlBuilder +import hu.bbara.purefin.model.CastMember +import hu.bbara.purefin.model.Episode +import hu.bbara.purefin.model.Season +import hu.bbara.purefin.model.Series import hu.bbara.purefin.feature.content.series.SeriesViewModel -import hu.bbara.purefin.core.image.ArtworkKind +import hu.bbara.purefin.image.ArtworkKind internal const val SeriesPlayButtonTag = "series-play-button" internal const val SeriesFirstSeasonTabTag = "series-first-season-tab" diff --git a/app-tv/src/test/java/hu/bbara/purefin/ui/screen/home/components/TvFocusedItemHeroTest.kt b/app-tv/src/test/java/hu/bbara/purefin/ui/screen/home/components/TvFocusedItemHeroTest.kt index 4b19f4e1..0897315c 100644 --- a/app-tv/src/test/java/hu/bbara/purefin/ui/screen/home/components/TvFocusedItemHeroTest.kt +++ b/app-tv/src/test/java/hu/bbara/purefin/ui/screen/home/components/TvFocusedItemHeroTest.kt @@ -1,14 +1,14 @@ package hu.bbara.purefin.ui.screen.home.components -import hu.bbara.purefin.core.image.ImageUrlBuilder -import hu.bbara.purefin.core.model.Episode -import hu.bbara.purefin.core.model.MediaKind -import hu.bbara.purefin.core.model.Movie -import hu.bbara.purefin.core.model.Series +import hu.bbara.purefin.image.ImageUrlBuilder +import hu.bbara.purefin.model.Episode +import hu.bbara.purefin.model.MediaKind +import hu.bbara.purefin.model.Movie +import hu.bbara.purefin.model.Series import hu.bbara.purefin.feature.browse.home.ContinueWatchingItem import hu.bbara.purefin.feature.browse.home.NextUpItem import hu.bbara.purefin.feature.browse.home.PosterItem -import hu.bbara.purefin.core.image.ArtworkKind +import hu.bbara.purefin.image.ArtworkKind import org.junit.Assert.assertEquals import org.junit.Test import java.util.UUID diff --git a/app-tv/src/test/java/hu/bbara/purefin/ui/screen/home/components/TvHomeHeroStateTest.kt b/app-tv/src/test/java/hu/bbara/purefin/ui/screen/home/components/TvHomeHeroStateTest.kt index 6112ef1c..ef8665a0 100644 --- a/app-tv/src/test/java/hu/bbara/purefin/ui/screen/home/components/TvHomeHeroStateTest.kt +++ b/app-tv/src/test/java/hu/bbara/purefin/ui/screen/home/components/TvHomeHeroStateTest.kt @@ -1,9 +1,9 @@ package hu.bbara.purefin.ui.screen.home.components -import hu.bbara.purefin.core.model.Episode -import hu.bbara.purefin.core.model.LibraryKind -import hu.bbara.purefin.core.model.MediaKind -import hu.bbara.purefin.core.model.Movie +import hu.bbara.purefin.model.Episode +import hu.bbara.purefin.model.LibraryKind +import hu.bbara.purefin.model.MediaKind +import hu.bbara.purefin.model.Movie import hu.bbara.purefin.feature.browse.home.ContinueWatchingItem import hu.bbara.purefin.feature.browse.home.LibraryItem import hu.bbara.purefin.feature.browse.home.NextUpItem diff --git a/app/src/main/java/hu/bbara/purefin/PurefinActivity.kt b/app/src/main/java/hu/bbara/purefin/PurefinActivity.kt index 833301e7..957b8497 100644 --- a/app/src/main/java/hu/bbara/purefin/PurefinActivity.kt +++ b/app/src/main/java/hu/bbara/purefin/PurefinActivity.kt @@ -36,9 +36,9 @@ import coil3.network.okhttp.OkHttpNetworkFetcherFactory import coil3.request.crossfade import coil3.util.DebugLogger import dagger.hilt.android.AndroidEntryPoint -import hu.bbara.purefin.core.data.SessionBootstrapper +import hu.bbara.purefin.data.SessionBootstrapper import hu.bbara.purefin.data.jellyfin.client.JellyfinAuthInterceptor -import hu.bbara.purefin.core.data.session.UserSessionRepository +import hu.bbara.purefin.data.session.UserSessionRepository import hu.bbara.purefin.navigation.LocalNavigationBackStack import hu.bbara.purefin.navigation.LocalNavigationManager import hu.bbara.purefin.core.navigation.NavigationCommand diff --git a/app/src/main/java/hu/bbara/purefin/modules/PlaybackProfileFamilyModule.kt b/app/src/main/java/hu/bbara/purefin/modules/PlaybackProfileFamilyModule.kt index a5303d6f..37988f9b 100644 --- a/app/src/main/java/hu/bbara/purefin/modules/PlaybackProfileFamilyModule.kt +++ b/app/src/main/java/hu/bbara/purefin/modules/PlaybackProfileFamilyModule.kt @@ -4,7 +4,7 @@ import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import hu.bbara.purefin.core.data.PlaybackProfileFamily +import hu.bbara.purefin.data.PlaybackProfileFamily @Module @InstallIn(SingletonComponent::class) 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 7956b278..55081deb 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 @@ -35,18 +35,18 @@ import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen import hu.bbara.purefin.ui.common.media.MediaHero import hu.bbara.purefin.ui.common.media.MediaMetadataFlowRow import hu.bbara.purefin.core.download.DownloadState -import hu.bbara.purefin.core.image.ImageUrlBuilder +import hu.bbara.purefin.image.ImageUrlBuilder import hu.bbara.purefin.core.navigation.EpisodeDto import hu.bbara.purefin.navigation.LocalNavigationBackStack import hu.bbara.purefin.core.navigation.Route -import hu.bbara.purefin.core.model.CastMember -import hu.bbara.purefin.core.model.Episode +import hu.bbara.purefin.model.CastMember +import hu.bbara.purefin.model.Episode import hu.bbara.purefin.feature.content.episode.EpisodeScreenViewModel import hu.bbara.purefin.ui.screen.episode.components.EpisodeDetails import hu.bbara.purefin.ui.screen.episode.components.EpisodeTopBar import hu.bbara.purefin.ui.screen.episode.components.EpisodeTopBarShortcut import hu.bbara.purefin.ui.theme.AppTheme -import hu.bbara.purefin.core.image.ArtworkKind +import hu.bbara.purefin.image.ArtworkKind import java.util.UUID @Composable 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 5cb4da8c..a825b744 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 @@ -43,7 +43,7 @@ import hu.bbara.purefin.ui.common.button.MediaActionButton import hu.bbara.purefin.ui.common.media.MediaPlaybackSettings import hu.bbara.purefin.ui.common.button.MediaResumeButton import hu.bbara.purefin.core.download.DownloadState -import hu.bbara.purefin.core.model.Episode +import hu.bbara.purefin.model.Episode import hu.bbara.purefin.player.PlayerActivity internal sealed interface EpisodeTopBarShortcut { diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/HomeSearchOverlay.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/HomeSearchOverlay.kt index 85f91e36..2f5c5eb6 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/HomeSearchOverlay.kt +++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/HomeSearchOverlay.kt @@ -37,7 +37,7 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import hu.bbara.purefin.feature.search.SearchViewModel import java.util.UUID -import hu.bbara.purefin.core.model.MediaKind +import hu.bbara.purefin.model.MediaKind @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/HomeSearchResultCard.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/HomeSearchResultCard.kt index d1128069..08c55f62 100644 --- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/HomeSearchResultCard.kt +++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/HomeSearchResultCard.kt @@ -17,7 +17,7 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import hu.bbara.purefin.core.model.MediaKind +import hu.bbara.purefin.model.MediaKind import hu.bbara.purefin.feature.search.SearchResult import hu.bbara.purefin.ui.common.image.PurefinAsyncImage 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 b5517d3d..4aa1ac56 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 @@ -34,15 +34,15 @@ import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen import hu.bbara.purefin.ui.common.media.MediaHero import hu.bbara.purefin.ui.common.media.MediaMetadataFlowRow import hu.bbara.purefin.core.download.DownloadState -import hu.bbara.purefin.core.image.ImageUrlBuilder +import hu.bbara.purefin.image.ImageUrlBuilder import hu.bbara.purefin.core.navigation.MovieDto -import hu.bbara.purefin.core.model.CastMember -import hu.bbara.purefin.core.model.Movie +import hu.bbara.purefin.model.CastMember +import hu.bbara.purefin.model.Movie import hu.bbara.purefin.feature.content.movie.MovieScreenViewModel import hu.bbara.purefin.ui.screen.movie.components.MovieDetails import hu.bbara.purefin.ui.screen.movie.components.MovieTopBar import hu.bbara.purefin.ui.theme.AppTheme -import hu.bbara.purefin.core.image.ArtworkKind +import hu.bbara.purefin.image.ArtworkKind import java.util.UUID @Composable 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 4458fc2d..c2bb9c93 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 @@ -38,7 +38,7 @@ import hu.bbara.purefin.ui.common.button.MediaActionButton import hu.bbara.purefin.ui.common.media.MediaPlaybackSettings import hu.bbara.purefin.ui.common.button.MediaResumeButton import hu.bbara.purefin.core.download.DownloadState -import hu.bbara.purefin.core.model.Movie +import hu.bbara.purefin.model.Movie import hu.bbara.purefin.player.PlayerActivity @Composable 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 ea2c971b..4cf3bd86 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 @@ -34,12 +34,12 @@ import hu.bbara.purefin.ui.common.media.MediaSynopsis import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen import hu.bbara.purefin.ui.common.media.MediaHero import hu.bbara.purefin.core.download.DownloadState -import hu.bbara.purefin.core.image.ImageUrlBuilder +import hu.bbara.purefin.image.ImageUrlBuilder import hu.bbara.purefin.core.navigation.SeriesDto -import hu.bbara.purefin.core.model.CastMember -import hu.bbara.purefin.core.model.Episode -import hu.bbara.purefin.core.model.Season -import hu.bbara.purefin.core.model.Series +import hu.bbara.purefin.model.CastMember +import hu.bbara.purefin.model.Episode +import hu.bbara.purefin.model.Season +import hu.bbara.purefin.model.Series import hu.bbara.purefin.feature.content.series.SeriesViewModel import hu.bbara.purefin.ui.screen.series.components.CastRow import hu.bbara.purefin.ui.screen.series.components.EpisodeCarousel @@ -49,7 +49,7 @@ import hu.bbara.purefin.ui.screen.series.components.SeriesDownloadOption import hu.bbara.purefin.ui.screen.series.components.SeriesMetaChips import hu.bbara.purefin.ui.screen.series.components.SeriesTopBar import hu.bbara.purefin.ui.theme.AppTheme -import hu.bbara.purefin.core.image.ArtworkKind +import hu.bbara.purefin.image.ArtworkKind import java.util.UUID @Composable 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 feb71a53..c613120e 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 @@ -66,17 +66,17 @@ import hu.bbara.purefin.ui.common.button.MediaResumeButton import hu.bbara.purefin.ui.common.image.PurefinAsyncImage import hu.bbara.purefin.ui.common.badge.WatchStateBadge import hu.bbara.purefin.core.download.DownloadState -import hu.bbara.purefin.core.image.ImageUrlBuilder +import hu.bbara.purefin.image.ImageUrlBuilder import hu.bbara.purefin.core.navigation.EpisodeDto import hu.bbara.purefin.navigation.LocalNavigationManager import hu.bbara.purefin.core.navigation.Route -import hu.bbara.purefin.core.model.CastMember -import hu.bbara.purefin.core.model.Episode -import hu.bbara.purefin.core.model.Season -import hu.bbara.purefin.core.model.Series +import hu.bbara.purefin.model.CastMember +import hu.bbara.purefin.model.Episode +import hu.bbara.purefin.model.Season +import hu.bbara.purefin.model.Series import hu.bbara.purefin.feature.content.series.SeriesViewModel import hu.bbara.purefin.player.PlayerActivity -import hu.bbara.purefin.core.image.ArtworkKind +import hu.bbara.purefin.image.ArtworkKind @Composable internal fun SeriesTopBar( diff --git a/data/src/main/java/hu/bbara/purefin/core/data/AuthenticationRepository.kt b/data/src/main/java/hu/bbara/purefin/data/AuthenticationRepository.kt similarity index 77% rename from data/src/main/java/hu/bbara/purefin/core/data/AuthenticationRepository.kt rename to data/src/main/java/hu/bbara/purefin/data/AuthenticationRepository.kt index 9dde8ce7..07e9577a 100644 --- a/data/src/main/java/hu/bbara/purefin/core/data/AuthenticationRepository.kt +++ b/data/src/main/java/hu/bbara/purefin/data/AuthenticationRepository.kt @@ -1,4 +1,4 @@ -package hu.bbara.purefin.core.data +package hu.bbara.purefin.data interface AuthenticationRepository { suspend fun login(url: String, username: String, password: String): Boolean diff --git a/data/src/main/java/hu/bbara/purefin/core/data/DownloadMediaSourceResolver.kt b/data/src/main/java/hu/bbara/purefin/data/DownloadMediaSourceResolver.kt similarity index 77% rename from data/src/main/java/hu/bbara/purefin/core/data/DownloadMediaSourceResolver.kt rename to data/src/main/java/hu/bbara/purefin/data/DownloadMediaSourceResolver.kt index 6ca7b60a..7cb6d7f0 100644 --- a/data/src/main/java/hu/bbara/purefin/core/data/DownloadMediaSourceResolver.kt +++ b/data/src/main/java/hu/bbara/purefin/data/DownloadMediaSourceResolver.kt @@ -1,9 +1,9 @@ -package hu.bbara.purefin.core.data +package hu.bbara.purefin.data -import hu.bbara.purefin.core.model.Episode -import hu.bbara.purefin.core.model.Movie -import hu.bbara.purefin.core.model.Season -import hu.bbara.purefin.core.model.Series +import hu.bbara.purefin.model.Episode +import hu.bbara.purefin.model.Movie +import hu.bbara.purefin.model.Season +import hu.bbara.purefin.model.Series import java.util.UUID interface DownloadMediaSourceResolver { diff --git a/data/src/main/java/hu/bbara/purefin/core/data/EpisodeSeriesLookup.kt b/data/src/main/java/hu/bbara/purefin/data/EpisodeSeriesLookup.kt similarity index 76% rename from data/src/main/java/hu/bbara/purefin/core/data/EpisodeSeriesLookup.kt rename to data/src/main/java/hu/bbara/purefin/data/EpisodeSeriesLookup.kt index 0a432a39..2ed26af7 100644 --- a/data/src/main/java/hu/bbara/purefin/core/data/EpisodeSeriesLookup.kt +++ b/data/src/main/java/hu/bbara/purefin/data/EpisodeSeriesLookup.kt @@ -1,4 +1,4 @@ -package hu.bbara.purefin.core.data +package hu.bbara.purefin.data import java.util.UUID diff --git a/data/src/main/java/hu/bbara/purefin/core/data/HomeRepository.kt b/data/src/main/java/hu/bbara/purefin/data/HomeRepository.kt similarity index 76% rename from data/src/main/java/hu/bbara/purefin/core/data/HomeRepository.kt rename to data/src/main/java/hu/bbara/purefin/data/HomeRepository.kt index 4f926ac9..2ed2e24f 100644 --- a/data/src/main/java/hu/bbara/purefin/core/data/HomeRepository.kt +++ b/data/src/main/java/hu/bbara/purefin/data/HomeRepository.kt @@ -1,7 +1,7 @@ -package hu.bbara.purefin.core.data +package hu.bbara.purefin.data -import hu.bbara.purefin.core.model.Library -import hu.bbara.purefin.core.model.Media +import hu.bbara.purefin.model.Library +import hu.bbara.purefin.model.Media import kotlinx.coroutines.flow.StateFlow import java.util.UUID diff --git a/data/src/main/java/hu/bbara/purefin/core/data/MediaCatalogReader.kt b/data/src/main/java/hu/bbara/purefin/data/MediaCatalogReader.kt similarity index 67% rename from data/src/main/java/hu/bbara/purefin/core/data/MediaCatalogReader.kt rename to data/src/main/java/hu/bbara/purefin/data/MediaCatalogReader.kt index 1f3ecd12..34f60ee5 100644 --- a/data/src/main/java/hu/bbara/purefin/core/data/MediaCatalogReader.kt +++ b/data/src/main/java/hu/bbara/purefin/data/MediaCatalogReader.kt @@ -1,8 +1,8 @@ -package hu.bbara.purefin.core.data +package hu.bbara.purefin.data -import hu.bbara.purefin.core.model.Episode -import hu.bbara.purefin.core.model.Movie -import hu.bbara.purefin.core.model.Series +import hu.bbara.purefin.model.Episode +import hu.bbara.purefin.model.Movie +import hu.bbara.purefin.model.Series import java.util.UUID import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow diff --git a/data/src/main/java/hu/bbara/purefin/core/data/MediaProgressWriter.kt b/data/src/main/java/hu/bbara/purefin/data/MediaProgressWriter.kt similarity index 80% rename from data/src/main/java/hu/bbara/purefin/core/data/MediaProgressWriter.kt rename to data/src/main/java/hu/bbara/purefin/data/MediaProgressWriter.kt index 99daf0cf..3793ae5a 100644 --- a/data/src/main/java/hu/bbara/purefin/core/data/MediaProgressWriter.kt +++ b/data/src/main/java/hu/bbara/purefin/data/MediaProgressWriter.kt @@ -1,4 +1,4 @@ -package hu.bbara.purefin.core.data +package hu.bbara.purefin.data import java.util.UUID diff --git a/data/src/main/java/hu/bbara/purefin/core/data/NetworkMonitor.kt b/data/src/main/java/hu/bbara/purefin/data/NetworkMonitor.kt similarity index 73% rename from data/src/main/java/hu/bbara/purefin/core/data/NetworkMonitor.kt rename to data/src/main/java/hu/bbara/purefin/data/NetworkMonitor.kt index ffa3e9a2..2cda483f 100644 --- a/data/src/main/java/hu/bbara/purefin/core/data/NetworkMonitor.kt +++ b/data/src/main/java/hu/bbara/purefin/data/NetworkMonitor.kt @@ -1,4 +1,4 @@ -package hu.bbara.purefin.core.data +package hu.bbara.purefin.data import kotlinx.coroutines.flow.Flow diff --git a/data/src/main/java/hu/bbara/purefin/core/data/OfflineCatalogReader.kt b/data/src/main/java/hu/bbara/purefin/data/OfflineCatalogReader.kt similarity index 59% rename from data/src/main/java/hu/bbara/purefin/core/data/OfflineCatalogReader.kt rename to data/src/main/java/hu/bbara/purefin/data/OfflineCatalogReader.kt index 74db5ed4..69e6b9ae 100644 --- a/data/src/main/java/hu/bbara/purefin/core/data/OfflineCatalogReader.kt +++ b/data/src/main/java/hu/bbara/purefin/data/OfflineCatalogReader.kt @@ -1,8 +1,8 @@ -package hu.bbara.purefin.core.data +package hu.bbara.purefin.data -import hu.bbara.purefin.core.model.Episode -import hu.bbara.purefin.core.model.Movie -import hu.bbara.purefin.core.model.Series +import hu.bbara.purefin.model.Episode +import hu.bbara.purefin.model.Movie +import hu.bbara.purefin.model.Series import java.util.UUID import kotlinx.coroutines.flow.StateFlow diff --git a/data/src/main/java/hu/bbara/purefin/core/data/OfflineCatalogStore.kt b/data/src/main/java/hu/bbara/purefin/data/OfflineCatalogStore.kt similarity index 71% rename from data/src/main/java/hu/bbara/purefin/core/data/OfflineCatalogStore.kt rename to data/src/main/java/hu/bbara/purefin/data/OfflineCatalogStore.kt index 7731db10..41c58759 100644 --- a/data/src/main/java/hu/bbara/purefin/core/data/OfflineCatalogStore.kt +++ b/data/src/main/java/hu/bbara/purefin/data/OfflineCatalogStore.kt @@ -1,9 +1,9 @@ -package hu.bbara.purefin.core.data +package hu.bbara.purefin.data -import hu.bbara.purefin.core.model.Episode -import hu.bbara.purefin.core.model.Movie -import hu.bbara.purefin.core.model.Season -import hu.bbara.purefin.core.model.Series +import hu.bbara.purefin.model.Episode +import hu.bbara.purefin.model.Movie +import hu.bbara.purefin.model.Season +import hu.bbara.purefin.model.Series import java.util.UUID interface OfflineCatalogStore { diff --git a/data/src/main/java/hu/bbara/purefin/core/data/PlayableMediaRepository.kt b/data/src/main/java/hu/bbara/purefin/data/PlayableMediaRepository.kt similarity index 82% rename from data/src/main/java/hu/bbara/purefin/core/data/PlayableMediaRepository.kt rename to data/src/main/java/hu/bbara/purefin/data/PlayableMediaRepository.kt index 7727d8de..87cc12f2 100644 --- a/data/src/main/java/hu/bbara/purefin/core/data/PlayableMediaRepository.kt +++ b/data/src/main/java/hu/bbara/purefin/data/PlayableMediaRepository.kt @@ -1,7 +1,7 @@ -package hu.bbara.purefin.core.data +package hu.bbara.purefin.data import androidx.media3.common.MediaItem -import hu.bbara.purefin.core.model.MediaSegment +import hu.bbara.purefin.model.MediaSegment import java.util.UUID interface PlayableMediaRepository { diff --git a/data/src/main/java/hu/bbara/purefin/core/data/PlaybackMethod.kt b/data/src/main/java/hu/bbara/purefin/data/PlaybackMethod.kt similarity index 70% rename from data/src/main/java/hu/bbara/purefin/core/data/PlaybackMethod.kt rename to data/src/main/java/hu/bbara/purefin/data/PlaybackMethod.kt index b1e63175..c4d5b76c 100644 --- a/data/src/main/java/hu/bbara/purefin/core/data/PlaybackMethod.kt +++ b/data/src/main/java/hu/bbara/purefin/data/PlaybackMethod.kt @@ -1,4 +1,4 @@ -package hu.bbara.purefin.core.data +package hu.bbara.purefin.data enum class PlaybackMethod { DIRECT_PLAY, diff --git a/data/src/main/java/hu/bbara/purefin/core/data/PlaybackProfileFamily.kt b/data/src/main/java/hu/bbara/purefin/data/PlaybackProfileFamily.kt similarity index 62% rename from data/src/main/java/hu/bbara/purefin/core/data/PlaybackProfileFamily.kt rename to data/src/main/java/hu/bbara/purefin/data/PlaybackProfileFamily.kt index 6771b159..72ca2ad7 100644 --- a/data/src/main/java/hu/bbara/purefin/core/data/PlaybackProfileFamily.kt +++ b/data/src/main/java/hu/bbara/purefin/data/PlaybackProfileFamily.kt @@ -1,4 +1,4 @@ -package hu.bbara.purefin.core.data +package hu.bbara.purefin.data enum class PlaybackProfileFamily { MOBILE, diff --git a/data/src/main/java/hu/bbara/purefin/core/data/PlaybackProgressReporter.kt b/data/src/main/java/hu/bbara/purefin/data/PlaybackProgressReporter.kt similarity index 92% rename from data/src/main/java/hu/bbara/purefin/core/data/PlaybackProgressReporter.kt rename to data/src/main/java/hu/bbara/purefin/data/PlaybackProgressReporter.kt index b4d84c5b..e26c1f36 100644 --- a/data/src/main/java/hu/bbara/purefin/core/data/PlaybackProgressReporter.kt +++ b/data/src/main/java/hu/bbara/purefin/data/PlaybackProgressReporter.kt @@ -1,4 +1,4 @@ -package hu.bbara.purefin.core.data +package hu.bbara.purefin.data import java.util.UUID diff --git a/data/src/main/java/hu/bbara/purefin/core/data/PlaybackReportContext.kt b/data/src/main/java/hu/bbara/purefin/data/PlaybackReportContext.kt similarity index 87% rename from data/src/main/java/hu/bbara/purefin/core/data/PlaybackReportContext.kt rename to data/src/main/java/hu/bbara/purefin/data/PlaybackReportContext.kt index 8f5915cb..c1c1eb4f 100644 --- a/data/src/main/java/hu/bbara/purefin/core/data/PlaybackReportContext.kt +++ b/data/src/main/java/hu/bbara/purefin/data/PlaybackReportContext.kt @@ -1,4 +1,4 @@ -package hu.bbara.purefin.core.data +package hu.bbara.purefin.data data class PlaybackReportContext( val playMethod: PlaybackMethod, diff --git a/data/src/main/java/hu/bbara/purefin/core/data/SessionBootstrapper.kt b/data/src/main/java/hu/bbara/purefin/data/SessionBootstrapper.kt similarity index 64% rename from data/src/main/java/hu/bbara/purefin/core/data/SessionBootstrapper.kt rename to data/src/main/java/hu/bbara/purefin/data/SessionBootstrapper.kt index 912af10c..9d8ff604 100644 --- a/data/src/main/java/hu/bbara/purefin/core/data/SessionBootstrapper.kt +++ b/data/src/main/java/hu/bbara/purefin/data/SessionBootstrapper.kt @@ -1,4 +1,4 @@ -package hu.bbara.purefin.core.data +package hu.bbara.purefin.data interface SessionBootstrapper { suspend fun initialize() diff --git a/data/src/main/java/hu/bbara/purefin/core/data/SmartDownloadStore.kt b/data/src/main/java/hu/bbara/purefin/data/SmartDownloadStore.kt similarity index 88% rename from data/src/main/java/hu/bbara/purefin/core/data/SmartDownloadStore.kt rename to data/src/main/java/hu/bbara/purefin/data/SmartDownloadStore.kt index 0652610c..7a7878e1 100644 --- a/data/src/main/java/hu/bbara/purefin/core/data/SmartDownloadStore.kt +++ b/data/src/main/java/hu/bbara/purefin/data/SmartDownloadStore.kt @@ -1,4 +1,4 @@ -package hu.bbara.purefin.core.data +package hu.bbara.purefin.data import java.util.UUID import kotlinx.coroutines.flow.Flow diff --git a/data/src/main/java/hu/bbara/purefin/data/catalog/CompositeMediaRepository.kt b/data/src/main/java/hu/bbara/purefin/data/catalog/CompositeMediaRepository.kt index b47e272b..1e2e2bdb 100644 --- a/data/src/main/java/hu/bbara/purefin/data/catalog/CompositeMediaRepository.kt +++ b/data/src/main/java/hu/bbara/purefin/data/catalog/CompositeMediaRepository.kt @@ -1,14 +1,11 @@ package hu.bbara.purefin.data.catalog -import hu.bbara.purefin.core.data.MediaCatalogReader -import hu.bbara.purefin.core.data.MediaProgressWriter -import hu.bbara.purefin.core.data.NetworkMonitor -import hu.bbara.purefin.core.model.Episode -import hu.bbara.purefin.core.model.Movie -import hu.bbara.purefin.core.model.Series -import java.util.UUID -import javax.inject.Inject -import javax.inject.Singleton +import hu.bbara.purefin.data.MediaCatalogReader +import hu.bbara.purefin.data.MediaProgressWriter +import hu.bbara.purefin.data.NetworkMonitor +import hu.bbara.purefin.model.Episode +import hu.bbara.purefin.model.Movie +import hu.bbara.purefin.model.Series import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -20,6 +17,9 @@ import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.stateIn +import java.util.UUID +import javax.inject.Inject +import javax.inject.Singleton @OptIn(ExperimentalCoroutinesApi::class) @Singleton diff --git a/data/src/main/java/hu/bbara/purefin/data/catalog/DefaultEpisodeSeriesLookup.kt b/data/src/main/java/hu/bbara/purefin/data/catalog/DefaultEpisodeSeriesLookup.kt index 93b61fc0..7e4c9a28 100644 --- a/data/src/main/java/hu/bbara/purefin/data/catalog/DefaultEpisodeSeriesLookup.kt +++ b/data/src/main/java/hu/bbara/purefin/data/catalog/DefaultEpisodeSeriesLookup.kt @@ -1,7 +1,7 @@ package hu.bbara.purefin.data.catalog -import hu.bbara.purefin.core.data.EpisodeSeriesLookup -import hu.bbara.purefin.core.data.MediaCatalogReader +import hu.bbara.purefin.data.EpisodeSeriesLookup +import hu.bbara.purefin.data.MediaCatalogReader import java.util.UUID import javax.inject.Inject import javax.inject.Singleton diff --git a/data/src/main/java/hu/bbara/purefin/data/catalog/InMemoryAppContentRepository.kt b/data/src/main/java/hu/bbara/purefin/data/catalog/InMemoryAppContentRepository.kt index 8a3af514..73d708ae 100644 --- a/data/src/main/java/hu/bbara/purefin/data/catalog/InMemoryAppContentRepository.kt +++ b/data/src/main/java/hu/bbara/purefin/data/catalog/InMemoryAppContentRepository.kt @@ -2,18 +2,18 @@ package hu.bbara.purefin.data.catalog import android.util.Log import androidx.datastore.core.DataStore -import hu.bbara.purefin.core.data.HomeRepository -import hu.bbara.purefin.core.data.NetworkMonitor -import hu.bbara.purefin.core.data.session.UserSessionRepository -import hu.bbara.purefin.core.image.ArtworkKind -import hu.bbara.purefin.core.image.ImageUrlBuilder -import hu.bbara.purefin.core.model.Episode -import hu.bbara.purefin.core.model.Library -import hu.bbara.purefin.core.model.LibraryKind -import hu.bbara.purefin.core.model.Media -import hu.bbara.purefin.core.model.Movie -import hu.bbara.purefin.core.model.Season -import hu.bbara.purefin.core.model.Series +import hu.bbara.purefin.data.HomeRepository +import hu.bbara.purefin.data.NetworkMonitor +import hu.bbara.purefin.data.session.UserSessionRepository +import hu.bbara.purefin.image.ArtworkKind +import hu.bbara.purefin.image.ImageUrlBuilder +import hu.bbara.purefin.model.Episode +import hu.bbara.purefin.model.Library +import hu.bbara.purefin.model.LibraryKind +import hu.bbara.purefin.model.Media +import hu.bbara.purefin.model.Movie +import hu.bbara.purefin.model.Season +import hu.bbara.purefin.model.Series import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient import hu.bbara.purefin.data.offline.cache.HomeCache import hu.bbara.purefin.data.offline.cache.toCachedEpisode diff --git a/data/src/main/java/hu/bbara/purefin/data/catalog/InMemoryMediaRepository.kt b/data/src/main/java/hu/bbara/purefin/data/catalog/InMemoryMediaRepository.kt index af5b18c2..664559d5 100644 --- a/data/src/main/java/hu/bbara/purefin/data/catalog/InMemoryMediaRepository.kt +++ b/data/src/main/java/hu/bbara/purefin/data/catalog/InMemoryMediaRepository.kt @@ -1,14 +1,14 @@ package hu.bbara.purefin.data.catalog -import hu.bbara.purefin.core.data.MediaCatalogReader -import hu.bbara.purefin.core.data.MediaProgressWriter +import hu.bbara.purefin.data.MediaCatalogReader +import hu.bbara.purefin.data.MediaProgressWriter import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient -import hu.bbara.purefin.core.image.ImageUrlBuilder -import hu.bbara.purefin.core.data.session.UserSessionRepository -import hu.bbara.purefin.core.model.Episode -import hu.bbara.purefin.core.model.Movie -import hu.bbara.purefin.core.model.Season -import hu.bbara.purefin.core.model.Series +import hu.bbara.purefin.image.ImageUrlBuilder +import hu.bbara.purefin.data.session.UserSessionRepository +import hu.bbara.purefin.model.Episode +import hu.bbara.purefin.model.Movie +import hu.bbara.purefin.model.Season +import hu.bbara.purefin.model.Series import java.time.LocalDateTime import java.time.format.DateTimeFormatter import java.util.Locale diff --git a/data/src/main/java/hu/bbara/purefin/data/catalog/MediaRepositoryModule.kt b/data/src/main/java/hu/bbara/purefin/data/catalog/MediaRepositoryModule.kt index 99d64ea5..64f7fc54 100644 --- a/data/src/main/java/hu/bbara/purefin/data/catalog/MediaRepositoryModule.kt +++ b/data/src/main/java/hu/bbara/purefin/data/catalog/MediaRepositoryModule.kt @@ -4,11 +4,11 @@ import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import hu.bbara.purefin.core.data.EpisodeSeriesLookup -import hu.bbara.purefin.core.data.HomeRepository -import hu.bbara.purefin.core.data.MediaCatalogReader -import hu.bbara.purefin.core.data.MediaProgressWriter -import hu.bbara.purefin.core.data.OfflineCatalogReader +import hu.bbara.purefin.data.EpisodeSeriesLookup +import hu.bbara.purefin.data.HomeRepository +import hu.bbara.purefin.data.MediaCatalogReader +import hu.bbara.purefin.data.MediaProgressWriter +import hu.bbara.purefin.data.OfflineCatalogReader @Module @InstallIn(SingletonComponent::class) diff --git a/data/src/main/java/hu/bbara/purefin/data/catalog/OfflineMediaRepository.kt b/data/src/main/java/hu/bbara/purefin/data/catalog/OfflineMediaRepository.kt index f9fc93e4..e5c6dc7f 100644 --- a/data/src/main/java/hu/bbara/purefin/data/catalog/OfflineMediaRepository.kt +++ b/data/src/main/java/hu/bbara/purefin/data/catalog/OfflineMediaRepository.kt @@ -1,12 +1,12 @@ package hu.bbara.purefin.data.catalog -import hu.bbara.purefin.core.data.MediaCatalogReader -import hu.bbara.purefin.core.data.MediaProgressWriter -import hu.bbara.purefin.core.data.OfflineCatalogReader +import hu.bbara.purefin.data.MediaCatalogReader +import hu.bbara.purefin.data.MediaProgressWriter +import hu.bbara.purefin.data.OfflineCatalogReader import hu.bbara.purefin.data.offline.room.offline.OfflineRoomMediaLocalDataSource -import hu.bbara.purefin.core.model.Episode -import hu.bbara.purefin.core.model.Movie -import hu.bbara.purefin.core.model.Series +import hu.bbara.purefin.model.Episode +import hu.bbara.purefin.model.Movie +import hu.bbara.purefin.model.Series import java.util.UUID import javax.inject.Inject import javax.inject.Singleton diff --git a/data/src/main/java/hu/bbara/purefin/data/jellyfin/ConnectivityNetworkMonitor.kt b/data/src/main/java/hu/bbara/purefin/data/jellyfin/ConnectivityNetworkMonitor.kt index 5a954123..40ac9986 100644 --- a/data/src/main/java/hu/bbara/purefin/data/jellyfin/ConnectivityNetworkMonitor.kt +++ b/data/src/main/java/hu/bbara/purefin/data/jellyfin/ConnectivityNetworkMonitor.kt @@ -6,7 +6,7 @@ import android.net.Network import android.net.NetworkCapabilities import android.net.NetworkRequest import dagger.hilt.android.qualifiers.ApplicationContext -import hu.bbara.purefin.core.data.NetworkMonitor +import hu.bbara.purefin.data.NetworkMonitor import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/data/src/main/java/hu/bbara/purefin/data/jellyfin/DefaultPlayableMediaRepository.kt b/data/src/main/java/hu/bbara/purefin/data/jellyfin/DefaultPlayableMediaRepository.kt index 0effbf0e..801d584e 100644 --- a/data/src/main/java/hu/bbara/purefin/data/jellyfin/DefaultPlayableMediaRepository.kt +++ b/data/src/main/java/hu/bbara/purefin/data/jellyfin/DefaultPlayableMediaRepository.kt @@ -6,13 +6,13 @@ import androidx.core.net.toUri import androidx.media3.common.MediaItem import androidx.media3.common.MediaMetadata import androidx.media3.common.util.UnstableApi -import hu.bbara.purefin.core.data.PlayableMediaRepository -import hu.bbara.purefin.core.data.PlaybackReportContext -import hu.bbara.purefin.core.data.session.UserSessionRepository -import hu.bbara.purefin.core.image.ArtworkKind -import hu.bbara.purefin.core.image.ImageUrlBuilder -import hu.bbara.purefin.core.model.MediaSegment -import hu.bbara.purefin.core.model.SegmentType +import hu.bbara.purefin.data.PlayableMediaRepository +import hu.bbara.purefin.data.PlaybackReportContext +import hu.bbara.purefin.data.session.UserSessionRepository +import hu.bbara.purefin.image.ArtworkKind +import hu.bbara.purefin.image.ImageUrlBuilder +import hu.bbara.purefin.model.MediaSegment +import hu.bbara.purefin.model.SegmentType import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient import hu.bbara.purefin.data.jellyfin.playback.JellyfinPlaybackResolver import hu.bbara.purefin.data.jellyfin.playback.PlaybackDecision diff --git a/data/src/main/java/hu/bbara/purefin/data/jellyfin/JellyfinBindingsModule.kt b/data/src/main/java/hu/bbara/purefin/data/jellyfin/JellyfinBindingsModule.kt index d6375ecd..5bb76c13 100644 --- a/data/src/main/java/hu/bbara/purefin/data/jellyfin/JellyfinBindingsModule.kt +++ b/data/src/main/java/hu/bbara/purefin/data/jellyfin/JellyfinBindingsModule.kt @@ -4,12 +4,12 @@ import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import hu.bbara.purefin.core.data.AuthenticationRepository -import hu.bbara.purefin.core.data.DownloadMediaSourceResolver -import hu.bbara.purefin.core.data.NetworkMonitor -import hu.bbara.purefin.core.data.PlayableMediaRepository -import hu.bbara.purefin.core.data.PlaybackProgressReporter -import hu.bbara.purefin.core.data.SessionBootstrapper +import hu.bbara.purefin.data.AuthenticationRepository +import hu.bbara.purefin.data.DownloadMediaSourceResolver +import hu.bbara.purefin.data.NetworkMonitor +import hu.bbara.purefin.data.PlayableMediaRepository +import hu.bbara.purefin.data.PlaybackProgressReporter +import hu.bbara.purefin.data.SessionBootstrapper import hu.bbara.purefin.data.jellyfin.download.JellyfinDownloadMediaSourceResolver import hu.bbara.purefin.data.jellyfin.session.JellyfinAuthenticationRepository import hu.bbara.purefin.data.jellyfin.session.JellyfinSessionBootstrapper diff --git a/data/src/main/java/hu/bbara/purefin/data/jellyfin/JellyfinPlaybackProgressReporter.kt b/data/src/main/java/hu/bbara/purefin/data/jellyfin/JellyfinPlaybackProgressReporter.kt index d1520e86..7604b422 100644 --- a/data/src/main/java/hu/bbara/purefin/data/jellyfin/JellyfinPlaybackProgressReporter.kt +++ b/data/src/main/java/hu/bbara/purefin/data/jellyfin/JellyfinPlaybackProgressReporter.kt @@ -1,8 +1,8 @@ package hu.bbara.purefin.data.jellyfin -import hu.bbara.purefin.core.data.PlaybackProgressReporter +import hu.bbara.purefin.data.PlaybackProgressReporter import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient -import hu.bbara.purefin.core.data.PlaybackReportContext +import hu.bbara.purefin.data.PlaybackReportContext import java.util.UUID import javax.inject.Inject import javax.inject.Singleton diff --git a/data/src/main/java/hu/bbara/purefin/data/jellyfin/client/JellyfinApiClient.kt b/data/src/main/java/hu/bbara/purefin/data/jellyfin/client/JellyfinApiClient.kt index d1b71e4f..bfd470f3 100644 --- a/data/src/main/java/hu/bbara/purefin/data/jellyfin/client/JellyfinApiClient.kt +++ b/data/src/main/java/hu/bbara/purefin/data/jellyfin/client/JellyfinApiClient.kt @@ -3,9 +3,9 @@ package hu.bbara.purefin.data.jellyfin.client import android.content.Context import android.util.Log import dagger.hilt.android.qualifiers.ApplicationContext -import hu.bbara.purefin.core.data.PlaybackMethod -import hu.bbara.purefin.core.data.PlaybackReportContext -import hu.bbara.purefin.core.data.session.UserSessionRepository +import hu.bbara.purefin.data.PlaybackMethod +import hu.bbara.purefin.data.PlaybackReportContext +import hu.bbara.purefin.data.session.UserSessionRepository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.first import kotlinx.coroutines.withContext diff --git a/data/src/main/java/hu/bbara/purefin/data/jellyfin/client/JellyfinAuthInterceptor.kt b/data/src/main/java/hu/bbara/purefin/data/jellyfin/client/JellyfinAuthInterceptor.kt index fe954361..e7b6d845 100644 --- a/data/src/main/java/hu/bbara/purefin/data/jellyfin/client/JellyfinAuthInterceptor.kt +++ b/data/src/main/java/hu/bbara/purefin/data/jellyfin/client/JellyfinAuthInterceptor.kt @@ -1,6 +1,6 @@ package hu.bbara.purefin.data.jellyfin.client -import hu.bbara.purefin.core.data.session.UserSessionRepository +import hu.bbara.purefin.data.session.UserSessionRepository import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/data/src/main/java/hu/bbara/purefin/data/jellyfin/download/JellyfinDownloadMappers.kt b/data/src/main/java/hu/bbara/purefin/data/jellyfin/download/JellyfinDownloadMappers.kt index c3a532c0..88307c22 100644 --- a/data/src/main/java/hu/bbara/purefin/data/jellyfin/download/JellyfinDownloadMappers.kt +++ b/data/src/main/java/hu/bbara/purefin/data/jellyfin/download/JellyfinDownloadMappers.kt @@ -1,10 +1,10 @@ package hu.bbara.purefin.data.jellyfin.download -import hu.bbara.purefin.core.image.ImageUrlBuilder -import hu.bbara.purefin.core.model.Episode -import hu.bbara.purefin.core.model.Movie -import hu.bbara.purefin.core.model.Season -import hu.bbara.purefin.core.model.Series +import hu.bbara.purefin.image.ImageUrlBuilder +import hu.bbara.purefin.model.Episode +import hu.bbara.purefin.model.Movie +import hu.bbara.purefin.model.Season +import hu.bbara.purefin.model.Series import java.util.UUID import java.util.concurrent.TimeUnit import org.jellyfin.sdk.model.api.BaseItemDto diff --git a/data/src/main/java/hu/bbara/purefin/data/jellyfin/download/JellyfinDownloadMediaSourceResolver.kt b/data/src/main/java/hu/bbara/purefin/data/jellyfin/download/JellyfinDownloadMediaSourceResolver.kt index bad7fb97..c2132329 100644 --- a/data/src/main/java/hu/bbara/purefin/data/jellyfin/download/JellyfinDownloadMediaSourceResolver.kt +++ b/data/src/main/java/hu/bbara/purefin/data/jellyfin/download/JellyfinDownloadMediaSourceResolver.kt @@ -1,10 +1,10 @@ package hu.bbara.purefin.data.jellyfin.download -import hu.bbara.purefin.core.data.DownloadMediaSourceResolver -import hu.bbara.purefin.core.data.EpisodeDownloadSource -import hu.bbara.purefin.core.data.MovieDownloadSource -import hu.bbara.purefin.core.data.PlaybackMethod -import hu.bbara.purefin.core.data.session.UserSessionRepository +import hu.bbara.purefin.data.DownloadMediaSourceResolver +import hu.bbara.purefin.data.EpisodeDownloadSource +import hu.bbara.purefin.data.MovieDownloadSource +import hu.bbara.purefin.data.PlaybackMethod +import hu.bbara.purefin.data.session.UserSessionRepository import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient import hu.bbara.purefin.data.jellyfin.playback.PlaybackDecisionResolver import hu.bbara.purefin.data.jellyfin.playback.playbackCustomCacheKey diff --git a/data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/JellyfinPlaybackResolver.kt b/data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/JellyfinPlaybackResolver.kt index a17986fa..16f14e16 100644 --- a/data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/JellyfinPlaybackResolver.kt +++ b/data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/JellyfinPlaybackResolver.kt @@ -1,7 +1,7 @@ package hu.bbara.purefin.data.jellyfin.playback import android.util.Log -import hu.bbara.purefin.core.data.session.UserSessionRepository +import hu.bbara.purefin.data.session.UserSessionRepository import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient import java.util.UUID import java.util.concurrent.ConcurrentHashMap diff --git a/data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackCacheKeys.kt b/data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackCacheKeys.kt index c401f115..63cf33b7 100644 --- a/data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackCacheKeys.kt +++ b/data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackCacheKeys.kt @@ -1,6 +1,6 @@ package hu.bbara.purefin.data.jellyfin.playback -import hu.bbara.purefin.core.data.PlaybackMethod +import hu.bbara.purefin.data.PlaybackMethod fun playbackCustomCacheKey( mediaId: String, diff --git a/data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackDecision.kt b/data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackDecision.kt index a90177c1..265117df 100644 --- a/data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackDecision.kt +++ b/data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackDecision.kt @@ -1,6 +1,6 @@ package hu.bbara.purefin.data.jellyfin.playback -import hu.bbara.purefin.core.data.PlaybackReportContext +import hu.bbara.purefin.data.PlaybackReportContext import org.jellyfin.sdk.model.api.MediaSourceInfo data class PlaybackDecision( diff --git a/data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackDecisionResolver.kt b/data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackDecisionResolver.kt index 0b21ed70..9c3a60b7 100644 --- a/data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackDecisionResolver.kt +++ b/data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackDecisionResolver.kt @@ -1,10 +1,9 @@ package hu.bbara.purefin.data.jellyfin.playback -import hu.bbara.purefin.core.data.PlaybackMethod -import hu.bbara.purefin.core.data.PlaybackReportContext +import hu.bbara.purefin.data.PlaybackMethod +import hu.bbara.purefin.data.PlaybackReportContext import org.jellyfin.sdk.model.api.MediaProtocol import org.jellyfin.sdk.model.api.MediaSourceInfo -import org.jellyfin.sdk.model.api.PlayMethod internal object PlaybackDecisionResolver { fun resolve( diff --git a/data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackProfileModule.kt b/data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackProfileModule.kt index 330fb6de..572f98fe 100644 --- a/data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackProfileModule.kt +++ b/data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackProfileModule.kt @@ -4,7 +4,7 @@ import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import hu.bbara.purefin.core.data.PlaybackProfileFamily +import hu.bbara.purefin.data.PlaybackProfileFamily import javax.inject.Singleton @Module diff --git a/data/src/main/java/hu/bbara/purefin/data/jellyfin/session/JellyfinAuthenticationRepository.kt b/data/src/main/java/hu/bbara/purefin/data/jellyfin/session/JellyfinAuthenticationRepository.kt index 48002217..8287e9d5 100644 --- a/data/src/main/java/hu/bbara/purefin/data/jellyfin/session/JellyfinAuthenticationRepository.kt +++ b/data/src/main/java/hu/bbara/purefin/data/jellyfin/session/JellyfinAuthenticationRepository.kt @@ -1,8 +1,8 @@ package hu.bbara.purefin.data.jellyfin.session import android.util.Log -import hu.bbara.purefin.core.data.AuthenticationRepository -import hu.bbara.purefin.core.data.session.UserSessionRepository +import hu.bbara.purefin.data.AuthenticationRepository +import hu.bbara.purefin.data.session.UserSessionRepository import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient import javax.inject.Inject import javax.inject.Singleton diff --git a/data/src/main/java/hu/bbara/purefin/data/jellyfin/session/JellyfinSessionBootstrapper.kt b/data/src/main/java/hu/bbara/purefin/data/jellyfin/session/JellyfinSessionBootstrapper.kt index f3f36181..3d728cdc 100644 --- a/data/src/main/java/hu/bbara/purefin/data/jellyfin/session/JellyfinSessionBootstrapper.kt +++ b/data/src/main/java/hu/bbara/purefin/data/jellyfin/session/JellyfinSessionBootstrapper.kt @@ -1,6 +1,6 @@ package hu.bbara.purefin.data.jellyfin.session -import hu.bbara.purefin.core.data.SessionBootstrapper +import hu.bbara.purefin.data.SessionBootstrapper import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient import javax.inject.Inject import javax.inject.Singleton diff --git a/data/src/main/java/hu/bbara/purefin/data/jellyfin/session/UserSession.kt b/data/src/main/java/hu/bbara/purefin/data/jellyfin/session/UserSession.kt index e7d51cd2..8d3a7428 100644 --- a/data/src/main/java/hu/bbara/purefin/data/jellyfin/session/UserSession.kt +++ b/data/src/main/java/hu/bbara/purefin/data/jellyfin/session/UserSession.kt @@ -1,7 +1,7 @@ package hu.bbara.purefin.data.jellyfin.session import kotlinx.serialization.Serializable -import hu.bbara.purefin.core.navigation.UuidSerializer +import hu.bbara.purefin.navigation.UuidSerializer import java.util.UUID @Serializable diff --git a/data/src/main/java/hu/bbara/purefin/data/jellyfin/session/UserSessionModule.kt b/data/src/main/java/hu/bbara/purefin/data/jellyfin/session/UserSessionModule.kt index 19e6c507..d2a974e3 100644 --- a/data/src/main/java/hu/bbara/purefin/data/jellyfin/session/UserSessionModule.kt +++ b/data/src/main/java/hu/bbara/purefin/data/jellyfin/session/UserSessionModule.kt @@ -10,7 +10,7 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import hu.bbara.purefin.core.data.session.UserSessionRepository +import hu.bbara.purefin.data.session.UserSessionRepository import javax.inject.Singleton @Module diff --git a/data/src/main/java/hu/bbara/purefin/data/jellyfin/session/UserSessionRepository.kt b/data/src/main/java/hu/bbara/purefin/data/jellyfin/session/UserSessionRepository.kt index f3a67021..9dbdadd8 100644 --- a/data/src/main/java/hu/bbara/purefin/data/jellyfin/session/UserSessionRepository.kt +++ b/data/src/main/java/hu/bbara/purefin/data/jellyfin/session/UserSessionRepository.kt @@ -1,7 +1,7 @@ package hu.bbara.purefin.data.jellyfin.session import androidx.datastore.core.DataStore -import hu.bbara.purefin.core.data.session.UserSessionRepository +import hu.bbara.purefin.data.session.UserSessionRepository import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.first diff --git a/data/src/main/java/hu/bbara/purefin/data/offline/OfflineBindingsModule.kt b/data/src/main/java/hu/bbara/purefin/data/offline/OfflineBindingsModule.kt index 146c13d1..3b6054e5 100644 --- a/data/src/main/java/hu/bbara/purefin/data/offline/OfflineBindingsModule.kt +++ b/data/src/main/java/hu/bbara/purefin/data/offline/OfflineBindingsModule.kt @@ -4,8 +4,8 @@ import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import hu.bbara.purefin.core.data.OfflineCatalogStore -import hu.bbara.purefin.core.data.SmartDownloadStore +import hu.bbara.purefin.data.OfflineCatalogStore +import hu.bbara.purefin.data.SmartDownloadStore @Module @InstallIn(SingletonComponent::class) diff --git a/data/src/main/java/hu/bbara/purefin/data/offline/RoomOfflineCatalogStore.kt b/data/src/main/java/hu/bbara/purefin/data/offline/RoomOfflineCatalogStore.kt index b9cbeffb..56d54ae6 100644 --- a/data/src/main/java/hu/bbara/purefin/data/offline/RoomOfflineCatalogStore.kt +++ b/data/src/main/java/hu/bbara/purefin/data/offline/RoomOfflineCatalogStore.kt @@ -1,11 +1,11 @@ package hu.bbara.purefin.data.offline -import hu.bbara.purefin.core.data.OfflineCatalogStore +import hu.bbara.purefin.data.OfflineCatalogStore import hu.bbara.purefin.data.offline.room.offline.OfflineRoomMediaLocalDataSource -import hu.bbara.purefin.core.model.Episode -import hu.bbara.purefin.core.model.Movie -import hu.bbara.purefin.core.model.Season -import hu.bbara.purefin.core.model.Series +import hu.bbara.purefin.model.Episode +import hu.bbara.purefin.model.Movie +import hu.bbara.purefin.model.Season +import hu.bbara.purefin.model.Series import java.util.UUID import javax.inject.Inject import javax.inject.Singleton diff --git a/data/src/main/java/hu/bbara/purefin/data/offline/RoomSmartDownloadStore.kt b/data/src/main/java/hu/bbara/purefin/data/offline/RoomSmartDownloadStore.kt index 5ad51c04..befe025b 100644 --- a/data/src/main/java/hu/bbara/purefin/data/offline/RoomSmartDownloadStore.kt +++ b/data/src/main/java/hu/bbara/purefin/data/offline/RoomSmartDownloadStore.kt @@ -1,6 +1,6 @@ package hu.bbara.purefin.data.offline -import hu.bbara.purefin.core.data.SmartDownloadStore +import hu.bbara.purefin.data.SmartDownloadStore import hu.bbara.purefin.data.offline.room.dao.SmartDownloadDao import hu.bbara.purefin.data.offline.room.entity.SmartDownloadEntity import java.util.UUID diff --git a/data/src/main/java/hu/bbara/purefin/data/offline/cache/HomeCache.kt b/data/src/main/java/hu/bbara/purefin/data/offline/cache/HomeCache.kt index 385caf10..c08f69cd 100644 --- a/data/src/main/java/hu/bbara/purefin/data/offline/cache/HomeCache.kt +++ b/data/src/main/java/hu/bbara/purefin/data/offline/cache/HomeCache.kt @@ -1,12 +1,12 @@ package hu.bbara.purefin.data.offline.cache -import hu.bbara.purefin.core.model.CastMember -import hu.bbara.purefin.core.model.Episode -import hu.bbara.purefin.core.model.Library -import hu.bbara.purefin.core.model.LibraryKind -import hu.bbara.purefin.core.model.Media -import hu.bbara.purefin.core.model.Movie -import hu.bbara.purefin.core.model.Series +import hu.bbara.purefin.model.CastMember +import hu.bbara.purefin.model.Episode +import hu.bbara.purefin.model.Library +import hu.bbara.purefin.model.LibraryKind +import hu.bbara.purefin.model.Media +import hu.bbara.purefin.model.Movie +import hu.bbara.purefin.model.Series import kotlinx.serialization.Serializable import java.util.UUID diff --git a/data/src/main/java/hu/bbara/purefin/data/offline/room/offline/OfflineRoomMediaLocalDataSource.kt b/data/src/main/java/hu/bbara/purefin/data/offline/room/offline/OfflineRoomMediaLocalDataSource.kt index 33f2fb04..83f13c2c 100644 --- a/data/src/main/java/hu/bbara/purefin/data/offline/room/offline/OfflineRoomMediaLocalDataSource.kt +++ b/data/src/main/java/hu/bbara/purefin/data/offline/room/offline/OfflineRoomMediaLocalDataSource.kt @@ -9,10 +9,10 @@ import hu.bbara.purefin.data.offline.room.entity.EpisodeEntity import hu.bbara.purefin.data.offline.room.entity.MovieEntity import hu.bbara.purefin.data.offline.room.entity.SeasonEntity import hu.bbara.purefin.data.offline.room.entity.SeriesEntity -import hu.bbara.purefin.core.model.Episode -import hu.bbara.purefin.core.model.Movie -import hu.bbara.purefin.core.model.Season -import hu.bbara.purefin.core.model.Series +import hu.bbara.purefin.model.Episode +import hu.bbara.purefin.model.Movie +import hu.bbara.purefin.model.Season +import hu.bbara.purefin.model.Series import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import java.util.UUID diff --git a/data/src/main/java/hu/bbara/purefin/core/data/session/UserSessionRepository.kt b/data/src/main/java/hu/bbara/purefin/data/session/UserSessionRepository.kt similarity index 91% rename from data/src/main/java/hu/bbara/purefin/core/data/session/UserSessionRepository.kt rename to data/src/main/java/hu/bbara/purefin/data/session/UserSessionRepository.kt index cde057b8..46b26799 100644 --- a/data/src/main/java/hu/bbara/purefin/core/data/session/UserSessionRepository.kt +++ b/data/src/main/java/hu/bbara/purefin/data/session/UserSessionRepository.kt @@ -1,4 +1,4 @@ -package hu.bbara.purefin.core.data.session +package hu.bbara.purefin.data.session import java.util.UUID import kotlinx.coroutines.flow.Flow diff --git a/data/src/main/java/hu/bbara/purefin/core/image/ArtworkKind.kt b/data/src/main/java/hu/bbara/purefin/image/ArtworkKind.kt similarity index 76% rename from data/src/main/java/hu/bbara/purefin/core/image/ArtworkKind.kt rename to data/src/main/java/hu/bbara/purefin/image/ArtworkKind.kt index f35f6cd3..7259133d 100644 --- a/data/src/main/java/hu/bbara/purefin/core/image/ArtworkKind.kt +++ b/data/src/main/java/hu/bbara/purefin/image/ArtworkKind.kt @@ -1,4 +1,4 @@ -package hu.bbara.purefin.core.image +package hu.bbara.purefin.image enum class ArtworkKind( internal val pathSegment: String, diff --git a/data/src/main/java/hu/bbara/purefin/core/image/ImageUrlBuilder.kt b/data/src/main/java/hu/bbara/purefin/image/ImageUrlBuilder.kt similarity index 96% rename from data/src/main/java/hu/bbara/purefin/core/image/ImageUrlBuilder.kt rename to data/src/main/java/hu/bbara/purefin/image/ImageUrlBuilder.kt index be7a8446..c689f387 100644 --- a/data/src/main/java/hu/bbara/purefin/core/image/ImageUrlBuilder.kt +++ b/data/src/main/java/hu/bbara/purefin/image/ImageUrlBuilder.kt @@ -1,4 +1,4 @@ -package hu.bbara.purefin.core.image +package hu.bbara.purefin.image import java.util.UUID diff --git a/data/src/main/java/hu/bbara/purefin/core/model/CastMember.kt b/data/src/main/java/hu/bbara/purefin/model/CastMember.kt similarity index 72% rename from data/src/main/java/hu/bbara/purefin/core/model/CastMember.kt rename to data/src/main/java/hu/bbara/purefin/model/CastMember.kt index 92c12b86..bc3cf5b1 100644 --- a/data/src/main/java/hu/bbara/purefin/core/model/CastMember.kt +++ b/data/src/main/java/hu/bbara/purefin/model/CastMember.kt @@ -1,4 +1,4 @@ -package hu.bbara.purefin.core.model +package hu.bbara.purefin.model data class CastMember( val name: String, diff --git a/data/src/main/java/hu/bbara/purefin/core/model/Episode.kt b/data/src/main/java/hu/bbara/purefin/model/Episode.kt similarity index 91% rename from data/src/main/java/hu/bbara/purefin/core/model/Episode.kt rename to data/src/main/java/hu/bbara/purefin/model/Episode.kt index 438745c6..243f363b 100644 --- a/data/src/main/java/hu/bbara/purefin/core/model/Episode.kt +++ b/data/src/main/java/hu/bbara/purefin/model/Episode.kt @@ -1,4 +1,4 @@ -package hu.bbara.purefin.core.model +package hu.bbara.purefin.model import java.util.UUID diff --git a/data/src/main/java/hu/bbara/purefin/core/model/Library.kt b/data/src/main/java/hu/bbara/purefin/model/Library.kt similarity index 93% rename from data/src/main/java/hu/bbara/purefin/core/model/Library.kt rename to data/src/main/java/hu/bbara/purefin/model/Library.kt index 9f4f996a..804b647a 100644 --- a/data/src/main/java/hu/bbara/purefin/core/model/Library.kt +++ b/data/src/main/java/hu/bbara/purefin/model/Library.kt @@ -1,4 +1,4 @@ -package hu.bbara.purefin.core.model +package hu.bbara.purefin.model import java.util.UUID diff --git a/data/src/main/java/hu/bbara/purefin/core/model/LibraryKind.kt b/data/src/main/java/hu/bbara/purefin/model/LibraryKind.kt similarity index 59% rename from data/src/main/java/hu/bbara/purefin/core/model/LibraryKind.kt rename to data/src/main/java/hu/bbara/purefin/model/LibraryKind.kt index ff959323..97b06084 100644 --- a/data/src/main/java/hu/bbara/purefin/core/model/LibraryKind.kt +++ b/data/src/main/java/hu/bbara/purefin/model/LibraryKind.kt @@ -1,4 +1,4 @@ -package hu.bbara.purefin.core.model +package hu.bbara.purefin.model enum class LibraryKind { MOVIES, diff --git a/data/src/main/java/hu/bbara/purefin/core/model/Media.kt b/data/src/main/java/hu/bbara/purefin/model/Media.kt similarity index 92% rename from data/src/main/java/hu/bbara/purefin/core/model/Media.kt rename to data/src/main/java/hu/bbara/purefin/model/Media.kt index f9eea9c2..a5fa5fff 100644 --- a/data/src/main/java/hu/bbara/purefin/core/model/Media.kt +++ b/data/src/main/java/hu/bbara/purefin/model/Media.kt @@ -1,4 +1,4 @@ -package hu.bbara.purefin.core.model +package hu.bbara.purefin.model import java.util.UUID diff --git a/data/src/main/java/hu/bbara/purefin/core/model/MediaKind.kt b/data/src/main/java/hu/bbara/purefin/model/MediaKind.kt similarity index 67% rename from data/src/main/java/hu/bbara/purefin/core/model/MediaKind.kt rename to data/src/main/java/hu/bbara/purefin/model/MediaKind.kt index 1c2495f7..53a225b5 100644 --- a/data/src/main/java/hu/bbara/purefin/core/model/MediaKind.kt +++ b/data/src/main/java/hu/bbara/purefin/model/MediaKind.kt @@ -1,4 +1,4 @@ -package hu.bbara.purefin.core.model +package hu.bbara.purefin.model enum class MediaKind { MOVIE, diff --git a/data/src/main/java/hu/bbara/purefin/core/model/MediaSegment.kt b/data/src/main/java/hu/bbara/purefin/model/MediaSegment.kt similarity index 91% rename from data/src/main/java/hu/bbara/purefin/core/model/MediaSegment.kt rename to data/src/main/java/hu/bbara/purefin/model/MediaSegment.kt index 1538c436..3cf7c6a7 100644 --- a/data/src/main/java/hu/bbara/purefin/core/model/MediaSegment.kt +++ b/data/src/main/java/hu/bbara/purefin/model/MediaSegment.kt @@ -1,4 +1,4 @@ -package hu.bbara.purefin.core.model +package hu.bbara.purefin.model import java.util.UUID diff --git a/data/src/main/java/hu/bbara/purefin/core/model/Movie.kt b/data/src/main/java/hu/bbara/purefin/model/Movie.kt similarity index 91% rename from data/src/main/java/hu/bbara/purefin/core/model/Movie.kt rename to data/src/main/java/hu/bbara/purefin/model/Movie.kt index 5f185b88..aafd31d9 100644 --- a/data/src/main/java/hu/bbara/purefin/core/model/Movie.kt +++ b/data/src/main/java/hu/bbara/purefin/model/Movie.kt @@ -1,4 +1,4 @@ -package hu.bbara.purefin.core.model +package hu.bbara.purefin.model import java.util.UUID diff --git a/data/src/main/java/hu/bbara/purefin/core/model/Season.kt b/data/src/main/java/hu/bbara/purefin/model/Season.kt similarity index 86% rename from data/src/main/java/hu/bbara/purefin/core/model/Season.kt rename to data/src/main/java/hu/bbara/purefin/model/Season.kt index b01a43fa..a2118d66 100644 --- a/data/src/main/java/hu/bbara/purefin/core/model/Season.kt +++ b/data/src/main/java/hu/bbara/purefin/model/Season.kt @@ -1,4 +1,4 @@ -package hu.bbara.purefin.core.model +package hu.bbara.purefin.model import java.util.UUID diff --git a/data/src/main/java/hu/bbara/purefin/core/model/Series.kt b/data/src/main/java/hu/bbara/purefin/model/Series.kt similarity index 89% rename from data/src/main/java/hu/bbara/purefin/core/model/Series.kt rename to data/src/main/java/hu/bbara/purefin/model/Series.kt index 2c20edce..0f167373 100644 --- a/data/src/main/java/hu/bbara/purefin/core/model/Series.kt +++ b/data/src/main/java/hu/bbara/purefin/model/Series.kt @@ -1,4 +1,4 @@ -package hu.bbara.purefin.core.model +package hu.bbara.purefin.model import java.util.UUID diff --git a/data/src/main/java/hu/bbara/purefin/core/navigation/UuidSerializer.kt b/data/src/main/java/hu/bbara/purefin/navigation/UuidSerializer.kt similarity index 94% rename from data/src/main/java/hu/bbara/purefin/core/navigation/UuidSerializer.kt rename to data/src/main/java/hu/bbara/purefin/navigation/UuidSerializer.kt index 18a2073d..ec1fa714 100644 --- a/data/src/main/java/hu/bbara/purefin/core/navigation/UuidSerializer.kt +++ b/data/src/main/java/hu/bbara/purefin/navigation/UuidSerializer.kt @@ -1,12 +1,12 @@ -package hu.bbara.purefin.core.navigation +package hu.bbara.purefin.navigation -import java.util.UUID import kotlinx.serialization.KSerializer import kotlinx.serialization.descriptors.PrimitiveKind import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor import kotlinx.serialization.descriptors.SerialDescriptor import kotlinx.serialization.encoding.Decoder import kotlinx.serialization.encoding.Encoder +import java.util.UUID object UuidSerializer : KSerializer { override val descriptor: SerialDescriptor = @@ -17,4 +17,4 @@ object UuidSerializer : KSerializer { override fun serialize(encoder: Encoder, value: UUID) { encoder.encodeString(value.toString()) } -} +} \ No newline at end of file diff --git a/data/src/test/java/hu/bbara/purefin/data/catalog/DefaultEpisodeSeriesLookupTest.kt b/data/src/test/java/hu/bbara/purefin/data/catalog/DefaultEpisodeSeriesLookupTest.kt index 800f4cac..a83a1310 100644 --- a/data/src/test/java/hu/bbara/purefin/data/catalog/DefaultEpisodeSeriesLookupTest.kt +++ b/data/src/test/java/hu/bbara/purefin/data/catalog/DefaultEpisodeSeriesLookupTest.kt @@ -1,9 +1,9 @@ package hu.bbara.purefin.data.catalog -import hu.bbara.purefin.core.data.MediaCatalogReader -import hu.bbara.purefin.core.model.Episode -import hu.bbara.purefin.core.model.Movie -import hu.bbara.purefin.core.model.Series +import hu.bbara.purefin.data.MediaCatalogReader +import hu.bbara.purefin.model.Episode +import hu.bbara.purefin.model.Movie +import hu.bbara.purefin.model.Series import java.util.UUID import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/data/src/test/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackCacheKeysTest.kt b/data/src/test/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackCacheKeysTest.kt index e58b9953..2ea16a1e 100644 --- a/data/src/test/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackCacheKeysTest.kt +++ b/data/src/test/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackCacheKeysTest.kt @@ -1,6 +1,6 @@ package hu.bbara.purefin.data.jellyfin.playback -import hu.bbara.purefin.core.data.PlaybackMethod +import hu.bbara.purefin.data.PlaybackMethod import org.junit.Assert.assertEquals import org.junit.Assert.assertNull import org.junit.Test diff --git a/data/src/test/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackDecisionResolverTest.kt b/data/src/test/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackDecisionResolverTest.kt index c8da70ab..9f3915e0 100644 --- a/data/src/test/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackDecisionResolverTest.kt +++ b/data/src/test/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackDecisionResolverTest.kt @@ -1,6 +1,6 @@ package hu.bbara.purefin.data.jellyfin.playback -import hu.bbara.purefin.core.data.PlaybackMethod +import hu.bbara.purefin.data.PlaybackMethod import org.jellyfin.sdk.model.api.MediaProtocol import org.jellyfin.sdk.model.api.MediaSourceInfo import org.jellyfin.sdk.model.api.MediaSourceType diff --git a/domain/src/main/java/hu/bbara/purefin/core/download/MediaDownloadManager.kt b/domain/src/main/java/hu/bbara/purefin/core/download/MediaDownloadManager.kt index f4df08cd..473e281e 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/download/MediaDownloadManager.kt +++ b/domain/src/main/java/hu/bbara/purefin/core/download/MediaDownloadManager.kt @@ -9,9 +9,9 @@ import androidx.media3.exoplayer.offline.Download import androidx.media3.exoplayer.offline.DownloadManager import androidx.media3.exoplayer.offline.DownloadRequest import dagger.hilt.android.qualifiers.ApplicationContext -import hu.bbara.purefin.core.data.DownloadMediaSourceResolver -import hu.bbara.purefin.core.data.OfflineCatalogStore -import hu.bbara.purefin.core.data.SmartDownloadStore +import hu.bbara.purefin.data.DownloadMediaSourceResolver +import hu.bbara.purefin.data.OfflineCatalogStore +import hu.bbara.purefin.data.SmartDownloadStore import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.delay @@ -19,7 +19,6 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.distinctUntilChanged -import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.launch diff --git a/domain/src/main/java/hu/bbara/purefin/core/navigation/EpisodeDto.kt b/domain/src/main/java/hu/bbara/purefin/core/navigation/EpisodeDto.kt index 5fc6a985..78529687 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/navigation/EpisodeDto.kt +++ b/domain/src/main/java/hu/bbara/purefin/core/navigation/EpisodeDto.kt @@ -2,7 +2,7 @@ package hu.bbara.purefin.core.navigation import java.util.UUID import kotlinx.serialization.Serializable -import hu.bbara.purefin.core.navigation.UuidSerializer +import hu.bbara.purefin.navigation.UuidSerializer @Serializable data class EpisodeDto( diff --git a/domain/src/main/java/hu/bbara/purefin/core/navigation/LibraryDto.kt b/domain/src/main/java/hu/bbara/purefin/core/navigation/LibraryDto.kt index 9ea517c2..e50f6d8f 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/navigation/LibraryDto.kt +++ b/domain/src/main/java/hu/bbara/purefin/core/navigation/LibraryDto.kt @@ -2,7 +2,7 @@ package hu.bbara.purefin.core.navigation import java.util.UUID import kotlinx.serialization.Serializable -import hu.bbara.purefin.core.navigation.UuidSerializer +import hu.bbara.purefin.navigation.UuidSerializer @Serializable data class LibraryDto( diff --git a/domain/src/main/java/hu/bbara/purefin/core/navigation/MovieDto.kt b/domain/src/main/java/hu/bbara/purefin/core/navigation/MovieDto.kt index 03b7a5f5..822e4f3a 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/navigation/MovieDto.kt +++ b/domain/src/main/java/hu/bbara/purefin/core/navigation/MovieDto.kt @@ -2,7 +2,7 @@ package hu.bbara.purefin.core.navigation import java.util.UUID import kotlinx.serialization.Serializable -import hu.bbara.purefin.core.navigation.UuidSerializer +import hu.bbara.purefin.navigation.UuidSerializer @Serializable data class MovieDto( diff --git a/domain/src/main/java/hu/bbara/purefin/core/navigation/SeriesDto.kt b/domain/src/main/java/hu/bbara/purefin/core/navigation/SeriesDto.kt index a2cffdb5..1e1f4332 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/navigation/SeriesDto.kt +++ b/domain/src/main/java/hu/bbara/purefin/core/navigation/SeriesDto.kt @@ -2,7 +2,7 @@ package hu.bbara.purefin.core.navigation import java.util.UUID import kotlinx.serialization.Serializable -import hu.bbara.purefin.core.navigation.UuidSerializer +import hu.bbara.purefin.navigation.UuidSerializer @Serializable data class SeriesDto( diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/manager/MediaSegmentManager.kt b/domain/src/main/java/hu/bbara/purefin/core/player/manager/MediaSegmentManager.kt index 4e51e41b..59d185f6 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/manager/MediaSegmentManager.kt +++ b/domain/src/main/java/hu/bbara/purefin/core/player/manager/MediaSegmentManager.kt @@ -6,8 +6,8 @@ import androidx.annotation.OptIn import androidx.media3.common.util.UnstableApi import androidx.media3.exoplayer.ExoPlayer import androidx.media3.exoplayer.PlayerMessage -import hu.bbara.purefin.core.model.MediaSegment -import hu.bbara.purefin.core.model.SegmentType +import hu.bbara.purefin.model.MediaSegment +import hu.bbara.purefin.model.SegmentType import hu.bbara.purefin.core.player.model.SegmentStatus @OptIn(UnstableApi::class) diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/manager/PlayerManager.kt b/domain/src/main/java/hu/bbara/purefin/core/player/manager/PlayerManager.kt index bf8a5457..3b96ecfa 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/manager/PlayerManager.kt +++ b/domain/src/main/java/hu/bbara/purefin/core/player/manager/PlayerManager.kt @@ -9,8 +9,8 @@ import androidx.media3.common.TrackSelectionOverride import androidx.media3.common.util.UnstableApi import androidx.media3.exoplayer.ExoPlayer import dagger.hilt.android.scopes.ViewModelScoped -import hu.bbara.purefin.core.data.PlaybackReportContext -import hu.bbara.purefin.core.model.MediaSegment +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 diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/manager/ProgressManager.kt b/domain/src/main/java/hu/bbara/purefin/core/player/manager/ProgressManager.kt index d2f6dc6f..c72136fb 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/manager/ProgressManager.kt +++ b/domain/src/main/java/hu/bbara/purefin/core/player/manager/ProgressManager.kt @@ -2,9 +2,9 @@ package hu.bbara.purefin.core.player.manager import android.util.Log import dagger.hilt.android.scopes.ViewModelScoped -import hu.bbara.purefin.core.data.MediaProgressWriter -import hu.bbara.purefin.core.data.PlaybackProgressReporter -import hu.bbara.purefin.core.data.PlaybackReportContext +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 diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/model/MediaContext.kt b/domain/src/main/java/hu/bbara/purefin/core/player/model/MediaContext.kt index dd382214..29bcc58c 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/model/MediaContext.kt +++ b/domain/src/main/java/hu/bbara/purefin/core/player/model/MediaContext.kt @@ -1,6 +1,6 @@ package hu.bbara.purefin.core.player.model -import hu.bbara.purefin.core.model.MediaSegment +import hu.bbara.purefin.model.MediaSegment import hu.bbara.purefin.core.player.preference.MediaTrackPreferences data class MediaContext( diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/model/MetadataState.kt b/domain/src/main/java/hu/bbara/purefin/core/player/model/MetadataState.kt index a25342e6..88ec733b 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/model/MetadataState.kt +++ b/domain/src/main/java/hu/bbara/purefin/core/player/model/MetadataState.kt @@ -1,6 +1,6 @@ package hu.bbara.purefin.core.player.model -import hu.bbara.purefin.core.data.PlaybackReportContext +import hu.bbara.purefin.data.PlaybackReportContext data class MetadataState( val mediaId: String? = null, diff --git a/domain/src/main/java/hu/bbara/purefin/core/player/viewmodel/PlayerViewModel.kt b/domain/src/main/java/hu/bbara/purefin/core/player/viewmodel/PlayerViewModel.kt index a7408658..80077b09 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/player/viewmodel/PlayerViewModel.kt +++ b/domain/src/main/java/hu/bbara/purefin/core/player/viewmodel/PlayerViewModel.kt @@ -4,8 +4,8 @@ import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import hu.bbara.purefin.core.data.EpisodeSeriesLookup -import hu.bbara.purefin.core.data.PlayableMediaRepository +import hu.bbara.purefin.data.EpisodeSeriesLookup +import hu.bbara.purefin.data.PlayableMediaRepository import hu.bbara.purefin.core.player.manager.PlayerManager import hu.bbara.purefin.core.player.manager.ProgressManager import hu.bbara.purefin.core.player.model.MediaContext diff --git a/domain/src/main/java/hu/bbara/purefin/core/ui/model/MediaUiModel.kt b/domain/src/main/java/hu/bbara/purefin/core/ui/model/MediaUiModel.kt index 8bbfa23d..8d9a0774 100644 --- a/domain/src/main/java/hu/bbara/purefin/core/ui/model/MediaUiModel.kt +++ b/domain/src/main/java/hu/bbara/purefin/core/ui/model/MediaUiModel.kt @@ -1,10 +1,10 @@ package hu.bbara.purefin.core.ui.model -import hu.bbara.purefin.core.image.ArtworkKind -import hu.bbara.purefin.core.image.ImageUrlBuilder -import hu.bbara.purefin.core.model.Episode -import hu.bbara.purefin.core.model.Movie -import hu.bbara.purefin.core.model.Series +import hu.bbara.purefin.image.ArtworkKind +import hu.bbara.purefin.image.ImageUrlBuilder +import hu.bbara.purefin.model.Episode +import hu.bbara.purefin.model.Movie +import hu.bbara.purefin.model.Series import java.util.UUID sealed interface MediaUiModel { 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 1da87af1..93456e3d 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 @@ -3,12 +3,12 @@ package hu.bbara.purefin.feature.browse.home import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import hu.bbara.purefin.core.data.HomeRepository -import hu.bbara.purefin.core.data.MediaCatalogReader -import hu.bbara.purefin.core.data.session.UserSessionRepository +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.core.model.LibraryKind -import hu.bbara.purefin.core.model.Media +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 diff --git a/domain/src/main/java/hu/bbara/purefin/feature/browse/home/HomeModels.kt b/domain/src/main/java/hu/bbara/purefin/feature/browse/home/HomeModels.kt index 1654fa5e..1ab2dd5e 100644 --- a/domain/src/main/java/hu/bbara/purefin/feature/browse/home/HomeModels.kt +++ b/domain/src/main/java/hu/bbara/purefin/feature/browse/home/HomeModels.kt @@ -1,12 +1,12 @@ package hu.bbara.purefin.feature.browse.home -import hu.bbara.purefin.core.image.ArtworkKind -import hu.bbara.purefin.core.image.ImageUrlBuilder -import hu.bbara.purefin.core.model.Episode -import hu.bbara.purefin.core.model.LibraryKind -import hu.bbara.purefin.core.model.MediaKind -import hu.bbara.purefin.core.model.Movie -import hu.bbara.purefin.core.model.Series +import hu.bbara.purefin.image.ArtworkKind +import hu.bbara.purefin.image.ImageUrlBuilder +import hu.bbara.purefin.model.Episode +import hu.bbara.purefin.model.LibraryKind +import hu.bbara.purefin.model.MediaKind +import hu.bbara.purefin.model.Movie +import hu.bbara.purefin.model.Series import java.util.UUID sealed interface FocusableItem { 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 db30f79f..f42be826 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 @@ -3,8 +3,8 @@ package hu.bbara.purefin.feature.browse.library import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import hu.bbara.purefin.core.data.HomeRepository -import hu.bbara.purefin.core.model.LibraryKind +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 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 cefb2451..91edc088 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 @@ -3,10 +3,10 @@ package hu.bbara.purefin.feature.content.episode import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import hu.bbara.purefin.core.data.MediaCatalogReader +import hu.bbara.purefin.data.MediaCatalogReader import hu.bbara.purefin.core.download.DownloadState import hu.bbara.purefin.core.download.MediaDownloadController -import hu.bbara.purefin.core.model.Episode +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 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 53d223c1..637001ba 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 @@ -3,10 +3,10 @@ package hu.bbara.purefin.feature.content.movie import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import hu.bbara.purefin.core.data.MediaCatalogReader +import hu.bbara.purefin.data.MediaCatalogReader import hu.bbara.purefin.core.download.DownloadState import hu.bbara.purefin.core.download.MediaDownloadController -import hu.bbara.purefin.core.model.Movie +import hu.bbara.purefin.model.Movie import hu.bbara.purefin.core.navigation.NavigationManager import hu.bbara.purefin.core.navigation.Route import java.util.UUID 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 ce0dadf0..96234615 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 @@ -3,11 +3,11 @@ package hu.bbara.purefin.feature.content.series import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import hu.bbara.purefin.core.data.MediaCatalogReader +import hu.bbara.purefin.data.MediaCatalogReader import hu.bbara.purefin.core.download.DownloadState import hu.bbara.purefin.core.download.MediaDownloadController -import hu.bbara.purefin.core.model.Episode -import hu.bbara.purefin.core.model.Series +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 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 9c443a66..2f3fbdb3 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 @@ -3,10 +3,10 @@ package hu.bbara.purefin.feature.downloads import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import hu.bbara.purefin.core.data.OfflineCatalogReader +import hu.bbara.purefin.data.OfflineCatalogReader import hu.bbara.purefin.core.download.MediaDownloadController -import hu.bbara.purefin.core.image.ArtworkKind -import hu.bbara.purefin.core.image.ImageUrlBuilder +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 diff --git a/domain/src/main/java/hu/bbara/purefin/feature/login/LoginViewModel.kt b/domain/src/main/java/hu/bbara/purefin/feature/login/LoginViewModel.kt index d17c147e..a20a8c80 100644 --- a/domain/src/main/java/hu/bbara/purefin/feature/login/LoginViewModel.kt +++ b/domain/src/main/java/hu/bbara/purefin/feature/login/LoginViewModel.kt @@ -3,8 +3,8 @@ package hu.bbara.purefin.feature.login import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import hu.bbara.purefin.core.data.AuthenticationRepository -import hu.bbara.purefin.core.data.session.UserSessionRepository +import hu.bbara.purefin.data.AuthenticationRepository +import hu.bbara.purefin.data.session.UserSessionRepository import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/domain/src/main/java/hu/bbara/purefin/feature/search/SearchResult.kt b/domain/src/main/java/hu/bbara/purefin/feature/search/SearchResult.kt index e5ba1ccd..33d80ab1 100644 --- a/domain/src/main/java/hu/bbara/purefin/feature/search/SearchResult.kt +++ b/domain/src/main/java/hu/bbara/purefin/feature/search/SearchResult.kt @@ -1,8 +1,8 @@ package hu.bbara.purefin.feature.search -import hu.bbara.purefin.core.model.MediaKind -import hu.bbara.purefin.core.model.Movie -import hu.bbara.purefin.core.model.Series +import hu.bbara.purefin.model.MediaKind +import hu.bbara.purefin.model.Movie +import hu.bbara.purefin.model.Series import java.util.UUID data class SearchResult( diff --git a/domain/src/main/java/hu/bbara/purefin/feature/search/SearchViewModel.kt b/domain/src/main/java/hu/bbara/purefin/feature/search/SearchViewModel.kt index 233b8aee..a808a912 100644 --- a/domain/src/main/java/hu/bbara/purefin/feature/search/SearchViewModel.kt +++ b/domain/src/main/java/hu/bbara/purefin/feature/search/SearchViewModel.kt @@ -3,9 +3,9 @@ package hu.bbara.purefin.feature.search import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import hu.bbara.purefin.core.data.MediaCatalogReader -import hu.bbara.purefin.core.image.ImageUrlBuilder -import hu.bbara.purefin.core.data.session.UserSessionRepository +import hu.bbara.purefin.data.MediaCatalogReader +import hu.bbara.purefin.image.ImageUrlBuilder +import hu.bbara.purefin.data.session.UserSessionRepository import java.util.UUID import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.MutableStateFlow @@ -15,7 +15,7 @@ import kotlinx.coroutines.flow.debounce import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.launchIn -import hu.bbara.purefin.core.image.ArtworkKind +import hu.bbara.purefin.image.ArtworkKind import javax.inject.Inject @HiltViewModel diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailComponents.kt b/ui-common/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailComponents.kt index deccbab0..fd2e3757 100644 --- a/ui-common/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailComponents.kt +++ b/ui-common/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailComponents.kt @@ -33,7 +33,7 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import hu.bbara.purefin.core.model.CastMember +import hu.bbara.purefin.model.CastMember import hu.bbara.purefin.ui.common.image.PurefinAsyncImage @Composable