diff --git a/app/src/main/java/eu/kanade/data/exh/FavoriteEntry.kt b/app/src/main/java/eu/kanade/data/exh/FavoriteEntry.kt index e22403339..05b9972ec 100644 --- a/app/src/main/java/eu/kanade/data/exh/FavoriteEntry.kt +++ b/app/src/main/java/eu/kanade/data/exh/FavoriteEntry.kt @@ -1,6 +1,6 @@ package eu.kanade.data.exh -import exh.favorites.sql.models.FavoriteEntry +import tachiyomi.domain.manga.model.FavoriteEntry val favoriteEntryMapper: (Long, String, String, String, Long) -> FavoriteEntry = { id, title, gid, token, category -> diff --git a/app/src/main/java/eu/kanade/data/exh/FeedSavedSearch.kt b/app/src/main/java/eu/kanade/data/exh/FeedSavedSearch.kt index c46e3e6f3..cd4496448 100644 --- a/app/src/main/java/eu/kanade/data/exh/FeedSavedSearch.kt +++ b/app/src/main/java/eu/kanade/data/exh/FeedSavedSearch.kt @@ -1,6 +1,6 @@ package eu.kanade.data.exh -import exh.savedsearches.models.FeedSavedSearch +import tachiyomi.domain.source.model.FeedSavedSearch val feedSavedSearchMapper: (Long, Long, Long?, Boolean) -> FeedSavedSearch = { id, source, savedSearch, global -> diff --git a/app/src/main/java/eu/kanade/data/exh/MergedMangaReferenceMapper.kt b/app/src/main/java/eu/kanade/data/exh/MergedMangaReferenceMapper.kt index cea88182b..eb4d33e9b 100644 --- a/app/src/main/java/eu/kanade/data/exh/MergedMangaReferenceMapper.kt +++ b/app/src/main/java/eu/kanade/data/exh/MergedMangaReferenceMapper.kt @@ -1,6 +1,6 @@ package eu.kanade.data.exh -import exh.merged.sql.models.MergedMangaReference +import tachiyomi.domain.manga.model.MergedMangaReference val mergedMangaReferenceMapper = { id: Long, isInfoManga: Boolean, getChapterUpdates: Boolean, chapterSortMode: Long, chapterPriority: Long, downloadChapters: Boolean, mergeId: Long, mergeUrl: String, mangaId: Long?, mangaUrl: String, mangaSourceId: Long -> diff --git a/app/src/main/java/eu/kanade/data/exh/SavedSearch.kt b/app/src/main/java/eu/kanade/data/exh/SavedSearch.kt index 85b2df187..68c482442 100644 --- a/app/src/main/java/eu/kanade/data/exh/SavedSearch.kt +++ b/app/src/main/java/eu/kanade/data/exh/SavedSearch.kt @@ -1,6 +1,6 @@ package eu.kanade.data.exh -import exh.savedsearches.models.SavedSearch +import tachiyomi.domain.source.model.SavedSearch val savedSearchMapper: (Long, Long, String, String?, String?) -> SavedSearch = { id, source, name, query, filtersJson -> diff --git a/app/src/main/java/eu/kanade/data/manga/FavoritesEntryRepositoryImpl.kt b/app/src/main/java/eu/kanade/data/manga/FavoritesEntryRepositoryImpl.kt index 771e0b35d..1efbc1002 100644 --- a/app/src/main/java/eu/kanade/data/manga/FavoritesEntryRepositoryImpl.kt +++ b/app/src/main/java/eu/kanade/data/manga/FavoritesEntryRepositoryImpl.kt @@ -1,9 +1,9 @@ package eu.kanade.data.manga import eu.kanade.data.exh.favoriteEntryMapper -import eu.kanade.domain.manga.repository.FavoritesEntryRepository -import exh.favorites.sql.models.FavoriteEntry import tachiyomi.data.DatabaseHandler +import tachiyomi.domain.manga.model.FavoriteEntry +import tachiyomi.domain.manga.repository.FavoritesEntryRepository class FavoritesEntryRepositoryImpl( private val handler: DatabaseHandler, diff --git a/app/src/main/java/eu/kanade/data/manga/MangaMergeRepositoryImpl.kt b/app/src/main/java/eu/kanade/data/manga/MangaMergeRepositoryImpl.kt index 6480e011a..6d8301cdd 100644 --- a/app/src/main/java/eu/kanade/data/manga/MangaMergeRepositoryImpl.kt +++ b/app/src/main/java/eu/kanade/data/manga/MangaMergeRepositoryImpl.kt @@ -1,15 +1,15 @@ package eu.kanade.data.manga import eu.kanade.data.exh.mergedMangaReferenceMapper -import eu.kanade.domain.manga.model.MergeMangaSettingsUpdate -import eu.kanade.domain.manga.repository.MangaMergeRepository import eu.kanade.tachiyomi.util.system.logcat import eu.kanade.tachiyomi.util.system.toLong -import exh.merged.sql.models.MergedMangaReference import kotlinx.coroutines.flow.Flow import logcat.LogPriority import tachiyomi.data.DatabaseHandler import tachiyomi.domain.manga.model.Manga +import tachiyomi.domain.manga.model.MergeMangaSettingsUpdate +import tachiyomi.domain.manga.model.MergedMangaReference +import tachiyomi.domain.manga.repository.MangaMergeRepository class MangaMergeRepositoryImpl( private val handler: DatabaseHandler, diff --git a/app/src/main/java/eu/kanade/data/manga/MangaMetadataRepositoryImpl.kt b/app/src/main/java/eu/kanade/data/manga/MangaMetadataRepositoryImpl.kt index 96e916ceb..5568cbc6a 100644 --- a/app/src/main/java/eu/kanade/data/manga/MangaMetadataRepositoryImpl.kt +++ b/app/src/main/java/eu/kanade/data/manga/MangaMetadataRepositoryImpl.kt @@ -3,7 +3,6 @@ package eu.kanade.data.manga import eu.kanade.data.exh.searchMetadataMapper import eu.kanade.data.exh.searchTagMapper import eu.kanade.data.exh.searchTitleMapper -import eu.kanade.domain.manga.repository.MangaMetadataRepository import exh.metadata.metadata.base.FlatMetadata import exh.metadata.sql.models.SearchMetadata import exh.metadata.sql.models.SearchTag @@ -13,6 +12,7 @@ import exh.source.EXH_SOURCE_ID import kotlinx.coroutines.flow.Flow import tachiyomi.data.DatabaseHandler import tachiyomi.domain.manga.model.Manga +import tachiyomi.domain.manga.repository.MangaMetadataRepository class MangaMetadataRepositoryImpl( private val handler: DatabaseHandler, diff --git a/app/src/main/java/eu/kanade/data/source/FeedSavedSearchRepositoryImpl.kt b/app/src/main/java/eu/kanade/data/source/FeedSavedSearchRepositoryImpl.kt index 07f563803..de9aab8c2 100644 --- a/app/src/main/java/eu/kanade/data/source/FeedSavedSearchRepositoryImpl.kt +++ b/app/src/main/java/eu/kanade/data/source/FeedSavedSearchRepositoryImpl.kt @@ -2,11 +2,11 @@ package eu.kanade.data.source import eu.kanade.data.exh.feedSavedSearchMapper import eu.kanade.data.exh.savedSearchMapper -import eu.kanade.domain.source.repository.FeedSavedSearchRepository -import exh.savedsearches.models.FeedSavedSearch -import exh.savedsearches.models.SavedSearch import kotlinx.coroutines.flow.Flow import tachiyomi.data.DatabaseHandler +import tachiyomi.domain.source.model.FeedSavedSearch +import tachiyomi.domain.source.model.SavedSearch +import tachiyomi.domain.source.repository.FeedSavedSearchRepository class FeedSavedSearchRepositoryImpl( private val handler: DatabaseHandler, diff --git a/app/src/main/java/eu/kanade/data/source/SavedSearchRepositoryImpl.kt b/app/src/main/java/eu/kanade/data/source/SavedSearchRepositoryImpl.kt index 09297f6ff..576054760 100644 --- a/app/src/main/java/eu/kanade/data/source/SavedSearchRepositoryImpl.kt +++ b/app/src/main/java/eu/kanade/data/source/SavedSearchRepositoryImpl.kt @@ -1,10 +1,10 @@ package eu.kanade.data.source import eu.kanade.data.exh.savedSearchMapper -import eu.kanade.domain.source.repository.SavedSearchRepository -import exh.savedsearches.models.SavedSearch import kotlinx.coroutines.flow.Flow import tachiyomi.data.DatabaseHandler +import tachiyomi.domain.source.model.SavedSearch +import tachiyomi.domain.source.repository.SavedSearchRepository class SavedSearchRepositoryImpl( private val handler: DatabaseHandler, diff --git a/app/src/main/java/eu/kanade/domain/SYDomainModule.kt b/app/src/main/java/eu/kanade/domain/SYDomainModule.kt index 2103545a1..2b01e54ea 100644 --- a/app/src/main/java/eu/kanade/domain/SYDomainModule.kt +++ b/app/src/main/java/eu/kanade/domain/SYDomainModule.kt @@ -38,9 +38,6 @@ import eu.kanade.domain.manga.interactor.InsertMergedReference import eu.kanade.domain.manga.interactor.ReorderSortTag import eu.kanade.domain.manga.interactor.SetMangaFilteredScanlators import eu.kanade.domain.manga.interactor.UpdateMergedSettings -import eu.kanade.domain.manga.repository.FavoritesEntryRepository -import eu.kanade.domain.manga.repository.MangaMergeRepository -import eu.kanade.domain.manga.repository.MangaMetadataRepository import eu.kanade.domain.source.interactor.CountFeedSavedSearchBySourceId import eu.kanade.domain.source.interactor.CountFeedSavedSearchGlobal import eu.kanade.domain.source.interactor.CreateSourceCategory @@ -64,14 +61,17 @@ import eu.kanade.domain.source.interactor.InsertSavedSearch import eu.kanade.domain.source.interactor.RenameSourceCategory import eu.kanade.domain.source.interactor.SetSourceCategories import eu.kanade.domain.source.interactor.ToggleExcludeFromDataSaver -import eu.kanade.domain.source.repository.FeedSavedSearchRepository -import eu.kanade.domain.source.repository.SavedSearchRepository import eu.kanade.tachiyomi.source.online.MetadataSource import exh.search.SearchEngine import tachiyomi.data.manga.CustomMangaRepositoryImpl import tachiyomi.domain.manga.interactor.GetCustomMangaInfo import tachiyomi.domain.manga.interactor.SetCustomMangaInfo import tachiyomi.domain.manga.repository.CustomMangaRepository +import tachiyomi.domain.manga.repository.FavoritesEntryRepository +import tachiyomi.domain.manga.repository.MangaMergeRepository +import tachiyomi.domain.manga.repository.MangaMetadataRepository +import tachiyomi.domain.source.repository.FeedSavedSearchRepository +import tachiyomi.domain.source.repository.SavedSearchRepository 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/chapter/interactor/GetMergedChapterByMangaId.kt b/app/src/main/java/eu/kanade/domain/chapter/interactor/GetMergedChapterByMangaId.kt index b0cc5295f..a916a8c1f 100644 --- a/app/src/main/java/eu/kanade/domain/chapter/interactor/GetMergedChapterByMangaId.kt +++ b/app/src/main/java/eu/kanade/domain/chapter/interactor/GetMergedChapterByMangaId.kt @@ -2,7 +2,6 @@ package eu.kanade.domain.chapter.interactor import eu.kanade.domain.manga.interactor.GetMergedReferencesById import eu.kanade.tachiyomi.util.system.logcat -import exh.merged.sql.models.MergedMangaReference import exh.source.MERGED_SOURCE_ID import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine @@ -10,6 +9,7 @@ import kotlinx.coroutines.flow.flowOf import logcat.LogPriority import tachiyomi.domain.chapter.model.Chapter import tachiyomi.domain.chapter.repository.ChapterRepository +import tachiyomi.domain.manga.model.MergedMangaReference class GetMergedChapterByMangaId( private val chapterRepository: ChapterRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/DeleteByMergeId.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/DeleteByMergeId.kt index c39b6e986..805a1fff5 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/DeleteByMergeId.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/DeleteByMergeId.kt @@ -1,6 +1,6 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.MangaMergeRepository +import tachiyomi.domain.manga.repository.MangaMergeRepository class DeleteByMergeId( private val mangaMergeRepository: MangaMergeRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/DeleteFavoriteEntries.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/DeleteFavoriteEntries.kt index 2e75ae9e8..044482a2f 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/DeleteFavoriteEntries.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/DeleteFavoriteEntries.kt @@ -1,6 +1,6 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.FavoritesEntryRepository +import tachiyomi.domain.manga.repository.FavoritesEntryRepository class DeleteFavoriteEntries( private val favoriteEntryRepository: FavoritesEntryRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/DeleteMergeById.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/DeleteMergeById.kt index 9d15efccf..9d8c39796 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/DeleteMergeById.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/DeleteMergeById.kt @@ -1,6 +1,6 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.MangaMergeRepository +import tachiyomi.domain.manga.repository.MangaMergeRepository class DeleteMergeById( private val mangaMergeRepository: MangaMergeRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetExhFavoriteMangaWithMetadata.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/GetExhFavoriteMangaWithMetadata.kt index d22302897..519774560 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetExhFavoriteMangaWithMetadata.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/GetExhFavoriteMangaWithMetadata.kt @@ -1,7 +1,7 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.MangaMetadataRepository import tachiyomi.domain.manga.model.Manga +import tachiyomi.domain.manga.repository.MangaMetadataRepository class GetExhFavoriteMangaWithMetadata( private val mangaMetadataRepository: MangaMetadataRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetFavoriteEntries.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/GetFavoriteEntries.kt index 5ec942003..737f8d2e7 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetFavoriteEntries.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/GetFavoriteEntries.kt @@ -1,7 +1,7 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.FavoritesEntryRepository -import exh.favorites.sql.models.FavoriteEntry +import tachiyomi.domain.manga.model.FavoriteEntry +import tachiyomi.domain.manga.repository.FavoritesEntryRepository class GetFavoriteEntries( private val favoriteEntryRepository: FavoritesEntryRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetFlatMetadataById.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/GetFlatMetadataById.kt index c67a557ba..4d93ac68e 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetFlatMetadataById.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/GetFlatMetadataById.kt @@ -1,12 +1,12 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.MangaMetadataRepository import eu.kanade.tachiyomi.source.online.MetadataSource import eu.kanade.tachiyomi.util.system.logcat import exh.metadata.metadata.base.FlatMetadata import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine import logcat.LogPriority +import tachiyomi.domain.manga.repository.MangaMetadataRepository class GetFlatMetadataById( private val mangaMetadataRepository: MangaMetadataRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetIdsOfFavoriteMangaWithMetadata.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/GetIdsOfFavoriteMangaWithMetadata.kt index 21249566f..587fcd47f 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetIdsOfFavoriteMangaWithMetadata.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/GetIdsOfFavoriteMangaWithMetadata.kt @@ -1,6 +1,6 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.MangaMetadataRepository +import tachiyomi.domain.manga.repository.MangaMetadataRepository class GetIdsOfFavoriteMangaWithMetadata( private val mangaMetadataRepository: MangaMetadataRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedManga.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedManga.kt index 4aceb736b..b7512aa8e 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedManga.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedManga.kt @@ -1,10 +1,10 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.MangaMergeRepository 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.MangaMergeRepository class GetMergedManga( private val mangaMergeRepository: MangaMergeRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedMangaById.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedMangaById.kt index 7d012bfcc..516c37069 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedMangaById.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedMangaById.kt @@ -1,10 +1,10 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.MangaMergeRepository 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.MangaMergeRepository class GetMergedMangaById( private val mangaMergeRepository: MangaMergeRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedMangaForDownloading.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedMangaForDownloading.kt index 06df3e430..aabb43a95 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedMangaForDownloading.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedMangaForDownloading.kt @@ -1,7 +1,7 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.MangaMergeRepository import tachiyomi.domain.manga.model.Manga +import tachiyomi.domain.manga.repository.MangaMergeRepository class GetMergedMangaForDownloading( private val mangaMergeRepository: MangaMergeRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedReferencesById.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedReferencesById.kt index e85b50398..5379a13b3 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedReferencesById.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedReferencesById.kt @@ -1,10 +1,10 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.MangaMergeRepository import eu.kanade.tachiyomi.util.system.logcat -import exh.merged.sql.models.MergedMangaReference import kotlinx.coroutines.flow.Flow import logcat.LogPriority +import tachiyomi.domain.manga.model.MergedMangaReference +import tachiyomi.domain.manga.repository.MangaMergeRepository class GetMergedReferencesById( private val mangaMergeRepository: MangaMergeRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchMetadata.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchMetadata.kt index 82ed212be..b4ccbdb70 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchMetadata.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchMetadata.kt @@ -1,7 +1,7 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.MangaMetadataRepository import exh.metadata.sql.models.SearchMetadata +import tachiyomi.domain.manga.repository.MangaMetadataRepository class GetSearchMetadata( private val mangaMetadataRepository: MangaMetadataRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchTags.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchTags.kt index dd27648ab..f8190c980 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchTags.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchTags.kt @@ -1,7 +1,7 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.MangaMetadataRepository import exh.metadata.sql.models.SearchTag +import tachiyomi.domain.manga.repository.MangaMetadataRepository class GetSearchTags( private val mangaMetadataRepository: MangaMetadataRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchTitles.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchTitles.kt index 7ca3c8079..9ee95fdda 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchTitles.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchTitles.kt @@ -1,7 +1,7 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.MangaMetadataRepository import exh.metadata.sql.models.SearchTitle +import tachiyomi.domain.manga.repository.MangaMetadataRepository class GetSearchTitles( private val mangaMetadataRepository: MangaMetadataRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/InsertFavoriteEntries.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/InsertFavoriteEntries.kt index 143f62f57..445594369 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/InsertFavoriteEntries.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/InsertFavoriteEntries.kt @@ -1,7 +1,7 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.FavoritesEntryRepository -import exh.favorites.sql.models.FavoriteEntry +import tachiyomi.domain.manga.model.FavoriteEntry +import tachiyomi.domain.manga.repository.FavoritesEntryRepository class InsertFavoriteEntries( private val favoriteEntryRepository: FavoritesEntryRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/InsertFlatMetadata.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/InsertFlatMetadata.kt index 6d0968a1c..791ebb95d 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/InsertFlatMetadata.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/InsertFlatMetadata.kt @@ -1,11 +1,11 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.MangaMetadataRepository import eu.kanade.tachiyomi.source.online.MetadataSource import eu.kanade.tachiyomi.util.system.logcat import exh.metadata.metadata.base.FlatMetadata import exh.metadata.metadata.base.RaisedSearchMetadata import logcat.LogPriority +import tachiyomi.domain.manga.repository.MangaMetadataRepository class InsertFlatMetadata( private val mangaMetadataRepository: MangaMetadataRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/InsertMergedReference.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/InsertMergedReference.kt index 254bd1c53..73a54bcea 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/InsertMergedReference.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/InsertMergedReference.kt @@ -1,7 +1,7 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.repository.MangaMergeRepository -import exh.merged.sql.models.MergedMangaReference +import tachiyomi.domain.manga.model.MergedMangaReference +import tachiyomi.domain.manga.repository.MangaMergeRepository class InsertMergedReference( private val mangaMergedRepository: MangaMergeRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/UpdateMergedSettings.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/UpdateMergedSettings.kt index be27221c6..f28ccd850 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/UpdateMergedSettings.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/UpdateMergedSettings.kt @@ -1,7 +1,7 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.model.MergeMangaSettingsUpdate -import eu.kanade.domain.manga.repository.MangaMergeRepository +import tachiyomi.domain.manga.model.MergeMangaSettingsUpdate +import tachiyomi.domain.manga.repository.MangaMergeRepository class UpdateMergedSettings( private val mangaMergeRepository: MangaMergeRepository, diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/CountFeedSavedSearchBySourceId.kt b/app/src/main/java/eu/kanade/domain/source/interactor/CountFeedSavedSearchBySourceId.kt index a5f9a6e9d..be9b92800 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/CountFeedSavedSearchBySourceId.kt +++ b/app/src/main/java/eu/kanade/domain/source/interactor/CountFeedSavedSearchBySourceId.kt @@ -1,6 +1,6 @@ package eu.kanade.domain.source.interactor -import eu.kanade.domain.source.repository.FeedSavedSearchRepository +import tachiyomi.domain.source.repository.FeedSavedSearchRepository class CountFeedSavedSearchBySourceId( private val feedSavedSearchRepository: FeedSavedSearchRepository, diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/CountFeedSavedSearchGlobal.kt b/app/src/main/java/eu/kanade/domain/source/interactor/CountFeedSavedSearchGlobal.kt index 2fbe775d2..7c1d8b5ab 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/CountFeedSavedSearchGlobal.kt +++ b/app/src/main/java/eu/kanade/domain/source/interactor/CountFeedSavedSearchGlobal.kt @@ -1,6 +1,6 @@ package eu.kanade.domain.source.interactor -import eu.kanade.domain.source.repository.FeedSavedSearchRepository +import tachiyomi.domain.source.repository.FeedSavedSearchRepository class CountFeedSavedSearchGlobal( private val feedSavedSearchRepository: FeedSavedSearchRepository, diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/DeleteFeedSavedSearchById.kt b/app/src/main/java/eu/kanade/domain/source/interactor/DeleteFeedSavedSearchById.kt index c94786101..9185a4196 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/DeleteFeedSavedSearchById.kt +++ b/app/src/main/java/eu/kanade/domain/source/interactor/DeleteFeedSavedSearchById.kt @@ -1,6 +1,6 @@ package eu.kanade.domain.source.interactor -import eu.kanade.domain.source.repository.FeedSavedSearchRepository +import tachiyomi.domain.source.repository.FeedSavedSearchRepository class DeleteFeedSavedSearchById( private val feedSavedSearchRepository: FeedSavedSearchRepository, diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/DeleteSavedSearchById.kt b/app/src/main/java/eu/kanade/domain/source/interactor/DeleteSavedSearchById.kt index 2b866e35a..b8a41e4b2 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/DeleteSavedSearchById.kt +++ b/app/src/main/java/eu/kanade/domain/source/interactor/DeleteSavedSearchById.kt @@ -1,6 +1,6 @@ package eu.kanade.domain.source.interactor -import eu.kanade.domain.source.repository.SavedSearchRepository +import tachiyomi.domain.source.repository.SavedSearchRepository class DeleteSavedSearchById( private val savedSearchRepository: SavedSearchRepository, diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/GetExhSavedSearch.kt b/app/src/main/java/eu/kanade/domain/source/interactor/GetExhSavedSearch.kt index 47e665a4b..2ae634fad 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/GetExhSavedSearch.kt +++ b/app/src/main/java/eu/kanade/domain/source/interactor/GetExhSavedSearch.kt @@ -3,8 +3,6 @@ package eu.kanade.domain.source.interactor import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.util.lang.withIOContext import exh.log.xLogE -import exh.savedsearches.EXHSavedSearch -import exh.savedsearches.models.SavedSearch import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOn @@ -12,6 +10,8 @@ import kotlinx.coroutines.flow.map import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonArray +import tachiyomi.domain.source.model.EXHSavedSearch +import tachiyomi.domain.source.model.SavedSearch import xyz.nulldev.ts.api.http.serializer.FilterSerializer class GetExhSavedSearch( diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/GetFeedSavedSearchBySourceId.kt b/app/src/main/java/eu/kanade/domain/source/interactor/GetFeedSavedSearchBySourceId.kt index ceaa79ad4..31ea04a7a 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/GetFeedSavedSearchBySourceId.kt +++ b/app/src/main/java/eu/kanade/domain/source/interactor/GetFeedSavedSearchBySourceId.kt @@ -1,8 +1,8 @@ package eu.kanade.domain.source.interactor -import eu.kanade.domain.source.repository.FeedSavedSearchRepository -import exh.savedsearches.models.FeedSavedSearch import kotlinx.coroutines.flow.Flow +import tachiyomi.domain.source.model.FeedSavedSearch +import tachiyomi.domain.source.repository.FeedSavedSearchRepository class GetFeedSavedSearchBySourceId( private val feedSavedSearchRepository: FeedSavedSearchRepository, diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/GetFeedSavedSearchGlobal.kt b/app/src/main/java/eu/kanade/domain/source/interactor/GetFeedSavedSearchGlobal.kt index 05dbd982a..37125ebde 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/GetFeedSavedSearchGlobal.kt +++ b/app/src/main/java/eu/kanade/domain/source/interactor/GetFeedSavedSearchGlobal.kt @@ -1,8 +1,8 @@ package eu.kanade.domain.source.interactor -import eu.kanade.domain.source.repository.FeedSavedSearchRepository -import exh.savedsearches.models.FeedSavedSearch import kotlinx.coroutines.flow.Flow +import tachiyomi.domain.source.model.FeedSavedSearch +import tachiyomi.domain.source.repository.FeedSavedSearchRepository class GetFeedSavedSearchGlobal( private val feedSavedSearchRepository: FeedSavedSearchRepository, diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchById.kt b/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchById.kt index 1053874e0..9cab24b1c 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchById.kt +++ b/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchById.kt @@ -1,7 +1,7 @@ package eu.kanade.domain.source.interactor -import eu.kanade.domain.source.repository.SavedSearchRepository -import exh.savedsearches.models.SavedSearch +import tachiyomi.domain.source.model.SavedSearch +import tachiyomi.domain.source.repository.SavedSearchRepository class GetSavedSearchById( private val savedSearchRepository: SavedSearchRepository, diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchBySourceId.kt b/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchBySourceId.kt index d3068785f..c8add3a99 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchBySourceId.kt +++ b/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchBySourceId.kt @@ -1,8 +1,8 @@ package eu.kanade.domain.source.interactor -import eu.kanade.domain.source.repository.SavedSearchRepository -import exh.savedsearches.models.SavedSearch import kotlinx.coroutines.flow.Flow +import tachiyomi.domain.source.model.SavedSearch +import tachiyomi.domain.source.repository.SavedSearchRepository class GetSavedSearchBySourceId( private val savedSearchRepository: SavedSearchRepository, diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchBySourceIdFeed.kt b/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchBySourceIdFeed.kt index bf4409d18..6c997d8c2 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchBySourceIdFeed.kt +++ b/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchBySourceIdFeed.kt @@ -1,7 +1,7 @@ package eu.kanade.domain.source.interactor -import eu.kanade.domain.source.repository.FeedSavedSearchRepository -import exh.savedsearches.models.SavedSearch +import tachiyomi.domain.source.model.SavedSearch +import tachiyomi.domain.source.repository.FeedSavedSearchRepository class GetSavedSearchBySourceIdFeed( private val feedSavedSearchRepository: FeedSavedSearchRepository, diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchGlobalFeed.kt b/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchGlobalFeed.kt index d2c3d99d6..8e6592a29 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchGlobalFeed.kt +++ b/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchGlobalFeed.kt @@ -1,7 +1,7 @@ package eu.kanade.domain.source.interactor -import eu.kanade.domain.source.repository.FeedSavedSearchRepository -import exh.savedsearches.models.SavedSearch +import tachiyomi.domain.source.model.SavedSearch +import tachiyomi.domain.source.repository.FeedSavedSearchRepository class GetSavedSearchGlobalFeed( private val feedSavedSearchRepository: FeedSavedSearchRepository, diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/InsertFeedSavedSearch.kt b/app/src/main/java/eu/kanade/domain/source/interactor/InsertFeedSavedSearch.kt index d0973f69a..51dabf280 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/InsertFeedSavedSearch.kt +++ b/app/src/main/java/eu/kanade/domain/source/interactor/InsertFeedSavedSearch.kt @@ -1,10 +1,10 @@ package eu.kanade.domain.source.interactor -import eu.kanade.domain.source.repository.FeedSavedSearchRepository import eu.kanade.tachiyomi.util.system.logcat -import exh.savedsearches.models.FeedSavedSearch import logcat.LogPriority import logcat.asLog +import tachiyomi.domain.source.model.FeedSavedSearch +import tachiyomi.domain.source.repository.FeedSavedSearchRepository class InsertFeedSavedSearch( private val feedSavedSearchRepository: FeedSavedSearchRepository, diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/InsertSavedSearch.kt b/app/src/main/java/eu/kanade/domain/source/interactor/InsertSavedSearch.kt index 0dbeeb390..42820a5be 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/InsertSavedSearch.kt +++ b/app/src/main/java/eu/kanade/domain/source/interactor/InsertSavedSearch.kt @@ -1,10 +1,10 @@ package eu.kanade.domain.source.interactor -import eu.kanade.domain.source.repository.SavedSearchRepository import eu.kanade.tachiyomi.util.system.logcat -import exh.savedsearches.models.SavedSearch import logcat.LogPriority import logcat.asLog +import tachiyomi.domain.source.model.SavedSearch +import tachiyomi.domain.source.repository.SavedSearchRepository class InsertSavedSearch( private val savedSearchRepository: SavedSearchRepository, diff --git a/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt index 48cbad9eb..c8d59b76a 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt @@ -42,10 +42,10 @@ import eu.kanade.presentation.util.topSmallPaddingValues import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.ui.browse.feed.FeedScreenState -import exh.savedsearches.models.FeedSavedSearch -import exh.savedsearches.models.SavedSearch import kotlinx.coroutines.delay import tachiyomi.domain.manga.model.Manga +import tachiyomi.domain.source.model.FeedSavedSearch +import tachiyomi.domain.source.model.SavedSearch import kotlin.time.Duration.Companion.seconds data class FeedItemUI( diff --git a/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt index a6a4f09e2..3ad84eef1 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt @@ -22,9 +22,9 @@ import eu.kanade.presentation.components.SearchToolbar import eu.kanade.presentation.util.plus import eu.kanade.presentation.util.topSmallPaddingValues import eu.kanade.tachiyomi.R -import exh.savedsearches.models.FeedSavedSearch -import exh.savedsearches.models.SavedSearch import tachiyomi.domain.manga.model.Manga +import tachiyomi.domain.source.model.FeedSavedSearch +import tachiyomi.domain.source.model.SavedSearch sealed class SourceFeedUI { abstract val id: Long diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupMergedMangaReference.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupMergedMangaReference.kt index 7f25129df..d648546b6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupMergedMangaReference.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupMergedMangaReference.kt @@ -1,8 +1,8 @@ package eu.kanade.tachiyomi.data.backup.models -import exh.merged.sql.models.MergedMangaReference import kotlinx.serialization.Serializable import kotlinx.serialization.protobuf.ProtoNumber +import tachiyomi.domain.manga.model.MergedMangaReference /* * SY merged manga backup class diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MergedSource.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MergedSource.kt index 7baee4338..f4fb8b9d5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MergedSource.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MergedSource.kt @@ -19,7 +19,6 @@ import eu.kanade.tachiyomi.source.model.copy import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.util.lang.withIOContext import eu.kanade.tachiyomi.util.shouldDownloadNewChapters -import exh.merged.sql.models.MergedMangaReference import exh.source.MERGED_SOURCE_ID import kotlinx.coroutines.CancellationException import kotlinx.coroutines.async @@ -30,6 +29,7 @@ import kotlinx.coroutines.sync.withPermit import okhttp3.Response import tachiyomi.domain.chapter.model.Chapter import tachiyomi.domain.manga.model.Manga +import tachiyomi.domain.manga.model.MergedMangaReference import uy.kohesive.injekt.injectLazy class MergedSource : HttpSource() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedScreenModel.kt index ae4299470..ec421fa91 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedScreenModel.kt @@ -30,8 +30,6 @@ import eu.kanade.tachiyomi.util.lang.withIOContext import eu.kanade.tachiyomi.util.lang.withNonCancellableContext import eu.kanade.tachiyomi.util.system.LocaleHelper import eu.kanade.tachiyomi.util.system.logcat -import exh.savedsearches.models.FeedSavedSearch -import exh.savedsearches.models.SavedSearch import kotlinx.coroutines.asCoroutineDispatcher import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll @@ -49,6 +47,8 @@ import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json import logcat.LogPriority import tachiyomi.domain.manga.model.toMangaUpdate +import tachiyomi.domain.source.model.FeedSavedSearch +import tachiyomi.domain.source.model.SavedSearch import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import xyz.nulldev.ts.api.http.serializer.FilterSerializer diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt index 292d6a810..199ebfc77 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt @@ -74,8 +74,6 @@ import eu.kanade.tachiyomi.util.removeCovers import eu.kanade.tachiyomi.util.system.logcat import eu.kanade.tachiyomi.util.system.toast import exh.metadata.metadata.base.RaisedSearchMetadata -import exh.savedsearches.EXHSavedSearch -import exh.savedsearches.models.SavedSearch import exh.source.getMainSource import exh.util.nullIfBlank import kotlinx.coroutines.flow.Flow @@ -100,6 +98,8 @@ import logcat.LogPriority import tachiyomi.domain.category.model.Category import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.toMangaUpdate +import tachiyomi.domain.source.model.EXHSavedSearch +import tachiyomi.domain.source.model.SavedSearch import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import xyz.nulldev.ts.api.http.serializer.FilterSerializer diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt index 2eef9692c..dcc7ea4e1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt @@ -17,8 +17,8 @@ import eu.kanade.tachiyomi.source.online.all.MangaDex import eu.kanade.tachiyomi.widget.SimpleNavigationView import eu.kanade.tachiyomi.widget.sheet.BaseBottomSheetDialog import exh.md.MangaDexFabHeaderAdapter -import exh.savedsearches.EXHSavedSearch import exh.source.getMainSource +import tachiyomi.domain.source.model.EXHSavedSearch class SourceFilterSheet( context: Context, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedScreen.kt index 659dd4a69..b793bf327 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedScreen.kt @@ -26,12 +26,12 @@ import eu.kanade.tachiyomi.ui.browse.source.browse.SourceFilterSheet import eu.kanade.tachiyomi.ui.manga.MangaScreen import eu.kanade.tachiyomi.util.lang.launchUI import eu.kanade.tachiyomi.util.system.toast -import exh.savedsearches.models.SavedSearch import exh.util.nullIfBlank import kotlinx.coroutines.CoroutineScope import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import tachiyomi.domain.manga.model.Manga +import tachiyomi.domain.source.model.SavedSearch import xyz.nulldev.ts.api.http.serializer.FilterSerializer class SourceFeedScreen(val sourceId: Long) : Screen { @@ -150,7 +150,7 @@ class SourceFeedScreen(val sourceId: Long) : Screen { } if (search.filterList != null) { - screenModel.setFilters(FilterList(search.filterList)) + screenModel.setFilters(FilterList(search.filterList!!)) filterSheet?.setFilters(state.filterItems) } val allDefault = search.filterList != null && state.filters == screenModel.source.getFilterList() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedScreenModel.kt index 7bec15d90..300589872 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedScreenModel.kt @@ -29,8 +29,6 @@ import eu.kanade.tachiyomi.util.lang.launchNonCancellable import eu.kanade.tachiyomi.util.lang.withIOContext import eu.kanade.tachiyomi.util.lang.withNonCancellableContext import eu.kanade.tachiyomi.util.system.logcat -import exh.savedsearches.models.FeedSavedSearch -import exh.savedsearches.models.SavedSearch import kotlinx.coroutines.asCoroutineDispatcher import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll @@ -44,6 +42,8 @@ import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json import logcat.LogPriority import tachiyomi.domain.manga.model.toMangaUpdate +import tachiyomi.domain.source.model.FeedSavedSearch +import tachiyomi.domain.source.model.SavedSearch import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import xyz.nulldev.ts.api.http.serializer.FilterSerializer diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt index fd91c6018..68ea753bc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt @@ -38,7 +38,6 @@ import eu.kanade.domain.manga.interactor.SetMangaChapterFlags import eu.kanade.domain.manga.interactor.SetMangaFilteredScanlators import eu.kanade.domain.manga.interactor.UpdateManga import eu.kanade.domain.manga.interactor.UpdateMergedSettings -import eu.kanade.domain.manga.model.MergeMangaSettingsUpdate import eu.kanade.domain.manga.model.PagePreview import eu.kanade.domain.manga.model.copyFrom import eu.kanade.domain.manga.model.downloadedFilter @@ -85,7 +84,6 @@ import exh.eh.EHentaiUpdateHelper import exh.log.xLogD import exh.md.utils.FollowStatus import exh.md.utils.MdUtil -import exh.merged.sql.models.MergedMangaReference import exh.metadata.metadata.base.FlatMetadata import exh.metadata.metadata.base.RaisedSearchMetadata import exh.source.MERGED_SOURCE_ID @@ -115,6 +113,8 @@ import tachiyomi.domain.manga.interactor.SetCustomMangaInfo import tachiyomi.domain.manga.model.CustomMangaInfo import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.MangaUpdate +import tachiyomi.domain.manga.model.MergeMangaSettingsUpdate +import tachiyomi.domain.manga.model.MergedMangaReference import tachiyomi.domain.manga.model.TriStateFilter import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaHolder.kt index 663e467bd..82a44bfbf 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaHolder.kt @@ -9,7 +9,7 @@ import eu.kanade.tachiyomi.databinding.EditMergedSettingsItemBinding import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.util.system.dpToPx import eu.kanade.tachiyomi.util.system.getResourceColor -import exh.merged.sql.models.MergedMangaReference +import tachiyomi.domain.manga.model.MergedMangaReference import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaItem.kt index 5001d7d10..886be2241 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaItem.kt @@ -7,8 +7,8 @@ import eu.davidea.flexibleadapter.items.AbstractFlexibleItem import eu.davidea.flexibleadapter.items.IFlexible import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.databinding.EditMergedSettingsItemBinding -import exh.merged.sql.models.MergedMangaReference import tachiyomi.domain.manga.model.Manga +import tachiyomi.domain.manga.model.MergedMangaReference class EditMergedMangaItem(val mergedManga: Manga?, val mergedMangaReference: MergedMangaReference) : AbstractFlexibleItem() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt index c58c124a4..0bc60f41f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt @@ -27,9 +27,9 @@ import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.databinding.EditMergedSettingsDialogBinding import eu.kanade.tachiyomi.ui.manga.MergedMangaData import eu.kanade.tachiyomi.util.system.toast -import exh.merged.sql.models.MergedMangaReference import exh.source.MERGED_SOURCE_ID import tachiyomi.domain.manga.model.Manga +import tachiyomi.domain.manga.model.MergedMangaReference @Stable class EditMergedSettingsState( diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsHeaderAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsHeaderAdapter.kt index a75d57ab2..185b76b17 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsHeaderAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsHeaderAdapter.kt @@ -10,7 +10,7 @@ import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.databinding.EditMergedSettingsHeaderBinding import eu.kanade.tachiyomi.source.SourceManager import exh.log.xLogD -import exh.merged.sql.models.MergedMangaReference +import tachiyomi.domain.manga.model.MergedMangaReference import uy.kohesive.injekt.injectLazy class EditMergedSettingsHeaderAdapter(private val state: EditMergedSettingsState, adapter: EditMergedMangaAdapter) : RecyclerView.Adapter() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt index d7a9fc11a..7f5b3827e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt @@ -14,8 +14,8 @@ import eu.kanade.tachiyomi.ui.reader.model.ReaderChapter import eu.kanade.tachiyomi.util.lang.withIOContext import eu.kanade.tachiyomi.util.system.logcat import exh.debug.DebugFunctions.readerPrefs -import exh.merged.sql.models.MergedMangaReference import tachiyomi.domain.manga.model.Manga +import tachiyomi.domain.manga.model.MergedMangaReference /** * Loader used to retrieve the [PageLoader] for a given chapter. diff --git a/app/src/main/java/exh/EXHMigrations.kt b/app/src/main/java/exh/EXHMigrations.kt index 7d9f63054..17dc5db1c 100644 --- a/app/src/main/java/exh/EXHMigrations.kt +++ b/app/src/main/java/exh/EXHMigrations.kt @@ -42,9 +42,6 @@ import eu.kanade.tachiyomi.util.system.DeviceUtil import eu.kanade.tachiyomi.util.system.logcat import exh.eh.EHentaiUpdateWorker import exh.log.xLogE -import exh.merged.sql.models.MergedMangaReference -import exh.savedsearches.models.FeedSavedSearch -import exh.savedsearches.models.SavedSearch import exh.source.BlacklistedSources import exh.source.EH_SOURCE_ID import exh.source.HBROWSE_SOURCE_ID @@ -66,6 +63,9 @@ import tachiyomi.data.DatabaseHandler import tachiyomi.data.category.categoryMapper import tachiyomi.domain.chapter.model.ChapterUpdate import tachiyomi.domain.manga.model.MangaUpdate +import tachiyomi.domain.manga.model.MergedMangaReference +import tachiyomi.domain.source.model.FeedSavedSearch +import tachiyomi.domain.source.model.SavedSearch import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy diff --git a/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt b/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt index 39afe083d..858d9c318 100644 --- a/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt +++ b/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt @@ -24,7 +24,6 @@ import exh.GalleryAddEvent import exh.GalleryAdder import exh.eh.EHentaiThrottleManager import exh.eh.EHentaiUpdateWorker -import exh.favorites.sql.models.FavoriteEntry import exh.log.xLog import exh.source.EH_SOURCE_ID import exh.source.EXH_SOURCE_ID @@ -39,6 +38,7 @@ import okhttp3.FormBody import okhttp3.Request import tachiyomi.domain.category.model.Category import tachiyomi.domain.category.model.CategoryUpdate +import tachiyomi.domain.manga.model.FavoriteEntry import tachiyomi.domain.manga.model.Manga import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/exh/favorites/LocalFavoritesStorage.kt b/app/src/main/java/exh/favorites/LocalFavoritesStorage.kt index 132df4eff..386621762 100644 --- a/app/src/main/java/exh/favorites/LocalFavoritesStorage.kt +++ b/app/src/main/java/exh/favorites/LocalFavoritesStorage.kt @@ -7,7 +7,6 @@ import eu.kanade.domain.manga.interactor.GetFavorites import eu.kanade.domain.manga.interactor.InsertFavoriteEntries import eu.kanade.domain.manga.model.toDomainManga import eu.kanade.tachiyomi.source.online.all.EHentai -import exh.favorites.sql.models.FavoriteEntry import exh.metadata.metadata.EHentaiSearchMetadata import exh.source.EXH_SOURCE_ID import exh.source.isEhBasedManga @@ -18,6 +17,7 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.flow.toList import tachiyomi.domain.category.model.Category +import tachiyomi.domain.manga.model.FavoriteEntry import tachiyomi.domain.manga.model.Manga import uy.kohesive.injekt.injectLazy diff --git a/app/src/main/java/exh/favorites/sql/models/FavoriteEntry.kt b/domain/src/main/java/tachiyomi/domain/manga/model/FavoriteEntry.kt similarity index 88% rename from app/src/main/java/exh/favorites/sql/models/FavoriteEntry.kt rename to domain/src/main/java/tachiyomi/domain/manga/model/FavoriteEntry.kt index c41be75f2..21f9d086f 100644 --- a/app/src/main/java/exh/favorites/sql/models/FavoriteEntry.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/model/FavoriteEntry.kt @@ -1,4 +1,4 @@ -package exh.favorites.sql.models +package tachiyomi.domain.manga.model import exh.metadata.metadata.EHentaiSearchMetadata diff --git a/app/src/main/java/eu/kanade/domain/manga/model/MergeMangaSettingsUpdate.kt b/domain/src/main/java/tachiyomi/domain/manga/model/MergeMangaSettingsUpdate.kt similarity index 85% rename from app/src/main/java/eu/kanade/domain/manga/model/MergeMangaSettingsUpdate.kt rename to domain/src/main/java/tachiyomi/domain/manga/model/MergeMangaSettingsUpdate.kt index 26031028f..5d3f82d55 100644 --- a/app/src/main/java/eu/kanade/domain/manga/model/MergeMangaSettingsUpdate.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/model/MergeMangaSettingsUpdate.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.model +package tachiyomi.domain.manga.model data class MergeMangaSettingsUpdate( val id: Long, diff --git a/app/src/main/java/exh/merged/sql/models/MergedMangaReference.kt b/domain/src/main/java/tachiyomi/domain/manga/model/MergedMangaReference.kt similarity index 97% rename from app/src/main/java/exh/merged/sql/models/MergedMangaReference.kt rename to domain/src/main/java/tachiyomi/domain/manga/model/MergedMangaReference.kt index d1c4ca874..086c534f3 100644 --- a/app/src/main/java/exh/merged/sql/models/MergedMangaReference.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/model/MergedMangaReference.kt @@ -1,4 +1,4 @@ -package exh.merged.sql.models +package tachiyomi.domain.manga.model data class MergedMangaReference( // Tag identifier, unique diff --git a/app/src/main/java/eu/kanade/domain/manga/repository/FavoritesEntryRepository.kt b/domain/src/main/java/tachiyomi/domain/manga/repository/FavoritesEntryRepository.kt similarity index 66% rename from app/src/main/java/eu/kanade/domain/manga/repository/FavoritesEntryRepository.kt rename to domain/src/main/java/tachiyomi/domain/manga/repository/FavoritesEntryRepository.kt index 32ff09a81..66bfe8dcb 100644 --- a/app/src/main/java/eu/kanade/domain/manga/repository/FavoritesEntryRepository.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/repository/FavoritesEntryRepository.kt @@ -1,6 +1,6 @@ -package eu.kanade.domain.manga.repository +package tachiyomi.domain.manga.repository -import exh.favorites.sql.models.FavoriteEntry +import tachiyomi.domain.manga.model.FavoriteEntry interface FavoritesEntryRepository { suspend fun deleteAll() diff --git a/app/src/main/java/eu/kanade/domain/manga/repository/MangaMergeRepository.kt b/domain/src/main/java/tachiyomi/domain/manga/repository/MangaMergeRepository.kt similarity index 85% rename from app/src/main/java/eu/kanade/domain/manga/repository/MangaMergeRepository.kt rename to domain/src/main/java/tachiyomi/domain/manga/repository/MangaMergeRepository.kt index 0cf8a31fc..a3dddddc1 100644 --- a/app/src/main/java/eu/kanade/domain/manga/repository/MangaMergeRepository.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/repository/MangaMergeRepository.kt @@ -1,9 +1,9 @@ -package eu.kanade.domain.manga.repository +package tachiyomi.domain.manga.repository -import eu.kanade.domain.manga.model.MergeMangaSettingsUpdate -import exh.merged.sql.models.MergedMangaReference import kotlinx.coroutines.flow.Flow import tachiyomi.domain.manga.model.Manga +import tachiyomi.domain.manga.model.MergeMangaSettingsUpdate +import tachiyomi.domain.manga.model.MergedMangaReference interface MangaMergeRepository { suspend fun getMergedManga(): List diff --git a/app/src/main/java/eu/kanade/domain/manga/repository/MangaMetadataRepository.kt b/domain/src/main/java/tachiyomi/domain/manga/repository/MangaMetadataRepository.kt similarity index 96% rename from app/src/main/java/eu/kanade/domain/manga/repository/MangaMetadataRepository.kt rename to domain/src/main/java/tachiyomi/domain/manga/repository/MangaMetadataRepository.kt index 5c84efe7e..129f503be 100644 --- a/app/src/main/java/eu/kanade/domain/manga/repository/MangaMetadataRepository.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/repository/MangaMetadataRepository.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.repository +package tachiyomi.domain.manga.repository import exh.metadata.metadata.base.FlatMetadata import exh.metadata.metadata.base.RaisedSearchMetadata diff --git a/app/src/main/java/exh/savedsearches/EXHSavedSearch.kt b/domain/src/main/java/tachiyomi/domain/source/model/EXHSavedSearch.kt similarity index 82% rename from app/src/main/java/exh/savedsearches/EXHSavedSearch.kt rename to domain/src/main/java/tachiyomi/domain/source/model/EXHSavedSearch.kt index e7562cb41..11e3d85e4 100644 --- a/app/src/main/java/exh/savedsearches/EXHSavedSearch.kt +++ b/domain/src/main/java/tachiyomi/domain/source/model/EXHSavedSearch.kt @@ -1,4 +1,4 @@ -package exh.savedsearches +package tachiyomi.domain.source.model import eu.kanade.tachiyomi.source.model.FilterList diff --git a/app/src/main/java/exh/savedsearches/models/FeedSavedSearch.kt b/domain/src/main/java/tachiyomi/domain/source/model/FeedSavedSearch.kt similarity index 88% rename from app/src/main/java/exh/savedsearches/models/FeedSavedSearch.kt rename to domain/src/main/java/tachiyomi/domain/source/model/FeedSavedSearch.kt index d6aedd1c4..fd1b5c235 100644 --- a/app/src/main/java/exh/savedsearches/models/FeedSavedSearch.kt +++ b/domain/src/main/java/tachiyomi/domain/source/model/FeedSavedSearch.kt @@ -1,4 +1,4 @@ -package exh.savedsearches.models +package tachiyomi.domain.source.model data class FeedSavedSearch( // Tag identifier, unique diff --git a/app/src/main/java/exh/savedsearches/models/SavedSearch.kt b/domain/src/main/java/tachiyomi/domain/source/model/SavedSearch.kt similarity index 89% rename from app/src/main/java/exh/savedsearches/models/SavedSearch.kt rename to domain/src/main/java/tachiyomi/domain/source/model/SavedSearch.kt index 20515afd0..c6cad2013 100644 --- a/app/src/main/java/exh/savedsearches/models/SavedSearch.kt +++ b/domain/src/main/java/tachiyomi/domain/source/model/SavedSearch.kt @@ -1,4 +1,4 @@ -package exh.savedsearches.models +package tachiyomi.domain.source.model data class SavedSearch( // Tag identifier, unique diff --git a/app/src/main/java/eu/kanade/domain/source/repository/FeedSavedSearchRepository.kt b/domain/src/main/java/tachiyomi/domain/source/repository/FeedSavedSearchRepository.kt similarity index 83% rename from app/src/main/java/eu/kanade/domain/source/repository/FeedSavedSearchRepository.kt rename to domain/src/main/java/tachiyomi/domain/source/repository/FeedSavedSearchRepository.kt index 20fad43e5..e4b89bc26 100644 --- a/app/src/main/java/eu/kanade/domain/source/repository/FeedSavedSearchRepository.kt +++ b/domain/src/main/java/tachiyomi/domain/source/repository/FeedSavedSearchRepository.kt @@ -1,8 +1,8 @@ -package eu.kanade.domain.source.repository +package tachiyomi.domain.source.repository -import exh.savedsearches.models.FeedSavedSearch -import exh.savedsearches.models.SavedSearch import kotlinx.coroutines.flow.Flow +import tachiyomi.domain.source.model.FeedSavedSearch +import tachiyomi.domain.source.model.SavedSearch interface FeedSavedSearchRepository { diff --git a/app/src/main/java/eu/kanade/domain/source/repository/SavedSearchRepository.kt b/domain/src/main/java/tachiyomi/domain/source/repository/SavedSearchRepository.kt similarity index 82% rename from app/src/main/java/eu/kanade/domain/source/repository/SavedSearchRepository.kt rename to domain/src/main/java/tachiyomi/domain/source/repository/SavedSearchRepository.kt index 621b1b4ce..86fb79685 100644 --- a/app/src/main/java/eu/kanade/domain/source/repository/SavedSearchRepository.kt +++ b/domain/src/main/java/tachiyomi/domain/source/repository/SavedSearchRepository.kt @@ -1,7 +1,7 @@ -package eu.kanade.domain.source.repository +package tachiyomi.domain.source.repository -import exh.savedsearches.models.SavedSearch import kotlinx.coroutines.flow.Flow +import tachiyomi.domain.source.model.SavedSearch interface SavedSearchRepository {