From 120ea4c768658d433724cd76d57d4fb22d4877b7 Mon Sep 17 00:00:00 2001 From: Andreas Date: Sun, 22 Jan 2023 17:44:39 +0100 Subject: [PATCH] Move more implementation to data module (#8971) (cherry picked from commit aee785a8bbf95bd8b2ce975a25cf68dc302f363b) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt --- .../java/eu/kanade/data/chapter/ChapterRepositoryImpl.kt | 2 +- .../java/eu/kanade/data/manga/MangaMergeRepositoryImpl.kt | 3 ++- .../eu/kanade/data/manga/MangaMetadataRepositoryImpl.kt | 1 + app/src/main/java/eu/kanade/domain/DomainModule.kt | 6 +++--- .../java/eu/kanade/tachiyomi/data/backup/BackupManager.kt | 4 ++-- .../migration/advanced/design/MigrationBottomSheetDialog.kt | 2 +- .../java/eu/kanade/tachiyomi/util}/BooleanExtensions.kt | 2 +- data/build.gradle.kts | 1 + .../src/main/java/tachiyomi}/data/history/HistoryMapper.kt | 2 +- .../java/tachiyomi}/data/history/HistoryRepositoryImpl.kt | 2 +- .../src/main/java/tachiyomi}/data/manga/MangaMapper.kt | 2 +- .../main/java/tachiyomi}/data/manga/MangaRepositoryImpl.kt | 4 ++-- .../src/main/java/tachiyomi}/data/updates/UpdatesMapper.kt | 2 +- .../java/tachiyomi}/data/updates/UpdatesRepositoryImpl.kt | 2 +- 14 files changed, 19 insertions(+), 16 deletions(-) rename {app/src/main/java/eu/kanade/tachiyomi/util/system => core/src/main/java/eu/kanade/tachiyomi/util}/BooleanExtensions.kt (52%) rename {app/src/main/java/eu/kanade => data/src/main/java/tachiyomi}/data/history/HistoryMapper.kt (97%) rename {app/src/main/java/eu/kanade => data/src/main/java/tachiyomi}/data/history/HistoryRepositoryImpl.kt (98%) rename {app/src/main/java/eu/kanade => data/src/main/java/tachiyomi}/data/manga/MangaMapper.kt (99%) rename {app/src/main/java/eu/kanade => data/src/main/java/tachiyomi}/data/manga/MangaRepositoryImpl.kt (98%) rename {app/src/main/java/eu/kanade => data/src/main/java/tachiyomi}/data/updates/UpdatesMapper.kt (98%) rename {app/src/main/java/eu/kanade => data/src/main/java/tachiyomi}/data/updates/UpdatesRepositoryImpl.kt (96%) diff --git a/app/src/main/java/eu/kanade/data/chapter/ChapterRepositoryImpl.kt b/app/src/main/java/eu/kanade/data/chapter/ChapterRepositoryImpl.kt index ca28faa43..a48e283d0 100644 --- a/app/src/main/java/eu/kanade/data/chapter/ChapterRepositoryImpl.kt +++ b/app/src/main/java/eu/kanade/data/chapter/ChapterRepositoryImpl.kt @@ -1,7 +1,7 @@ package eu.kanade.data.chapter import eu.kanade.tachiyomi.util.system.logcat -import eu.kanade.tachiyomi.util.system.toLong +import eu.kanade.tachiyomi.util.toLong import kotlinx.coroutines.flow.Flow import logcat.LogPriority import tachiyomi.data.DatabaseHandler diff --git a/app/src/main/java/eu/kanade/data/manga/MangaMergeRepositoryImpl.kt b/app/src/main/java/eu/kanade/data/manga/MangaMergeRepositoryImpl.kt index 6d8301cdd..d62b3d1bf 100644 --- a/app/src/main/java/eu/kanade/data/manga/MangaMergeRepositoryImpl.kt +++ b/app/src/main/java/eu/kanade/data/manga/MangaMergeRepositoryImpl.kt @@ -2,10 +2,11 @@ package eu.kanade.data.manga import eu.kanade.data.exh.mergedMangaReferenceMapper import eu.kanade.tachiyomi.util.system.logcat -import eu.kanade.tachiyomi.util.system.toLong +import eu.kanade.tachiyomi.util.toLong import kotlinx.coroutines.flow.Flow import logcat.LogPriority import tachiyomi.data.DatabaseHandler +import tachiyomi.data.manga.mangaMapper import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.MergeMangaSettingsUpdate import tachiyomi.domain.manga.model.MergedMangaReference diff --git a/app/src/main/java/eu/kanade/data/manga/MangaMetadataRepositoryImpl.kt b/app/src/main/java/eu/kanade/data/manga/MangaMetadataRepositoryImpl.kt index 5568cbc6a..51f1b5281 100644 --- a/app/src/main/java/eu/kanade/data/manga/MangaMetadataRepositoryImpl.kt +++ b/app/src/main/java/eu/kanade/data/manga/MangaMetadataRepositoryImpl.kt @@ -11,6 +11,7 @@ import exh.source.EH_SOURCE_ID import exh.source.EXH_SOURCE_ID import kotlinx.coroutines.flow.Flow import tachiyomi.data.DatabaseHandler +import tachiyomi.data.manga.mangaMapper import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.repository.MangaMetadataRepository diff --git a/app/src/main/java/eu/kanade/domain/DomainModule.kt b/app/src/main/java/eu/kanade/domain/DomainModule.kt index a9c33f26e..bd224e1e7 100644 --- a/app/src/main/java/eu/kanade/domain/DomainModule.kt +++ b/app/src/main/java/eu/kanade/domain/DomainModule.kt @@ -1,12 +1,9 @@ package eu.kanade.domain import eu.kanade.data.chapter.ChapterRepositoryImpl -import eu.kanade.data.history.HistoryRepositoryImpl -import eu.kanade.data.manga.MangaRepositoryImpl import eu.kanade.data.source.SourceDataRepositoryImpl import eu.kanade.data.source.SourceRepositoryImpl import eu.kanade.data.track.TrackRepositoryImpl -import eu.kanade.data.updates.UpdatesRepositoryImpl import eu.kanade.domain.category.interactor.CreateCategoryWithName import eu.kanade.domain.category.interactor.DeleteCategory import eu.kanade.domain.category.interactor.GetCategories @@ -61,6 +58,9 @@ import eu.kanade.domain.track.interactor.InsertTrack import eu.kanade.domain.track.repository.TrackRepository import eu.kanade.domain.updates.interactor.GetUpdates import tachiyomi.data.category.CategoryRepositoryImpl +import tachiyomi.data.history.HistoryRepositoryImpl +import tachiyomi.data.manga.MangaRepositoryImpl +import tachiyomi.data.updates.UpdatesRepositoryImpl import tachiyomi.domain.category.repository.CategoryRepository import tachiyomi.domain.chapter.repository.ChapterRepository import tachiyomi.domain.history.repository.HistoryRepository 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 67bc0254c..76fa594df 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 @@ -5,7 +5,6 @@ import android.content.Context import android.net.Uri import com.hippo.unifile.UniFile import eu.kanade.data.exh.mergedMangaReferenceMapper -import eu.kanade.data.manga.mangaMapper import eu.kanade.domain.backup.service.BackupPreferences import eu.kanade.domain.category.interactor.GetCategories import eu.kanade.domain.library.service.LibraryPreferences @@ -48,7 +47,7 @@ import eu.kanade.tachiyomi.source.model.copyFrom import eu.kanade.tachiyomi.source.online.MetadataSource import eu.kanade.tachiyomi.util.system.hasPermission import eu.kanade.tachiyomi.util.system.logcat -import eu.kanade.tachiyomi.util.system.toLong +import eu.kanade.tachiyomi.util.toLong import exh.source.MERGED_SOURCE_ID import exh.source.getMainSource import exh.util.nullIfBlank @@ -61,6 +60,7 @@ import tachiyomi.data.DatabaseHandler import tachiyomi.data.Manga_sync import tachiyomi.data.Mangas import tachiyomi.data.listOfStringsAndAdapter +import tachiyomi.data.manga.mangaMapper import tachiyomi.data.updateStrategyAdapter import tachiyomi.domain.category.model.Category import tachiyomi.domain.history.model.HistoryUpdate diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationBottomSheetDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationBottomSheetDialog.kt index 643d799cf..9e8ac1e2a 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 @@ -16,8 +16,8 @@ import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.core.preference.Preference import eu.kanade.tachiyomi.databinding.MigrationBottomSheetBinding import eu.kanade.tachiyomi.ui.browse.migration.MigrationFlags -import eu.kanade.tachiyomi.util.system.toLong import eu.kanade.tachiyomi.util.system.toast +import eu.kanade.tachiyomi.util.toLong import eu.kanade.tachiyomi.widget.sheet.BaseBottomSheetDialog import uy.kohesive.injekt.injectLazy diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/BooleanExtensions.kt b/core/src/main/java/eu/kanade/tachiyomi/util/BooleanExtensions.kt similarity index 52% rename from app/src/main/java/eu/kanade/tachiyomi/util/system/BooleanExtensions.kt rename to core/src/main/java/eu/kanade/tachiyomi/util/BooleanExtensions.kt index d32476757..07c801926 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/BooleanExtensions.kt +++ b/core/src/main/java/eu/kanade/tachiyomi/util/BooleanExtensions.kt @@ -1,3 +1,3 @@ -package eu.kanade.tachiyomi.util.system +package eu.kanade.tachiyomi.util fun Boolean.toLong() = if (this) 1L else 0L diff --git a/data/build.gradle.kts b/data/build.gradle.kts index fb8daf73f..c4cc115a0 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -23,6 +23,7 @@ android { dependencies { implementation(project(":source-api")) implementation(project(":domain")) + implementation(project(":core")) api(libs.sqldelight.android.driver) api(libs.sqldelight.coroutines) api(libs.sqldelight.android.paging) diff --git a/app/src/main/java/eu/kanade/data/history/HistoryMapper.kt b/data/src/main/java/tachiyomi/data/history/HistoryMapper.kt similarity index 97% rename from app/src/main/java/eu/kanade/data/history/HistoryMapper.kt rename to data/src/main/java/tachiyomi/data/history/HistoryMapper.kt index b9ea32e48..7235405f3 100644 --- a/app/src/main/java/eu/kanade/data/history/HistoryMapper.kt +++ b/data/src/main/java/tachiyomi/data/history/HistoryMapper.kt @@ -1,4 +1,4 @@ -package eu.kanade.data.history +package tachiyomi.data.history import tachiyomi.domain.history.model.History import tachiyomi.domain.history.model.HistoryWithRelations diff --git a/app/src/main/java/eu/kanade/data/history/HistoryRepositoryImpl.kt b/data/src/main/java/tachiyomi/data/history/HistoryRepositoryImpl.kt similarity index 98% rename from app/src/main/java/eu/kanade/data/history/HistoryRepositoryImpl.kt rename to data/src/main/java/tachiyomi/data/history/HistoryRepositoryImpl.kt index fb6fb5b3d..b0ad79ed1 100644 --- a/app/src/main/java/eu/kanade/data/history/HistoryRepositoryImpl.kt +++ b/data/src/main/java/tachiyomi/data/history/HistoryRepositoryImpl.kt @@ -1,4 +1,4 @@ -package eu.kanade.data.history +package tachiyomi.data.history import eu.kanade.tachiyomi.util.system.logcat import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/eu/kanade/data/manga/MangaMapper.kt b/data/src/main/java/tachiyomi/data/manga/MangaMapper.kt similarity index 99% rename from app/src/main/java/eu/kanade/data/manga/MangaMapper.kt rename to data/src/main/java/tachiyomi/data/manga/MangaMapper.kt index af62748fb..00dd980f9 100644 --- a/app/src/main/java/eu/kanade/data/manga/MangaMapper.kt +++ b/data/src/main/java/tachiyomi/data/manga/MangaMapper.kt @@ -1,4 +1,4 @@ -package eu.kanade.data.manga +package tachiyomi.data.manga import eu.kanade.tachiyomi.source.model.UpdateStrategy import tachiyomi.domain.library.model.LibraryManga diff --git a/app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt b/data/src/main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt similarity index 98% rename from app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt rename to data/src/main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt index 669f9b182..00fe77eaa 100644 --- a/app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt +++ b/data/src/main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt @@ -1,7 +1,7 @@ -package eu.kanade.data.manga +package tachiyomi.data.manga import eu.kanade.tachiyomi.util.system.logcat -import eu.kanade.tachiyomi.util.system.toLong +import eu.kanade.tachiyomi.util.toLong import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import logcat.LogPriority diff --git a/app/src/main/java/eu/kanade/data/updates/UpdatesMapper.kt b/data/src/main/java/tachiyomi/data/updates/UpdatesMapper.kt similarity index 98% rename from app/src/main/java/eu/kanade/data/updates/UpdatesMapper.kt rename to data/src/main/java/tachiyomi/data/updates/UpdatesMapper.kt index fb7e036f5..cc78c74b8 100644 --- a/app/src/main/java/eu/kanade/data/updates/UpdatesMapper.kt +++ b/data/src/main/java/tachiyomi/data/updates/UpdatesMapper.kt @@ -1,4 +1,4 @@ -package eu.kanade.data.updates +package tachiyomi.data.updates import tachiyomi.domain.manga.model.MangaCover import tachiyomi.domain.updates.model.UpdatesWithRelations diff --git a/app/src/main/java/eu/kanade/data/updates/UpdatesRepositoryImpl.kt b/data/src/main/java/tachiyomi/data/updates/UpdatesRepositoryImpl.kt similarity index 96% rename from app/src/main/java/eu/kanade/data/updates/UpdatesRepositoryImpl.kt rename to data/src/main/java/tachiyomi/data/updates/UpdatesRepositoryImpl.kt index 303c24b86..21203a980 100644 --- a/app/src/main/java/eu/kanade/data/updates/UpdatesRepositoryImpl.kt +++ b/data/src/main/java/tachiyomi/data/updates/UpdatesRepositoryImpl.kt @@ -1,4 +1,4 @@ -package eu.kanade.data.updates +package tachiyomi.data.updates import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map