diff --git a/app/src/main/java/eu/kanade/domain/SYDomainModule.kt b/app/src/main/java/eu/kanade/domain/SYDomainModule.kt index 2b01e54ea..187f2108b 100644 --- a/app/src/main/java/eu/kanade/domain/SYDomainModule.kt +++ b/app/src/main/java/eu/kanade/domain/SYDomainModule.kt @@ -1,11 +1,6 @@ package eu.kanade.domain import android.app.Application -import eu.kanade.data.manga.FavoritesEntryRepositoryImpl -import eu.kanade.data.manga.MangaMergeRepositoryImpl -import eu.kanade.data.manga.MangaMetadataRepositoryImpl -import eu.kanade.data.source.FeedSavedSearchRepositoryImpl -import eu.kanade.data.source.SavedSearchRepositoryImpl import eu.kanade.domain.chapter.interactor.DeleteChapters import eu.kanade.domain.chapter.interactor.GetChapterByUrl import eu.kanade.domain.chapter.interactor.GetMergedChapterByMangaId @@ -64,6 +59,11 @@ import eu.kanade.domain.source.interactor.ToggleExcludeFromDataSaver import eu.kanade.tachiyomi.source.online.MetadataSource import exh.search.SearchEngine import tachiyomi.data.manga.CustomMangaRepositoryImpl +import tachiyomi.data.manga.FavoritesEntryRepositoryImpl +import tachiyomi.data.manga.MangaMergeRepositoryImpl +import tachiyomi.data.manga.MangaMetadataRepositoryImpl +import tachiyomi.data.source.FeedSavedSearchRepositoryImpl +import tachiyomi.data.source.SavedSearchRepositoryImpl import tachiyomi.domain.manga.interactor.GetCustomMangaInfo import tachiyomi.domain.manga.interactor.SetCustomMangaInfo import tachiyomi.domain.manga.repository.CustomMangaRepository diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt index 76fa594df..7a50a7bf7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt @@ -4,7 +4,6 @@ import android.Manifest import android.content.Context import android.net.Uri import com.hippo.unifile.UniFile -import eu.kanade.data.exh.mergedMangaReferenceMapper import eu.kanade.domain.backup.service.BackupPreferences import eu.kanade.domain.category.interactor.GetCategories import eu.kanade.domain.library.service.LibraryPreferences @@ -61,6 +60,7 @@ import tachiyomi.data.Manga_sync import tachiyomi.data.Mangas import tachiyomi.data.listOfStringsAndAdapter import tachiyomi.data.manga.mangaMapper +import tachiyomi.data.manga.mergedMangaReferenceMapper import tachiyomi.data.updateStrategyAdapter import tachiyomi.domain.category.model.Category import tachiyomi.domain.history.model.HistoryUpdate diff --git a/app/src/main/java/eu/kanade/data/exh/FavoriteEntry.kt b/data/src/main/java/tachiyomi/data/manga/FavoriteEntry.kt similarity index 92% rename from app/src/main/java/eu/kanade/data/exh/FavoriteEntry.kt rename to data/src/main/java/tachiyomi/data/manga/FavoriteEntry.kt index 05b9972ec..6357f642d 100644 --- a/app/src/main/java/eu/kanade/data/exh/FavoriteEntry.kt +++ b/data/src/main/java/tachiyomi/data/manga/FavoriteEntry.kt @@ -1,4 +1,4 @@ -package eu.kanade.data.exh +package tachiyomi.data.manga import tachiyomi.domain.manga.model.FavoriteEntry diff --git a/app/src/main/java/eu/kanade/data/manga/FavoritesEntryRepositoryImpl.kt b/data/src/main/java/tachiyomi/data/manga/FavoritesEntryRepositoryImpl.kt similarity index 91% rename from app/src/main/java/eu/kanade/data/manga/FavoritesEntryRepositoryImpl.kt rename to data/src/main/java/tachiyomi/data/manga/FavoritesEntryRepositoryImpl.kt index 1efbc1002..3e81a6c89 100644 --- a/app/src/main/java/eu/kanade/data/manga/FavoritesEntryRepositoryImpl.kt +++ b/data/src/main/java/tachiyomi/data/manga/FavoritesEntryRepositoryImpl.kt @@ -1,6 +1,5 @@ -package eu.kanade.data.manga +package tachiyomi.data.manga -import eu.kanade.data.exh.favoriteEntryMapper import tachiyomi.data.DatabaseHandler import tachiyomi.domain.manga.model.FavoriteEntry import tachiyomi.domain.manga.repository.FavoritesEntryRepository diff --git a/app/src/main/java/eu/kanade/data/manga/MangaMergeRepositoryImpl.kt b/data/src/main/java/tachiyomi/data/manga/MangaMergeRepositoryImpl.kt similarity index 97% rename from app/src/main/java/eu/kanade/data/manga/MangaMergeRepositoryImpl.kt rename to data/src/main/java/tachiyomi/data/manga/MangaMergeRepositoryImpl.kt index d62b3d1bf..97086186a 100644 --- a/app/src/main/java/eu/kanade/data/manga/MangaMergeRepositoryImpl.kt +++ b/data/src/main/java/tachiyomi/data/manga/MangaMergeRepositoryImpl.kt @@ -1,12 +1,10 @@ -package eu.kanade.data.manga +package tachiyomi.data.manga -import eu.kanade.data.exh.mergedMangaReferenceMapper import eu.kanade.tachiyomi.util.system.logcat import eu.kanade.tachiyomi.util.toLong import kotlinx.coroutines.flow.Flow import logcat.LogPriority import tachiyomi.data.DatabaseHandler -import tachiyomi.data.manga.mangaMapper import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.MergeMangaSettingsUpdate import tachiyomi.domain.manga.model.MergedMangaReference diff --git a/app/src/main/java/eu/kanade/data/manga/MangaMetadataRepositoryImpl.kt b/data/src/main/java/tachiyomi/data/manga/MangaMetadataRepositoryImpl.kt similarity index 93% rename from app/src/main/java/eu/kanade/data/manga/MangaMetadataRepositoryImpl.kt rename to data/src/main/java/tachiyomi/data/manga/MangaMetadataRepositoryImpl.kt index 51f1b5281..3b9757eb7 100644 --- a/app/src/main/java/eu/kanade/data/manga/MangaMetadataRepositoryImpl.kt +++ b/data/src/main/java/tachiyomi/data/manga/MangaMetadataRepositoryImpl.kt @@ -1,8 +1,5 @@ -package eu.kanade.data.manga +package tachiyomi.data.manga -import eu.kanade.data.exh.searchMetadataMapper -import eu.kanade.data.exh.searchTagMapper -import eu.kanade.data.exh.searchTitleMapper import exh.metadata.metadata.base.FlatMetadata import exh.metadata.sql.models.SearchMetadata import exh.metadata.sql.models.SearchTag @@ -11,7 +8,6 @@ import exh.source.EH_SOURCE_ID import exh.source.EXH_SOURCE_ID import kotlinx.coroutines.flow.Flow import tachiyomi.data.DatabaseHandler -import tachiyomi.data.manga.mangaMapper import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.repository.MangaMetadataRepository diff --git a/app/src/main/java/eu/kanade/data/exh/MergedMangaReferenceMapper.kt b/data/src/main/java/tachiyomi/data/manga/MergedMangaReferenceMapper.kt similarity index 96% rename from app/src/main/java/eu/kanade/data/exh/MergedMangaReferenceMapper.kt rename to data/src/main/java/tachiyomi/data/manga/MergedMangaReferenceMapper.kt index eb4d33e9b..403affdf1 100644 --- a/app/src/main/java/eu/kanade/data/exh/MergedMangaReferenceMapper.kt +++ b/data/src/main/java/tachiyomi/data/manga/MergedMangaReferenceMapper.kt @@ -1,4 +1,4 @@ -package eu.kanade.data.exh +package tachiyomi.data.manga import tachiyomi.domain.manga.model.MergedMangaReference diff --git a/app/src/main/java/eu/kanade/data/exh/SearchMetadataMapper.kt b/data/src/main/java/tachiyomi/data/manga/SearchMetadataMapper.kt similarity index 93% rename from app/src/main/java/eu/kanade/data/exh/SearchMetadataMapper.kt rename to data/src/main/java/tachiyomi/data/manga/SearchMetadataMapper.kt index 2956a6814..b2bc2cd80 100644 --- a/app/src/main/java/eu/kanade/data/exh/SearchMetadataMapper.kt +++ b/data/src/main/java/tachiyomi/data/manga/SearchMetadataMapper.kt @@ -1,4 +1,4 @@ -package eu.kanade.data.exh +package tachiyomi.data.manga import exh.metadata.sql.models.SearchMetadata diff --git a/app/src/main/java/eu/kanade/data/exh/SearchTag.kt b/data/src/main/java/tachiyomi/data/manga/SearchTag.kt similarity index 91% rename from app/src/main/java/eu/kanade/data/exh/SearchTag.kt rename to data/src/main/java/tachiyomi/data/manga/SearchTag.kt index ccc2c14eb..699a10931 100644 --- a/app/src/main/java/eu/kanade/data/exh/SearchTag.kt +++ b/data/src/main/java/tachiyomi/data/manga/SearchTag.kt @@ -1,4 +1,4 @@ -package eu.kanade.data.exh +package tachiyomi.data.manga import exh.metadata.sql.models.SearchTag diff --git a/app/src/main/java/eu/kanade/data/exh/SearchTitle.kt b/data/src/main/java/tachiyomi/data/manga/SearchTitle.kt similarity index 90% rename from app/src/main/java/eu/kanade/data/exh/SearchTitle.kt rename to data/src/main/java/tachiyomi/data/manga/SearchTitle.kt index 1e641aa54..ba6cb9096 100644 --- a/app/src/main/java/eu/kanade/data/exh/SearchTitle.kt +++ b/data/src/main/java/tachiyomi/data/manga/SearchTitle.kt @@ -1,4 +1,4 @@ -package eu.kanade.data.exh +package tachiyomi.data.manga import exh.metadata.sql.models.SearchTitle diff --git a/app/src/main/java/eu/kanade/data/exh/FeedSavedSearch.kt b/data/src/main/java/tachiyomi/data/source/FeedSavedSearch.kt similarity index 91% rename from app/src/main/java/eu/kanade/data/exh/FeedSavedSearch.kt rename to data/src/main/java/tachiyomi/data/source/FeedSavedSearch.kt index cd4496448..3d2019a28 100644 --- a/app/src/main/java/eu/kanade/data/exh/FeedSavedSearch.kt +++ b/data/src/main/java/tachiyomi/data/source/FeedSavedSearch.kt @@ -1,4 +1,4 @@ -package eu.kanade.data.exh +package tachiyomi.data.source import tachiyomi.domain.source.model.FeedSavedSearch diff --git a/app/src/main/java/eu/kanade/data/source/FeedSavedSearchRepositoryImpl.kt b/data/src/main/java/tachiyomi/data/source/FeedSavedSearchRepositoryImpl.kt similarity index 95% rename from app/src/main/java/eu/kanade/data/source/FeedSavedSearchRepositoryImpl.kt rename to data/src/main/java/tachiyomi/data/source/FeedSavedSearchRepositoryImpl.kt index de9aab8c2..d3f7a6eb2 100644 --- a/app/src/main/java/eu/kanade/data/source/FeedSavedSearchRepositoryImpl.kt +++ b/data/src/main/java/tachiyomi/data/source/FeedSavedSearchRepositoryImpl.kt @@ -1,7 +1,5 @@ -package eu.kanade.data.source +package tachiyomi.data.source -import eu.kanade.data.exh.feedSavedSearchMapper -import eu.kanade.data.exh.savedSearchMapper import kotlinx.coroutines.flow.Flow import tachiyomi.data.DatabaseHandler import tachiyomi.domain.source.model.FeedSavedSearch diff --git a/app/src/main/java/eu/kanade/data/exh/SavedSearch.kt b/data/src/main/java/tachiyomi/data/source/SavedSearch.kt similarity index 92% rename from app/src/main/java/eu/kanade/data/exh/SavedSearch.kt rename to data/src/main/java/tachiyomi/data/source/SavedSearch.kt index 68c482442..4a5c775dc 100644 --- a/app/src/main/java/eu/kanade/data/exh/SavedSearch.kt +++ b/data/src/main/java/tachiyomi/data/source/SavedSearch.kt @@ -1,4 +1,4 @@ -package eu.kanade.data.exh +package tachiyomi.data.source import tachiyomi.domain.source.model.SavedSearch diff --git a/app/src/main/java/eu/kanade/data/source/SavedSearchRepositoryImpl.kt b/data/src/main/java/tachiyomi/data/source/SavedSearchRepositoryImpl.kt similarity index 95% rename from app/src/main/java/eu/kanade/data/source/SavedSearchRepositoryImpl.kt rename to data/src/main/java/tachiyomi/data/source/SavedSearchRepositoryImpl.kt index 576054760..92c59d148 100644 --- a/app/src/main/java/eu/kanade/data/source/SavedSearchRepositoryImpl.kt +++ b/data/src/main/java/tachiyomi/data/source/SavedSearchRepositoryImpl.kt @@ -1,6 +1,5 @@ -package eu.kanade.data.source +package tachiyomi.data.source -import eu.kanade.data.exh.savedSearchMapper import kotlinx.coroutines.flow.Flow import tachiyomi.data.DatabaseHandler import tachiyomi.domain.source.model.SavedSearch