diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/BackupSchemaScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/BackupSchemaScreen.kt index 7d42ebb42..d5652b16a 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/BackupSchemaScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/BackupSchemaScreen.kt @@ -17,10 +17,10 @@ import cafe.adriel.voyager.navigator.currentOrThrow import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.AppBarActions import eu.kanade.presentation.util.Screen +import eu.kanade.tachiyomi.data.backup.models.Backup import eu.kanade.tachiyomi.util.system.copyToClipboard import kotlinx.collections.immutable.persistentListOf import kotlinx.serialization.protobuf.schema.ProtoBufSchemaGenerator -import tachiyomi.domain.backup.model.Backup import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.i18n.stringResource diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupDecoder.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupDecoder.kt index 98667586d..e33572caf 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupDecoder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupDecoder.kt @@ -2,12 +2,12 @@ package eu.kanade.tachiyomi.data.backup import android.content.Context import android.net.Uri +import eu.kanade.tachiyomi.data.backup.models.Backup +import eu.kanade.tachiyomi.data.backup.models.BackupSerializer import kotlinx.serialization.protobuf.ProtoBuf import okio.buffer import okio.gzip import okio.source -import tachiyomi.domain.backup.model.Backup -import tachiyomi.domain.backup.model.BackupSerializer import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt index 3d9c280d7..2dffba007 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt @@ -14,6 +14,14 @@ import eu.kanade.tachiyomi.data.backup.create.creators.MangaBackupCreator import eu.kanade.tachiyomi.data.backup.create.creators.PreferenceBackupCreator import eu.kanade.tachiyomi.data.backup.create.creators.SavedSearchBackupCreator import eu.kanade.tachiyomi.data.backup.create.creators.SourcesBackupCreator +import eu.kanade.tachiyomi.data.backup.models.Backup +import eu.kanade.tachiyomi.data.backup.models.BackupCategory +import eu.kanade.tachiyomi.data.backup.models.BackupManga +import eu.kanade.tachiyomi.data.backup.models.BackupPreference +import eu.kanade.tachiyomi.data.backup.models.BackupSavedSearch +import eu.kanade.tachiyomi.data.backup.models.BackupSerializer +import eu.kanade.tachiyomi.data.backup.models.BackupSource +import eu.kanade.tachiyomi.data.backup.models.BackupSourcePreferences import kotlinx.serialization.protobuf.ProtoBuf import logcat.LogPriority import okio.buffer @@ -23,14 +31,6 @@ import tachiyomi.core.i18n.stringResource import tachiyomi.core.util.system.logcat import tachiyomi.data.DatabaseHandler import tachiyomi.data.manga.MangaMapper -import tachiyomi.domain.backup.model.Backup -import tachiyomi.domain.backup.model.BackupCategory -import tachiyomi.domain.backup.model.BackupManga -import tachiyomi.domain.backup.model.BackupPreference -import tachiyomi.domain.backup.model.BackupSavedSearch -import tachiyomi.domain.backup.model.BackupSerializer -import tachiyomi.domain.backup.model.BackupSource -import tachiyomi.domain.backup.model.BackupSourcePreferences import tachiyomi.domain.backup.service.BackupPreferences import tachiyomi.domain.manga.interactor.GetFavorites import tachiyomi.domain.manga.interactor.GetMergedManga diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/CategoriesBackupCreator.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/CategoriesBackupCreator.kt index 164957768..e1ed56ee1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/CategoriesBackupCreator.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/CategoriesBackupCreator.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.data.backup.create.creators -import tachiyomi.domain.backup.model.BackupCategory -import tachiyomi.domain.backup.model.backupCategoryMapper +import eu.kanade.tachiyomi.data.backup.models.BackupCategory +import eu.kanade.tachiyomi.data.backup.models.backupCategoryMapper import tachiyomi.domain.category.interactor.GetCategories import tachiyomi.domain.category.model.Category import uy.kohesive.injekt.Injekt diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/MangaBackupCreator.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/MangaBackupCreator.kt index 7e6366a4c..3bb700787 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/MangaBackupCreator.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/MangaBackupCreator.kt @@ -2,18 +2,18 @@ package eu.kanade.tachiyomi.data.backup.create.creators import eu.kanade.tachiyomi.data.backup.create.BackupCreateFlags import eu.kanade.tachiyomi.data.backup.create.BackupCreateFlags.BACKUP_CUSTOM_INFO +import eu.kanade.tachiyomi.data.backup.models.BackupChapter +import eu.kanade.tachiyomi.data.backup.models.BackupFlatMetadata +import eu.kanade.tachiyomi.data.backup.models.BackupHistory +import eu.kanade.tachiyomi.data.backup.models.BackupManga +import eu.kanade.tachiyomi.data.backup.models.backupChapterMapper +import eu.kanade.tachiyomi.data.backup.models.backupMergedMangaReferenceMapper +import eu.kanade.tachiyomi.data.backup.models.backupTrackMapper import eu.kanade.tachiyomi.source.online.MetadataSource import eu.kanade.tachiyomi.ui.reader.setting.ReadingMode import exh.source.MERGED_SOURCE_ID import exh.source.getMainSource import tachiyomi.data.DatabaseHandler -import tachiyomi.domain.backup.model.BackupChapter -import tachiyomi.domain.backup.model.BackupFlatMetadata -import tachiyomi.domain.backup.model.BackupHistory -import tachiyomi.domain.backup.model.BackupManga -import tachiyomi.domain.backup.model.backupChapterMapper -import tachiyomi.domain.backup.model.backupMergedMangaReferenceMapper -import tachiyomi.domain.backup.model.backupTrackMapper import tachiyomi.domain.category.interactor.GetCategories import tachiyomi.domain.history.interactor.GetHistory import tachiyomi.domain.manga.interactor.GetCustomMangaInfo diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/PreferenceBackupCreator.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/PreferenceBackupCreator.kt index 74e36da19..c75612de9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/PreferenceBackupCreator.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/PreferenceBackupCreator.kt @@ -1,18 +1,18 @@ package eu.kanade.tachiyomi.data.backup.create.creators +import eu.kanade.tachiyomi.data.backup.models.BackupPreference +import eu.kanade.tachiyomi.data.backup.models.BackupSourcePreferences +import eu.kanade.tachiyomi.data.backup.models.BooleanPreferenceValue +import eu.kanade.tachiyomi.data.backup.models.FloatPreferenceValue +import eu.kanade.tachiyomi.data.backup.models.IntPreferenceValue +import eu.kanade.tachiyomi.data.backup.models.LongPreferenceValue +import eu.kanade.tachiyomi.data.backup.models.StringPreferenceValue +import eu.kanade.tachiyomi.data.backup.models.StringSetPreferenceValue import eu.kanade.tachiyomi.source.ConfigurableSource import eu.kanade.tachiyomi.source.preferenceKey import eu.kanade.tachiyomi.source.sourcePreferences import tachiyomi.core.preference.Preference import tachiyomi.core.preference.PreferenceStore -import tachiyomi.domain.backup.model.BackupPreference -import tachiyomi.domain.backup.model.BackupSourcePreferences -import tachiyomi.domain.backup.model.BooleanPreferenceValue -import tachiyomi.domain.backup.model.FloatPreferenceValue -import tachiyomi.domain.backup.model.IntPreferenceValue -import tachiyomi.domain.backup.model.LongPreferenceValue -import tachiyomi.domain.backup.model.StringPreferenceValue -import tachiyomi.domain.backup.model.StringSetPreferenceValue 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/data/backup/create/creators/SavedSearchBackupCreator.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/SavedSearchBackupCreator.kt index b59c34285..22941e799 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/SavedSearchBackupCreator.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/SavedSearchBackupCreator.kt @@ -1,8 +1,8 @@ package eu.kanade.tachiyomi.data.backup.create.creators +import eu.kanade.tachiyomi.data.backup.models.BackupSavedSearch +import eu.kanade.tachiyomi.data.backup.models.backupSavedSearchMapper import tachiyomi.data.DatabaseHandler -import tachiyomi.domain.backup.model.BackupSavedSearch -import tachiyomi.domain.backup.model.backupSavedSearchMapper import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/SourcesBackupCreator.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/SourcesBackupCreator.kt index bf1c7ba36..075e449a7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/SourcesBackupCreator.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/SourcesBackupCreator.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.data.backup.create.creators +import eu.kanade.tachiyomi.data.backup.models.BackupSource import eu.kanade.tachiyomi.source.Source -import tachiyomi.domain.backup.model.BackupSource import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.source.service.SourceManager import uy.kohesive.injekt.Injekt diff --git a/domain/src/main/java/tachiyomi/domain/backup/model/Backup.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/Backup.kt similarity index 94% rename from domain/src/main/java/tachiyomi/domain/backup/model/Backup.kt rename to app/src/main/java/eu/kanade/tachiyomi/data/backup/models/Backup.kt index 74325d6ea..8003918ee 100644 --- a/domain/src/main/java/tachiyomi/domain/backup/model/Backup.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/Backup.kt @@ -1,4 +1,4 @@ -package tachiyomi.domain.backup.model +package eu.kanade.tachiyomi.data.backup.models import kotlinx.serialization.Serializable import kotlinx.serialization.Serializer diff --git a/domain/src/main/java/tachiyomi/domain/backup/model/BackupCategory.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupCategory.kt similarity index 95% rename from domain/src/main/java/tachiyomi/domain/backup/model/BackupCategory.kt rename to app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupCategory.kt index e07ab3bfd..eb5dd0833 100644 --- a/domain/src/main/java/tachiyomi/domain/backup/model/BackupCategory.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupCategory.kt @@ -1,4 +1,4 @@ -package tachiyomi.domain.backup.model +package eu.kanade.tachiyomi.data.backup.models import kotlinx.serialization.Serializable import kotlinx.serialization.protobuf.ProtoNumber diff --git a/domain/src/main/java/tachiyomi/domain/backup/model/BackupChapter.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupChapter.kt similarity index 98% rename from domain/src/main/java/tachiyomi/domain/backup/model/BackupChapter.kt rename to app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupChapter.kt index 4cba7e376..3bf95c6c0 100644 --- a/domain/src/main/java/tachiyomi/domain/backup/model/BackupChapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupChapter.kt @@ -1,4 +1,4 @@ -package tachiyomi.domain.backup.model +package eu.kanade.tachiyomi.data.backup.models import kotlinx.serialization.Serializable import kotlinx.serialization.protobuf.ProtoNumber diff --git a/domain/src/main/java/tachiyomi/domain/backup/model/BackupFlatMetadata.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupFlatMetadata.kt similarity index 80% rename from domain/src/main/java/tachiyomi/domain/backup/model/BackupFlatMetadata.kt rename to app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupFlatMetadata.kt index cd88f4629..12e64356c 100644 --- a/domain/src/main/java/tachiyomi/domain/backup/model/BackupFlatMetadata.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupFlatMetadata.kt @@ -1,8 +1,8 @@ -package tachiyomi.domain.backup.model +package eu.kanade.tachiyomi.data.backup.models -import tachiyomi.domain.backup.model.metadata.BackupSearchMetadata -import tachiyomi.domain.backup.model.metadata.BackupSearchTag -import tachiyomi.domain.backup.model.metadata.BackupSearchTitle +import eu.kanade.tachiyomi.data.backup.models.metadata.BackupSearchMetadata +import eu.kanade.tachiyomi.data.backup.models.metadata.BackupSearchTag +import eu.kanade.tachiyomi.data.backup.models.metadata.BackupSearchTitle import exh.metadata.metadata.base.FlatMetadata import kotlinx.serialization.Serializable import kotlinx.serialization.protobuf.ProtoNumber diff --git a/domain/src/main/java/tachiyomi/domain/backup/model/BackupHistory.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupHistory.kt similarity index 94% rename from domain/src/main/java/tachiyomi/domain/backup/model/BackupHistory.kt rename to app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupHistory.kt index cb692cde2..1108a376e 100644 --- a/domain/src/main/java/tachiyomi/domain/backup/model/BackupHistory.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupHistory.kt @@ -1,4 +1,4 @@ -package tachiyomi.domain.backup.model +package eu.kanade.tachiyomi.data.backup.models import kotlinx.serialization.Serializable import kotlinx.serialization.protobuf.ProtoNumber diff --git a/domain/src/main/java/tachiyomi/domain/backup/model/BackupManga.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt similarity index 98% rename from domain/src/main/java/tachiyomi/domain/backup/model/BackupManga.kt rename to app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt index ddcf40aae..4f503a0db 100644 --- a/domain/src/main/java/tachiyomi/domain/backup/model/BackupManga.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt @@ -1,4 +1,4 @@ -package tachiyomi.domain.backup.model +package eu.kanade.tachiyomi.data.backup.models import eu.kanade.tachiyomi.source.model.UpdateStrategy import kotlinx.serialization.Serializable diff --git a/domain/src/main/java/tachiyomi/domain/backup/model/BackupMergedMangaReference.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupMergedMangaReference.kt similarity index 97% rename from domain/src/main/java/tachiyomi/domain/backup/model/BackupMergedMangaReference.kt rename to app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupMergedMangaReference.kt index 8435e0441..4431570f2 100644 --- a/domain/src/main/java/tachiyomi/domain/backup/model/BackupMergedMangaReference.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupMergedMangaReference.kt @@ -1,4 +1,4 @@ -package tachiyomi.domain.backup.model +package eu.kanade.tachiyomi.data.backup.models import kotlinx.serialization.Serializable import kotlinx.serialization.protobuf.ProtoNumber diff --git a/domain/src/main/java/tachiyomi/domain/backup/model/BackupPreference.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupPreference.kt similarity index 95% rename from domain/src/main/java/tachiyomi/domain/backup/model/BackupPreference.kt rename to app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupPreference.kt index 516d4dac2..3884f37e3 100644 --- a/domain/src/main/java/tachiyomi/domain/backup/model/BackupPreference.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupPreference.kt @@ -1,4 +1,4 @@ -package tachiyomi.domain.backup.model +package eu.kanade.tachiyomi.data.backup.models import kotlinx.serialization.Serializable import kotlinx.serialization.protobuf.ProtoNumber diff --git a/domain/src/main/java/tachiyomi/domain/backup/model/BackupSavedSearch.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupSavedSearch.kt similarity index 93% rename from domain/src/main/java/tachiyomi/domain/backup/model/BackupSavedSearch.kt rename to app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupSavedSearch.kt index 82f36867d..4486b6bfd 100644 --- a/domain/src/main/java/tachiyomi/domain/backup/model/BackupSavedSearch.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupSavedSearch.kt @@ -1,4 +1,4 @@ -package tachiyomi.domain.backup.model +package eu.kanade.tachiyomi.data.backup.models import kotlinx.serialization.Serializable import kotlinx.serialization.protobuf.ProtoNumber diff --git a/domain/src/main/java/tachiyomi/domain/backup/model/BackupSource.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupSource.kt similarity index 89% rename from domain/src/main/java/tachiyomi/domain/backup/model/BackupSource.kt rename to app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupSource.kt index aae2cf03d..bfd2c93bf 100644 --- a/domain/src/main/java/tachiyomi/domain/backup/model/BackupSource.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupSource.kt @@ -1,4 +1,4 @@ -package tachiyomi.domain.backup.model +package eu.kanade.tachiyomi.data.backup.models import kotlinx.serialization.Serializable import kotlinx.serialization.protobuf.ProtoNumber diff --git a/domain/src/main/java/tachiyomi/domain/backup/model/BackupTracking.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupTracking.kt similarity index 98% rename from domain/src/main/java/tachiyomi/domain/backup/model/BackupTracking.kt rename to app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupTracking.kt index 37deb68fb..0a05c0edf 100644 --- a/domain/src/main/java/tachiyomi/domain/backup/model/BackupTracking.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupTracking.kt @@ -1,4 +1,4 @@ -package tachiyomi.domain.backup.model +package eu.kanade.tachiyomi.data.backup.models import kotlinx.serialization.Serializable import kotlinx.serialization.protobuf.ProtoNumber diff --git a/domain/src/main/java/tachiyomi/domain/backup/model/metadata/BackupSearchMetadata.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/metadata/BackupSearchMetadata.kt similarity index 94% rename from domain/src/main/java/tachiyomi/domain/backup/model/metadata/BackupSearchMetadata.kt rename to app/src/main/java/eu/kanade/tachiyomi/data/backup/models/metadata/BackupSearchMetadata.kt index 2a9f45558..3ed955440 100644 --- a/domain/src/main/java/tachiyomi/domain/backup/model/metadata/BackupSearchMetadata.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/metadata/BackupSearchMetadata.kt @@ -1,4 +1,4 @@ -package tachiyomi.domain.backup.model.metadata +package eu.kanade.tachiyomi.data.backup.models.metadata import exh.metadata.sql.models.SearchMetadata import kotlinx.serialization.Serializable diff --git a/domain/src/main/java/tachiyomi/domain/backup/model/metadata/BackupSearchTag.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/metadata/BackupSearchTag.kt similarity index 93% rename from domain/src/main/java/tachiyomi/domain/backup/model/metadata/BackupSearchTag.kt rename to app/src/main/java/eu/kanade/tachiyomi/data/backup/models/metadata/BackupSearchTag.kt index 2f30e73d3..9ff83bf15 100644 --- a/domain/src/main/java/tachiyomi/domain/backup/model/metadata/BackupSearchTag.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/metadata/BackupSearchTag.kt @@ -1,4 +1,4 @@ -package tachiyomi.domain.backup.model.metadata +package eu.kanade.tachiyomi.data.backup.models.metadata import exh.metadata.sql.models.SearchTag import kotlinx.serialization.Serializable diff --git a/domain/src/main/java/tachiyomi/domain/backup/model/metadata/BackupSearchTitle.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/metadata/BackupSearchTitle.kt similarity index 92% rename from domain/src/main/java/tachiyomi/domain/backup/model/metadata/BackupSearchTitle.kt rename to app/src/main/java/eu/kanade/tachiyomi/data/backup/models/metadata/BackupSearchTitle.kt index d8903d118..5b162c07b 100644 --- a/domain/src/main/java/tachiyomi/domain/backup/model/metadata/BackupSearchTitle.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/metadata/BackupSearchTitle.kt @@ -1,4 +1,4 @@ -package tachiyomi.domain.backup.model.metadata +package eu.kanade.tachiyomi.data.backup.models.metadata import exh.metadata.sql.models.SearchTitle import kotlinx.serialization.Serializable diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/BackupRestorer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/BackupRestorer.kt index 0a132a6f6..60466fafa 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/BackupRestorer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/BackupRestorer.kt @@ -4,6 +4,11 @@ import android.content.Context import android.net.Uri import eu.kanade.tachiyomi.data.backup.BackupDecoder import eu.kanade.tachiyomi.data.backup.BackupNotifier +import eu.kanade.tachiyomi.data.backup.models.BackupCategory +import eu.kanade.tachiyomi.data.backup.models.BackupManga +import eu.kanade.tachiyomi.data.backup.models.BackupPreference +import eu.kanade.tachiyomi.data.backup.models.BackupSavedSearch +import eu.kanade.tachiyomi.data.backup.models.BackupSourcePreferences import eu.kanade.tachiyomi.data.backup.restore.restorers.CategoriesRestorer import eu.kanade.tachiyomi.data.backup.restore.restorers.MangaRestorer import eu.kanade.tachiyomi.data.backup.restore.restorers.PreferenceRestorer @@ -15,11 +20,6 @@ import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.ensureActive import kotlinx.coroutines.launch import tachiyomi.core.i18n.stringResource -import tachiyomi.domain.backup.model.BackupCategory -import tachiyomi.domain.backup.model.BackupManga -import tachiyomi.domain.backup.model.BackupPreference -import tachiyomi.domain.backup.model.BackupSavedSearch -import tachiyomi.domain.backup.model.BackupSourcePreferences import tachiyomi.i18n.MR import tachiyomi.i18n.sy.SYMR import java.io.File diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CategoriesRestorer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CategoriesRestorer.kt index 00f7fe96c..f98af1045 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CategoriesRestorer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CategoriesRestorer.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.data.backup.restore.restorers +import eu.kanade.tachiyomi.data.backup.models.BackupCategory import tachiyomi.data.DatabaseHandler -import tachiyomi.domain.backup.model.BackupCategory import tachiyomi.domain.category.interactor.GetCategories import tachiyomi.domain.library.service.LibraryPreferences import uy.kohesive.injekt.Injekt diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/MangaRestorer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/MangaRestorer.kt index a0798ff4a..35dddf4f6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/MangaRestorer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/MangaRestorer.kt @@ -1,18 +1,18 @@ package eu.kanade.tachiyomi.data.backup.restore.restorers import eu.kanade.domain.manga.interactor.UpdateManga +import eu.kanade.tachiyomi.data.backup.models.BackupCategory +import eu.kanade.tachiyomi.data.backup.models.BackupChapter +import eu.kanade.tachiyomi.data.backup.models.BackupFlatMetadata +import eu.kanade.tachiyomi.data.backup.models.BackupHistory +import eu.kanade.tachiyomi.data.backup.models.BackupManga +import eu.kanade.tachiyomi.data.backup.models.BackupMergedMangaReference +import eu.kanade.tachiyomi.data.backup.models.BackupTracking import exh.EXHMigrations import tachiyomi.data.DatabaseHandler import tachiyomi.data.UpdateStrategyColumnAdapter import tachiyomi.data.manga.MangaMapper import tachiyomi.data.manga.MergedMangaMapper -import tachiyomi.domain.backup.model.BackupCategory -import tachiyomi.domain.backup.model.BackupChapter -import tachiyomi.domain.backup.model.BackupFlatMetadata -import tachiyomi.domain.backup.model.BackupHistory -import tachiyomi.domain.backup.model.BackupManga -import tachiyomi.domain.backup.model.BackupMergedMangaReference -import tachiyomi.domain.backup.model.BackupTracking import tachiyomi.domain.category.interactor.GetCategories import tachiyomi.domain.chapter.interactor.GetChaptersByMangaId import tachiyomi.domain.chapter.model.Chapter diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/PreferenceRestorer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/PreferenceRestorer.kt index ac215fbb6..1062937d4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/PreferenceRestorer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/PreferenceRestorer.kt @@ -2,18 +2,18 @@ package eu.kanade.tachiyomi.data.backup.restore.restorers import android.content.Context import eu.kanade.tachiyomi.data.backup.create.BackupCreateJob +import eu.kanade.tachiyomi.data.backup.models.BackupPreference +import eu.kanade.tachiyomi.data.backup.models.BackupSourcePreferences +import eu.kanade.tachiyomi.data.backup.models.BooleanPreferenceValue +import eu.kanade.tachiyomi.data.backup.models.FloatPreferenceValue +import eu.kanade.tachiyomi.data.backup.models.IntPreferenceValue +import eu.kanade.tachiyomi.data.backup.models.LongPreferenceValue +import eu.kanade.tachiyomi.data.backup.models.StringPreferenceValue +import eu.kanade.tachiyomi.data.backup.models.StringSetPreferenceValue import eu.kanade.tachiyomi.data.library.LibraryUpdateJob import eu.kanade.tachiyomi.source.sourcePreferences import tachiyomi.core.preference.AndroidPreferenceStore import tachiyomi.core.preference.PreferenceStore -import tachiyomi.domain.backup.model.BackupPreference -import tachiyomi.domain.backup.model.BackupSourcePreferences -import tachiyomi.domain.backup.model.BooleanPreferenceValue -import tachiyomi.domain.backup.model.FloatPreferenceValue -import tachiyomi.domain.backup.model.IntPreferenceValue -import tachiyomi.domain.backup.model.LongPreferenceValue -import tachiyomi.domain.backup.model.StringPreferenceValue -import tachiyomi.domain.backup.model.StringSetPreferenceValue import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/SavedSearchRestorer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/SavedSearchRestorer.kt index 6061085d0..66430abfe 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/SavedSearchRestorer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/SavedSearchRestorer.kt @@ -1,8 +1,8 @@ package eu.kanade.tachiyomi.data.backup.restore.restorers +import eu.kanade.tachiyomi.data.backup.models.BackupSavedSearch import exh.util.nullIfBlank import tachiyomi.data.DatabaseHandler -import tachiyomi.domain.backup.model.BackupSavedSearch import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/exh/debug/DebugFunctions.kt b/app/src/main/java/exh/debug/DebugFunctions.kt index 73f6e9b57..b2db66588 100644 --- a/app/src/main/java/exh/debug/DebugFunctions.kt +++ b/app/src/main/java/exh/debug/DebugFunctions.kt @@ -7,6 +7,7 @@ import eu.kanade.domain.manga.model.toSManga import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.domain.ui.UiPreferences import eu.kanade.tachiyomi.core.security.SecurityPreferences +import eu.kanade.tachiyomi.data.backup.models.BackupSerializer import eu.kanade.tachiyomi.data.cache.PagePreviewCache import eu.kanade.tachiyomi.data.track.TrackerManager import eu.kanade.tachiyomi.network.NetworkPreferences @@ -26,7 +27,6 @@ import kotlinx.coroutines.runBlocking import kotlinx.serialization.protobuf.schema.ProtoBufSchemaGenerator import tachiyomi.core.preference.PreferenceStore import tachiyomi.data.DatabaseHandler -import tachiyomi.domain.backup.model.BackupSerializer import tachiyomi.domain.backup.service.BackupPreferences import tachiyomi.domain.library.service.LibraryPreferences import tachiyomi.domain.manga.interactor.GetAllManga