Move more things around

2023-01-27 22:31:12 -05:00
parent 2501fef9e4
commit 1730dd6af1
158 changed files with 262 additions and 258 deletions
--- a/app/src/main/java/eu/kanade/domain/DomainModule.kt
+++ b/app/src/main/java/eu/kanade/domain/DomainModule.kt
@@ -1,6 +1,5 @@
 package eu.kanade.domain

-import eu.kanade.data.source.SourceDataRepositoryImpl
 import eu.kanade.data.source.SourceRepositoryImpl
 import eu.kanade.domain.category.interactor.CreateCategoryWithName
 import eu.kanade.domain.category.interactor.DeleteCategory
@@ -58,6 +57,7 @@ import tachiyomi.data.category.CategoryRepositoryImpl
 import tachiyomi.data.chapter.ChapterRepositoryImpl
 import tachiyomi.data.history.HistoryRepositoryImpl
 import tachiyomi.data.manga.MangaRepositoryImpl
+import tachiyomi.data.source.SourceDataRepositoryImpl
 import tachiyomi.data.track.TrackRepositoryImpl
 import tachiyomi.data.updates.UpdatesRepositoryImpl
 import tachiyomi.domain.category.repository.CategoryRepository
--- a/app/src/main/java/eu/kanade/domain/backup/service/BackupPreferences.kt
+++ b/app/src/main/java/eu/kanade/domain/backup/service/BackupPreferences.kt
@@ -1,7 +1,7 @@
 package eu.kanade.domain.backup.service

-import eu.kanade.tachiyomi.core.preference.PreferenceStore
-import eu.kanade.tachiyomi.core.provider.FolderProvider
+import tachiyomi.core.preference.PreferenceStore
+import tachiyomi.core.provider.FolderProvider

 class BackupPreferences(
    private val folderProvider: FolderProvider,
--- a/app/src/main/java/eu/kanade/domain/base/BasePreferences.kt
+++ b/app/src/main/java/eu/kanade/domain/base/BasePreferences.kt
@@ -1,9 +1,9 @@
 package eu.kanade.domain.base

 import android.content.Context
-import eu.kanade.tachiyomi.core.preference.PreferenceStore
 import eu.kanade.tachiyomi.util.system.isPreviewBuildType
 import eu.kanade.tachiyomi.util.system.isReleaseBuildType
+import tachiyomi.core.preference.PreferenceStore

 class BasePreferences(
    val context: Context,
--- a/app/src/main/java/eu/kanade/domain/base/ExtensionInstallerPreference.kt
+++ b/app/src/main/java/eu/kanade/domain/base/ExtensionInstallerPreference.kt
@@ -1,13 +1,13 @@
 package eu.kanade.domain.base

 import android.content.Context
-import eu.kanade.tachiyomi.core.preference.Preference
-import eu.kanade.tachiyomi.core.preference.PreferenceStore
-import eu.kanade.tachiyomi.core.preference.getEnum
 import eu.kanade.tachiyomi.data.preference.PreferenceValues.ExtensionInstaller
 import eu.kanade.tachiyomi.util.system.hasMiuiPackageInstaller
 import eu.kanade.tachiyomi.util.system.isShizukuInstalled
 import kotlinx.coroutines.CoroutineScope
+import tachiyomi.core.preference.Preference
+import tachiyomi.core.preference.PreferenceStore
+import tachiyomi.core.preference.getEnum

 class ExtensionInstallerPreference(
    private val context: Context,
--- a/app/src/main/java/eu/kanade/domain/category/interactor/CreateCategoryWithName.kt
+++ b/app/src/main/java/eu/kanade/domain/category/interactor/CreateCategoryWithName.kt
@@ -1,9 +1,9 @@
 package eu.kanade.domain.category.interactor

 import eu.kanade.domain.library.service.LibraryPreferences
-import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
-import eu.kanade.tachiyomi.util.system.logcat
 import logcat.LogPriority
+import tachiyomi.core.util.lang.withNonCancellableContext
+import tachiyomi.core.util.system.logcat
 import tachiyomi.domain.category.model.Category
 import tachiyomi.domain.category.repository.CategoryRepository

--- a/app/src/main/java/eu/kanade/domain/category/interactor/DeleteCategory.kt
+++ b/app/src/main/java/eu/kanade/domain/category/interactor/DeleteCategory.kt
@@ -1,8 +1,8 @@
 package eu.kanade.domain.category.interactor

-import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
-import eu.kanade.tachiyomi.util.system.logcat
 import logcat.LogPriority
+import tachiyomi.core.util.lang.withNonCancellableContext
+import tachiyomi.core.util.system.logcat
 import tachiyomi.domain.category.model.CategoryUpdate
 import tachiyomi.domain.category.repository.CategoryRepository

--- a/app/src/main/java/eu/kanade/domain/category/interactor/RenameCategory.kt
+++ b/app/src/main/java/eu/kanade/domain/category/interactor/RenameCategory.kt
@@ -1,8 +1,8 @@
 package eu.kanade.domain.category.interactor

-import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
-import eu.kanade.tachiyomi.util.system.logcat
 import logcat.LogPriority
+import tachiyomi.core.util.lang.withNonCancellableContext
+import tachiyomi.core.util.system.logcat
 import tachiyomi.domain.category.model.Category
 import tachiyomi.domain.category.model.CategoryUpdate
 import tachiyomi.domain.category.repository.CategoryRepository
--- a/app/src/main/java/eu/kanade/domain/category/interactor/ReorderCategory.kt
+++ b/app/src/main/java/eu/kanade/domain/category/interactor/ReorderCategory.kt
@@ -1,10 +1,10 @@
 package eu.kanade.domain.category.interactor

-import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
-import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import logcat.LogPriority
+import tachiyomi.core.util.lang.withNonCancellableContext
+import tachiyomi.core.util.system.logcat
 import tachiyomi.domain.category.model.Category
 import tachiyomi.domain.category.model.CategoryUpdate
 import tachiyomi.domain.category.repository.CategoryRepository
--- a/app/src/main/java/eu/kanade/domain/category/interactor/SetMangaCategories.kt
+++ b/app/src/main/java/eu/kanade/domain/category/interactor/SetMangaCategories.kt
@@ -1,7 +1,7 @@
 package eu.kanade.domain.category.interactor

-import eu.kanade.tachiyomi.util.system.logcat
 import logcat.LogPriority
+import tachiyomi.core.util.system.logcat
 import tachiyomi.domain.manga.repository.MangaRepository

 class SetMangaCategories(
--- a/app/src/main/java/eu/kanade/domain/category/interactor/UpdateCategory.kt
+++ b/app/src/main/java/eu/kanade/domain/category/interactor/UpdateCategory.kt
@@ -1,6 +1,6 @@
 package eu.kanade.domain.category.interactor

-import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
+import tachiyomi.core.util.lang.withNonCancellableContext
 import tachiyomi.domain.category.model.CategoryUpdate
 import tachiyomi.domain.category.repository.CategoryRepository

--- a/app/src/main/java/eu/kanade/domain/chapter/interactor/GetChapter.kt
+++ b/app/src/main/java/eu/kanade/domain/chapter/interactor/GetChapter.kt
@@ -1,7 +1,7 @@
 package eu.kanade.domain.chapter.interactor

-import eu.kanade.tachiyomi.util.system.logcat
 import logcat.LogPriority
+import tachiyomi.core.util.system.logcat
 import tachiyomi.domain.chapter.model.Chapter
 import tachiyomi.domain.chapter.repository.ChapterRepository

--- a/app/src/main/java/eu/kanade/domain/chapter/interactor/GetChapterByMangaId.kt
+++ b/app/src/main/java/eu/kanade/domain/chapter/interactor/GetChapterByMangaId.kt
@@ -1,7 +1,7 @@
 package eu.kanade.domain.chapter.interactor

-import eu.kanade.tachiyomi.util.system.logcat
 import logcat.LogPriority
+import tachiyomi.core.util.system.logcat
 import tachiyomi.domain.chapter.model.Chapter
 import tachiyomi.domain.chapter.repository.ChapterRepository

--- a/app/src/main/java/eu/kanade/domain/chapter/interactor/SetDefaultChapterSettings.kt
+++ b/app/src/main/java/eu/kanade/domain/chapter/interactor/SetDefaultChapterSettings.kt
@@ -3,7 +3,7 @@ package eu.kanade.domain.chapter.interactor
 import eu.kanade.domain.library.service.LibraryPreferences
 import eu.kanade.domain.manga.interactor.GetFavorites
 import eu.kanade.domain.manga.interactor.SetMangaChapterFlags
-import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
+import tachiyomi.core.util.lang.withNonCancellableContext
 import tachiyomi.domain.manga.model.Manga

 class SetMangaDefaultChapterFlags(
--- a/app/src/main/java/eu/kanade/domain/chapter/interactor/SetReadStatus.kt
+++ b/app/src/main/java/eu/kanade/domain/chapter/interactor/SetReadStatus.kt
@@ -2,9 +2,9 @@ package eu.kanade.domain.chapter.interactor

 import eu.kanade.domain.download.interactor.DeleteDownload
 import eu.kanade.domain.download.service.DownloadPreferences
-import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
-import eu.kanade.tachiyomi.util.system.logcat
 import logcat.LogPriority
+import tachiyomi.core.util.lang.withNonCancellableContext
+import tachiyomi.core.util.system.logcat
 import tachiyomi.domain.chapter.model.Chapter
 import tachiyomi.domain.chapter.model.ChapterUpdate
 import tachiyomi.domain.chapter.repository.ChapterRepository
--- a/app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithTrackServiceTwoWay.kt
+++ b/app/src/main/java/eu/kanade/domain/chapter/interactor/SyncChaptersWithTrackServiceTwoWay.kt
@@ -3,8 +3,8 @@ package eu.kanade.domain.chapter.interactor
 import eu.kanade.domain.track.interactor.InsertTrack
 import eu.kanade.domain.track.model.toDbTrack
 import eu.kanade.tachiyomi.data.track.TrackService
-import eu.kanade.tachiyomi.util.system.logcat
 import logcat.LogPriority
+import tachiyomi.core.util.system.logcat
 import tachiyomi.domain.chapter.model.Chapter
 import tachiyomi.domain.chapter.model.toChapterUpdate
 import tachiyomi.domain.track.model.Track
--- a/app/src/main/java/eu/kanade/domain/chapter/interactor/UpdateChapter.kt
+++ b/app/src/main/java/eu/kanade/domain/chapter/interactor/UpdateChapter.kt
@@ -1,7 +1,7 @@
 package eu.kanade.domain.chapter.interactor

-import eu.kanade.tachiyomi.util.system.logcat
 import logcat.LogPriority
+import tachiyomi.core.util.system.logcat
 import tachiyomi.domain.chapter.model.ChapterUpdate
 import tachiyomi.domain.chapter.repository.ChapterRepository

--- a/app/src/main/java/eu/kanade/domain/download/interactor/DeleteDownload.kt
+++ b/app/src/main/java/eu/kanade/domain/download/interactor/DeleteDownload.kt
@@ -2,7 +2,7 @@ package eu.kanade.domain.download.interactor

 import eu.kanade.tachiyomi.data.download.DownloadManager
 import eu.kanade.tachiyomi.source.SourceManager
-import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
+import tachiyomi.core.util.lang.withNonCancellableContext
 import tachiyomi.domain.chapter.model.Chapter
 import tachiyomi.domain.manga.model.Manga

--- a/app/src/main/java/eu/kanade/domain/download/service/DownloadPreferences.kt
+++ b/app/src/main/java/eu/kanade/domain/download/service/DownloadPreferences.kt
@@ -1,7 +1,7 @@
 package eu.kanade.domain.download.service

-import eu.kanade.tachiyomi.core.preference.PreferenceStore
-import eu.kanade.tachiyomi.core.provider.FolderProvider
+import tachiyomi.core.preference.PreferenceStore
+import tachiyomi.core.provider.FolderProvider

 class DownloadPreferences(
    private val folderProvider: FolderProvider,
--- a/app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt
+++ b/app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt
@@ -1,11 +1,11 @@
 package eu.kanade.domain.library.service

-import eu.kanade.tachiyomi.core.preference.PreferenceStore
 import eu.kanade.tachiyomi.data.preference.DEVICE_ONLY_ON_WIFI
 import eu.kanade.tachiyomi.data.preference.MANGA_HAS_UNREAD
 import eu.kanade.tachiyomi.data.preference.MANGA_NON_COMPLETED
 import eu.kanade.tachiyomi.data.preference.MANGA_NON_READ
 import eu.kanade.tachiyomi.widget.ExtendedNavigationView
+import tachiyomi.core.preference.PreferenceStore
 import tachiyomi.domain.library.model.LibraryDisplayMode
 import tachiyomi.domain.library.model.LibrarySort
 import tachiyomi.domain.manga.model.Manga
--- a/app/src/main/java/eu/kanade/domain/manga/interactor/GetManga.kt
+++ b/app/src/main/java/eu/kanade/domain/manga/interactor/GetManga.kt
@@ -1,8 +1,8 @@
 package eu.kanade.domain.manga.interactor

-import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.flow.Flow
 import logcat.LogPriority
+import tachiyomi.core.util.system.logcat
 import tachiyomi.domain.manga.model.Manga
 import tachiyomi.domain.manga.repository.MangaRepository

--- a/app/src/main/java/eu/kanade/domain/source/interactor/ToggleLanguage.kt
+++ b/app/src/main/java/eu/kanade/domain/source/interactor/ToggleLanguage.kt
@@ -1,7 +1,7 @@
 package eu.kanade.domain.source.interactor

 import eu.kanade.domain.source.service.SourcePreferences
-import eu.kanade.tachiyomi.core.preference.getAndSet
+import tachiyomi.core.preference.getAndSet

 class ToggleLanguage(
    val preferences: SourcePreferences,
--- a/app/src/main/java/eu/kanade/domain/source/interactor/ToggleSource.kt
+++ b/app/src/main/java/eu/kanade/domain/source/interactor/ToggleSource.kt
@@ -1,7 +1,7 @@
 package eu.kanade.domain.source.interactor

 import eu.kanade.domain.source.service.SourcePreferences
-import eu.kanade.tachiyomi.core.preference.getAndSet
+import tachiyomi.core.preference.getAndSet
 import tachiyomi.domain.source.model.Source

 class ToggleSource(
--- a/app/src/main/java/eu/kanade/domain/source/interactor/ToggleSourcePin.kt
+++ b/app/src/main/java/eu/kanade/domain/source/interactor/ToggleSourcePin.kt
@@ -1,7 +1,7 @@
 package eu.kanade.domain.source.interactor

 import eu.kanade.domain.source.service.SourcePreferences
-import eu.kanade.tachiyomi.core.preference.getAndSet
+import tachiyomi.core.preference.getAndSet
 import tachiyomi.domain.source.model.Source

 class ToggleSourcePin(
--- a/app/src/main/java/eu/kanade/domain/source/service/SourcePreferences.kt
+++ b/app/src/main/java/eu/kanade/domain/source/service/SourcePreferences.kt
@@ -1,9 +1,9 @@
 package eu.kanade.domain.source.service

 import eu.kanade.domain.source.interactor.SetMigrateSorting
-import eu.kanade.tachiyomi.core.preference.PreferenceStore
-import eu.kanade.tachiyomi.core.preference.getEnum
 import eu.kanade.tachiyomi.util.system.LocaleHelper
+import tachiyomi.core.preference.PreferenceStore
+import tachiyomi.core.preference.getEnum
 import tachiyomi.domain.library.model.LibraryDisplayMode

 class SourcePreferences(
--- a/app/src/main/java/eu/kanade/domain/track/interactor/DeleteTrack.kt
+++ b/app/src/main/java/eu/kanade/domain/track/interactor/DeleteTrack.kt
@@ -1,7 +1,7 @@
 package eu.kanade.domain.track.interactor

-import eu.kanade.tachiyomi.util.system.logcat
 import logcat.LogPriority
+import tachiyomi.core.util.system.logcat
 import tachiyomi.domain.track.repository.TrackRepository

 class DeleteTrack(
--- a/app/src/main/java/eu/kanade/domain/track/interactor/GetTracks.kt
+++ b/app/src/main/java/eu/kanade/domain/track/interactor/GetTracks.kt
@@ -1,8 +1,8 @@
 package eu.kanade.domain.track.interactor

-import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.flow.Flow
 import logcat.LogPriority
+import tachiyomi.core.util.system.logcat
 import tachiyomi.domain.track.model.Track
 import tachiyomi.domain.track.repository.TrackRepository

--- a/app/src/main/java/eu/kanade/domain/track/interactor/InsertTrack.kt
+++ b/app/src/main/java/eu/kanade/domain/track/interactor/InsertTrack.kt
@@ -1,7 +1,7 @@
 package eu.kanade.domain.track.interactor

-import eu.kanade.tachiyomi.util.system.logcat
 import logcat.LogPriority
+import tachiyomi.core.util.system.logcat
 import tachiyomi.domain.track.model.Track
 import tachiyomi.domain.track.repository.TrackRepository

--- a/app/src/main/java/eu/kanade/domain/track/service/DelayedTrackingUpdateJob.kt
+++ b/app/src/main/java/eu/kanade/domain/track/service/DelayedTrackingUpdateJob.kt
@@ -14,9 +14,9 @@ import eu.kanade.domain.track.interactor.InsertTrack
 import eu.kanade.domain.track.model.toDbTrack
 import eu.kanade.domain.track.store.DelayedTrackingStore
 import eu.kanade.tachiyomi.data.track.TrackManager
-import eu.kanade.tachiyomi.util.lang.withIOContext
-import eu.kanade.tachiyomi.util.system.logcat
 import logcat.LogPriority
+import tachiyomi.core.util.lang.withIOContext
+import tachiyomi.core.util.system.logcat
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.util.concurrent.TimeUnit
--- a/app/src/main/java/eu/kanade/domain/track/service/TrackPreferences.kt
+++ b/app/src/main/java/eu/kanade/domain/track/service/TrackPreferences.kt
@@ -1,8 +1,8 @@
 package eu.kanade.domain.track.service

-import eu.kanade.tachiyomi.core.preference.PreferenceStore
 import eu.kanade.tachiyomi.data.track.TrackService
 import eu.kanade.tachiyomi.data.track.anilist.Anilist
+import tachiyomi.core.preference.PreferenceStore

 class TrackPreferences(
    private val preferenceStore: PreferenceStore,
--- a/app/src/main/java/eu/kanade/domain/track/store/DelayedTrackingStore.kt
+++ b/app/src/main/java/eu/kanade/domain/track/store/DelayedTrackingStore.kt
@@ -2,8 +2,8 @@ package eu.kanade.domain.track.store

 import android.content.Context
 import androidx.core.content.edit
-import eu.kanade.tachiyomi.util.system.logcat
 import logcat.LogPriority
+import tachiyomi.core.util.system.logcat
 import tachiyomi.domain.track.model.Track

 class DelayedTrackingStore(context: Context) {
--- a/app/src/main/java/eu/kanade/domain/ui/UiPreferences.kt
+++ b/app/src/main/java/eu/kanade/domain/ui/UiPreferences.kt
@@ -4,10 +4,10 @@ import android.os.Build
 import eu.kanade.domain.ui.model.AppTheme
 import eu.kanade.domain.ui.model.TabletUiMode
 import eu.kanade.domain.ui.model.ThemeMode
-import eu.kanade.tachiyomi.core.preference.PreferenceStore
-import eu.kanade.tachiyomi.core.preference.getEnum
 import eu.kanade.tachiyomi.util.system.DeviceUtil
 import eu.kanade.tachiyomi.util.system.isDynamicColorAvailable
+import tachiyomi.core.preference.PreferenceStore
+import tachiyomi.core.preference.getEnum
 import java.text.DateFormat
 import java.text.SimpleDateFormat
 import java.util.Locale