diff --git a/app/src/main/java/eu/kanade/domain/SYDomainModule.kt b/app/src/main/java/eu/kanade/domain/SYDomainModule.kt index 21fd3c617..46012afa9 100644 --- a/app/src/main/java/eu/kanade/domain/SYDomainModule.kt +++ b/app/src/main/java/eu/kanade/domain/SYDomainModule.kt @@ -1,54 +1,17 @@ package eu.kanade.domain import android.app.Application -import eu.kanade.domain.chapter.interactor.DeleteChapters -import eu.kanade.domain.chapter.interactor.GetChapterByUrl import eu.kanade.domain.manga.interactor.CreateSortTag -import eu.kanade.domain.manga.interactor.DeleteByMergeId -import eu.kanade.domain.manga.interactor.DeleteFavoriteEntries -import eu.kanade.domain.manga.interactor.DeleteMangaById -import eu.kanade.domain.manga.interactor.DeleteMergeById import eu.kanade.domain.manga.interactor.DeleteSortTag -import eu.kanade.domain.manga.interactor.GetAllManga -import eu.kanade.domain.manga.interactor.GetExhFavoriteMangaWithMetadata -import eu.kanade.domain.manga.interactor.GetFavoriteEntries -import eu.kanade.domain.manga.interactor.GetFlatMetadataById -import eu.kanade.domain.manga.interactor.GetIdsOfFavoriteMangaWithMetadata -import eu.kanade.domain.manga.interactor.GetMangaBySource -import eu.kanade.domain.manga.interactor.GetMergedManga -import eu.kanade.domain.manga.interactor.GetMergedMangaById -import eu.kanade.domain.manga.interactor.GetMergedMangaForDownloading import eu.kanade.domain.manga.interactor.GetPagePreviews -import eu.kanade.domain.manga.interactor.GetSearchMetadata -import eu.kanade.domain.manga.interactor.GetSearchTags -import eu.kanade.domain.manga.interactor.GetSearchTitles import eu.kanade.domain.manga.interactor.GetSortTag -import eu.kanade.domain.manga.interactor.InsertFavoriteEntries -import eu.kanade.domain.manga.interactor.InsertFlatMetadata -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.source.interactor.CountFeedSavedSearchBySourceId -import eu.kanade.domain.source.interactor.CountFeedSavedSearchGlobal import eu.kanade.domain.source.interactor.CreateSourceCategory import eu.kanade.domain.source.interactor.CreateSourceRepo -import eu.kanade.domain.source.interactor.DeleteFeedSavedSearchById -import eu.kanade.domain.source.interactor.DeleteSavedSearchById import eu.kanade.domain.source.interactor.DeleteSourceCategory -import eu.kanade.domain.source.interactor.DeleteSourceRepos import eu.kanade.domain.source.interactor.GetExhSavedSearch -import eu.kanade.domain.source.interactor.GetFeedSavedSearchBySourceId -import eu.kanade.domain.source.interactor.GetFeedSavedSearchGlobal -import eu.kanade.domain.source.interactor.GetSavedSearchById -import eu.kanade.domain.source.interactor.GetSavedSearchBySourceId -import eu.kanade.domain.source.interactor.GetSavedSearchBySourceIdFeed -import eu.kanade.domain.source.interactor.GetSavedSearchGlobalFeed import eu.kanade.domain.source.interactor.GetShowLatest import eu.kanade.domain.source.interactor.GetSourceCategories -import eu.kanade.domain.source.interactor.GetSourceRepos -import eu.kanade.domain.source.interactor.InsertFeedSavedSearch -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 @@ -60,16 +23,53 @@ import tachiyomi.data.manga.MangaMergeRepositoryImpl import tachiyomi.data.manga.MangaMetadataRepositoryImpl import tachiyomi.data.source.FeedSavedSearchRepositoryImpl import tachiyomi.data.source.SavedSearchRepositoryImpl +import tachiyomi.domain.chapter.interactor.DeleteChapters +import tachiyomi.domain.chapter.interactor.GetChapterByUrl import tachiyomi.domain.chapter.interactor.GetMergedChapterByMangaId import tachiyomi.domain.history.interactor.GetHistoryByMangaId +import tachiyomi.domain.manga.interactor.DeleteByMergeId +import tachiyomi.domain.manga.interactor.DeleteFavoriteEntries +import tachiyomi.domain.manga.interactor.DeleteMangaById +import tachiyomi.domain.manga.interactor.DeleteMergeById +import tachiyomi.domain.manga.interactor.GetAllManga import tachiyomi.domain.manga.interactor.GetCustomMangaInfo +import tachiyomi.domain.manga.interactor.GetExhFavoriteMangaWithMetadata +import tachiyomi.domain.manga.interactor.GetFavoriteEntries +import tachiyomi.domain.manga.interactor.GetFlatMetadataById +import tachiyomi.domain.manga.interactor.GetIdsOfFavoriteMangaWithMetadata import tachiyomi.domain.manga.interactor.GetManga +import tachiyomi.domain.manga.interactor.GetMangaBySource +import tachiyomi.domain.manga.interactor.GetMergedManga +import tachiyomi.domain.manga.interactor.GetMergedMangaById +import tachiyomi.domain.manga.interactor.GetMergedMangaForDownloading import tachiyomi.domain.manga.interactor.GetMergedReferencesById +import tachiyomi.domain.manga.interactor.GetSearchMetadata +import tachiyomi.domain.manga.interactor.GetSearchTags +import tachiyomi.domain.manga.interactor.GetSearchTitles +import tachiyomi.domain.manga.interactor.InsertFavoriteEntries +import tachiyomi.domain.manga.interactor.InsertFlatMetadata +import tachiyomi.domain.manga.interactor.InsertMergedReference import tachiyomi.domain.manga.interactor.SetCustomMangaInfo +import tachiyomi.domain.manga.interactor.SetMangaFilteredScanlators +import tachiyomi.domain.manga.interactor.UpdateMergedSettings 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.interactor.CountFeedSavedSearchBySourceId +import tachiyomi.domain.source.interactor.CountFeedSavedSearchGlobal +import tachiyomi.domain.source.interactor.DeleteFeedSavedSearchById +import tachiyomi.domain.source.interactor.DeleteSavedSearchById +import tachiyomi.domain.source.interactor.DeleteSourceRepos +import tachiyomi.domain.source.interactor.GetFeedSavedSearchBySourceId +import tachiyomi.domain.source.interactor.GetFeedSavedSearchGlobal +import tachiyomi.domain.source.interactor.GetSavedSearchById +import tachiyomi.domain.source.interactor.GetSavedSearchBySourceId +import tachiyomi.domain.source.interactor.GetSavedSearchBySourceIdFeed +import tachiyomi.domain.source.interactor.GetSavedSearchGlobalFeed +import tachiyomi.domain.source.interactor.GetSourceRepos +import tachiyomi.domain.source.interactor.InsertFeedSavedSearch +import tachiyomi.domain.source.interactor.InsertSavedSearch import tachiyomi.domain.source.repository.FeedSavedSearchRepository import tachiyomi.domain.source.repository.SavedSearchRepository import tachiyomi.domain.track.interactor.IsTrackUnfollowed diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/CreateSourceRepo.kt b/app/src/main/java/eu/kanade/domain/source/interactor/CreateSourceRepo.kt index 7f50c306a..946255dc9 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/CreateSourceRepo.kt +++ b/app/src/main/java/eu/kanade/domain/source/interactor/CreateSourceRepo.kt @@ -1,7 +1,7 @@ package eu.kanade.domain.source.interactor -import eu.kanade.domain.UnsortedPreferences import eu.kanade.tachiyomi.util.preference.plusAssign +import tachiyomi.domain.UnsortedPreferences class CreateSourceRepo(private val preferences: UnsortedPreferences) { 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 70ae73b23..ff229e31a 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 @@ -11,6 +11,8 @@ import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonArray import tachiyomi.core.util.lang.withIOContext +import tachiyomi.domain.source.interactor.GetSavedSearchById +import tachiyomi.domain.source.interactor.GetSavedSearchBySourceId import tachiyomi.domain.source.model.EXHSavedSearch import tachiyomi.domain.source.model.SavedSearch import xyz.nulldev.ts.api.http.serializer.FilterSerializer diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/ConfigureExhDialog.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/ConfigureExhDialog.kt index f62bb3cd2..867b0fad3 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/ConfigureExhDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/ConfigureExhDialog.kt @@ -12,7 +12,6 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.window.DialogProperties -import eu.kanade.domain.UnsortedPreferences import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.system.toast import exh.log.xLogE @@ -22,6 +21,7 @@ import kotlinx.coroutines.NonCancellable import kotlinx.coroutines.delay import kotlinx.coroutines.withContext import tachiyomi.core.util.lang.launchUI +import tachiyomi.domain.UnsortedPreferences import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import kotlin.time.Duration.Companion.seconds 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 176355981..cf2aff4e9 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 @@ -38,9 +38,7 @@ import androidx.core.net.toUri import androidx.core.text.HtmlCompat import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow -import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.base.BasePreferences -import eu.kanade.domain.manga.interactor.GetAllManga import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.domain.source.service.SourcePreferences.DataSaver import eu.kanade.presentation.more.settings.Preference @@ -88,8 +86,10 @@ import okhttp3.Headers import tachiyomi.core.util.lang.launchNonCancellable import tachiyomi.core.util.lang.withUIContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.UnsortedPreferences import tachiyomi.domain.chapter.interactor.GetChapterByMangaId import tachiyomi.domain.library.service.LibraryPreferences +import tachiyomi.domain.manga.interactor.GetAllManga import tachiyomi.domain.manga.repository.MangaRepository import tachiyomi.domain.source.service.SourceManager import uy.kohesive.injekt.Injekt diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt index 4cb649d08..f5c478f16 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt @@ -11,7 +11,6 @@ import androidx.compose.ui.res.stringResource import androidx.fragment.app.FragmentActivity import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow -import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.domain.ui.UiPreferences import eu.kanade.presentation.more.settings.Preference @@ -20,6 +19,7 @@ import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.category.repos.RepoScreen import eu.kanade.tachiyomi.ui.category.sources.SourceCategoryScreen import eu.kanade.tachiyomi.util.system.AuthenticatorUtil.authenticate +import tachiyomi.domain.UnsortedPreferences import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsEhScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsEhScreen.kt index 924f4c1ac..6c281d081 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsEhScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsEhScreen.kt @@ -46,10 +46,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.DialogProperties import androidx.core.content.ContextCompat.startActivity -import eu.kanade.domain.UnsortedPreferences -import eu.kanade.domain.manga.interactor.DeleteFavoriteEntries -import eu.kanade.domain.manga.interactor.GetExhFavoriteMangaWithMetadata -import eu.kanade.domain.manga.interactor.GetFlatMetadataById import eu.kanade.presentation.library.components.SyncFavoritesWarningDialog import eu.kanade.presentation.more.settings.Preference import eu.kanade.presentation.util.collectAsState @@ -69,8 +65,12 @@ import tachiyomi.core.util.lang.launchNonCancellable import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.lang.withUIContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.UnsortedPreferences import tachiyomi.domain.library.service.LibraryPreferences.Companion.DEVICE_CHARGING import tachiyomi.domain.library.service.LibraryPreferences.Companion.DEVICE_ONLY_ON_WIFI +import tachiyomi.domain.manga.interactor.DeleteFavoriteEntries +import tachiyomi.domain.manga.interactor.GetExhFavoriteMangaWithMetadata +import tachiyomi.domain.manga.interactor.GetFlatMetadataById import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import kotlin.time.Duration diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt index b2b144c0c..5a27564e7 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt @@ -31,7 +31,6 @@ import androidx.core.content.ContextCompat import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.Navigator import cafe.adriel.voyager.navigator.currentOrThrow -import eu.kanade.domain.UnsortedPreferences import eu.kanade.presentation.category.visualName import eu.kanade.presentation.more.settings.Preference import eu.kanade.presentation.more.settings.widget.TriStateListDialog @@ -43,6 +42,7 @@ import eu.kanade.tachiyomi.ui.category.CategoryScreen import eu.kanade.tachiyomi.ui.category.genre.SortTagScreen import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking +import tachiyomi.domain.UnsortedPreferences import tachiyomi.domain.category.interactor.GetCategories import tachiyomi.domain.category.interactor.ResetCategoryFlags import tachiyomi.domain.category.model.Category diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMangadexScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMangadexScreen.kt index b45ba1af8..615a1f9ae 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMangadexScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMangadexScreen.kt @@ -25,7 +25,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource -import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.domain.track.service.TrackPreferences import eu.kanade.presentation.more.settings.Preference @@ -41,6 +40,7 @@ import logcat.LogPriority import tachiyomi.core.util.lang.launchIO import tachiyomi.core.util.lang.withUIContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.UnsortedPreferences import tachiyomi.presentation.core.components.material.padding import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt b/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt index d5500dcba..2da136a1f 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt @@ -7,7 +7,6 @@ import androidx.sqlite.db.SupportSQLiteDatabase import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory import com.squareup.sqldelight.android.AndroidSqliteDriver import com.squareup.sqldelight.db.SqlDriver -import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.base.BasePreferences import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.domain.track.service.TrackPreferences @@ -52,6 +51,7 @@ import tachiyomi.data.listOfLongsAdapter import tachiyomi.data.listOfStringsAdapter import tachiyomi.data.listOfStringsAndAdapter import tachiyomi.data.updateStrategyAdapter +import tachiyomi.domain.UnsortedPreferences import tachiyomi.domain.backup.service.BackupPreferences import tachiyomi.domain.download.service.DownloadPreferences import tachiyomi.domain.library.service.LibraryPreferences 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 72d102c21..90ddb4083 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,9 +4,6 @@ import android.Manifest import android.content.Context import android.net.Uri import com.hippo.unifile.UniFile -import eu.kanade.domain.manga.interactor.GetFlatMetadataById -import eu.kanade.domain.manga.interactor.GetMergedManga -import eu.kanade.domain.manga.interactor.InsertFlatMetadata import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_CATEGORY import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_CATEGORY_MASK @@ -64,6 +61,9 @@ import tachiyomi.domain.history.model.HistoryUpdate import tachiyomi.domain.library.service.LibraryPreferences import tachiyomi.domain.manga.interactor.GetCustomMangaInfo import tachiyomi.domain.manga.interactor.GetFavorites +import tachiyomi.domain.manga.interactor.GetFlatMetadataById +import tachiyomi.domain.manga.interactor.GetMergedManga +import tachiyomi.domain.manga.interactor.InsertFlatMetadata import tachiyomi.domain.manga.interactor.SetCustomMangaInfo import tachiyomi.domain.manga.model.CustomMangaInfo import tachiyomi.domain.source.service.SourceManager diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt index ab7335727..c8ef4dbc8 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt @@ -15,11 +15,8 @@ import androidx.work.WorkManager import androidx.work.WorkQuery import androidx.work.WorkerParameters import androidx.work.workDataOf -import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.chapter.interactor.SyncChaptersWithSource import eu.kanade.domain.chapter.interactor.SyncChaptersWithTrackServiceTwoWay -import eu.kanade.domain.manga.interactor.GetMergedMangaForDownloading -import eu.kanade.domain.manga.interactor.InsertFlatMetadata import eu.kanade.domain.manga.interactor.UpdateManga import eu.kanade.domain.manga.model.copyFrom import eu.kanade.domain.manga.model.toSManga @@ -67,6 +64,7 @@ import logcat.LogPriority import tachiyomi.core.preference.getAndSet import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.UnsortedPreferences import tachiyomi.domain.category.interactor.GetCategories import tachiyomi.domain.category.model.Category import tachiyomi.domain.chapter.interactor.GetChapterByMangaId @@ -87,6 +85,8 @@ import tachiyomi.domain.library.service.LibraryPreferences.Companion.MANGA_NON_R import tachiyomi.domain.manga.interactor.GetFavorites import tachiyomi.domain.manga.interactor.GetLibraryManga import tachiyomi.domain.manga.interactor.GetManga +import tachiyomi.domain.manga.interactor.GetMergedMangaForDownloading +import tachiyomi.domain.manga.interactor.InsertFlatMetadata import tachiyomi.domain.manga.interactor.NetworkToLocalManga import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.toMangaUpdate diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt index f81764351..bd186024a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt @@ -1,7 +1,6 @@ package eu.kanade.tachiyomi.extension.api import android.content.Context -import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.tachiyomi.extension.ExtensionManager import eu.kanade.tachiyomi.extension.model.AvailableSources @@ -20,6 +19,7 @@ import tachiyomi.core.preference.Preference import tachiyomi.core.preference.PreferenceStore import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.UnsortedPreferences import uy.kohesive.injekt.injectLazy import java.util.Date import kotlin.time.Duration.Companion.days diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/AndroidSourceManager.kt b/app/src/main/java/eu/kanade/tachiyomi/source/AndroidSourceManager.kt index c5e4652ff..ce5b802a9 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/AndroidSourceManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/AndroidSourceManager.kt @@ -1,7 +1,6 @@ package eu.kanade.tachiyomi.source import android.content.Context -import eu.kanade.domain.UnsortedPreferences import eu.kanade.tachiyomi.data.download.DownloadManager import eu.kanade.tachiyomi.extension.ExtensionManager import eu.kanade.tachiyomi.source.online.HttpSource @@ -35,6 +34,7 @@ import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking +import tachiyomi.domain.UnsortedPreferences import tachiyomi.domain.source.model.SourceData import tachiyomi.domain.source.model.StubSource import tachiyomi.domain.source.repository.SourceDataRepository diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt index 6490cfa5b..4a2f0d399 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt @@ -5,7 +5,6 @@ import android.graphics.Bitmap import android.graphics.BitmapFactory import android.net.Uri import androidx.core.net.toUri -import eu.kanade.domain.UnsortedPreferences import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.asObservableSuccess import eu.kanade.tachiyomi.network.await @@ -85,6 +84,7 @@ import org.jsoup.nodes.TextNode import rx.Observable import tachiyomi.core.util.lang.runAsObservable import tachiyomi.core.util.lang.withIOContext +import tachiyomi.domain.UnsortedPreferences import uy.kohesive.injekt.injectLazy import java.io.ByteArrayOutputStream import java.io.IOException 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 de06d7e91..d10148ff4 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 @@ -10,12 +10,6 @@ import eu.kanade.domain.manga.interactor.UpdateManga import eu.kanade.domain.manga.model.copyFrom import eu.kanade.domain.manga.model.toDomainManga import eu.kanade.domain.manga.model.toSManga -import eu.kanade.domain.source.interactor.CountFeedSavedSearchGlobal -import eu.kanade.domain.source.interactor.DeleteFeedSavedSearchById -import eu.kanade.domain.source.interactor.GetFeedSavedSearchGlobal -import eu.kanade.domain.source.interactor.GetSavedSearchBySourceId -import eu.kanade.domain.source.interactor.GetSavedSearchGlobalFeed -import eu.kanade.domain.source.interactor.InsertFeedSavedSearch import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.presentation.browse.FeedItemUI import eu.kanade.tachiyomi.source.CatalogueSource @@ -46,6 +40,12 @@ import tachiyomi.core.util.system.logcat import tachiyomi.domain.manga.interactor.GetManga import tachiyomi.domain.manga.interactor.NetworkToLocalManga import tachiyomi.domain.manga.model.toMangaUpdate +import tachiyomi.domain.source.interactor.CountFeedSavedSearchGlobal +import tachiyomi.domain.source.interactor.DeleteFeedSavedSearchById +import tachiyomi.domain.source.interactor.GetFeedSavedSearchGlobal +import tachiyomi.domain.source.interactor.GetSavedSearchBySourceId +import tachiyomi.domain.source.interactor.GetSavedSearchGlobalFeed +import tachiyomi.domain.source.interactor.InsertFeedSavedSearch import tachiyomi.domain.source.model.FeedSavedSearch import tachiyomi.domain.source.model.SavedSearch import tachiyomi.domain.source.service.SourceManager diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationBottomSheetDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationBottomSheetDialog.kt index 233ad285f..5fe4c08f3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationBottomSheetDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationBottomSheetDialog.kt @@ -11,7 +11,6 @@ import android.widget.RadioGroup import android.widget.Toast import androidx.core.view.isVisible import com.google.android.material.bottomsheet.BottomSheetBehavior -import eu.kanade.domain.UnsortedPreferences import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.databinding.MigrationBottomSheetBinding import eu.kanade.tachiyomi.ui.browse.migration.MigrationFlags @@ -19,6 +18,7 @@ import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.widget.sheet.BaseBottomSheetDialog import tachiyomi.core.preference.Preference import tachiyomi.core.util.lang.toLong +import tachiyomi.domain.UnsortedPreferences import uy.kohesive.injekt.injectLazy class MigrationBottomSheetDialog(private val baseContext: Context, private val listener: StartMigrationListener) : BaseBottomSheetDialog(baseContext) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/PreMigrationScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/PreMigrationScreenModel.kt index 0ac8bd6e4..45cd0d40a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/PreMigrationScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/PreMigrationScreenModel.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.ui.browse.migration.advanced.design import cafe.adriel.voyager.core.model.ScreenModel import cafe.adriel.voyager.core.model.coroutineScope import eu.davidea.flexibleadapter.FlexibleAdapter -import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.tachiyomi.databinding.PreMigrationListBinding import eu.kanade.tachiyomi.source.online.HttpSource @@ -13,6 +12,7 @@ import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import tachiyomi.core.util.lang.launchIO +import tachiyomi.domain.UnsortedPreferences import tachiyomi.domain.source.service.SourceManager import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListScreenModel.kt index 859fd4638..89a4ba43f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListScreenModel.kt @@ -4,7 +4,6 @@ import android.content.Context import android.widget.Toast import cafe.adriel.voyager.core.model.ScreenModel import cafe.adriel.voyager.core.model.coroutineScope -import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.chapter.interactor.SyncChaptersWithSource import eu.kanade.domain.manga.interactor.UpdateManga import eu.kanade.domain.manga.model.hasCustomCover @@ -34,6 +33,7 @@ import logcat.LogPriority import tachiyomi.core.util.lang.launchIO import tachiyomi.core.util.lang.withUIContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.UnsortedPreferences import tachiyomi.domain.category.interactor.GetCategories import tachiyomi.domain.category.interactor.SetMangaCategories import tachiyomi.domain.chapter.interactor.GetChapterByMangaId diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaScreen.kt index 119860ed1..dbf76934f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaScreen.kt @@ -8,7 +8,6 @@ import androidx.compose.ui.platform.LocalContext import cafe.adriel.voyager.core.model.rememberScreenModel import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow -import eu.kanade.domain.UnsortedPreferences import eu.kanade.presentation.browse.MigrateMangaScreen import eu.kanade.presentation.util.Screen import eu.kanade.tachiyomi.R @@ -16,6 +15,7 @@ import eu.kanade.tachiyomi.ui.browse.migration.advanced.design.PreMigrationScree import eu.kanade.tachiyomi.ui.manga.MangaScreen import eu.kanade.tachiyomi.util.system.toast import kotlinx.coroutines.flow.collectLatest +import tachiyomi.domain.UnsortedPreferences import tachiyomi.presentation.core.screens.LoadingScreen import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrateSourceTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrateSourceTab.kt index 475ea16c2..0d1545ecc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrateSourceTab.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrateSourceTab.kt @@ -11,7 +11,6 @@ import cafe.adriel.voyager.core.model.rememberScreenModel import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow -import eu.kanade.domain.UnsortedPreferences import eu.kanade.presentation.browse.MigrateSourceScreen import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.TabContent @@ -20,6 +19,7 @@ import eu.kanade.tachiyomi.ui.browse.migration.advanced.design.PreMigrationScree import eu.kanade.tachiyomi.ui.browse.migration.manga.MigrationMangaScreen import tachiyomi.core.util.lang.launchIO import tachiyomi.core.util.lang.withUIContext +import tachiyomi.domain.UnsortedPreferences import tachiyomi.domain.manga.interactor.GetFavorites import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get 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 74218d226..9f5fdc097 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 @@ -14,16 +14,12 @@ import androidx.paging.map import cafe.adriel.voyager.core.model.StateScreenModel import cafe.adriel.voyager.core.model.coroutineScope import eu.kanade.core.preference.asState -import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.chapter.interactor.SyncChaptersWithTrackServiceTwoWay -import eu.kanade.domain.manga.interactor.GetFlatMetadataById import eu.kanade.domain.manga.interactor.UpdateManga import eu.kanade.domain.manga.model.copyFrom import eu.kanade.domain.manga.model.toDomainManga import eu.kanade.domain.manga.model.toSManga -import eu.kanade.domain.source.interactor.DeleteSavedSearchById import eu.kanade.domain.source.interactor.GetExhSavedSearch -import eu.kanade.domain.source.interactor.InsertSavedSearch import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.domain.track.model.toDomainTrack import eu.kanade.domain.ui.UiPreferences @@ -67,6 +63,7 @@ import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.lang.withNonCancellableContext import tachiyomi.core.util.lang.withUIContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.UnsortedPreferences import tachiyomi.domain.category.interactor.GetCategories import tachiyomi.domain.category.interactor.SetMangaCategories import tachiyomi.domain.category.model.Category @@ -74,11 +71,14 @@ import tachiyomi.domain.chapter.interactor.GetChapterByMangaId import tachiyomi.domain.chapter.interactor.SetMangaDefaultChapterFlags import tachiyomi.domain.library.service.LibraryPreferences import tachiyomi.domain.manga.interactor.GetDuplicateLibraryManga +import tachiyomi.domain.manga.interactor.GetFlatMetadataById import tachiyomi.domain.manga.interactor.GetManga import tachiyomi.domain.manga.interactor.NetworkToLocalManga import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.toMangaUpdate +import tachiyomi.domain.source.interactor.DeleteSavedSearchById import tachiyomi.domain.source.interactor.GetRemoteManga +import tachiyomi.domain.source.interactor.InsertSavedSearch import tachiyomi.domain.source.model.EXHSavedSearch import tachiyomi.domain.source.model.SavedSearch import tachiyomi.domain.source.repository.SourcePagingSourceType 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 1bd746772..cf8b8a9e0 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 @@ -12,12 +12,7 @@ import eu.kanade.domain.manga.interactor.UpdateManga import eu.kanade.domain.manga.model.copyFrom import eu.kanade.domain.manga.model.toDomainManga import eu.kanade.domain.manga.model.toSManga -import eu.kanade.domain.source.interactor.CountFeedSavedSearchBySourceId -import eu.kanade.domain.source.interactor.DeleteFeedSavedSearchById import eu.kanade.domain.source.interactor.GetExhSavedSearch -import eu.kanade.domain.source.interactor.GetFeedSavedSearchBySourceId -import eu.kanade.domain.source.interactor.GetSavedSearchBySourceIdFeed -import eu.kanade.domain.source.interactor.InsertFeedSavedSearch import eu.kanade.domain.ui.UiPreferences import eu.kanade.presentation.browse.SourceFeedUI import eu.kanade.tachiyomi.R @@ -50,6 +45,11 @@ import tachiyomi.core.util.system.logcat import tachiyomi.domain.manga.interactor.GetManga import tachiyomi.domain.manga.interactor.NetworkToLocalManga import tachiyomi.domain.manga.model.toMangaUpdate +import tachiyomi.domain.source.interactor.CountFeedSavedSearchBySourceId +import tachiyomi.domain.source.interactor.DeleteFeedSavedSearchById +import tachiyomi.domain.source.interactor.GetFeedSavedSearchBySourceId +import tachiyomi.domain.source.interactor.GetSavedSearchBySourceIdFeed +import tachiyomi.domain.source.interactor.InsertFeedSavedSearch import tachiyomi.domain.source.model.EXHSavedSearch import tachiyomi.domain.source.model.FeedSavedSearch import tachiyomi.domain.source.model.SavedSearch diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/repos/RepoScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/repos/RepoScreenModel.kt index 20c4102c6..764be5c07 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/repos/RepoScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/repos/RepoScreenModel.kt @@ -5,14 +5,14 @@ import androidx.compose.runtime.Immutable import cafe.adriel.voyager.core.model.StateScreenModel import cafe.adriel.voyager.core.model.coroutineScope import eu.kanade.domain.source.interactor.CreateSourceRepo -import eu.kanade.domain.source.interactor.DeleteSourceRepos -import eu.kanade.domain.source.interactor.GetSourceRepos import eu.kanade.tachiyomi.R import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.flow.update import tachiyomi.core.util.lang.launchIO +import tachiyomi.domain.source.interactor.DeleteSourceRepos +import tachiyomi.domain.source.interactor.GetSourceRepos 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 3e8dff27e..63edb6de6 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt @@ -18,13 +18,8 @@ import eu.kanade.core.util.fastFilter import eu.kanade.core.util.fastFilterNot import eu.kanade.core.util.fastMapNotNull import eu.kanade.core.util.fastPartition -import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.base.BasePreferences import eu.kanade.domain.chapter.interactor.SetReadStatus -import eu.kanade.domain.manga.interactor.GetIdsOfFavoriteMangaWithMetadata -import eu.kanade.domain.manga.interactor.GetMergedMangaById -import eu.kanade.domain.manga.interactor.GetSearchTags -import eu.kanade.domain.manga.interactor.GetSearchTitles import eu.kanade.domain.manga.interactor.UpdateManga import eu.kanade.domain.manga.model.isLocal import eu.kanade.domain.source.service.SourcePreferences @@ -81,6 +76,7 @@ import tachiyomi.core.preference.CheckboxState import tachiyomi.core.util.lang.launchIO import tachiyomi.core.util.lang.launchNonCancellable import tachiyomi.core.util.lang.withIOContext +import tachiyomi.domain.UnsortedPreferences import tachiyomi.domain.category.interactor.GetCategories import tachiyomi.domain.category.interactor.SetMangaCategories import tachiyomi.domain.category.model.Category @@ -93,7 +89,11 @@ import tachiyomi.domain.library.model.LibraryManga import tachiyomi.domain.library.model.LibrarySort import tachiyomi.domain.library.model.sort import tachiyomi.domain.library.service.LibraryPreferences +import tachiyomi.domain.manga.interactor.GetIdsOfFavoriteMangaWithMetadata import tachiyomi.domain.manga.interactor.GetLibraryManga +import tachiyomi.domain.manga.interactor.GetMergedMangaById +import tachiyomi.domain.manga.interactor.GetSearchTags +import tachiyomi.domain.manga.interactor.GetSearchTitles import tachiyomi.domain.manga.interactor.SetCustomMangaInfo import tachiyomi.domain.manga.model.CustomMangaInfo 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 0431d9037..92d602339 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 @@ -29,7 +29,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.UnsortedPreferences import eu.kanade.domain.manga.model.isLocal import eu.kanade.presentation.category.components.ChangeCategoryDialog import eu.kanade.presentation.library.DeleteLibraryMangaDialog @@ -58,6 +57,7 @@ import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.launch import tachiyomi.core.util.lang.launchIO +import tachiyomi.domain.UnsortedPreferences import tachiyomi.domain.category.model.Category import tachiyomi.domain.library.model.LibraryGroup import tachiyomi.domain.library.model.LibraryManga diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 97c5df70b..07864ec32 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -50,7 +50,6 @@ import cafe.adriel.voyager.navigator.Navigator import cafe.adriel.voyager.navigator.NavigatorDisposeBehavior import cafe.adriel.voyager.navigator.currentOrThrow import com.google.accompanist.systemuicontroller.rememberSystemUiController -import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.base.BasePreferences import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.domain.ui.UiPreferences @@ -100,6 +99,7 @@ import kotlinx.coroutines.launch import logcat.LogPriority import tachiyomi.core.Constants import tachiyomi.core.util.system.logcat +import tachiyomi.domain.UnsortedPreferences import tachiyomi.domain.library.service.LibraryPreferences import tachiyomi.presentation.core.components.material.Scaffold import uy.kohesive.injekt.Injekt diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt index a98635199..7bc297898 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt @@ -23,7 +23,6 @@ import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.Navigator import cafe.adriel.voyager.navigator.currentOrThrow import com.google.android.material.dialog.MaterialAlertDialogBuilder -import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.manga.model.hasCustomCover import eu.kanade.domain.manga.model.toSManga import eu.kanade.presentation.category.components.ChangeCategoryDialog @@ -74,6 +73,7 @@ import tachiyomi.core.util.lang.launchUI import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.lang.withNonCancellableContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.UnsortedPreferences import tachiyomi.domain.chapter.model.Chapter import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.source.service.SourceManager 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 1a0279d88..4f912f2d1 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 @@ -12,16 +12,8 @@ import eu.kanade.core.preference.asState import eu.kanade.core.util.addOrRemove import eu.kanade.domain.chapter.interactor.SetReadStatus import eu.kanade.domain.chapter.interactor.SyncChaptersWithSource -import eu.kanade.domain.manga.interactor.DeleteByMergeId -import eu.kanade.domain.manga.interactor.DeleteMangaById -import eu.kanade.domain.manga.interactor.DeleteMergeById -import eu.kanade.domain.manga.interactor.GetFlatMetadataById -import eu.kanade.domain.manga.interactor.GetMergedMangaById import eu.kanade.domain.manga.interactor.GetPagePreviews -import eu.kanade.domain.manga.interactor.InsertMergedReference -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.PagePreview import eu.kanade.domain.manga.model.copyFrom import eu.kanade.domain.manga.model.downloadedFilter @@ -98,13 +90,21 @@ import tachiyomi.domain.chapter.model.NoChaptersException import tachiyomi.domain.chapter.service.getChapterSort import tachiyomi.domain.download.service.DownloadPreferences import tachiyomi.domain.library.service.LibraryPreferences +import tachiyomi.domain.manga.interactor.DeleteByMergeId +import tachiyomi.domain.manga.interactor.DeleteMangaById +import tachiyomi.domain.manga.interactor.DeleteMergeById import tachiyomi.domain.manga.interactor.GetDuplicateLibraryManga +import tachiyomi.domain.manga.interactor.GetFlatMetadataById import tachiyomi.domain.manga.interactor.GetManga import tachiyomi.domain.manga.interactor.GetMangaWithChapters +import tachiyomi.domain.manga.interactor.GetMergedMangaById import tachiyomi.domain.manga.interactor.GetMergedReferencesById +import tachiyomi.domain.manga.interactor.InsertMergedReference import tachiyomi.domain.manga.interactor.NetworkToLocalManga import tachiyomi.domain.manga.interactor.SetCustomMangaInfo import tachiyomi.domain.manga.interactor.SetMangaChapterFlags +import tachiyomi.domain.manga.interactor.SetMangaFilteredScanlators +import tachiyomi.domain.manga.interactor.UpdateMergedSettings import tachiyomi.domain.manga.model.CustomMangaInfo import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.MangaUpdate diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt index ba3e1a747..49eace4fd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt @@ -9,8 +9,6 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import eu.kanade.domain.base.BasePreferences import eu.kanade.domain.chapter.model.toDbChapter -import eu.kanade.domain.manga.interactor.GetFlatMetadataById -import eu.kanade.domain.manga.interactor.GetMergedMangaById import eu.kanade.domain.manga.interactor.SetMangaViewerFlags import eu.kanade.domain.manga.model.isLocal import eu.kanade.domain.manga.model.orientationType @@ -93,7 +91,9 @@ import tachiyomi.domain.download.service.DownloadPreferences import tachiyomi.domain.history.interactor.GetNextChapters import tachiyomi.domain.history.interactor.UpsertHistory import tachiyomi.domain.history.model.HistoryUpdate +import tachiyomi.domain.manga.interactor.GetFlatMetadataById import tachiyomi.domain.manga.interactor.GetManga +import tachiyomi.domain.manga.interactor.GetMergedMangaById import tachiyomi.domain.manga.interactor.GetMergedReferencesById import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.source.service.SourceManager diff --git a/app/src/main/java/exh/EXHMigrations.kt b/app/src/main/java/exh/EXHMigrations.kt index d76422c75..9cb95b224 100644 --- a/app/src/main/java/exh/EXHMigrations.kt +++ b/app/src/main/java/exh/EXHMigrations.kt @@ -7,12 +7,7 @@ import androidx.core.content.edit import androidx.preference.PreferenceManager import androidx.work.WorkManager import eu.kanade.domain.base.BasePreferences -import eu.kanade.domain.chapter.interactor.DeleteChapters -import eu.kanade.domain.manga.interactor.GetMangaBySource -import eu.kanade.domain.manga.interactor.InsertMergedReference import eu.kanade.domain.manga.interactor.UpdateManga -import eu.kanade.domain.source.interactor.InsertFeedSavedSearch -import eu.kanade.domain.source.interactor.InsertSavedSearch import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.domain.ui.UiPreferences import eu.kanade.tachiyomi.BuildConfig @@ -56,14 +51,19 @@ import tachiyomi.data.DatabaseHandler import tachiyomi.data.category.categoryMapper import tachiyomi.data.chapter.chapterMapper import tachiyomi.domain.backup.service.BackupPreferences +import tachiyomi.domain.chapter.interactor.DeleteChapters import tachiyomi.domain.chapter.interactor.UpdateChapter import tachiyomi.domain.chapter.model.ChapterUpdate import tachiyomi.domain.library.service.LibraryPreferences import tachiyomi.domain.library.service.LibraryPreferences.Companion.MANGA_NON_COMPLETED import tachiyomi.domain.manga.interactor.GetManga +import tachiyomi.domain.manga.interactor.GetMangaBySource +import tachiyomi.domain.manga.interactor.InsertMergedReference import tachiyomi.domain.manga.model.MangaUpdate import tachiyomi.domain.manga.model.MergedMangaReference import tachiyomi.domain.manga.model.TriStateFilter +import tachiyomi.domain.source.interactor.InsertFeedSavedSearch +import tachiyomi.domain.source.interactor.InsertSavedSearch import tachiyomi.domain.source.model.FeedSavedSearch import tachiyomi.domain.source.model.SavedSearch import tachiyomi.domain.source.service.SourceManager diff --git a/app/src/main/java/exh/debug/DebugFunctions.kt b/app/src/main/java/exh/debug/DebugFunctions.kt index 4c87c7b8d..ba52207ee 100644 --- a/app/src/main/java/exh/debug/DebugFunctions.kt +++ b/app/src/main/java/exh/debug/DebugFunctions.kt @@ -3,11 +3,6 @@ package exh.debug import android.app.Application import androidx.work.WorkManager import eu.kanade.domain.base.BasePreferences -import eu.kanade.domain.manga.interactor.GetAllManga -import eu.kanade.domain.manga.interactor.GetExhFavoriteMangaWithMetadata -import eu.kanade.domain.manga.interactor.GetFlatMetadataById -import eu.kanade.domain.manga.interactor.GetSearchMetadata -import eu.kanade.domain.manga.interactor.InsertFlatMetadata import eu.kanade.domain.manga.interactor.UpdateManga import eu.kanade.domain.manga.model.toSManga import eu.kanade.domain.source.service.SourcePreferences @@ -33,7 +28,12 @@ import tachiyomi.core.preference.PreferenceStore import tachiyomi.data.DatabaseHandler import tachiyomi.domain.backup.service.BackupPreferences import tachiyomi.domain.library.service.LibraryPreferences +import tachiyomi.domain.manga.interactor.GetAllManga +import tachiyomi.domain.manga.interactor.GetExhFavoriteMangaWithMetadata import tachiyomi.domain.manga.interactor.GetFavorites +import tachiyomi.domain.manga.interactor.GetFlatMetadataById +import tachiyomi.domain.manga.interactor.GetSearchMetadata +import tachiyomi.domain.manga.interactor.InsertFlatMetadata import tachiyomi.domain.source.service.SourceManager import uy.kohesive.injekt.injectLazy import java.util.UUID diff --git a/app/src/main/java/exh/eh/EHentaiUpdateHelper.kt b/app/src/main/java/exh/eh/EHentaiUpdateHelper.kt index b960f41fe..aed45f1df 100644 --- a/app/src/main/java/exh/eh/EHentaiUpdateHelper.kt +++ b/app/src/main/java/exh/eh/EHentaiUpdateHelper.kt @@ -1,7 +1,6 @@ package exh.eh import android.content.Context -import eu.kanade.domain.chapter.interactor.GetChapterByUrl import eu.kanade.domain.manga.interactor.UpdateManga import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async @@ -9,6 +8,7 @@ import kotlinx.coroutines.coroutineScope import tachiyomi.domain.category.interactor.GetCategories import tachiyomi.domain.category.interactor.SetMangaCategories import tachiyomi.domain.chapter.interactor.GetChapterByMangaId +import tachiyomi.domain.chapter.interactor.GetChapterByUrl import tachiyomi.domain.chapter.model.Chapter import tachiyomi.domain.chapter.model.ChapterUpdate import tachiyomi.domain.chapter.repository.ChapterRepository diff --git a/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt b/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt index c3b58b5a2..41a5fc9e9 100644 --- a/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt +++ b/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt @@ -11,11 +11,7 @@ import androidx.work.WorkManager import androidx.work.WorkerParameters import com.elvishew.xlog.Logger import com.elvishew.xlog.XLog -import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.chapter.interactor.SyncChaptersWithSource -import eu.kanade.domain.manga.interactor.GetExhFavoriteMangaWithMetadata -import eu.kanade.domain.manga.interactor.GetFlatMetadataById -import eu.kanade.domain.manga.interactor.InsertFlatMetadata import eu.kanade.domain.manga.interactor.UpdateManga import eu.kanade.domain.manga.model.toSManga import eu.kanade.tachiyomi.data.library.LibraryUpdateNotifier @@ -31,10 +27,14 @@ import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.flow.toList import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json +import tachiyomi.domain.UnsortedPreferences import tachiyomi.domain.chapter.interactor.GetChapterByMangaId import tachiyomi.domain.chapter.model.Chapter import tachiyomi.domain.library.service.LibraryPreferences.Companion.DEVICE_CHARGING import tachiyomi.domain.library.service.LibraryPreferences.Companion.DEVICE_ONLY_ON_WIFI +import tachiyomi.domain.manga.interactor.GetExhFavoriteMangaWithMetadata +import tachiyomi.domain.manga.interactor.GetFlatMetadataById +import tachiyomi.domain.manga.interactor.InsertFlatMetadata import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.source.service.SourceManager import uy.kohesive.injekt.Injekt diff --git a/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt b/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt index 24d23b667..9d57e2aa6 100644 --- a/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt +++ b/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt @@ -3,7 +3,6 @@ package exh.favorites import android.content.Context import android.net.wifi.WifiManager import android.os.PowerManager -import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.manga.interactor.UpdateManga import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.network.POST @@ -29,6 +28,7 @@ import okhttp3.FormBody import okhttp3.Request import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.lang.withUIContext +import tachiyomi.domain.UnsortedPreferences import tachiyomi.domain.category.interactor.CreateCategoryWithName import tachiyomi.domain.category.interactor.GetCategories import tachiyomi.domain.category.interactor.SetMangaCategories diff --git a/app/src/main/java/exh/favorites/LocalFavoritesStorage.kt b/app/src/main/java/exh/favorites/LocalFavoritesStorage.kt index fbe05774d..02d522cd6 100644 --- a/app/src/main/java/exh/favorites/LocalFavoritesStorage.kt +++ b/app/src/main/java/exh/favorites/LocalFavoritesStorage.kt @@ -1,8 +1,5 @@ package exh.favorites -import eu.kanade.domain.manga.interactor.DeleteFavoriteEntries -import eu.kanade.domain.manga.interactor.GetFavoriteEntries -import eu.kanade.domain.manga.interactor.InsertFavoriteEntries import eu.kanade.domain.manga.model.toDomainManga import eu.kanade.tachiyomi.source.online.all.EHentai import exh.metadata.metadata.EHentaiSearchMetadata @@ -16,7 +13,10 @@ import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.flow.toList import tachiyomi.domain.category.interactor.GetCategories import tachiyomi.domain.category.model.Category +import tachiyomi.domain.manga.interactor.DeleteFavoriteEntries +import tachiyomi.domain.manga.interactor.GetFavoriteEntries import tachiyomi.domain.manga.interactor.GetFavorites +import tachiyomi.domain.manga.interactor.InsertFavoriteEntries 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/md/handlers/ApiMangaParser.kt b/app/src/main/java/exh/md/handlers/ApiMangaParser.kt index c5e5ce670..e96d9f86f 100644 --- a/app/src/main/java/exh/md/handlers/ApiMangaParser.kt +++ b/app/src/main/java/exh/md/handlers/ApiMangaParser.kt @@ -1,7 +1,5 @@ package exh.md.handlers -import eu.kanade.domain.manga.interactor.GetFlatMetadataById -import eu.kanade.domain.manga.interactor.InsertFlatMetadata import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga import exh.log.xLogE @@ -17,7 +15,9 @@ import exh.metadata.metadata.base.RaisedTag import exh.util.capitalize import exh.util.floor import exh.util.nullIfEmpty +import tachiyomi.domain.manga.interactor.GetFlatMetadataById import tachiyomi.domain.manga.interactor.GetManga +import tachiyomi.domain.manga.interactor.InsertFlatMetadata import uy.kohesive.injekt.injectLazy import java.util.Locale diff --git a/app/src/main/java/exh/md/utils/MdUtil.kt b/app/src/main/java/exh/md/utils/MdUtil.kt index bd8c55a65..40aa8360f 100644 --- a/app/src/main/java/exh/md/utils/MdUtil.kt +++ b/app/src/main/java/exh/md/utils/MdUtil.kt @@ -1,6 +1,5 @@ package exh.md.utils -import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.domain.track.service.TrackPreferences import eu.kanade.tachiyomi.data.track.mdlist.MdList @@ -26,6 +25,7 @@ import okhttp3.Request import okhttp3.RequestBody import okhttp3.RequestBody.Companion.toRequestBody import org.jsoup.parser.Parser +import tachiyomi.domain.UnsortedPreferences import tachiyomi.domain.source.service.SourceManager import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/exh/uconfig/EHConfigurator.kt b/app/src/main/java/exh/uconfig/EHConfigurator.kt index 7f7f80c99..cb6780828 100644 --- a/app/src/main/java/exh/uconfig/EHConfigurator.kt +++ b/app/src/main/java/exh/uconfig/EHConfigurator.kt @@ -1,7 +1,6 @@ package exh.uconfig import android.content.Context -import eu.kanade.domain.UnsortedPreferences import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.network.awaitSuccess import eu.kanade.tachiyomi.source.online.all.EHentai @@ -13,6 +12,7 @@ import exh.source.EXH_SOURCE_ID import okhttp3.FormBody import okhttp3.OkHttpClient import okhttp3.Request +import tachiyomi.domain.UnsortedPreferences import tachiyomi.domain.source.service.SourceManager import uy.kohesive.injekt.injectLazy import java.util.Locale diff --git a/app/src/main/java/exh/uconfig/EhUConfigBuilder.kt b/app/src/main/java/exh/uconfig/EhUConfigBuilder.kt index d55c9828d..add1d9498 100644 --- a/app/src/main/java/exh/uconfig/EhUConfigBuilder.kt +++ b/app/src/main/java/exh/uconfig/EhUConfigBuilder.kt @@ -1,7 +1,7 @@ package exh.uconfig -import eu.kanade.domain.UnsortedPreferences import okhttp3.FormBody +import tachiyomi.domain.UnsortedPreferences import uy.kohesive.injekt.injectLazy import java.util.Locale diff --git a/app/src/main/java/exh/ui/batchadd/BatchAddScreenModel.kt b/app/src/main/java/exh/ui/batchadd/BatchAddScreenModel.kt index 69b667cb5..4cd37ec1f 100644 --- a/app/src/main/java/exh/ui/batchadd/BatchAddScreenModel.kt +++ b/app/src/main/java/exh/ui/batchadd/BatchAddScreenModel.kt @@ -3,7 +3,6 @@ package exh.ui.batchadd import android.content.Context import cafe.adriel.voyager.core.model.StateScreenModel import cafe.adriel.voyager.core.model.coroutineScope -import eu.kanade.domain.UnsortedPreferences import eu.kanade.tachiyomi.R import exh.GalleryAddEvent import exh.GalleryAdder @@ -15,6 +14,7 @@ import kotlinx.coroutines.ensureActive import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import tachiyomi.core.util.lang.withIOContext +import tachiyomi.domain.UnsortedPreferences import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/exh/ui/login/EhLoginActivity.kt b/app/src/main/java/exh/ui/login/EhLoginActivity.kt index fff85f1b6..fef564465 100644 --- a/app/src/main/java/exh/ui/login/EhLoginActivity.kt +++ b/app/src/main/java/exh/ui/login/EhLoginActivity.kt @@ -11,7 +11,6 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue -import eu.kanade.domain.UnsortedPreferences import eu.kanade.presentation.webview.EhLoginWebViewScreen import eu.kanade.presentation.webview.components.IgneousDialog import eu.kanade.tachiyomi.R @@ -20,6 +19,7 @@ import eu.kanade.tachiyomi.util.system.WebViewUtil import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.view.setComposeContent import exh.log.xLogD +import tachiyomi.domain.UnsortedPreferences import uy.kohesive.injekt.injectLazy import java.net.HttpCookie import java.util.Locale diff --git a/app/src/main/java/exh/ui/metadata/MetadataViewScreenModel.kt b/app/src/main/java/exh/ui/metadata/MetadataViewScreenModel.kt index 10bf761d9..1dbdd192a 100644 --- a/app/src/main/java/exh/ui/metadata/MetadataViewScreenModel.kt +++ b/app/src/main/java/exh/ui/metadata/MetadataViewScreenModel.kt @@ -2,13 +2,13 @@ package exh.ui.metadata import cafe.adriel.voyager.core.model.StateScreenModel import cafe.adriel.voyager.core.model.coroutineScope -import eu.kanade.domain.manga.interactor.GetFlatMetadataById import eu.kanade.tachiyomi.source.online.MetadataSource import exh.metadata.metadata.base.RaisedSearchMetadata import exh.source.getMainSource import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import tachiyomi.core.util.lang.launchIO +import tachiyomi.domain.manga.interactor.GetFlatMetadataById import tachiyomi.domain.manga.interactor.GetManga import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.source.service.SourceManager diff --git a/app/src/main/java/eu/kanade/domain/UnsortedPreferences.kt b/domain/src/main/java/tachiyomi/domain/UnsortedPreferences.kt similarity index 99% rename from app/src/main/java/eu/kanade/domain/UnsortedPreferences.kt rename to domain/src/main/java/tachiyomi/domain/UnsortedPreferences.kt index 3d63daec3..5a9268034 100644 --- a/app/src/main/java/eu/kanade/domain/UnsortedPreferences.kt +++ b/domain/src/main/java/tachiyomi/domain/UnsortedPreferences.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain +package tachiyomi.domain import tachiyomi.core.preference.PreferenceStore diff --git a/app/src/main/java/eu/kanade/domain/chapter/interactor/DeleteChapters.kt b/domain/src/main/java/tachiyomi/domain/chapter/interactor/DeleteChapters.kt similarity index 85% rename from app/src/main/java/eu/kanade/domain/chapter/interactor/DeleteChapters.kt rename to domain/src/main/java/tachiyomi/domain/chapter/interactor/DeleteChapters.kt index 432d554ad..94ae7ed4f 100644 --- a/app/src/main/java/eu/kanade/domain/chapter/interactor/DeleteChapters.kt +++ b/domain/src/main/java/tachiyomi/domain/chapter/interactor/DeleteChapters.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.chapter.interactor +package tachiyomi.domain.chapter.interactor import tachiyomi.domain.chapter.repository.ChapterRepository diff --git a/app/src/main/java/eu/kanade/domain/chapter/interactor/GetChapterByUrl.kt b/domain/src/main/java/tachiyomi/domain/chapter/interactor/GetChapterByUrl.kt similarity index 91% rename from app/src/main/java/eu/kanade/domain/chapter/interactor/GetChapterByUrl.kt rename to domain/src/main/java/tachiyomi/domain/chapter/interactor/GetChapterByUrl.kt index 6b99d948c..1ac02fd6f 100644 --- a/app/src/main/java/eu/kanade/domain/chapter/interactor/GetChapterByUrl.kt +++ b/domain/src/main/java/tachiyomi/domain/chapter/interactor/GetChapterByUrl.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.chapter.interactor +package tachiyomi.domain.chapter.interactor import logcat.LogPriority import tachiyomi.core.util.system.logcat diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/DeleteByMergeId.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/DeleteByMergeId.kt similarity index 85% rename from app/src/main/java/eu/kanade/domain/manga/interactor/DeleteByMergeId.kt rename to domain/src/main/java/tachiyomi/domain/manga/interactor/DeleteByMergeId.kt index 805a1fff5..93deab0fb 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/DeleteByMergeId.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/DeleteByMergeId.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.interactor +package tachiyomi.domain.manga.interactor import tachiyomi.domain.manga.repository.MangaMergeRepository diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/DeleteFavoriteEntries.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/DeleteFavoriteEntries.kt similarity index 85% rename from app/src/main/java/eu/kanade/domain/manga/interactor/DeleteFavoriteEntries.kt rename to domain/src/main/java/tachiyomi/domain/manga/interactor/DeleteFavoriteEntries.kt index 044482a2f..a2f3e92a2 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/DeleteFavoriteEntries.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/DeleteFavoriteEntries.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.interactor +package tachiyomi.domain.manga.interactor import tachiyomi.domain.manga.repository.FavoritesEntryRepository diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/DeleteMangaById.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/DeleteMangaById.kt similarity index 84% rename from app/src/main/java/eu/kanade/domain/manga/interactor/DeleteMangaById.kt rename to domain/src/main/java/tachiyomi/domain/manga/interactor/DeleteMangaById.kt index b15394bbd..f2cb06a56 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/DeleteMangaById.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/DeleteMangaById.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.interactor +package tachiyomi.domain.manga.interactor import tachiyomi.domain.manga.repository.MangaRepository diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/DeleteMergeById.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/DeleteMergeById.kt similarity index 85% rename from app/src/main/java/eu/kanade/domain/manga/interactor/DeleteMergeById.kt rename to domain/src/main/java/tachiyomi/domain/manga/interactor/DeleteMergeById.kt index 9d8c39796..d1dcf8484 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/DeleteMergeById.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/DeleteMergeById.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.interactor +package tachiyomi.domain.manga.interactor import tachiyomi.domain.manga.repository.MangaMergeRepository diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetAllManga.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetAllManga.kt similarity index 86% rename from app/src/main/java/eu/kanade/domain/manga/interactor/GetAllManga.kt rename to domain/src/main/java/tachiyomi/domain/manga/interactor/GetAllManga.kt index 50f95a4f9..469794bea 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetAllManga.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetAllManga.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.interactor +package tachiyomi.domain.manga.interactor import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.repository.MangaRepository diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetExhFavoriteMangaWithMetadata.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetExhFavoriteMangaWithMetadata.kt similarity index 88% rename from app/src/main/java/eu/kanade/domain/manga/interactor/GetExhFavoriteMangaWithMetadata.kt rename to domain/src/main/java/tachiyomi/domain/manga/interactor/GetExhFavoriteMangaWithMetadata.kt index 519774560..60d30190a 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetExhFavoriteMangaWithMetadata.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetExhFavoriteMangaWithMetadata.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.interactor +package tachiyomi.domain.manga.interactor import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.repository.MangaMetadataRepository diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetFavoriteEntries.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetFavoriteEntries.kt similarity index 88% rename from app/src/main/java/eu/kanade/domain/manga/interactor/GetFavoriteEntries.kt rename to domain/src/main/java/tachiyomi/domain/manga/interactor/GetFavoriteEntries.kt index 737f8d2e7..f5f6ba9a9 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetFavoriteEntries.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetFavoriteEntries.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.interactor +package tachiyomi.domain.manga.interactor import tachiyomi.domain.manga.model.FavoriteEntry import tachiyomi.domain.manga.repository.FavoritesEntryRepository diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetFlatMetadataById.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetFlatMetadataById.kt similarity index 97% rename from app/src/main/java/eu/kanade/domain/manga/interactor/GetFlatMetadataById.kt rename to domain/src/main/java/tachiyomi/domain/manga/interactor/GetFlatMetadataById.kt index 9f6f0bb5d..595d6265f 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetFlatMetadataById.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetFlatMetadataById.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.interactor +package tachiyomi.domain.manga.interactor import eu.kanade.tachiyomi.source.online.MetadataSource import exh.metadata.metadata.base.FlatMetadata diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetIdsOfFavoriteMangaWithMetadata.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetIdsOfFavoriteMangaWithMetadata.kt similarity index 87% rename from app/src/main/java/eu/kanade/domain/manga/interactor/GetIdsOfFavoriteMangaWithMetadata.kt rename to domain/src/main/java/tachiyomi/domain/manga/interactor/GetIdsOfFavoriteMangaWithMetadata.kt index 587fcd47f..caa1a04c3 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetIdsOfFavoriteMangaWithMetadata.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetIdsOfFavoriteMangaWithMetadata.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.interactor +package tachiyomi.domain.manga.interactor import tachiyomi.domain.manga.repository.MangaMetadataRepository diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetMangaBySource.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetMangaBySource.kt similarity index 87% rename from app/src/main/java/eu/kanade/domain/manga/interactor/GetMangaBySource.kt rename to domain/src/main/java/tachiyomi/domain/manga/interactor/GetMangaBySource.kt index b621b422c..bcb79f2a9 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetMangaBySource.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetMangaBySource.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.interactor +package tachiyomi.domain.manga.interactor import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.repository.MangaRepository diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedManga.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetMergedManga.kt similarity index 93% rename from app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedManga.kt rename to domain/src/main/java/tachiyomi/domain/manga/interactor/GetMergedManga.kt index 69989ebe0..16289f417 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedManga.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetMergedManga.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.interactor +package tachiyomi.domain.manga.interactor import kotlinx.coroutines.flow.Flow import logcat.LogPriority diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedMangaById.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetMergedMangaById.kt similarity index 94% rename from app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedMangaById.kt rename to domain/src/main/java/tachiyomi/domain/manga/interactor/GetMergedMangaById.kt index b0790b989..55defbdf6 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedMangaById.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetMergedMangaById.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.interactor +package tachiyomi.domain.manga.interactor import kotlinx.coroutines.flow.Flow import logcat.LogPriority diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedMangaForDownloading.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetMergedMangaForDownloading.kt similarity index 89% rename from app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedMangaForDownloading.kt rename to domain/src/main/java/tachiyomi/domain/manga/interactor/GetMergedMangaForDownloading.kt index aabb43a95..d1838e73c 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedMangaForDownloading.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetMergedMangaForDownloading.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.interactor +package tachiyomi.domain.manga.interactor import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.repository.MangaMergeRepository diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchMetadata.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetSearchMetadata.kt similarity index 91% rename from app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchMetadata.kt rename to domain/src/main/java/tachiyomi/domain/manga/interactor/GetSearchMetadata.kt index b4ccbdb70..7a218b68f 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchMetadata.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetSearchMetadata.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.interactor +package tachiyomi.domain.manga.interactor import exh.metadata.sql.models.SearchMetadata import tachiyomi.domain.manga.repository.MangaMetadataRepository diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchTags.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetSearchTags.kt similarity index 88% rename from app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchTags.kt rename to domain/src/main/java/tachiyomi/domain/manga/interactor/GetSearchTags.kt index f8190c980..210355514 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchTags.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetSearchTags.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.interactor +package tachiyomi.domain.manga.interactor import exh.metadata.sql.models.SearchTag import tachiyomi.domain.manga.repository.MangaMetadataRepository diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchTitles.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetSearchTitles.kt similarity index 88% rename from app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchTitles.kt rename to domain/src/main/java/tachiyomi/domain/manga/interactor/GetSearchTitles.kt index 9ee95fdda..890118789 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchTitles.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetSearchTitles.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.interactor +package tachiyomi.domain.manga.interactor import exh.metadata.sql.models.SearchTitle import tachiyomi.domain.manga.repository.MangaMetadataRepository diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/InsertFavoriteEntries.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/InsertFavoriteEntries.kt similarity index 88% rename from app/src/main/java/eu/kanade/domain/manga/interactor/InsertFavoriteEntries.kt rename to domain/src/main/java/tachiyomi/domain/manga/interactor/InsertFavoriteEntries.kt index 445594369..5d274545a 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/InsertFavoriteEntries.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/InsertFavoriteEntries.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.interactor +package tachiyomi.domain.manga.interactor import tachiyomi.domain.manga.model.FavoriteEntry import tachiyomi.domain.manga.repository.FavoritesEntryRepository diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/InsertFlatMetadata.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/InsertFlatMetadata.kt similarity index 95% rename from app/src/main/java/eu/kanade/domain/manga/interactor/InsertFlatMetadata.kt rename to domain/src/main/java/tachiyomi/domain/manga/interactor/InsertFlatMetadata.kt index 23d132b11..1aece9147 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/InsertFlatMetadata.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/InsertFlatMetadata.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.interactor +package tachiyomi.domain.manga.interactor import eu.kanade.tachiyomi.source.online.MetadataSource import exh.metadata.metadata.base.FlatMetadata diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/InsertMergedReference.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/InsertMergedReference.kt similarity index 91% rename from app/src/main/java/eu/kanade/domain/manga/interactor/InsertMergedReference.kt rename to domain/src/main/java/tachiyomi/domain/manga/interactor/InsertMergedReference.kt index 73a54bcea..6b17b1d97 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/InsertMergedReference.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/InsertMergedReference.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.interactor +package tachiyomi.domain.manga.interactor import tachiyomi.domain.manga.model.MergedMangaReference import tachiyomi.domain.manga.repository.MangaMergeRepository diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaFilteredScanlators.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/SetMangaFilteredScanlators.kt similarity index 92% rename from app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaFilteredScanlators.kt rename to domain/src/main/java/tachiyomi/domain/manga/interactor/SetMangaFilteredScanlators.kt index b56928e7a..0ac31ba77 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaFilteredScanlators.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/SetMangaFilteredScanlators.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.interactor +package tachiyomi.domain.manga.interactor import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.MangaUpdate diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/UpdateMergedSettings.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/UpdateMergedSettings.kt similarity index 92% rename from app/src/main/java/eu/kanade/domain/manga/interactor/UpdateMergedSettings.kt rename to domain/src/main/java/tachiyomi/domain/manga/interactor/UpdateMergedSettings.kt index f28ccd850..95f240980 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/UpdateMergedSettings.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/UpdateMergedSettings.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.interactor +package tachiyomi.domain.manga.interactor import tachiyomi.domain.manga.model.MergeMangaSettingsUpdate import tachiyomi.domain.manga.repository.MangaMergeRepository diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/CountFeedSavedSearchBySourceId.kt b/domain/src/main/java/tachiyomi/domain/source/interactor/CountFeedSavedSearchBySourceId.kt similarity index 87% rename from app/src/main/java/eu/kanade/domain/source/interactor/CountFeedSavedSearchBySourceId.kt rename to domain/src/main/java/tachiyomi/domain/source/interactor/CountFeedSavedSearchBySourceId.kt index be9b92800..e1be68cb4 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/CountFeedSavedSearchBySourceId.kt +++ b/domain/src/main/java/tachiyomi/domain/source/interactor/CountFeedSavedSearchBySourceId.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.source.interactor +package tachiyomi.domain.source.interactor import tachiyomi.domain.source.repository.FeedSavedSearchRepository diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/CountFeedSavedSearchGlobal.kt b/domain/src/main/java/tachiyomi/domain/source/interactor/CountFeedSavedSearchGlobal.kt similarity index 86% rename from app/src/main/java/eu/kanade/domain/source/interactor/CountFeedSavedSearchGlobal.kt rename to domain/src/main/java/tachiyomi/domain/source/interactor/CountFeedSavedSearchGlobal.kt index 7c1d8b5ab..71bdec460 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/CountFeedSavedSearchGlobal.kt +++ b/domain/src/main/java/tachiyomi/domain/source/interactor/CountFeedSavedSearchGlobal.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.source.interactor +package tachiyomi.domain.source.interactor import tachiyomi.domain.source.repository.FeedSavedSearchRepository diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/DeleteFeedSavedSearchById.kt b/domain/src/main/java/tachiyomi/domain/source/interactor/DeleteFeedSavedSearchById.kt similarity index 87% rename from app/src/main/java/eu/kanade/domain/source/interactor/DeleteFeedSavedSearchById.kt rename to domain/src/main/java/tachiyomi/domain/source/interactor/DeleteFeedSavedSearchById.kt index 9185a4196..dffc9ac5d 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/DeleteFeedSavedSearchById.kt +++ b/domain/src/main/java/tachiyomi/domain/source/interactor/DeleteFeedSavedSearchById.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.source.interactor +package tachiyomi.domain.source.interactor import tachiyomi.domain.source.repository.FeedSavedSearchRepository diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/DeleteSavedSearchById.kt b/domain/src/main/java/tachiyomi/domain/source/interactor/DeleteSavedSearchById.kt similarity index 86% rename from app/src/main/java/eu/kanade/domain/source/interactor/DeleteSavedSearchById.kt rename to domain/src/main/java/tachiyomi/domain/source/interactor/DeleteSavedSearchById.kt index b8a41e4b2..bc29bda7b 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/DeleteSavedSearchById.kt +++ b/domain/src/main/java/tachiyomi/domain/source/interactor/DeleteSavedSearchById.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.source.interactor +package tachiyomi.domain.source.interactor import tachiyomi.domain.source.repository.SavedSearchRepository diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/DeleteSourceRepos.kt b/domain/src/main/java/tachiyomi/domain/source/interactor/DeleteSourceRepos.kt similarity index 74% rename from app/src/main/java/eu/kanade/domain/source/interactor/DeleteSourceRepos.kt rename to domain/src/main/java/tachiyomi/domain/source/interactor/DeleteSourceRepos.kt index 840ca1380..f0dbef12d 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/DeleteSourceRepos.kt +++ b/domain/src/main/java/tachiyomi/domain/source/interactor/DeleteSourceRepos.kt @@ -1,6 +1,6 @@ -package eu.kanade.domain.source.interactor +package tachiyomi.domain.source.interactor -import eu.kanade.domain.UnsortedPreferences +import tachiyomi.domain.UnsortedPreferences class DeleteSourceRepos(private val preferences: UnsortedPreferences) { diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/GetFeedSavedSearchBySourceId.kt b/domain/src/main/java/tachiyomi/domain/source/interactor/GetFeedSavedSearchBySourceId.kt similarity index 92% rename from app/src/main/java/eu/kanade/domain/source/interactor/GetFeedSavedSearchBySourceId.kt rename to domain/src/main/java/tachiyomi/domain/source/interactor/GetFeedSavedSearchBySourceId.kt index 31ea04a7a..cfad0c636 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/GetFeedSavedSearchBySourceId.kt +++ b/domain/src/main/java/tachiyomi/domain/source/interactor/GetFeedSavedSearchBySourceId.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.source.interactor +package tachiyomi.domain.source.interactor import kotlinx.coroutines.flow.Flow import tachiyomi.domain.source.model.FeedSavedSearch diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/GetFeedSavedSearchGlobal.kt b/domain/src/main/java/tachiyomi/domain/source/interactor/GetFeedSavedSearchGlobal.kt similarity index 91% rename from app/src/main/java/eu/kanade/domain/source/interactor/GetFeedSavedSearchGlobal.kt rename to domain/src/main/java/tachiyomi/domain/source/interactor/GetFeedSavedSearchGlobal.kt index 37125ebde..8e8fe1dfa 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/GetFeedSavedSearchGlobal.kt +++ b/domain/src/main/java/tachiyomi/domain/source/interactor/GetFeedSavedSearchGlobal.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.source.interactor +package tachiyomi.domain.source.interactor import kotlinx.coroutines.flow.Flow import tachiyomi.domain.source.model.FeedSavedSearch diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchById.kt b/domain/src/main/java/tachiyomi/domain/source/interactor/GetSavedSearchById.kt similarity index 91% rename from app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchById.kt rename to domain/src/main/java/tachiyomi/domain/source/interactor/GetSavedSearchById.kt index 9cab24b1c..45b7c9667 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchById.kt +++ b/domain/src/main/java/tachiyomi/domain/source/interactor/GetSavedSearchById.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.source.interactor +package tachiyomi.domain.source.interactor import tachiyomi.domain.source.model.SavedSearch import tachiyomi.domain.source.repository.SavedSearchRepository diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchBySourceId.kt b/domain/src/main/java/tachiyomi/domain/source/interactor/GetSavedSearchBySourceId.kt similarity index 92% rename from app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchBySourceId.kt rename to domain/src/main/java/tachiyomi/domain/source/interactor/GetSavedSearchBySourceId.kt index c8add3a99..ec446f5a2 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchBySourceId.kt +++ b/domain/src/main/java/tachiyomi/domain/source/interactor/GetSavedSearchBySourceId.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.source.interactor +package tachiyomi.domain.source.interactor import kotlinx.coroutines.flow.Flow import tachiyomi.domain.source.model.SavedSearch diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchBySourceIdFeed.kt b/domain/src/main/java/tachiyomi/domain/source/interactor/GetSavedSearchBySourceIdFeed.kt similarity index 89% rename from app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchBySourceIdFeed.kt rename to domain/src/main/java/tachiyomi/domain/source/interactor/GetSavedSearchBySourceIdFeed.kt index 6c997d8c2..a8e1276d1 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchBySourceIdFeed.kt +++ b/domain/src/main/java/tachiyomi/domain/source/interactor/GetSavedSearchBySourceIdFeed.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.source.interactor +package tachiyomi.domain.source.interactor import tachiyomi.domain.source.model.SavedSearch import tachiyomi.domain.source.repository.FeedSavedSearchRepository diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchGlobalFeed.kt b/domain/src/main/java/tachiyomi/domain/source/interactor/GetSavedSearchGlobalFeed.kt similarity index 88% rename from app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchGlobalFeed.kt rename to domain/src/main/java/tachiyomi/domain/source/interactor/GetSavedSearchGlobalFeed.kt index 8e6592a29..2e21afd63 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchGlobalFeed.kt +++ b/domain/src/main/java/tachiyomi/domain/source/interactor/GetSavedSearchGlobalFeed.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.source.interactor +package tachiyomi.domain.source.interactor import tachiyomi.domain.source.model.SavedSearch import tachiyomi.domain.source.repository.FeedSavedSearchRepository diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/GetSourceRepos.kt b/domain/src/main/java/tachiyomi/domain/source/interactor/GetSourceRepos.kt similarity index 77% rename from app/src/main/java/eu/kanade/domain/source/interactor/GetSourceRepos.kt rename to domain/src/main/java/tachiyomi/domain/source/interactor/GetSourceRepos.kt index 9ea50abdf..7ab7412b5 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/GetSourceRepos.kt +++ b/domain/src/main/java/tachiyomi/domain/source/interactor/GetSourceRepos.kt @@ -1,8 +1,8 @@ -package eu.kanade.domain.source.interactor +package tachiyomi.domain.source.interactor -import eu.kanade.domain.UnsortedPreferences import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map +import tachiyomi.domain.UnsortedPreferences class GetSourceRepos(private val preferences: UnsortedPreferences) { diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/InsertFeedSavedSearch.kt b/domain/src/main/java/tachiyomi/domain/source/interactor/InsertFeedSavedSearch.kt similarity index 95% rename from app/src/main/java/eu/kanade/domain/source/interactor/InsertFeedSavedSearch.kt rename to domain/src/main/java/tachiyomi/domain/source/interactor/InsertFeedSavedSearch.kt index 0bee00e8c..10b931ad7 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/InsertFeedSavedSearch.kt +++ b/domain/src/main/java/tachiyomi/domain/source/interactor/InsertFeedSavedSearch.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.source.interactor +package tachiyomi.domain.source.interactor import logcat.LogPriority import logcat.asLog diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/InsertSavedSearch.kt b/domain/src/main/java/tachiyomi/domain/source/interactor/InsertSavedSearch.kt similarity index 94% rename from app/src/main/java/eu/kanade/domain/source/interactor/InsertSavedSearch.kt rename to domain/src/main/java/tachiyomi/domain/source/interactor/InsertSavedSearch.kt index c5db304ff..cb5e0da39 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/InsertSavedSearch.kt +++ b/domain/src/main/java/tachiyomi/domain/source/interactor/InsertSavedSearch.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.source.interactor +package tachiyomi.domain.source.interactor import logcat.LogPriority import logcat.asLog