diff --git a/app/src/main/java/eu/kanade/data/chapter/ChapterRepositoryImpl.kt b/app/src/main/java/eu/kanade/data/chapter/ChapterRepositoryImpl.kt index a5e6734e0..52faab4d5 100644 --- a/app/src/main/java/eu/kanade/data/chapter/ChapterRepositoryImpl.kt +++ b/app/src/main/java/eu/kanade/data/chapter/ChapterRepositoryImpl.kt @@ -1,6 +1,5 @@ package eu.kanade.data.chapter -import eu.kanade.domain.chapter.repository.ChapterRepository import eu.kanade.tachiyomi.util.system.logcat import eu.kanade.tachiyomi.util.system.toLong import kotlinx.coroutines.flow.Flow @@ -8,6 +7,7 @@ import logcat.LogPriority import tachiyomi.data.DatabaseHandler import tachiyomi.domain.chapter.model.Chapter import tachiyomi.domain.chapter.model.ChapterUpdate +import tachiyomi.domain.chapter.repository.ChapterRepository class ChapterRepositoryImpl( private val handler: DatabaseHandler, diff --git a/app/src/main/java/eu/kanade/data/history/HistoryRepositoryImpl.kt b/app/src/main/java/eu/kanade/data/history/HistoryRepositoryImpl.kt index 98a389ccd..c0c66ca29 100644 --- a/app/src/main/java/eu/kanade/data/history/HistoryRepositoryImpl.kt +++ b/app/src/main/java/eu/kanade/data/history/HistoryRepositoryImpl.kt @@ -1,12 +1,12 @@ package eu.kanade.data.history -import eu.kanade.domain.history.repository.HistoryRepository import eu.kanade.tachiyomi.util.system.logcat import kotlinx.coroutines.flow.Flow import logcat.LogPriority import tachiyomi.data.DatabaseHandler import tachiyomi.domain.history.model.HistoryUpdate import tachiyomi.domain.history.model.HistoryWithRelations +import tachiyomi.domain.history.repository.HistoryRepository class HistoryRepositoryImpl( private val handler: DatabaseHandler, diff --git a/app/src/main/java/eu/kanade/data/manga/MangaMapper.kt b/app/src/main/java/eu/kanade/data/manga/MangaMapper.kt index c43f8dd9a..2574ab82a 100644 --- a/app/src/main/java/eu/kanade/data/manga/MangaMapper.kt +++ b/app/src/main/java/eu/kanade/data/manga/MangaMapper.kt @@ -1,7 +1,7 @@ package eu.kanade.data.manga -import eu.kanade.domain.library.model.LibraryManga import eu.kanade.tachiyomi.source.model.UpdateStrategy +import tachiyomi.domain.library.model.LibraryManga import tachiyomi.domain.manga.model.Manga val mangaMapper: (Long, Long, String, String?, String?, String?, List?, String, Long, String?, Boolean, Long?, Long?, Boolean, Long, Long, Long, Long, UpdateStrategy) -> Manga = diff --git a/app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt b/app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt index 9c221a271..037f7d050 100644 --- a/app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt +++ b/app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt @@ -1,7 +1,5 @@ package eu.kanade.data.manga -import eu.kanade.domain.library.model.LibraryManga -import eu.kanade.domain.manga.repository.MangaRepository import eu.kanade.tachiyomi.util.system.logcat import eu.kanade.tachiyomi.util.system.toLong import kotlinx.coroutines.flow.Flow @@ -9,8 +7,10 @@ import logcat.LogPriority import tachiyomi.data.DatabaseHandler import tachiyomi.data.listOfStringsAdapter import tachiyomi.data.updateStrategyAdapter +import tachiyomi.domain.library.model.LibraryManga import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.MangaUpdate +import tachiyomi.domain.manga.repository.MangaRepository class MangaRepositoryImpl( private val handler: DatabaseHandler, diff --git a/app/src/main/java/eu/kanade/data/source/SourceDataRepositoryImpl.kt b/app/src/main/java/eu/kanade/data/source/SourceDataRepositoryImpl.kt index ee80b888c..8616d134f 100644 --- a/app/src/main/java/eu/kanade/data/source/SourceDataRepositoryImpl.kt +++ b/app/src/main/java/eu/kanade/data/source/SourceDataRepositoryImpl.kt @@ -1,9 +1,9 @@ package eu.kanade.data.source -import eu.kanade.domain.source.repository.SourceDataRepository import kotlinx.coroutines.flow.Flow import tachiyomi.data.DatabaseHandler import tachiyomi.domain.source.model.SourceData +import tachiyomi.domain.source.repository.SourceDataRepository class SourceDataRepositoryImpl( private val handler: DatabaseHandler, diff --git a/app/src/main/java/eu/kanade/data/updates/UpdatesRepositoryImpl.kt b/app/src/main/java/eu/kanade/data/updates/UpdatesRepositoryImpl.kt index 5364b1ea8..4d0c86292 100644 --- a/app/src/main/java/eu/kanade/data/updates/UpdatesRepositoryImpl.kt +++ b/app/src/main/java/eu/kanade/data/updates/UpdatesRepositoryImpl.kt @@ -1,9 +1,9 @@ package eu.kanade.data.updates -import eu.kanade.domain.updates.repository.UpdatesRepository import kotlinx.coroutines.flow.Flow import tachiyomi.data.DatabaseHandler import tachiyomi.domain.updates.model.UpdatesWithRelations +import tachiyomi.domain.updates.repository.UpdatesRepository class UpdatesRepositoryImpl( val databaseHandler: DatabaseHandler, diff --git a/app/src/main/java/eu/kanade/domain/DomainModule.kt b/app/src/main/java/eu/kanade/domain/DomainModule.kt index eaea7ca99..9a84b61ca 100644 --- a/app/src/main/java/eu/kanade/domain/DomainModule.kt +++ b/app/src/main/java/eu/kanade/domain/DomainModule.kt @@ -25,7 +25,6 @@ import eu.kanade.domain.chapter.interactor.ShouldUpdateDbChapter import eu.kanade.domain.chapter.interactor.SyncChaptersWithSource import eu.kanade.domain.chapter.interactor.SyncChaptersWithTrackServiceTwoWay import eu.kanade.domain.chapter.interactor.UpdateChapter -import eu.kanade.domain.chapter.repository.ChapterRepository import eu.kanade.domain.download.interactor.DeleteDownload import eu.kanade.domain.extension.interactor.GetExtensionLanguages import eu.kanade.domain.extension.interactor.GetExtensionSources @@ -35,7 +34,6 @@ import eu.kanade.domain.history.interactor.GetNextChapters import eu.kanade.domain.history.interactor.GetTotalReadDuration import eu.kanade.domain.history.interactor.RemoveHistory import eu.kanade.domain.history.interactor.UpsertHistory -import eu.kanade.domain.history.repository.HistoryRepository import eu.kanade.domain.manga.interactor.GetDuplicateLibraryManga import eu.kanade.domain.manga.interactor.GetFavorites import eu.kanade.domain.manga.interactor.GetLibraryManga @@ -46,7 +44,6 @@ import eu.kanade.domain.manga.interactor.ResetViewerFlags import eu.kanade.domain.manga.interactor.SetMangaChapterFlags import eu.kanade.domain.manga.interactor.SetMangaViewerFlags import eu.kanade.domain.manga.interactor.UpdateManga -import eu.kanade.domain.manga.repository.MangaRepository import eu.kanade.domain.source.interactor.GetEnabledSources import eu.kanade.domain.source.interactor.GetLanguagesWithSources import eu.kanade.domain.source.interactor.GetRemoteManga @@ -56,7 +53,6 @@ import eu.kanade.domain.source.interactor.SetMigrateSorting import eu.kanade.domain.source.interactor.ToggleLanguage import eu.kanade.domain.source.interactor.ToggleSource import eu.kanade.domain.source.interactor.ToggleSourcePin -import eu.kanade.domain.source.repository.SourceDataRepository import eu.kanade.domain.source.repository.SourceRepository import eu.kanade.domain.track.interactor.DeleteTrack import eu.kanade.domain.track.interactor.GetTracks @@ -64,9 +60,13 @@ import eu.kanade.domain.track.interactor.GetTracksPerManga import eu.kanade.domain.track.interactor.InsertTrack import eu.kanade.domain.track.repository.TrackRepository import eu.kanade.domain.updates.interactor.GetUpdates -import eu.kanade.domain.updates.repository.UpdatesRepository import tachiyomi.data.category.CategoryRepositoryImpl import tachiyomi.domain.category.repository.CategoryRepository +import tachiyomi.domain.chapter.repository.ChapterRepository +import tachiyomi.domain.history.repository.HistoryRepository +import tachiyomi.domain.manga.repository.MangaRepository +import tachiyomi.domain.source.repository.SourceDataRepository +import tachiyomi.domain.updates.repository.UpdatesRepository import uy.kohesive.injekt.api.InjektModule import uy.kohesive.injekt.api.InjektRegistrar import uy.kohesive.injekt.api.addFactory diff --git a/app/src/main/java/eu/kanade/domain/category/interactor/SetMangaCategories.kt b/app/src/main/java/eu/kanade/domain/category/interactor/SetMangaCategories.kt index 1ddb55c3b..04fafc5e2 100644 --- a/app/src/main/java/eu/kanade/domain/category/interactor/SetMangaCategories.kt +++ b/app/src/main/java/eu/kanade/domain/category/interactor/SetMangaCategories.kt @@ -1,8 +1,8 @@ package eu.kanade.domain.category.interactor -import eu.kanade.domain.manga.repository.MangaRepository import eu.kanade.tachiyomi.util.system.logcat import logcat.LogPriority +import tachiyomi.domain.manga.repository.MangaRepository class SetMangaCategories( private val mangaRepository: MangaRepository, diff --git a/app/src/main/java/eu/kanade/domain/chapter/interactor/GetChapter.kt b/app/src/main/java/eu/kanade/domain/chapter/interactor/GetChapter.kt index 45236a1eb..9f82fed70 100644 --- a/app/src/main/java/eu/kanade/domain/chapter/interactor/GetChapter.kt +++ b/app/src/main/java/eu/kanade/domain/chapter/interactor/GetChapter.kt @@ -1,9 +1,9 @@ package eu.kanade.domain.chapter.interactor -import eu.kanade.domain.chapter.repository.ChapterRepository import eu.kanade.tachiyomi.util.system.logcat import logcat.LogPriority import tachiyomi.domain.chapter.model.Chapter +import tachiyomi.domain.chapter.repository.ChapterRepository class GetChapter( private val chapterRepository: ChapterRepository, diff --git a/app/src/main/java/eu/kanade/domain/chapter/interactor/GetChapterByMangaId.kt b/app/src/main/java/eu/kanade/domain/chapter/interactor/GetChapterByMangaId.kt index 7554a0437..c9c1dcbf8 100644 --- a/app/src/main/java/eu/kanade/domain/chapter/interactor/GetChapterByMangaId.kt +++ b/app/src/main/java/eu/kanade/domain/chapter/interactor/GetChapterByMangaId.kt @@ -1,9 +1,9 @@ package eu.kanade.domain.chapter.interactor -import eu.kanade.domain.chapter.repository.ChapterRepository import eu.kanade.tachiyomi.util.system.logcat import logcat.LogPriority import tachiyomi.domain.chapter.model.Chapter +import tachiyomi.domain.chapter.repository.ChapterRepository class GetChapterByMangaId( private val chapterRepository: ChapterRepository, diff --git a/app/src/main/java/eu/kanade/domain/chapter/interactor/SetReadStatus.kt b/app/src/main/java/eu/kanade/domain/chapter/interactor/SetReadStatus.kt index dbd1fff57..6a39e468f 100644 --- a/app/src/main/java/eu/kanade/domain/chapter/interactor/SetReadStatus.kt +++ b/app/src/main/java/eu/kanade/domain/chapter/interactor/SetReadStatus.kt @@ -1,15 +1,15 @@ package eu.kanade.domain.chapter.interactor -import eu.kanade.domain.chapter.repository.ChapterRepository import eu.kanade.domain.download.interactor.DeleteDownload import eu.kanade.domain.download.service.DownloadPreferences -import eu.kanade.domain.manga.repository.MangaRepository import eu.kanade.tachiyomi.util.lang.withNonCancellableContext import eu.kanade.tachiyomi.util.system.logcat import logcat.LogPriority import tachiyomi.domain.chapter.model.Chapter import tachiyomi.domain.chapter.model.ChapterUpdate +import tachiyomi.domain.chapter.repository.ChapterRepository import tachiyomi.domain.manga.model.Manga +import tachiyomi.domain.manga.repository.MangaRepository class SetReadStatus( private val downloadPreferences: DownloadPreferences, diff --git a/app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt b/app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt index 061fd4fc5..7093df5fc 100644 --- a/app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt +++ b/app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithSource.kt @@ -4,7 +4,6 @@ import eu.kanade.data.chapter.CleanupChapterName import eu.kanade.data.chapter.NoChaptersException import eu.kanade.domain.chapter.model.copyFromSChapter import eu.kanade.domain.chapter.model.toSChapter -import eu.kanade.domain.chapter.repository.ChapterRepository import eu.kanade.domain.manga.interactor.UpdateManga import eu.kanade.domain.manga.model.toSManga import eu.kanade.tachiyomi.data.download.DownloadManager @@ -16,6 +15,7 @@ import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.util.chapter.ChapterRecognition import tachiyomi.domain.chapter.model.Chapter import tachiyomi.domain.chapter.model.toChapterUpdate +import tachiyomi.domain.chapter.repository.ChapterRepository import tachiyomi.domain.manga.model.Manga import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/domain/chapter/interactor/UpdateChapter.kt b/app/src/main/java/eu/kanade/domain/chapter/interactor/UpdateChapter.kt index c8e2a1231..d2944733c 100644 --- a/app/src/main/java/eu/kanade/domain/chapter/interactor/UpdateChapter.kt +++ b/app/src/main/java/eu/kanade/domain/chapter/interactor/UpdateChapter.kt @@ -1,9 +1,9 @@ package eu.kanade.domain.chapter.interactor -import eu.kanade.domain.chapter.repository.ChapterRepository import eu.kanade.tachiyomi.util.system.logcat import logcat.LogPriority import tachiyomi.domain.chapter.model.ChapterUpdate +import tachiyomi.domain.chapter.repository.ChapterRepository class UpdateChapter( private val chapterRepository: ChapterRepository, diff --git a/app/src/main/java/eu/kanade/domain/history/interactor/GetHistory.kt b/app/src/main/java/eu/kanade/domain/history/interactor/GetHistory.kt index 2094f0595..066ff1538 100644 --- a/app/src/main/java/eu/kanade/domain/history/interactor/GetHistory.kt +++ b/app/src/main/java/eu/kanade/domain/history/interactor/GetHistory.kt @@ -1,8 +1,8 @@ package eu.kanade.domain.history.interactor -import eu.kanade.domain.history.repository.HistoryRepository import kotlinx.coroutines.flow.Flow import tachiyomi.domain.history.model.HistoryWithRelations +import tachiyomi.domain.history.repository.HistoryRepository class GetHistory( private val repository: HistoryRepository, diff --git a/app/src/main/java/eu/kanade/domain/history/interactor/GetNextChapters.kt b/app/src/main/java/eu/kanade/domain/history/interactor/GetNextChapters.kt index ecd245197..0cc907a03 100644 --- a/app/src/main/java/eu/kanade/domain/history/interactor/GetNextChapters.kt +++ b/app/src/main/java/eu/kanade/domain/history/interactor/GetNextChapters.kt @@ -1,10 +1,10 @@ package eu.kanade.domain.history.interactor import eu.kanade.domain.chapter.interactor.GetChapterByMangaId -import eu.kanade.domain.history.repository.HistoryRepository import eu.kanade.domain.manga.interactor.GetManga import eu.kanade.tachiyomi.util.chapter.getChapterSort import tachiyomi.domain.chapter.model.Chapter +import tachiyomi.domain.history.repository.HistoryRepository import kotlin.math.max class GetNextChapters( diff --git a/app/src/main/java/eu/kanade/domain/history/interactor/GetTotalReadDuration.kt b/app/src/main/java/eu/kanade/domain/history/interactor/GetTotalReadDuration.kt index 525f290e7..f4f2969ad 100644 --- a/app/src/main/java/eu/kanade/domain/history/interactor/GetTotalReadDuration.kt +++ b/app/src/main/java/eu/kanade/domain/history/interactor/GetTotalReadDuration.kt @@ -1,6 +1,6 @@ package eu.kanade.domain.history.interactor -import eu.kanade.domain.history.repository.HistoryRepository +import tachiyomi.domain.history.repository.HistoryRepository class GetTotalReadDuration( private val repository: HistoryRepository, diff --git a/app/src/main/java/eu/kanade/domain/history/interactor/RemoveHistory.kt b/app/src/main/java/eu/kanade/domain/history/interactor/RemoveHistory.kt index e182b9ba2..db24a2ab4 100644 --- a/app/src/main/java/eu/kanade/domain/history/interactor/RemoveHistory.kt +++ b/app/src/main/java/eu/kanade/domain/history/interactor/RemoveHistory.kt @@ -1,7 +1,7 @@ package eu.kanade.domain.history.interactor -import eu.kanade.domain.history.repository.HistoryRepository import tachiyomi.domain.history.model.HistoryWithRelations +import tachiyomi.domain.history.repository.HistoryRepository class RemoveHistory( private val repository: HistoryRepository, diff --git a/app/src/main/java/eu/kanade/domain/history/interactor/UpsertHistory.kt b/app/src/main/java/eu/kanade/domain/history/interactor/UpsertHistory.kt index 95b215249..aaa6dbd0a 100644 --- a/app/src/main/java/eu/kanade/domain/history/interactor/UpsertHistory.kt +++ b/app/src/main/java/eu/kanade/domain/history/interactor/UpsertHistory.kt @@ -1,7 +1,7 @@ package eu.kanade.domain.history.interactor -import eu.kanade.domain.history.repository.HistoryRepository import tachiyomi.domain.history.model.HistoryUpdate +import tachiyomi.domain.history.repository.HistoryRepository class UpsertHistory( private val historyRepository: HistoryRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetDuplicateLibraryManga.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/GetDuplicateLibraryManga.kt index c7dd45b4b..ab3079e16 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetDuplicateLibraryManga.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/GetDuplicateLibraryManga.kt @@ -1,7 +1,7 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.MangaRepository import tachiyomi.domain.manga.model.Manga +import tachiyomi.domain.manga.repository.MangaRepository class GetDuplicateLibraryManga( private val mangaRepository: MangaRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetFavorites.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/GetFavorites.kt index b433261a7..1e7bc54f7 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetFavorites.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/GetFavorites.kt @@ -1,8 +1,8 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.MangaRepository import kotlinx.coroutines.flow.Flow import tachiyomi.domain.manga.model.Manga +import tachiyomi.domain.manga.repository.MangaRepository class GetFavorites( private val mangaRepository: MangaRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetLibraryManga.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/GetLibraryManga.kt index c5d5b12be..c3053ef7e 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetLibraryManga.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/GetLibraryManga.kt @@ -1,8 +1,8 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.library.model.LibraryManga -import eu.kanade.domain.manga.repository.MangaRepository import kotlinx.coroutines.flow.Flow +import tachiyomi.domain.library.model.LibraryManga +import tachiyomi.domain.manga.repository.MangaRepository class GetLibraryManga( private val mangaRepository: MangaRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetManga.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/GetManga.kt index 5ed196d0f..7ea71048b 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetManga.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/GetManga.kt @@ -1,10 +1,10 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.MangaRepository import eu.kanade.tachiyomi.util.system.logcat import kotlinx.coroutines.flow.Flow import logcat.LogPriority import tachiyomi.domain.manga.model.Manga +import tachiyomi.domain.manga.repository.MangaRepository class GetManga( private val mangaRepository: MangaRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetMangaWithChapters.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/GetMangaWithChapters.kt index 34b0a3363..c24639ba2 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetMangaWithChapters.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/GetMangaWithChapters.kt @@ -1,11 +1,11 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.chapter.repository.ChapterRepository -import eu.kanade.domain.manga.repository.MangaRepository import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine import tachiyomi.domain.chapter.model.Chapter +import tachiyomi.domain.chapter.repository.ChapterRepository import tachiyomi.domain.manga.model.Manga +import tachiyomi.domain.manga.repository.MangaRepository class GetMangaWithChapters( private val mangaRepository: MangaRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/NetworkToLocalManga.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/NetworkToLocalManga.kt index 71387571a..b34ff0268 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/NetworkToLocalManga.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/NetworkToLocalManga.kt @@ -1,7 +1,7 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.MangaRepository import tachiyomi.domain.manga.model.Manga +import tachiyomi.domain.manga.repository.MangaRepository class NetworkToLocalManga( private val mangaRepository: MangaRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/ResetViewerFlags.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/ResetViewerFlags.kt index e28d10ef7..7b05381b6 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/ResetViewerFlags.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/ResetViewerFlags.kt @@ -1,6 +1,6 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.MangaRepository +import tachiyomi.domain.manga.repository.MangaRepository class ResetViewerFlags( private val mangaRepository: MangaRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaChapterFlags.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaChapterFlags.kt index 682754183..6c6162073 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaChapterFlags.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaChapterFlags.kt @@ -1,8 +1,8 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.MangaRepository import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.MangaUpdate +import tachiyomi.domain.manga.repository.MangaRepository class SetMangaChapterFlags( private val mangaRepository: MangaRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaViewerFlags.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaViewerFlags.kt index 7c058dc07..521be8b8c 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaViewerFlags.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaViewerFlags.kt @@ -1,9 +1,9 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.MangaRepository import eu.kanade.tachiyomi.ui.reader.setting.OrientationType import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType import tachiyomi.domain.manga.model.MangaUpdate +import tachiyomi.domain.manga.repository.MangaRepository class SetMangaViewerFlags( private val mangaRepository: MangaRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/UpdateManga.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/UpdateManga.kt index cb747afa3..c5488110a 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/UpdateManga.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/UpdateManga.kt @@ -2,11 +2,11 @@ package eu.kanade.domain.manga.interactor import eu.kanade.domain.manga.model.hasCustomCover import eu.kanade.domain.manga.model.isLocal -import eu.kanade.domain.manga.repository.MangaRepository import eu.kanade.tachiyomi.data.cache.CoverCache import eu.kanade.tachiyomi.source.model.SManga import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.MangaUpdate +import tachiyomi.domain.manga.repository.MangaRepository import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.util.Date diff --git a/app/src/main/java/eu/kanade/domain/updates/interactor/GetUpdates.kt b/app/src/main/java/eu/kanade/domain/updates/interactor/GetUpdates.kt index fd05d95cc..9e5cfd9e4 100644 --- a/app/src/main/java/eu/kanade/domain/updates/interactor/GetUpdates.kt +++ b/app/src/main/java/eu/kanade/domain/updates/interactor/GetUpdates.kt @@ -1,8 +1,8 @@ package eu.kanade.domain.updates.interactor -import eu.kanade.domain.updates.repository.UpdatesRepository import kotlinx.coroutines.flow.Flow import tachiyomi.domain.updates.model.UpdatesWithRelations +import tachiyomi.domain.updates.repository.UpdatesRepository import java.util.Calendar class GetUpdates( diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt index 21b549303..b4e13ec39 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt @@ -6,9 +6,9 @@ import androidx.compose.foundation.lazy.grid.items import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.util.fastAny -import eu.kanade.domain.library.model.LibraryManga import eu.kanade.presentation.components.MangaComfortableGridItem import eu.kanade.tachiyomi.ui.library.LibraryItem +import tachiyomi.domain.library.model.LibraryManga import tachiyomi.domain.manga.model.MangaCover @Composable diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt index 42eb3596f..2667e4540 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt @@ -6,9 +6,9 @@ import androidx.compose.foundation.lazy.grid.items import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.util.fastAny -import eu.kanade.domain.library.model.LibraryManga import eu.kanade.presentation.components.MangaCompactGridItem import eu.kanade.tachiyomi.ui.library.LibraryItem +import tachiyomi.domain.library.model.LibraryManga import tachiyomi.domain.manga.model.MangaCover @Composable diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt index 73f889d52..cf1f2a2ef 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt @@ -15,7 +15,6 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalLayoutDirection import eu.kanade.core.prefs.PreferenceMutableState -import eu.kanade.domain.library.model.LibraryManga import eu.kanade.presentation.components.PullRefresh import eu.kanade.presentation.components.rememberPagerState import eu.kanade.tachiyomi.ui.library.LibraryItem @@ -23,6 +22,7 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.launch import tachiyomi.domain.category.model.Category import tachiyomi.domain.library.model.LibraryDisplayMode +import tachiyomi.domain.library.model.LibraryManga import kotlin.time.Duration.Companion.seconds @Composable diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt index 4107d4759..3588c8c0b 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt @@ -8,11 +8,11 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.util.fastAny -import eu.kanade.domain.library.model.LibraryManga import eu.kanade.presentation.components.FastScrollLazyColumn import eu.kanade.presentation.components.MangaListItem import eu.kanade.presentation.util.plus import eu.kanade.tachiyomi.ui.library.LibraryItem +import tachiyomi.domain.library.model.LibraryManga import tachiyomi.domain.manga.model.MangaCover @Composable diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryPager.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryPager.kt index 1df8dd13c..0af97dfea 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryPager.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryPager.kt @@ -17,7 +17,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.unit.dp import eu.kanade.core.prefs.PreferenceMutableState -import eu.kanade.domain.library.model.LibraryManga import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.HorizontalPager import eu.kanade.presentation.components.PagerState @@ -25,6 +24,7 @@ import eu.kanade.presentation.util.plus import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.library.LibraryItem import tachiyomi.domain.library.model.LibraryDisplayMode +import tachiyomi.domain.library.model.LibraryManga @Composable fun LibraryPager( diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt index 1f0a13d6d..2b57ecfc5 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt @@ -26,7 +26,6 @@ import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import eu.kanade.domain.base.BasePreferences import eu.kanade.domain.library.service.LibraryPreferences -import eu.kanade.domain.manga.repository.MangaRepository import eu.kanade.presentation.more.settings.Preference import eu.kanade.presentation.util.collectAsState import eu.kanade.tachiyomi.R @@ -62,6 +61,7 @@ import eu.kanade.tachiyomi.util.system.toast import kotlinx.coroutines.launch import logcat.LogPriority import okhttp3.Headers +import tachiyomi.domain.manga.repository.MangaRepository import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.io.File diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt index a0c76430f..081c6c4ae 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt @@ -12,7 +12,6 @@ import eu.kanade.domain.chapter.interactor.GetChapterByMangaId import eu.kanade.domain.chapter.interactor.SyncChaptersWithSource import eu.kanade.domain.chapter.interactor.SyncChaptersWithTrackServiceTwoWay import eu.kanade.domain.download.service.DownloadPreferences -import eu.kanade.domain.library.model.LibraryManga import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.domain.manga.interactor.GetLibraryManga import eu.kanade.domain.manga.interactor.GetManga @@ -65,6 +64,7 @@ import kotlinx.coroutines.sync.withPermit import logcat.LogPriority import tachiyomi.domain.category.model.Category import tachiyomi.domain.chapter.model.Chapter +import tachiyomi.domain.library.model.LibraryManga import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.toMangaUpdate import uy.kohesive.injekt.Injekt diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt index 3bf6ae99f..2c0f94700 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt @@ -1,7 +1,6 @@ package eu.kanade.tachiyomi.source import android.content.Context -import eu.kanade.domain.source.repository.SourceDataRepository import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.download.DownloadManager import eu.kanade.tachiyomi.extension.ExtensionManager @@ -20,6 +19,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import rx.Observable import tachiyomi.domain.source.model.SourceData +import tachiyomi.domain.source.repository.SourceDataRepository import uy.kohesive.injekt.injectLazy import java.util.concurrent.ConcurrentHashMap diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt index 5cb3a04ea..148242d7e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt @@ -1,8 +1,8 @@ package eu.kanade.tachiyomi.ui.library -import eu.kanade.domain.library.model.LibraryManga import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.getNameForMangaInfo +import tachiyomi.domain.library.model.LibraryManga import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt index 356008b74..00befbf6b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt @@ -21,7 +21,6 @@ import eu.kanade.domain.category.interactor.SetMangaCategories import eu.kanade.domain.chapter.interactor.GetChapterByMangaId import eu.kanade.domain.chapter.interactor.SetReadStatus import eu.kanade.domain.history.interactor.GetNextChapters -import eu.kanade.domain.library.model.LibraryManga import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.domain.manga.interactor.GetLibraryManga import eu.kanade.domain.manga.interactor.UpdateManga @@ -54,6 +53,7 @@ import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.update import tachiyomi.domain.category.model.Category import tachiyomi.domain.chapter.model.Chapter +import tachiyomi.domain.library.model.LibraryManga import tachiyomi.domain.library.model.LibrarySort import tachiyomi.domain.library.model.sort import tachiyomi.domain.manga.model.Manga diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt index 45f0d4a50..2e12c1fbe 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt @@ -28,7 +28,6 @@ import cafe.adriel.voyager.navigator.Navigator import cafe.adriel.voyager.navigator.currentOrThrow import cafe.adriel.voyager.navigator.tab.LocalTabNavigator import cafe.adriel.voyager.navigator.tab.TabOptions -import eu.kanade.domain.library.model.LibraryManga import eu.kanade.domain.manga.model.isLocal import eu.kanade.presentation.components.ChangeCategoryDialog import eu.kanade.presentation.components.DeleteLibraryMangaDialog @@ -55,6 +54,7 @@ import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.launch import tachiyomi.domain.category.model.Category +import tachiyomi.domain.library.model.LibraryManga import tachiyomi.domain.library.model.display import tachiyomi.domain.manga.model.Manga diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/stats/StatsScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/stats/StatsScreenModel.kt index eebe91d73..924f85773 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/stats/StatsScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/stats/StatsScreenModel.kt @@ -8,7 +8,6 @@ import eu.kanade.core.util.fastFilter import eu.kanade.core.util.fastFilterNot import eu.kanade.core.util.fastMapNotNull import eu.kanade.domain.history.interactor.GetTotalReadDuration -import eu.kanade.domain.library.model.LibraryManga import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.domain.manga.interactor.GetLibraryManga import eu.kanade.domain.manga.model.isLocal @@ -24,6 +23,7 @@ import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.util.lang.launchIO import kotlinx.coroutines.flow.update +import tachiyomi.domain.library.model.LibraryManga import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/domain/chapter/repository/ChapterRepository.kt b/domain/src/main/java/tachiyomi/domain/chapter/repository/ChapterRepository.kt similarity index 94% rename from app/src/main/java/eu/kanade/domain/chapter/repository/ChapterRepository.kt rename to domain/src/main/java/tachiyomi/domain/chapter/repository/ChapterRepository.kt index 84f30b08f..22952f9f9 100644 --- a/app/src/main/java/eu/kanade/domain/chapter/repository/ChapterRepository.kt +++ b/domain/src/main/java/tachiyomi/domain/chapter/repository/ChapterRepository.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.chapter.repository +package tachiyomi.domain.chapter.repository import kotlinx.coroutines.flow.Flow import tachiyomi.domain.chapter.model.Chapter diff --git a/app/src/main/java/eu/kanade/domain/history/repository/HistoryRepository.kt b/domain/src/main/java/tachiyomi/domain/history/repository/HistoryRepository.kt similarity index 92% rename from app/src/main/java/eu/kanade/domain/history/repository/HistoryRepository.kt rename to domain/src/main/java/tachiyomi/domain/history/repository/HistoryRepository.kt index 698357aa5..2123ae796 100644 --- a/app/src/main/java/eu/kanade/domain/history/repository/HistoryRepository.kt +++ b/domain/src/main/java/tachiyomi/domain/history/repository/HistoryRepository.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.history.repository +package tachiyomi.domain.history.repository import kotlinx.coroutines.flow.Flow import tachiyomi.domain.history.model.HistoryUpdate diff --git a/app/src/main/java/eu/kanade/domain/library/model/LibraryManga.kt b/domain/src/main/java/tachiyomi/domain/library/model/LibraryManga.kt similarity index 92% rename from app/src/main/java/eu/kanade/domain/library/model/LibraryManga.kt rename to domain/src/main/java/tachiyomi/domain/library/model/LibraryManga.kt index 85a5728c1..65e06c195 100644 --- a/app/src/main/java/eu/kanade/domain/library/model/LibraryManga.kt +++ b/domain/src/main/java/tachiyomi/domain/library/model/LibraryManga.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.library.model +package tachiyomi.domain.library.model import tachiyomi.domain.manga.model.Manga diff --git a/app/src/main/java/eu/kanade/domain/manga/repository/MangaRepository.kt b/domain/src/main/java/tachiyomi/domain/manga/repository/MangaRepository.kt similarity index 91% rename from app/src/main/java/eu/kanade/domain/manga/repository/MangaRepository.kt rename to domain/src/main/java/tachiyomi/domain/manga/repository/MangaRepository.kt index 30511d415..3d065d22b 100644 --- a/app/src/main/java/eu/kanade/domain/manga/repository/MangaRepository.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/repository/MangaRepository.kt @@ -1,7 +1,7 @@ -package eu.kanade.domain.manga.repository +package tachiyomi.domain.manga.repository -import eu.kanade.domain.library.model.LibraryManga import kotlinx.coroutines.flow.Flow +import tachiyomi.domain.library.model.LibraryManga import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.MangaUpdate diff --git a/app/src/main/java/eu/kanade/domain/source/repository/SourceDataRepository.kt b/domain/src/main/java/tachiyomi/domain/source/repository/SourceDataRepository.kt similarity index 87% rename from app/src/main/java/eu/kanade/domain/source/repository/SourceDataRepository.kt rename to domain/src/main/java/tachiyomi/domain/source/repository/SourceDataRepository.kt index 9c839d8fc..4c0874789 100644 --- a/app/src/main/java/eu/kanade/domain/source/repository/SourceDataRepository.kt +++ b/domain/src/main/java/tachiyomi/domain/source/repository/SourceDataRepository.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.source.repository +package tachiyomi.domain.source.repository import kotlinx.coroutines.flow.Flow import tachiyomi.domain.source.model.SourceData diff --git a/app/src/main/java/eu/kanade/domain/updates/repository/UpdatesRepository.kt b/domain/src/main/java/tachiyomi/domain/updates/repository/UpdatesRepository.kt similarity index 81% rename from app/src/main/java/eu/kanade/domain/updates/repository/UpdatesRepository.kt rename to domain/src/main/java/tachiyomi/domain/updates/repository/UpdatesRepository.kt index 8b746b0e1..23d45e409 100644 --- a/app/src/main/java/eu/kanade/domain/updates/repository/UpdatesRepository.kt +++ b/domain/src/main/java/tachiyomi/domain/updates/repository/UpdatesRepository.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.updates.repository +package tachiyomi.domain.updates.repository import kotlinx.coroutines.flow.Flow import tachiyomi.domain.updates.model.UpdatesWithRelations