diff --git a/app/src/main/java/eu/kanade/data/history/HistoryMapper.kt b/app/src/main/java/eu/kanade/data/history/HistoryMapper.kt index 8bb28c301..b9ea32e48 100644 --- a/app/src/main/java/eu/kanade/data/history/HistoryMapper.kt +++ b/app/src/main/java/eu/kanade/data/history/HistoryMapper.kt @@ -1,8 +1,8 @@ package eu.kanade.data.history -import eu.kanade.domain.history.model.History -import eu.kanade.domain.history.model.HistoryWithRelations -import eu.kanade.domain.manga.model.MangaCover +import tachiyomi.domain.history.model.History +import tachiyomi.domain.history.model.HistoryWithRelations +import tachiyomi.domain.manga.model.MangaCover import java.util.Date val historyMapper: (Long, Long, Date?, Long) -> History = { id, chapterId, readAt, readDuration -> diff --git a/app/src/main/java/eu/kanade/data/history/HistoryRepositoryImpl.kt b/app/src/main/java/eu/kanade/data/history/HistoryRepositoryImpl.kt index 5b3f0b929..ad781dbd0 100644 --- a/app/src/main/java/eu/kanade/data/history/HistoryRepositoryImpl.kt +++ b/app/src/main/java/eu/kanade/data/history/HistoryRepositoryImpl.kt @@ -1,13 +1,13 @@ package eu.kanade.data.history -import eu.kanade.domain.history.model.History -import eu.kanade.domain.history.model.HistoryUpdate -import eu.kanade.domain.history.model.HistoryWithRelations import eu.kanade.domain.history.repository.HistoryRepository import eu.kanade.tachiyomi.util.system.logcat import kotlinx.coroutines.flow.Flow import logcat.LogPriority import tachiyomi.data.DatabaseHandler +import tachiyomi.domain.history.model.History +import tachiyomi.domain.history.model.HistoryUpdate +import tachiyomi.domain.history.model.HistoryWithRelations class HistoryRepositoryImpl( private val handler: DatabaseHandler, diff --git a/app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt b/app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt index 9fff062bf..08b1df5ad 100644 --- a/app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt +++ b/app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt @@ -2,7 +2,6 @@ package eu.kanade.data.manga import eu.kanade.domain.library.model.LibraryManga import eu.kanade.domain.manga.model.Manga -import eu.kanade.domain.manga.model.MangaUpdate import eu.kanade.domain.manga.repository.MangaRepository import eu.kanade.tachiyomi.util.system.logcat import eu.kanade.tachiyomi.util.system.toLong @@ -14,6 +13,7 @@ import tachiyomi.data.DatabaseHandler import tachiyomi.data.listOfStringsAdapter import tachiyomi.data.listOfStringsAndAdapter import tachiyomi.data.updateStrategyAdapter +import tachiyomi.domain.manga.model.MangaUpdate class MangaRepositoryImpl( private val handler: DatabaseHandler, diff --git a/app/src/main/java/eu/kanade/data/source/SourceDataRepositoryImpl.kt b/app/src/main/java/eu/kanade/data/source/SourceDataRepositoryImpl.kt index 6bd19a767..ee80b888c 100644 --- a/app/src/main/java/eu/kanade/data/source/SourceDataRepositoryImpl.kt +++ b/app/src/main/java/eu/kanade/data/source/SourceDataRepositoryImpl.kt @@ -1,9 +1,9 @@ package eu.kanade.data.source -import eu.kanade.domain.source.model.SourceData import eu.kanade.domain.source.repository.SourceDataRepository import kotlinx.coroutines.flow.Flow import tachiyomi.data.DatabaseHandler +import tachiyomi.domain.source.model.SourceData class SourceDataRepositoryImpl( private val handler: DatabaseHandler, diff --git a/app/src/main/java/eu/kanade/data/source/SourceMapper.kt b/app/src/main/java/eu/kanade/data/source/SourceMapper.kt index 20ae07288..b752ffdd0 100644 --- a/app/src/main/java/eu/kanade/data/source/SourceMapper.kt +++ b/app/src/main/java/eu/kanade/data/source/SourceMapper.kt @@ -1,9 +1,9 @@ package eu.kanade.data.source import eu.kanade.domain.source.model.Source -import eu.kanade.domain.source.model.SourceData import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.SourceManager +import tachiyomi.domain.source.model.SourceData val sourceMapper: (eu.kanade.tachiyomi.source.Source) -> Source = { source -> Source( diff --git a/app/src/main/java/eu/kanade/data/updates/UpdatesMapper.kt b/app/src/main/java/eu/kanade/data/updates/UpdatesMapper.kt index 08deabd6c..fb7e036f5 100644 --- a/app/src/main/java/eu/kanade/data/updates/UpdatesMapper.kt +++ b/app/src/main/java/eu/kanade/data/updates/UpdatesMapper.kt @@ -1,7 +1,7 @@ package eu.kanade.data.updates -import eu.kanade.domain.manga.model.MangaCover -import eu.kanade.domain.updates.model.UpdatesWithRelations +import tachiyomi.domain.manga.model.MangaCover +import tachiyomi.domain.updates.model.UpdatesWithRelations import tachiyomi.view.UpdatesView val updateWithRelationMapper: (Long, String, Long, String, String?, Boolean, Boolean, Long, Long, Boolean, String?, Long, Long, Long) -> UpdatesWithRelations = { diff --git a/app/src/main/java/eu/kanade/data/updates/UpdatesRepositoryImpl.kt b/app/src/main/java/eu/kanade/data/updates/UpdatesRepositoryImpl.kt index 0457f62c3..4bd93a809 100644 --- a/app/src/main/java/eu/kanade/data/updates/UpdatesRepositoryImpl.kt +++ b/app/src/main/java/eu/kanade/data/updates/UpdatesRepositoryImpl.kt @@ -1,11 +1,11 @@ package eu.kanade.data.updates -import eu.kanade.domain.updates.model.UpdatesWithRelations import eu.kanade.domain.updates.repository.UpdatesRepository import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import tachiyomi.data.AndroidDatabaseHandler import tachiyomi.data.DatabaseHandler +import tachiyomi.domain.updates.model.UpdatesWithRelations class UpdatesRepositoryImpl( val databaseHandler: DatabaseHandler, diff --git a/app/src/main/java/eu/kanade/domain/SYDomainModule.kt b/app/src/main/java/eu/kanade/domain/SYDomainModule.kt index 30793fbf8..2103545a1 100644 --- a/app/src/main/java/eu/kanade/domain/SYDomainModule.kt +++ b/app/src/main/java/eu/kanade/domain/SYDomainModule.kt @@ -1,5 +1,6 @@ package eu.kanade.domain +import android.app.Application import eu.kanade.data.manga.FavoritesEntryRepositoryImpl import eu.kanade.data.manga.MangaMergeRepositoryImpl import eu.kanade.data.manga.MangaMetadataRepositoryImpl @@ -67,6 +68,10 @@ import eu.kanade.domain.source.repository.FeedSavedSearchRepository import eu.kanade.domain.source.repository.SavedSearchRepository import eu.kanade.tachiyomi.source.online.MetadataSource import exh.search.SearchEngine +import tachiyomi.data.manga.CustomMangaRepositoryImpl +import tachiyomi.domain.manga.interactor.GetCustomMangaInfo +import tachiyomi.domain.manga.interactor.SetCustomMangaInfo +import tachiyomi.domain.manga.repository.CustomMangaRepository import uy.kohesive.injekt.api.InjektModule import uy.kohesive.injekt.api.InjektRegistrar import uy.kohesive.injekt.api.addFactory @@ -148,5 +153,9 @@ class SYDomainModule : InjektModule { addFactory { CountFeedSavedSearchBySourceId(get()) } addFactory { GetSavedSearchGlobalFeed(get()) } addFactory { GetSavedSearchBySourceIdFeed(get()) } + + addSingletonFactory { CustomMangaRepositoryImpl(get()) } + addFactory { GetCustomMangaInfo(get()) } + addFactory { SetCustomMangaInfo(get()) } } } diff --git a/app/src/main/java/eu/kanade/domain/category/interactor/ResetCategoryFlags.kt b/app/src/main/java/eu/kanade/domain/category/interactor/ResetCategoryFlags.kt index 2c75493bd..b5be470dc 100644 --- a/app/src/main/java/eu/kanade/domain/category/interactor/ResetCategoryFlags.kt +++ b/app/src/main/java/eu/kanade/domain/category/interactor/ResetCategoryFlags.kt @@ -1,8 +1,8 @@ package eu.kanade.domain.category.interactor -import eu.kanade.domain.library.model.plus import eu.kanade.domain.library.service.LibraryPreferences import tachiyomi.domain.category.repository.CategoryRepository +import tachiyomi.domain.library.model.plus class ResetCategoryFlags( private val preferences: LibraryPreferences, diff --git a/app/src/main/java/eu/kanade/domain/category/interactor/SetDisplayModeForCategory.kt b/app/src/main/java/eu/kanade/domain/category/interactor/SetDisplayModeForCategory.kt index 52e098e3a..a9a7968fc 100644 --- a/app/src/main/java/eu/kanade/domain/category/interactor/SetDisplayModeForCategory.kt +++ b/app/src/main/java/eu/kanade/domain/category/interactor/SetDisplayModeForCategory.kt @@ -1,12 +1,12 @@ package eu.kanade.domain.category.interactor -import eu.kanade.domain.library.model.LibraryDisplayMode import eu.kanade.domain.library.model.LibraryGroup -import eu.kanade.domain.library.model.plus import eu.kanade.domain.library.service.LibraryPreferences import tachiyomi.domain.category.model.Category import tachiyomi.domain.category.model.CategoryUpdate import tachiyomi.domain.category.repository.CategoryRepository +import tachiyomi.domain.library.model.LibraryDisplayMode +import tachiyomi.domain.library.model.plus class SetDisplayModeForCategory( private val preferences: LibraryPreferences, diff --git a/app/src/main/java/eu/kanade/domain/category/interactor/SetSortModeForCategory.kt b/app/src/main/java/eu/kanade/domain/category/interactor/SetSortModeForCategory.kt index 89d1943f4..a55bba584 100644 --- a/app/src/main/java/eu/kanade/domain/category/interactor/SetSortModeForCategory.kt +++ b/app/src/main/java/eu/kanade/domain/category/interactor/SetSortModeForCategory.kt @@ -1,12 +1,12 @@ package eu.kanade.domain.category.interactor import eu.kanade.domain.library.model.LibraryGroup -import eu.kanade.domain.library.model.LibrarySort -import eu.kanade.domain.library.model.plus import eu.kanade.domain.library.service.LibraryPreferences import tachiyomi.domain.category.model.Category import tachiyomi.domain.category.model.CategoryUpdate import tachiyomi.domain.category.repository.CategoryRepository +import tachiyomi.domain.library.model.LibrarySort +import tachiyomi.domain.library.model.plus class SetSortModeForCategory( private val preferences: LibraryPreferences, diff --git a/app/src/main/java/eu/kanade/domain/history/interactor/GetHistory.kt b/app/src/main/java/eu/kanade/domain/history/interactor/GetHistory.kt index cf1d00ed2..2094f0595 100644 --- a/app/src/main/java/eu/kanade/domain/history/interactor/GetHistory.kt +++ b/app/src/main/java/eu/kanade/domain/history/interactor/GetHistory.kt @@ -1,8 +1,8 @@ package eu.kanade.domain.history.interactor -import eu.kanade.domain.history.model.HistoryWithRelations import eu.kanade.domain.history.repository.HistoryRepository import kotlinx.coroutines.flow.Flow +import tachiyomi.domain.history.model.HistoryWithRelations class GetHistory( private val repository: HistoryRepository, diff --git a/app/src/main/java/eu/kanade/domain/history/interactor/GetHistoryByMangaId.kt b/app/src/main/java/eu/kanade/domain/history/interactor/GetHistoryByMangaId.kt index eecd14861..34cbf7d0a 100644 --- a/app/src/main/java/eu/kanade/domain/history/interactor/GetHistoryByMangaId.kt +++ b/app/src/main/java/eu/kanade/domain/history/interactor/GetHistoryByMangaId.kt @@ -1,7 +1,7 @@ package eu.kanade.domain.history.interactor -import eu.kanade.domain.history.model.History import eu.kanade.domain.history.repository.HistoryRepository +import tachiyomi.domain.history.model.History class GetHistoryByMangaId( private val repository: HistoryRepository, diff --git a/app/src/main/java/eu/kanade/domain/history/interactor/RemoveHistory.kt b/app/src/main/java/eu/kanade/domain/history/interactor/RemoveHistory.kt index d30d15235..0b461975a 100644 --- a/app/src/main/java/eu/kanade/domain/history/interactor/RemoveHistory.kt +++ b/app/src/main/java/eu/kanade/domain/history/interactor/RemoveHistory.kt @@ -1,7 +1,7 @@ package eu.kanade.domain.history.interactor -import eu.kanade.domain.history.model.HistoryWithRelations import eu.kanade.domain.history.repository.HistoryRepository +import tachiyomi.domain.history.model.HistoryWithRelations class RemoveHistory( private val repository: HistoryRepository, diff --git a/app/src/main/java/eu/kanade/domain/history/interactor/UpsertHistory.kt b/app/src/main/java/eu/kanade/domain/history/interactor/UpsertHistory.kt index 31c46b299..95b215249 100644 --- a/app/src/main/java/eu/kanade/domain/history/interactor/UpsertHistory.kt +++ b/app/src/main/java/eu/kanade/domain/history/interactor/UpsertHistory.kt @@ -1,7 +1,7 @@ package eu.kanade.domain.history.interactor -import eu.kanade.domain.history.model.HistoryUpdate import eu.kanade.domain.history.repository.HistoryRepository +import tachiyomi.domain.history.model.HistoryUpdate class UpsertHistory( private val historyRepository: HistoryRepository, diff --git a/app/src/main/java/eu/kanade/domain/history/repository/HistoryRepository.kt b/app/src/main/java/eu/kanade/domain/history/repository/HistoryRepository.kt index 92600fcec..058ff6313 100644 --- a/app/src/main/java/eu/kanade/domain/history/repository/HistoryRepository.kt +++ b/app/src/main/java/eu/kanade/domain/history/repository/HistoryRepository.kt @@ -1,9 +1,9 @@ package eu.kanade.domain.history.repository -import eu.kanade.domain.history.model.History -import eu.kanade.domain.history.model.HistoryUpdate -import eu.kanade.domain.history.model.HistoryWithRelations import kotlinx.coroutines.flow.Flow +import tachiyomi.domain.history.model.History +import tachiyomi.domain.history.model.HistoryUpdate +import tachiyomi.domain.history.model.HistoryWithRelations interface HistoryRepository { diff --git a/app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt b/app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt index 569fee034..09dc14b8e 100644 --- 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,9 +1,7 @@ package eu.kanade.domain.library.service import eu.kanade.domain.library.model.GroupLibraryMode -import eu.kanade.domain.library.model.LibraryDisplayMode import eu.kanade.domain.library.model.LibraryGroup -import eu.kanade.domain.library.model.LibrarySort import eu.kanade.domain.manga.model.Manga import eu.kanade.tachiyomi.core.preference.PreferenceStore import eu.kanade.tachiyomi.core.preference.getEnum @@ -12,6 +10,8 @@ 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.domain.library.model.LibraryDisplayMode +import tachiyomi.domain.library.model.LibrarySort class LibraryPreferences( private val preferenceStore: PreferenceStore, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaChapterFlags.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaChapterFlags.kt index 6362170c1..e8eebcdc9 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaChapterFlags.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaChapterFlags.kt @@ -1,8 +1,8 @@ package eu.kanade.domain.manga.interactor import eu.kanade.domain.manga.model.Manga -import eu.kanade.domain.manga.model.MangaUpdate import eu.kanade.domain.manga.repository.MangaRepository +import tachiyomi.domain.manga.model.MangaUpdate class SetMangaChapterFlags( private val mangaRepository: MangaRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaFilteredScanlators.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaFilteredScanlators.kt index 254cc892d..bfdf94dcb 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaFilteredScanlators.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaFilteredScanlators.kt @@ -1,8 +1,8 @@ package eu.kanade.domain.manga.interactor import eu.kanade.domain.manga.model.Manga -import eu.kanade.domain.manga.model.MangaUpdate import eu.kanade.domain.manga.repository.MangaRepository +import tachiyomi.domain.manga.model.MangaUpdate class SetMangaFilteredScanlators(private val mangaRepository: MangaRepository) { diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaViewerFlags.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaViewerFlags.kt index 5673cdbc1..7c058dc07 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaViewerFlags.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaViewerFlags.kt @@ -1,9 +1,9 @@ package eu.kanade.domain.manga.interactor -import eu.kanade.domain.manga.model.MangaUpdate import eu.kanade.domain.manga.repository.MangaRepository import eu.kanade.tachiyomi.ui.reader.setting.OrientationType import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType +import tachiyomi.domain.manga.model.MangaUpdate class SetMangaViewerFlags( private val mangaRepository: MangaRepository, diff --git a/app/src/main/java/eu/kanade/domain/manga/interactor/UpdateManga.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/UpdateManga.kt index 0e042fdf4..fc6ca01b4 100644 --- a/app/src/main/java/eu/kanade/domain/manga/interactor/UpdateManga.kt +++ b/app/src/main/java/eu/kanade/domain/manga/interactor/UpdateManga.kt @@ -1,13 +1,13 @@ package eu.kanade.domain.manga.interactor import eu.kanade.domain.manga.model.Manga -import eu.kanade.domain.manga.model.MangaUpdate import eu.kanade.domain.manga.model.hasCustomCover import eu.kanade.domain.manga.model.isLocal import eu.kanade.domain.manga.repository.MangaRepository import eu.kanade.tachiyomi.data.cache.CoverCache import eu.kanade.tachiyomi.data.download.DownloadManager import eu.kanade.tachiyomi.source.model.SManga +import tachiyomi.domain.manga.model.MangaUpdate import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.util.Date diff --git a/app/src/main/java/eu/kanade/domain/manga/model/Manga.kt b/app/src/main/java/eu/kanade/domain/manga/model/Manga.kt index e2682a461..730d36510 100644 --- a/app/src/main/java/eu/kanade/domain/manga/model/Manga.kt +++ b/app/src/main/java/eu/kanade/domain/manga/model/Manga.kt @@ -2,13 +2,14 @@ package eu.kanade.domain.manga.model import eu.kanade.domain.base.BasePreferences import eu.kanade.tachiyomi.data.cache.CoverCache -import eu.kanade.tachiyomi.data.library.CustomMangaManager import eu.kanade.tachiyomi.source.LocalSource import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.UpdateStrategy import eu.kanade.tachiyomi.ui.reader.setting.OrientationType import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType import eu.kanade.tachiyomi.widget.ExtendedNavigationView +import tachiyomi.domain.manga.interactor.GetCustomMangaInfo +import tachiyomi.domain.manga.model.MangaUpdate import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy @@ -42,7 +43,7 @@ data class Manga( // SY --> private val customMangaInfo = if (favorite) { - customMangaManager.getManga(this) + getCustomMangaInfo.get(id) } else { null } @@ -225,7 +226,7 @@ data class Manga( ) // SY --> - private val customMangaManager: CustomMangaManager by injectLazy() + private val getCustomMangaInfo: GetCustomMangaInfo by injectLazy() // SY <-- } } diff --git a/app/src/main/java/eu/kanade/domain/manga/model/MangaCover.kt b/app/src/main/java/eu/kanade/domain/manga/model/MangaCover.kt index 6b2d6a42f..d0dec8cee 100644 --- a/app/src/main/java/eu/kanade/domain/manga/model/MangaCover.kt +++ b/app/src/main/java/eu/kanade/domain/manga/model/MangaCover.kt @@ -1,15 +1,6 @@ package eu.kanade.domain.manga.model -/** - * Contains the required data for MangaCoverFetcher - */ -data class MangaCover( - val mangaId: Long, - val sourceId: Long, - val isMangaFavorite: Boolean, - val url: String?, - val lastModified: Long, -) +import tachiyomi.domain.manga.model.MangaCover fun Manga.asMangaCover(): MangaCover { return MangaCover( diff --git a/app/src/main/java/eu/kanade/domain/manga/repository/MangaRepository.kt b/app/src/main/java/eu/kanade/domain/manga/repository/MangaRepository.kt index a610f8626..3969697eb 100644 --- a/app/src/main/java/eu/kanade/domain/manga/repository/MangaRepository.kt +++ b/app/src/main/java/eu/kanade/domain/manga/repository/MangaRepository.kt @@ -2,8 +2,8 @@ package eu.kanade.domain.manga.repository import eu.kanade.domain.library.model.LibraryManga import eu.kanade.domain.manga.model.Manga -import eu.kanade.domain.manga.model.MangaUpdate import kotlinx.coroutines.flow.Flow +import tachiyomi.domain.manga.model.MangaUpdate interface MangaRepository { diff --git a/app/src/main/java/eu/kanade/domain/source/repository/SourceDataRepository.kt b/app/src/main/java/eu/kanade/domain/source/repository/SourceDataRepository.kt index 45fe944f4..9c839d8fc 100644 --- a/app/src/main/java/eu/kanade/domain/source/repository/SourceDataRepository.kt +++ b/app/src/main/java/eu/kanade/domain/source/repository/SourceDataRepository.kt @@ -1,7 +1,7 @@ package eu.kanade.domain.source.repository -import eu.kanade.domain.source.model.SourceData import kotlinx.coroutines.flow.Flow +import tachiyomi.domain.source.model.SourceData interface SourceDataRepository { fun subscribeAll(): Flow> diff --git a/app/src/main/java/eu/kanade/domain/source/service/SourcePreferences.kt b/app/src/main/java/eu/kanade/domain/source/service/SourcePreferences.kt index 0e035f1a9..d4dd6ee1b 100644 --- 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,10 +1,10 @@ package eu.kanade.domain.source.service -import eu.kanade.domain.library.model.LibraryDisplayMode 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.domain.library.model.LibraryDisplayMode class SourcePreferences( private val preferenceStore: PreferenceStore, @@ -18,8 +18,6 @@ class SourcePreferences( fun pinnedSources() = preferenceStore.getStringSet("pinned_catalogues", emptySet()) - fun duplicatePinnedSources() = preferenceStore.getBoolean("duplicate_pinned_sources", false) - fun lastUsedSource() = preferenceStore.getLong("last_catalogue_source", -1) fun showNsfwSource() = preferenceStore.getBoolean("show_nsfw_source", true) diff --git a/app/src/main/java/eu/kanade/domain/updates/interactor/GetUpdates.kt b/app/src/main/java/eu/kanade/domain/updates/interactor/GetUpdates.kt index b9e04b880..fd05d95cc 100644 --- a/app/src/main/java/eu/kanade/domain/updates/interactor/GetUpdates.kt +++ b/app/src/main/java/eu/kanade/domain/updates/interactor/GetUpdates.kt @@ -1,8 +1,8 @@ package eu.kanade.domain.updates.interactor -import eu.kanade.domain.updates.model.UpdatesWithRelations import eu.kanade.domain.updates.repository.UpdatesRepository import kotlinx.coroutines.flow.Flow +import tachiyomi.domain.updates.model.UpdatesWithRelations import java.util.Calendar class GetUpdates( diff --git a/app/src/main/java/eu/kanade/domain/updates/repository/UpdatesRepository.kt b/app/src/main/java/eu/kanade/domain/updates/repository/UpdatesRepository.kt index 5b63662c0..8b746b0e1 100644 --- a/app/src/main/java/eu/kanade/domain/updates/repository/UpdatesRepository.kt +++ b/app/src/main/java/eu/kanade/domain/updates/repository/UpdatesRepository.kt @@ -1,7 +1,7 @@ package eu.kanade.domain.updates.repository -import eu.kanade.domain.updates.model.UpdatesWithRelations import kotlinx.coroutines.flow.Flow +import tachiyomi.domain.updates.model.UpdatesWithRelations interface UpdatesRepository { diff --git a/app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt index 70ad3aa59..8004cdd65 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt @@ -15,7 +15,6 @@ import androidx.compose.ui.platform.LocalContext import androidx.paging.LoadState import androidx.paging.compose.LazyPagingItems import eu.kanade.data.source.NoResultsException -import eu.kanade.domain.library.model.LibraryDisplayMode import eu.kanade.domain.manga.model.Manga import eu.kanade.presentation.browse.components.BrowseSourceComfortableGrid import eu.kanade.presentation.browse.components.BrowseSourceCompactGrid @@ -30,6 +29,7 @@ import eu.kanade.tachiyomi.source.LocalSource import exh.metadata.metadata.base.RaisedSearchMetadata import exh.source.isEhBasedSource import kotlinx.coroutines.flow.StateFlow +import tachiyomi.domain.library.model.LibraryDisplayMode @Composable fun BrowseSourceContent( diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt index 629807fc4..0eb2f5cef 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt @@ -16,7 +16,6 @@ import androidx.compose.ui.unit.dp import androidx.paging.LoadState import androidx.paging.compose.LazyPagingItems import eu.kanade.domain.manga.model.Manga -import eu.kanade.domain.manga.model.MangaCover import eu.kanade.presentation.browse.InLibraryBadge import eu.kanade.presentation.components.Badge import eu.kanade.presentation.components.CommonMangaItemDefaults @@ -26,6 +25,7 @@ import eu.kanade.tachiyomi.R import exh.metadata.metadata.MangaDexSearchMetadata import exh.metadata.metadata.base.RaisedSearchMetadata import kotlinx.coroutines.flow.StateFlow +import tachiyomi.domain.manga.model.MangaCover @Composable fun BrowseSourceComfortableGrid( diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt index 3d44fd524..2ce1a1f21 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt @@ -16,7 +16,6 @@ import androidx.compose.ui.unit.dp import androidx.paging.LoadState import androidx.paging.compose.LazyPagingItems import eu.kanade.domain.manga.model.Manga -import eu.kanade.domain.manga.model.MangaCover import eu.kanade.presentation.browse.InLibraryBadge import eu.kanade.presentation.components.Badge import eu.kanade.presentation.components.CommonMangaItemDefaults @@ -26,6 +25,7 @@ import eu.kanade.tachiyomi.R import exh.metadata.metadata.MangaDexSearchMetadata import exh.metadata.metadata.base.RaisedSearchMetadata import kotlinx.coroutines.flow.StateFlow +import tachiyomi.domain.manga.model.MangaCover @Composable fun BrowseSourceCompactGrid( diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt index 7c8e09dfc..9d0d8950c 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt @@ -13,7 +13,6 @@ import androidx.paging.LoadState import androidx.paging.compose.LazyPagingItems import androidx.paging.compose.items import eu.kanade.domain.manga.model.Manga -import eu.kanade.domain.manga.model.MangaCover import eu.kanade.presentation.browse.InLibraryBadge import eu.kanade.presentation.components.Badge import eu.kanade.presentation.components.CommonMangaItemDefaults @@ -24,6 +23,7 @@ import eu.kanade.tachiyomi.R import exh.metadata.metadata.MangaDexSearchMetadata import exh.metadata.metadata.base.RaisedSearchMetadata import kotlinx.coroutines.flow.StateFlow +import tachiyomi.domain.manga.model.MangaCover @Composable fun BrowseSourceList( diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceSimpleToolbar.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceSimpleToolbar.kt index ed2197d17..07f6b1faa 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceSimpleToolbar.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceSimpleToolbar.kt @@ -13,11 +13,11 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.res.stringResource -import eu.kanade.domain.library.model.LibraryDisplayMode import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.AppBarActions import eu.kanade.presentation.components.DropdownMenu import eu.kanade.tachiyomi.R +import tachiyomi.domain.library.model.LibraryDisplayMode @Composable fun BrowseSourceSimpleToolbar( diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt index 6b10ca024..4e74e4f92 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt @@ -13,7 +13,6 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.res.stringResource -import eu.kanade.domain.library.model.LibraryDisplayMode import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.AppBarActions import eu.kanade.presentation.components.AppBarTitle @@ -25,6 +24,7 @@ import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.ConfigurableSource import eu.kanade.tachiyomi.source.LocalSource import exh.source.anyIs +import tachiyomi.domain.library.model.LibraryDisplayMode @Composable fun BrowseSourceToolbar( diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchCard.kt b/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchCard.kt index f0dec5335..3b9aea179 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchCard.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchCard.kt @@ -5,10 +5,10 @@ import androidx.compose.foundation.layout.width import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import eu.kanade.domain.manga.model.MangaCover import eu.kanade.presentation.browse.InLibraryBadge import eu.kanade.presentation.components.CommonMangaItemDefaults import eu.kanade.presentation.components.MangaComfortableGridItem +import tachiyomi.domain.manga.model.MangaCover @Composable fun GlobalSearchCard( diff --git a/app/src/main/java/eu/kanade/presentation/components/CommonMangaItem.kt b/app/src/main/java/eu/kanade/presentation/components/CommonMangaItem.kt index 399a2bf25..97d54ce2b 100644 --- a/app/src/main/java/eu/kanade/presentation/components/CommonMangaItem.kt +++ b/app/src/main/java/eu/kanade/presentation/components/CommonMangaItem.kt @@ -62,7 +62,7 @@ private const val GridSelectedCoverAlpha = 0.76f fun MangaCompactGridItem( isSelected: Boolean = false, title: String? = null, - coverData: eu.kanade.domain.manga.model.MangaCover, + coverData: tachiyomi.domain.manga.model.MangaCover, coverAlpha: Float = 1f, coverBadgeStart: @Composable (RowScope.() -> Unit)? = null, coverBadgeEnd: @Composable (RowScope.() -> Unit)? = null, @@ -162,7 +162,7 @@ private fun BoxScope.CoverTextOverlay( fun MangaComfortableGridItem( isSelected: Boolean = false, title: String, - coverData: eu.kanade.domain.manga.model.MangaCover, + coverData: tachiyomi.domain.manga.model.MangaCover, coverAlpha: Float = 1f, coverBadgeStart: (@Composable RowScope.() -> Unit)? = null, coverBadgeEnd: (@Composable RowScope.() -> Unit)? = null, @@ -330,7 +330,7 @@ private fun Modifier.selectedOutline( fun MangaListItem( isSelected: Boolean = false, title: String, - coverData: eu.kanade.domain.manga.model.MangaCover, + coverData: tachiyomi.domain.manga.model.MangaCover, coverAlpha: Float = 1f, badge: @Composable (RowScope.() -> Unit), onLongClick: () -> Unit, diff --git a/app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt b/app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt index 34643ca2e..8b38d310f 100644 --- a/app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt @@ -10,7 +10,6 @@ import androidx.compose.material3.SnackbarHostState import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import eu.kanade.domain.history.model.HistoryWithRelations import eu.kanade.presentation.components.AppBarTitle import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.LoadingScreen @@ -20,6 +19,7 @@ import eu.kanade.presentation.history.components.HistoryContent import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.history.HistoryScreenModel import eu.kanade.tachiyomi.ui.history.HistoryState +import tachiyomi.domain.history.model.HistoryWithRelations import java.util.Date @Composable diff --git a/app/src/main/java/eu/kanade/presentation/history/components/HistoryContent.kt b/app/src/main/java/eu/kanade/presentation/history/components/HistoryContent.kt index aeb5fee85..0976f7de0 100644 --- a/app/src/main/java/eu/kanade/presentation/history/components/HistoryContent.kt +++ b/app/src/main/java/eu/kanade/presentation/history/components/HistoryContent.kt @@ -5,11 +5,11 @@ import androidx.compose.foundation.lazy.items import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier -import eu.kanade.domain.history.model.HistoryWithRelations import eu.kanade.domain.ui.UiPreferences import eu.kanade.presentation.components.FastScrollLazyColumn import eu.kanade.presentation.components.RelativeDateHeader import eu.kanade.presentation.history.HistoryUiModel +import tachiyomi.domain.history.model.HistoryWithRelations import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.text.DateFormat diff --git a/app/src/main/java/eu/kanade/presentation/history/components/HistoryItem.kt b/app/src/main/java/eu/kanade/presentation/history/components/HistoryItem.kt index a7c157a65..4c8674dc6 100644 --- a/app/src/main/java/eu/kanade/presentation/history/components/HistoryItem.kt +++ b/app/src/main/java/eu/kanade/presentation/history/components/HistoryItem.kt @@ -20,11 +20,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import eu.kanade.domain.history.model.HistoryWithRelations import eu.kanade.presentation.components.MangaCover import eu.kanade.presentation.util.padding import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.lang.toTimestampString +import tachiyomi.domain.history.model.HistoryWithRelations import java.text.DecimalFormat import java.text.DecimalFormatSymbols diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt index 34724a06d..21b549303 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt @@ -7,9 +7,9 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.util.fastAny import eu.kanade.domain.library.model.LibraryManga -import eu.kanade.domain.manga.model.MangaCover import eu.kanade.presentation.components.MangaComfortableGridItem import eu.kanade.tachiyomi.ui.library.LibraryItem +import tachiyomi.domain.manga.model.MangaCover @Composable fun LibraryComfortableGrid( diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt index 12c0ac809..42eb3596f 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt @@ -7,9 +7,9 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.util.fastAny import eu.kanade.domain.library.model.LibraryManga -import eu.kanade.domain.manga.model.MangaCover import eu.kanade.presentation.components.MangaCompactGridItem import eu.kanade.tachiyomi.ui.library.LibraryItem +import tachiyomi.domain.manga.model.MangaCover @Composable fun LibraryCompactGrid( diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt index 93acfc95a..4dcfdf627 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt @@ -16,7 +16,6 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalLayoutDirection import eu.kanade.core.prefs.PreferenceMutableState -import eu.kanade.domain.library.model.LibraryDisplayMode import eu.kanade.domain.library.model.LibraryManga import eu.kanade.presentation.components.PullRefresh import eu.kanade.presentation.components.rememberPagerState @@ -24,6 +23,7 @@ import eu.kanade.tachiyomi.ui.library.LibraryItem import kotlinx.coroutines.delay import kotlinx.coroutines.launch import tachiyomi.domain.category.model.Category +import tachiyomi.domain.library.model.LibraryDisplayMode import kotlin.time.Duration.Companion.seconds @Composable diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt index 51d973e41..4107d4759 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt @@ -9,11 +9,11 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.util.fastAny import eu.kanade.domain.library.model.LibraryManga -import eu.kanade.domain.manga.model.MangaCover import eu.kanade.presentation.components.FastScrollLazyColumn import eu.kanade.presentation.components.MangaListItem import eu.kanade.presentation.util.plus import eu.kanade.tachiyomi.ui.library.LibraryItem +import tachiyomi.domain.manga.model.MangaCover @Composable fun LibraryList( diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryPager.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryPager.kt index f121152fa..1df8dd13c 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryPager.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryPager.kt @@ -17,7 +17,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.unit.dp import eu.kanade.core.prefs.PreferenceMutableState -import eu.kanade.domain.library.model.LibraryDisplayMode import eu.kanade.domain.library.model.LibraryManga import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.HorizontalPager @@ -25,6 +24,7 @@ import eu.kanade.presentation.components.PagerState import eu.kanade.presentation.util.plus import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.library.LibraryItem +import tachiyomi.domain.library.model.LibraryDisplayMode @Composable fun LibraryPager( diff --git a/app/src/main/java/eu/kanade/presentation/updates/UpdatesUiItem.kt b/app/src/main/java/eu/kanade/presentation/updates/UpdatesUiItem.kt index 5b211c440..cf73ed808 100644 --- a/app/src/main/java/eu/kanade/presentation/updates/UpdatesUiItem.kt +++ b/app/src/main/java/eu/kanade/presentation/updates/UpdatesUiItem.kt @@ -33,7 +33,6 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import eu.kanade.domain.updates.model.UpdatesWithRelations import eu.kanade.presentation.components.ChapterDownloadAction import eu.kanade.presentation.components.ChapterDownloadIndicator import eu.kanade.presentation.components.ListGroupHeader @@ -45,6 +44,7 @@ import eu.kanade.presentation.util.selectedBackground import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.download.model.Download import eu.kanade.tachiyomi.ui.updates.UpdatesItem +import tachiyomi.domain.updates.model.UpdatesWithRelations import java.util.Date import kotlin.time.Duration.Companion.minutes diff --git a/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt b/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt index 09612ba2e..197922a8c 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt @@ -27,7 +27,6 @@ import eu.kanade.tachiyomi.data.cache.PagePreviewCache import eu.kanade.tachiyomi.data.download.DownloadCache import eu.kanade.tachiyomi.data.download.DownloadManager import eu.kanade.tachiyomi.data.download.DownloadProvider -import eu.kanade.tachiyomi.data.library.CustomMangaManager import eu.kanade.tachiyomi.data.saver.ImageSaver import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.extension.ExtensionManager @@ -56,6 +55,7 @@ import tachiyomi.data.listOfLongsAdapter import tachiyomi.data.listOfStringsAdapter import tachiyomi.data.listOfStringsAndAdapter import tachiyomi.data.updateStrategyAdapter +import tachiyomi.domain.manga.interactor.GetCustomMangaInfo import uy.kohesive.injekt.api.InjektModule import uy.kohesive.injekt.api.InjektRegistrar import uy.kohesive.injekt.api.addSingleton @@ -150,8 +150,6 @@ class AppModule(val app: Application) : InjektModule { addSingletonFactory { ImageSaver(app) } // SY --> - addSingletonFactory { CustomMangaManager(app) } - addSingletonFactory { EHentaiUpdateHelper(app) } addSingletonFactory { PagePreviewCache(app) } @@ -168,7 +166,7 @@ class AppModule(val app: Application) : InjektModule { get() // SY --> - get() + get() // SY <-- } } 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 cfbdd1168..4f9911e50 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 @@ -8,7 +8,6 @@ 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.history.model.HistoryUpdate import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.domain.manga.interactor.GetFavorites import eu.kanade.domain.manga.interactor.GetFlatMetadataById @@ -44,7 +43,6 @@ import eu.kanade.tachiyomi.data.backup.models.backupTrackMapper import eu.kanade.tachiyomi.data.database.models.Chapter import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.database.models.Track -import eu.kanade.tachiyomi.data.library.CustomMangaManager import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.model.copyFrom import eu.kanade.tachiyomi.source.online.MetadataSource @@ -65,6 +63,10 @@ import tachiyomi.data.Mangas import tachiyomi.data.listOfStringsAndAdapter import tachiyomi.data.updateStrategyAdapter import tachiyomi.domain.category.model.Category +import tachiyomi.domain.history.model.HistoryUpdate +import tachiyomi.domain.manga.interactor.GetCustomMangaInfo +import tachiyomi.domain.manga.interactor.SetCustomMangaInfo +import tachiyomi.domain.manga.model.CustomMangaInfo import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.io.FileOutputStream @@ -85,7 +87,8 @@ class BackupManager( // SY --> private val getMergedManga: GetMergedManga = Injekt.get() - private val customMangaManager: CustomMangaManager = Injekt.get() + private val getCustomMangaInfo: GetCustomMangaInfo = Injekt.get() + private val setCustomMangaInfo: SetCustomMangaInfo = Injekt.get() private val insertFlatMetadata: InsertFlatMetadata = Injekt.get() private val getFlatMetadataById: GetFlatMetadataById = Injekt.get() // SY <-- @@ -225,7 +228,11 @@ class BackupManager( */ private suspend fun backupManga(manga: DomainManga, options: Int): BackupManga { // Entry for this manga - val mangaObject = BackupManga.copyFrom(manga /* SY --> */, if (options and BACKUP_CUSTOM_INFO_MASK == BACKUP_CUSTOM_INFO) customMangaManager else null /* SY <-- */) + val mangaObject = BackupManga.copyFrom( + manga, + // SY --> + if (options and BACKUP_CUSTOM_INFO_MASK == BACKUP_CUSTOM_INFO) getCustomMangaInfo.get(manga.id) else null, /* SY <-- */ + ) // SY --> if (manga.source == MERGED_SOURCE_ID) { @@ -743,9 +750,9 @@ class BackupManager( } } - internal fun restoreEditedInfo(mangaJson: CustomMangaManager.MangaJson?) { + internal fun restoreEditedInfo(mangaJson: CustomMangaInfo?) { mangaJson ?: return - customMangaManager.saveMangaInfo(mangaJson) + setCustomMangaInfo.set(mangaJson) } // SY <-- } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt index 8f829f409..036ad704b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt @@ -14,7 +14,6 @@ import eu.kanade.tachiyomi.data.backup.models.BackupSource import eu.kanade.tachiyomi.data.database.models.Chapter import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.database.models.Track -import eu.kanade.tachiyomi.data.library.CustomMangaManager import eu.kanade.tachiyomi.util.system.createFileInCacheDir import exh.EXHMigrations import exh.source.MERGED_SOURCE_ID @@ -22,6 +21,7 @@ import kotlinx.coroutines.Job import okio.buffer import okio.gzip import okio.source +import tachiyomi.domain.manga.model.CustomMangaInfo import java.io.File import java.text.SimpleDateFormat import java.util.Date @@ -190,7 +190,7 @@ class BackupRestorer( // SY --> mergedMangaReferences: List, flatMetadata: BackupFlatMetadata?, - customManga: CustomMangaManager.MangaJson?, + customManga: CustomMangaInfo?, // SY <-- ) { val fetchedManga = backupManager.restoreNewManga(manga) @@ -210,7 +210,7 @@ class BackupRestorer( // SY --> mergedMangaReferences: List, flatMetadata: BackupFlatMetadata?, - customManga: CustomMangaManager.MangaJson?, + customManga: CustomMangaInfo?, // SY <-- ) { backupManager.restoreChapters(backupManga, chapters) @@ -226,7 +226,7 @@ class BackupRestorer( // SY --> mergedMangaReferences: List, flatMetadata: BackupFlatMetadata?, - customManga: CustomMangaManager.MangaJson?, + customManga: CustomMangaInfo?, // SY <-- ) { backupManager.restoreCategories(manga, categories, backupCategories) @@ -235,8 +235,7 @@ class BackupRestorer( // SY --> backupManager.restoreMergedMangaReferencesForManga(manga.id!!, mergedMangaReferences) flatMetadata?.let { backupManager.restoreFlatMetadata(manga.id!!, it) } - customManga?.id = manga.id!! - backupManager.restoreEditedInfo(customManga) + backupManager.restoreEditedInfo(customManga?.copy(id = manga.id!!)) // SY <-- } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt index 6873af85c..d7d6ea463 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt @@ -4,12 +4,12 @@ import eu.kanade.domain.manga.model.Manga import eu.kanade.tachiyomi.data.database.models.ChapterImpl import eu.kanade.tachiyomi.data.database.models.MangaImpl import eu.kanade.tachiyomi.data.database.models.TrackImpl -import eu.kanade.tachiyomi.data.library.CustomMangaManager import eu.kanade.tachiyomi.source.model.UpdateStrategy import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType import kotlinx.serialization.Serializable import kotlinx.serialization.protobuf.ProtoNumber import tachiyomi.data.listOfStringsAndAdapter +import tachiyomi.domain.manga.model.CustomMangaInfo @Suppress("DEPRECATION") @Serializable @@ -86,7 +86,7 @@ data class BackupManga( } // SY --> - fun getCustomMangaInfo(): CustomMangaManager.MangaJson? { + fun getCustomMangaInfo(): CustomMangaInfo? { if (customTitle != null || customArtist != null || customAuthor != null || @@ -94,7 +94,7 @@ data class BackupManga( customGenre != null || customStatus != 0 ) { - return CustomMangaManager.MangaJson( + return CustomMangaInfo( id = 0L, title = customTitle, author = customAuthor, @@ -115,7 +115,7 @@ data class BackupManga( } companion object { - fun copyFrom(manga: Manga /* SY --> */, customMangaManager: CustomMangaManager?/* SY <-- */): BackupManga { + fun copyFrom(manga: Manga /* SY --> */, customMangaInfo: CustomMangaInfo?/* SY <-- */): BackupManga { return BackupManga( url = manga.url, // SY --> @@ -137,7 +137,7 @@ data class BackupManga( // SY --> filtered_scanlators = manga.filteredScanlators?.let(listOfStringsAndAdapter::encode), ).also { backupManga -> - customMangaManager?.getManga(manga.id)?.let { + customMangaInfo?.let { backupManga.customTitle = it.title backupManga.customArtist = it.artist backupManga.customAuthor = it.author diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverFetcher.kt b/app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverFetcher.kt index d7973936b..1a81cf484 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverFetcher.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverFetcher.kt @@ -10,7 +10,6 @@ import coil.fetch.SourceResult import coil.network.HttpException import coil.request.Options import coil.request.Parameters -import eu.kanade.domain.manga.model.MangaCover import eu.kanade.tachiyomi.data.cache.CoverCache import eu.kanade.tachiyomi.data.coil.MangaCoverFetcher.Companion.USE_CUSTOM_COVER import eu.kanade.tachiyomi.data.database.models.Manga @@ -28,6 +27,7 @@ import okio.Path.Companion.toOkioPath import okio.Source import okio.buffer import okio.sink +import tachiyomi.domain.manga.model.MangaCover import uy.kohesive.injekt.injectLazy import java.io.File import eu.kanade.domain.manga.model.Manga as DomainManga diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverKeyer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverKeyer.kt index 43298c200..9fa7b95b2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverKeyer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverKeyer.kt @@ -2,11 +2,11 @@ package eu.kanade.tachiyomi.data.coil import coil.key.Keyer import coil.request.Options -import eu.kanade.domain.manga.model.MangaCover import eu.kanade.domain.manga.model.hasCustomCover import eu.kanade.tachiyomi.data.cache.CoverCache import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.database.models.toDomainManga +import tachiyomi.domain.manga.model.MangaCover import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import eu.kanade.domain.manga.model.Manga as DomainManga diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaImpl.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaImpl.kt index 0c89509aa..759b230b1 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaImpl.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaImpl.kt @@ -1,9 +1,10 @@ package eu.kanade.tachiyomi.data.database.models import eu.kanade.tachiyomi.data.download.DownloadManager -import eu.kanade.tachiyomi.data.library.CustomMangaManager import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.UpdateStrategy +import tachiyomi.domain.manga.interactor.GetCustomMangaInfo +import tachiyomi.domain.manga.model.CustomMangaInfo import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy @@ -17,8 +18,8 @@ open class MangaImpl : Manga { override lateinit var url: String // SY --> - private val customManga: CustomMangaManager.CustomMangaInfo? - get() = customMangaManager.getManga(this) + private val customManga: CustomMangaInfo? + get() = getCustomMangaInfo.get(id!!) override var title: String get() = if (favorite) { @@ -43,7 +44,7 @@ open class MangaImpl : Manga { set(value) { ogDesc = value } override var genre: String? - get() = if (favorite) customManga?.genreString ?: ogGenre else ogGenre + get() = if (favorite) customManga?.genre?.joinToString() ?: ogGenre else ogGenre set(value) { ogGenre = value } override var status: Int @@ -126,7 +127,7 @@ open class MangaImpl : Manga { } companion object { - private val customMangaManager: CustomMangaManager by injectLazy() + private val getCustomMangaInfo: GetCustomMangaInfo by injectLazy() } // SY <-- } diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt index bdc876c24..d602e99a9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.extension import android.content.Context import android.graphics.drawable.Drawable import androidx.core.content.ContextCompat -import eu.kanade.domain.source.model.SourceData import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.extension.api.ExtensionGithubApi @@ -34,6 +33,7 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn import logcat.LogPriority import rx.Observable +import tachiyomi.domain.source.model.SourceData import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.util.Locale diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/model/Extension.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/model/Extension.kt index 8f252a13a..45df1b0d1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/model/Extension.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/model/Extension.kt @@ -1,8 +1,8 @@ package eu.kanade.tachiyomi.extension.model import android.graphics.drawable.Drawable -import eu.kanade.domain.source.model.SourceData import eu.kanade.tachiyomi.source.Source +import tachiyomi.domain.source.model.SourceData sealed class Extension { diff --git a/app/src/main/java/eu/kanade/tachiyomi/glance/UpdatesGridGlanceWidget.kt b/app/src/main/java/eu/kanade/tachiyomi/glance/UpdatesGridGlanceWidget.kt index 5c85e87be..44962d062 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/glance/UpdatesGridGlanceWidget.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/glance/UpdatesGridGlanceWidget.kt @@ -43,7 +43,6 @@ import coil.request.ImageRequest import coil.size.Precision import coil.size.Scale import coil.transform.RoundedCornersTransformation -import eu.kanade.domain.manga.model.MangaCover import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.core.security.SecurityPreferences import eu.kanade.tachiyomi.ui.main.MainActivity @@ -52,6 +51,7 @@ import eu.kanade.tachiyomi.util.lang.launchIO import eu.kanade.tachiyomi.util.system.dpToPx import kotlinx.coroutines.MainScope import tachiyomi.data.DatabaseHandler +import tachiyomi.domain.manga.model.MangaCover import tachiyomi.view.UpdatesView import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/SourceExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/source/SourceExtensions.kt index 1051692bd..9d34dbc54 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/SourceExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/SourceExtensions.kt @@ -1,9 +1,9 @@ package eu.kanade.tachiyomi.source import android.graphics.drawable.Drawable -import eu.kanade.domain.source.model.SourceData import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.tachiyomi.extension.ExtensionManager +import tachiyomi.domain.source.model.SourceData import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt index d4fba38f1..e3f5433c7 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt @@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.source import android.content.Context import eu.kanade.domain.UnsortedPreferences -import eu.kanade.domain.source.model.SourceData import eu.kanade.domain.source.repository.SourceDataRepository import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.download.DownloadManager @@ -42,6 +41,7 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import rx.Observable +import tachiyomi.domain.source.model.SourceData import uy.kohesive.injekt.injectLazy import java.util.concurrent.ConcurrentHashMap import kotlin.reflect.KClass 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 d2fc2102d..dc60f6db2 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 @@ -14,13 +14,11 @@ import eu.kanade.domain.chapter.model.Chapter import eu.kanade.domain.chapter.model.ChapterUpdate import eu.kanade.domain.history.interactor.GetHistoryByMangaId import eu.kanade.domain.history.interactor.UpsertHistory -import eu.kanade.domain.history.model.HistoryUpdate import eu.kanade.domain.manga.interactor.GetManga import eu.kanade.domain.manga.interactor.GetMergedReferencesById import eu.kanade.domain.manga.interactor.NetworkToLocalManga import eu.kanade.domain.manga.interactor.UpdateManga import eu.kanade.domain.manga.model.Manga -import eu.kanade.domain.manga.model.MangaUpdate import eu.kanade.domain.manga.model.hasCustomCover import eu.kanade.domain.track.interactor.DeleteTrack import eu.kanade.domain.track.interactor.GetTracks @@ -51,6 +49,8 @@ import kotlinx.coroutines.isActive import kotlinx.coroutines.sync.Semaphore import kotlinx.coroutines.sync.withPermit import logcat.LogPriority +import tachiyomi.domain.history.model.HistoryUpdate +import tachiyomi.domain.manga.model.MangaUpdate import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.util.concurrent.atomic.AtomicInteger diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryScreenModel.kt index 0a97d662c..94d9dd8df 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryScreenModel.kt @@ -8,7 +8,6 @@ import eu.kanade.domain.chapter.model.Chapter import eu.kanade.domain.history.interactor.GetHistory import eu.kanade.domain.history.interactor.GetNextChapters import eu.kanade.domain.history.interactor.RemoveHistory -import eu.kanade.domain.history.model.HistoryWithRelations import eu.kanade.presentation.history.HistoryUiModel import eu.kanade.tachiyomi.util.lang.launchIO import eu.kanade.tachiyomi.util.lang.toDateKey @@ -26,6 +25,7 @@ import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import logcat.LogPriority +import tachiyomi.domain.history.model.HistoryWithRelations import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.util.Date 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 94fb39e58..e232a9b52 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 @@ -26,11 +26,8 @@ import eu.kanade.domain.chapter.interactor.GetChapterByMangaId import eu.kanade.domain.chapter.interactor.SetReadStatus import eu.kanade.domain.chapter.model.Chapter import eu.kanade.domain.history.interactor.GetNextChapters -import eu.kanade.domain.library.model.LibraryDisplayMode import eu.kanade.domain.library.model.LibraryGroup import eu.kanade.domain.library.model.LibraryManga -import eu.kanade.domain.library.model.LibrarySort -import eu.kanade.domain.library.model.sort import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.domain.manga.interactor.GetIdsOfFavoriteMangaWithMetadata import eu.kanade.domain.manga.interactor.GetLibraryManga @@ -39,7 +36,6 @@ 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.Manga -import eu.kanade.domain.manga.model.MangaUpdate import eu.kanade.domain.manga.model.isLocal import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.domain.track.interactor.GetTracks @@ -51,7 +47,6 @@ import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.cache.CoverCache import eu.kanade.tachiyomi.data.download.DownloadCache import eu.kanade.tachiyomi.data.download.DownloadManager -import eu.kanade.tachiyomi.data.library.CustomMangaManager import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.data.track.TrackStatus import eu.kanade.tachiyomi.source.LocalSource @@ -100,6 +95,12 @@ import kotlinx.coroutines.flow.toList import kotlinx.coroutines.flow.update import kotlinx.coroutines.runBlocking import tachiyomi.domain.category.model.Category +import tachiyomi.domain.library.model.LibraryDisplayMode +import tachiyomi.domain.library.model.LibrarySort +import tachiyomi.domain.library.model.sort +import tachiyomi.domain.manga.interactor.SetCustomMangaInfo +import tachiyomi.domain.manga.model.CustomMangaInfo +import tachiyomi.domain.manga.model.MangaUpdate import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.text.Collator @@ -131,12 +132,12 @@ class LibraryScreenModel( private val unsortedPreferences: UnsortedPreferences = Injekt.get(), private val sourcePreferences: SourcePreferences = Injekt.get(), private val getMergedMangaById: GetMergedMangaById = Injekt.get(), - private val customMangaManager: CustomMangaManager = Injekt.get(), private val getTracks: GetTracks = Injekt.get(), private val getIdsOfFavoriteMangaWithMetadata: GetIdsOfFavoriteMangaWithMetadata = Injekt.get(), private val getSearchTags: GetSearchTags = Injekt.get(), private val getSearchTitles: GetSearchTitles = Injekt.get(), private val searchEngine: SearchEngine = Injekt.get(), + private val setCustomMangaInfo: SetCustomMangaInfo = Injekt.get(), // SY <-- ) : StateScreenModel(State()) { @@ -735,7 +736,7 @@ class LibraryScreenModel( } } if (manga.title == editedTitle) return@fastForEach - val mangaJson = CustomMangaManager.MangaJson( + val mangaInfo = CustomMangaInfo( id = manga.id, title = editedTitle.nullIfBlank(), author = manga.author.takeUnless { it == manga.ogAuthor }, @@ -745,7 +746,7 @@ class LibraryScreenModel( status = manga.status.takeUnless { it == manga.ogStatus }?.toLong(), ) - customMangaManager.saveMangaInfo(mangaJson) + setCustomMangaInfo.set(mangaInfo) } clearSelection() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt index 127532a9b..560f25d6e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt @@ -8,11 +8,7 @@ import eu.kanade.domain.base.BasePreferences import eu.kanade.domain.category.interactor.GetCategories import eu.kanade.domain.category.interactor.SetDisplayModeForCategory import eu.kanade.domain.category.interactor.SetSortModeForCategory -import eu.kanade.domain.library.model.LibraryDisplayMode import eu.kanade.domain.library.model.LibraryGroup -import eu.kanade.domain.library.model.LibrarySort -import eu.kanade.domain.library.model.display -import eu.kanade.domain.library.model.sort import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.track.TrackManager @@ -26,6 +22,10 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.runBlocking import tachiyomi.domain.category.model.Category +import tachiyomi.domain.library.model.LibraryDisplayMode +import tachiyomi.domain.library.model.LibrarySort +import tachiyomi.domain.library.model.display +import tachiyomi.domain.library.model.sort import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy 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 51dc3654d..c9ff4e8b2 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 @@ -31,7 +31,6 @@ import cafe.adriel.voyager.navigator.tab.TabOptions import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.library.model.LibraryGroup import eu.kanade.domain.library.model.LibraryManga -import eu.kanade.domain.library.model.display import eu.kanade.domain.manga.model.Manga import eu.kanade.domain.manga.model.isLocal import eu.kanade.presentation.components.ChangeCategoryDialog @@ -66,6 +65,7 @@ import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.launch import tachiyomi.domain.category.model.Category +import tachiyomi.domain.library.model.display import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get 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 7bef1cd5a..e5bf28c0e 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 @@ -41,7 +41,6 @@ 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.Manga -import eu.kanade.domain.manga.model.MangaUpdate import eu.kanade.domain.manga.model.MergeMangaSettingsUpdate import eu.kanade.domain.manga.model.PagePreview import eu.kanade.domain.manga.model.TriStateFilter @@ -59,7 +58,6 @@ import eu.kanade.tachiyomi.data.download.DownloadCache import eu.kanade.tachiyomi.data.download.DownloadManager import eu.kanade.tachiyomi.data.download.DownloadService import eu.kanade.tachiyomi.data.download.model.Download -import eu.kanade.tachiyomi.data.library.CustomMangaManager import eu.kanade.tachiyomi.data.track.EnhancedTrackService import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.data.track.TrackService @@ -112,6 +110,9 @@ import kotlinx.coroutines.isActive import kotlinx.coroutines.launch import logcat.LogPriority import tachiyomi.domain.category.model.Category +import tachiyomi.domain.manga.interactor.SetCustomMangaInfo +import tachiyomi.domain.manga.model.CustomMangaInfo +import tachiyomi.domain.manga.model.MangaUpdate import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy @@ -147,6 +148,7 @@ class MangaInfoScreenModel( private val getFlatMetadata: GetFlatMetadataById = Injekt.get(), private val getPagePreviews: GetPagePreviews = Injekt.get(), private val insertTrack: InsertTrack = Injekt.get(), + private val setCustomMangaInfo: SetCustomMangaInfo = Injekt.get(), // SY <-- private val getDuplicateLibraryManga: GetDuplicateLibraryManga = Injekt.get(), private val setMangaChapterFlags: SetMangaChapterFlags = Injekt.get(), @@ -189,8 +191,6 @@ class MangaInfoScreenModel( private val selectedChapterIds: HashSet = HashSet() // EXH --> - private val customMangaManager: CustomMangaManager by injectLazy() - private val updateHelper: EHentaiUpdateHelper by injectLazy() val redirectFlow: MutableSharedFlow = MutableSharedFlow() @@ -468,8 +468,8 @@ class MangaInfoScreenModel( } else { null } - customMangaManager.saveMangaInfo( - CustomMangaManager.MangaJson( + setCustomMangaInfo.set( + CustomMangaInfo( state.manga.id, title?.trimOrNull(), author?.trimOrNull(), 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 5e69c0623..b810dfb9d 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 @@ -17,7 +17,6 @@ import eu.kanade.domain.chapter.model.toDbChapter import eu.kanade.domain.download.service.DownloadPreferences import eu.kanade.domain.history.interactor.GetNextChapters import eu.kanade.domain.history.interactor.UpsertHistory -import eu.kanade.domain.history.model.HistoryUpdate import eu.kanade.domain.manga.interactor.GetFlatMetadataById import eu.kanade.domain.manga.interactor.GetManga import eu.kanade.domain.manga.interactor.GetMergedMangaById @@ -97,6 +96,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import logcat.LogPriority import tachiyomi.decoder.ImageDecoder +import tachiyomi.domain.history.model.HistoryUpdate import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.text.DecimalFormat diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesScreenModel.kt index 78cb21aa7..8ee534e4f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesScreenModel.kt @@ -19,7 +19,6 @@ import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.domain.manga.interactor.GetManga import eu.kanade.domain.ui.UiPreferences import eu.kanade.domain.updates.interactor.GetUpdates -import eu.kanade.domain.updates.model.UpdatesWithRelations import eu.kanade.presentation.components.ChapterDownloadAction import eu.kanade.presentation.updates.UpdatesUiModel import eu.kanade.tachiyomi.data.download.DownloadCache @@ -47,6 +46,7 @@ import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import logcat.LogPriority +import tachiyomi.domain.updates.model.UpdatesWithRelations import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.util.Calendar diff --git a/app/src/main/java/exh/EXHMigrations.kt b/app/src/main/java/exh/EXHMigrations.kt index c8dad2c2e..f0ca04fd2 100644 --- a/app/src/main/java/exh/EXHMigrations.kt +++ b/app/src/main/java/exh/EXHMigrations.kt @@ -16,7 +16,6 @@ import eu.kanade.domain.manga.interactor.GetManga 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.manga.model.MangaUpdate import eu.kanade.domain.source.interactor.InsertFeedSavedSearch import eu.kanade.domain.source.interactor.InsertSavedSearch import eu.kanade.domain.source.service.SourcePreferences @@ -66,6 +65,7 @@ import kotlinx.serialization.json.jsonArray import kotlinx.serialization.json.jsonPrimitive import tachiyomi.data.DatabaseHandler import tachiyomi.data.category.categoryMapper +import tachiyomi.domain.manga.model.MangaUpdate import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy diff --git a/app/src/main/java/exh/eh/EHentaiUpdateHelper.kt b/app/src/main/java/exh/eh/EHentaiUpdateHelper.kt index 9d6835059..4bdfab051 100644 --- a/app/src/main/java/exh/eh/EHentaiUpdateHelper.kt +++ b/app/src/main/java/exh/eh/EHentaiUpdateHelper.kt @@ -11,15 +11,15 @@ import eu.kanade.domain.chapter.repository.ChapterRepository import eu.kanade.domain.history.interactor.GetHistoryByMangaId import eu.kanade.domain.history.interactor.RemoveHistory import eu.kanade.domain.history.interactor.UpsertHistory -import eu.kanade.domain.history.model.History -import eu.kanade.domain.history.model.HistoryUpdate import eu.kanade.domain.manga.interactor.GetManga import eu.kanade.domain.manga.interactor.UpdateManga import eu.kanade.domain.manga.model.Manga -import eu.kanade.domain.manga.model.MangaUpdate import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope +import tachiyomi.domain.history.model.History +import tachiyomi.domain.history.model.HistoryUpdate +import tachiyomi.domain.manga.model.MangaUpdate import uy.kohesive.injekt.injectLazy import java.io.File diff --git a/core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt b/core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt index e3c837efd..0c2f63c92 100755 --- a/core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt +++ b/core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.network import android.content.Context -import eu.kanade.tachiyomi.i18n.BuildConfig +import eu.kanade.tachiyomi.core.BuildConfig import eu.kanade.tachiyomi.network.interceptor.CloudflareInterceptor import eu.kanade.tachiyomi.network.interceptor.UserAgentInterceptor import okhttp3.Cache diff --git a/data/build.gradle.kts b/data/build.gradle.kts index 062405e63..fb8daf73f 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -2,6 +2,7 @@ plugins { id("com.android.library") kotlin("android") id("com.squareup.sqldelight") + kotlin("plugin.serialization") } android { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/CustomMangaManager.kt b/data/src/main/java/tachiyomi/data/manga/CustomMangaRepositoryImpl.kt similarity index 61% rename from app/src/main/java/eu/kanade/tachiyomi/data/library/CustomMangaManager.kt rename to data/src/main/java/tachiyomi/data/manga/CustomMangaRepositoryImpl.kt index b609f95fb..57cda4753 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/CustomMangaManager.kt +++ b/data/src/main/java/tachiyomi/data/manga/CustomMangaRepositoryImpl.kt @@ -1,23 +1,20 @@ -package eu.kanade.tachiyomi.data.library +package tachiyomi.data.manga import android.content.Context -import eu.kanade.tachiyomi.data.database.models.Manga import kotlinx.serialization.Serializable import kotlinx.serialization.decodeFromString import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json +import tachiyomi.domain.manga.model.CustomMangaInfo +import tachiyomi.domain.manga.repository.CustomMangaRepository import java.io.File -import eu.kanade.domain.manga.model.Manga as DomainManga - -class CustomMangaManager(val context: Context) { +class CustomMangaRepositoryImpl(context: Context) : CustomMangaRepository { private val editJson = File(context.getExternalFilesDir(null), "edits.json") private val customMangaMap = fetchCustomData() - fun getManga(manga: Manga): CustomMangaInfo? = customMangaMap[manga.id] - fun getManga(manga: DomainManga): CustomMangaInfo? = customMangaMap[manga.id] - fun getManga(mangaId: Long): CustomMangaInfo? = customMangaMap[mangaId] + override fun get(mangaId: Long) = customMangaMap[mangaId] private fun fetchCustomData(): MutableMap { if (!editJson.exists() || !editJson.isFile) return mutableMapOf() @@ -40,18 +37,18 @@ class CustomMangaManager(val context: Context) { .toMutableMap() } - fun saveMangaInfo(manga: MangaJson) { + override fun set(mangaInfo: CustomMangaInfo) { if ( - manga.title == null && - manga.author == null && - manga.artist == null && - manga.description == null && - manga.genre == null && - manga.status == null + mangaInfo.title == null && + mangaInfo.author == null && + mangaInfo.artist == null && + mangaInfo.description == null && + mangaInfo.genre == null && + mangaInfo.status == null ) { - customMangaMap.remove(manga.id!!) + customMangaMap.remove(mangaInfo.id) } else { - customMangaMap[manga.id!!] = manga.toManga() + customMangaMap[mangaInfo.id] = mangaInfo } saveCustomInfo() } @@ -91,29 +88,15 @@ class CustomMangaManager(val context: Context) { ) } - data class CustomMangaInfo( - val id: Long, - val title: String?, - val author: String? = null, - val artist: String? = null, - val description: String? = null, - val genre: List? = null, - val status: Long? = null, - ) { - val genreString by lazy { - genre?.joinToString() - } - - fun toJson(): MangaJson { - return MangaJson( - id, - title, - author, - artist, - description, - genre, - status, - ) - } + fun CustomMangaInfo.toJson(): MangaJson { + return MangaJson( + id, + title, + author, + artist, + description, + genre, + status, + ) } } diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts index cfbcc1926..c11f199c5 100644 --- a/domain/build.gradle.kts +++ b/domain/build.gradle.kts @@ -10,10 +10,17 @@ android { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } - } dependencies { implementation(platform(kotlinx.coroutines.bom)) implementation(kotlinx.bundles.coroutines) + + implementation(project(":source-api")) + + // SY --> + implementation(libs.injekt.core) + // SY <-- + + testImplementation(libs.junit) } diff --git a/app/src/main/java/eu/kanade/domain/history/model/History.kt b/domain/src/main/java/tachiyomi/domain/history/model/History.kt similarity index 78% rename from app/src/main/java/eu/kanade/domain/history/model/History.kt rename to domain/src/main/java/tachiyomi/domain/history/model/History.kt index b8a1cf3c1..bb2917ad9 100644 --- a/app/src/main/java/eu/kanade/domain/history/model/History.kt +++ b/domain/src/main/java/tachiyomi/domain/history/model/History.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.history.model +package tachiyomi.domain.history.model import java.util.Date diff --git a/app/src/main/java/eu/kanade/domain/history/model/HistoryUpdate.kt b/domain/src/main/java/tachiyomi/domain/history/model/HistoryUpdate.kt similarity index 77% rename from app/src/main/java/eu/kanade/domain/history/model/HistoryUpdate.kt rename to domain/src/main/java/tachiyomi/domain/history/model/HistoryUpdate.kt index 8cd7f5a2e..62738c33b 100644 --- a/app/src/main/java/eu/kanade/domain/history/model/HistoryUpdate.kt +++ b/domain/src/main/java/tachiyomi/domain/history/model/HistoryUpdate.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.history.model +package tachiyomi.domain.history.model import java.util.Date diff --git a/app/src/main/java/eu/kanade/domain/history/model/HistoryWithRelations.kt b/domain/src/main/java/tachiyomi/domain/history/model/HistoryWithRelations.kt similarity index 58% rename from app/src/main/java/eu/kanade/domain/history/model/HistoryWithRelations.kt rename to domain/src/main/java/tachiyomi/domain/history/model/HistoryWithRelations.kt index a56f48998..09d3b4bba 100644 --- a/app/src/main/java/eu/kanade/domain/history/model/HistoryWithRelations.kt +++ b/domain/src/main/java/tachiyomi/domain/history/model/HistoryWithRelations.kt @@ -1,7 +1,7 @@ -package eu.kanade.domain.history.model +package tachiyomi.domain.history.model -import eu.kanade.domain.manga.model.MangaCover -import eu.kanade.tachiyomi.data.library.CustomMangaManager +import tachiyomi.domain.manga.interactor.GetCustomMangaInfo +import tachiyomi.domain.manga.model.MangaCover import uy.kohesive.injekt.injectLazy import java.util.Date @@ -18,10 +18,10 @@ data class HistoryWithRelations( val coverData: MangaCover, ) { // SY --> - val title: String = customMangaManager.getManga(mangaId)?.title ?: ogTitle + val title: String = customMangaManager.get(mangaId)?.title ?: ogTitle companion object { - private val customMangaManager: CustomMangaManager by injectLazy() + private val customMangaManager: GetCustomMangaInfo by injectLazy() } // SY <-- } diff --git a/app/src/main/java/eu/kanade/domain/library/model/Flag.kt b/domain/src/main/java/tachiyomi/domain/library/model/Flag.kt similarity index 94% rename from app/src/main/java/eu/kanade/domain/library/model/Flag.kt rename to domain/src/main/java/tachiyomi/domain/library/model/Flag.kt index 95203841a..655d19bf9 100644 --- a/app/src/main/java/eu/kanade/domain/library/model/Flag.kt +++ b/domain/src/main/java/tachiyomi/domain/library/model/Flag.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.library.model +package tachiyomi.domain.library.model interface Flag { val flag: Long diff --git a/app/src/main/java/eu/kanade/domain/library/model/LibraryDisplayMode.kt b/domain/src/main/java/tachiyomi/domain/library/model/LibraryDisplayMode.kt similarity index 97% rename from app/src/main/java/eu/kanade/domain/library/model/LibraryDisplayMode.kt rename to domain/src/main/java/tachiyomi/domain/library/model/LibraryDisplayMode.kt index 37c53c64f..236d00235 100644 --- a/app/src/main/java/eu/kanade/domain/library/model/LibraryDisplayMode.kt +++ b/domain/src/main/java/tachiyomi/domain/library/model/LibraryDisplayMode.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.library.model +package tachiyomi.domain.library.model import tachiyomi.domain.category.model.Category diff --git a/app/src/main/java/eu/kanade/domain/library/model/LibrarySort.kt b/domain/src/main/java/tachiyomi/domain/library/model/LibrarySort.kt similarity index 99% rename from app/src/main/java/eu/kanade/domain/library/model/LibrarySort.kt rename to domain/src/main/java/tachiyomi/domain/library/model/LibrarySort.kt index 5b2ec239c..52f412bcb 100644 --- a/app/src/main/java/eu/kanade/domain/library/model/LibrarySort.kt +++ b/domain/src/main/java/tachiyomi/domain/library/model/LibrarySort.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.library.model +package tachiyomi.domain.library.model import tachiyomi.domain.category.model.Category diff --git a/domain/src/main/java/tachiyomi/domain/manga/interactor/GetCustomMangaInfo.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetCustomMangaInfo.kt new file mode 100644 index 000000000..c3e726349 --- /dev/null +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetCustomMangaInfo.kt @@ -0,0 +1,10 @@ +package tachiyomi.domain.manga.interactor + +import tachiyomi.domain.manga.repository.CustomMangaRepository + +class GetCustomMangaInfo( + private val customMangaRepository: CustomMangaRepository, +) { + + fun get(mangaId: Long) = customMangaRepository.get(mangaId) +} diff --git a/domain/src/main/java/tachiyomi/domain/manga/interactor/SetCustomMangaInfo.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/SetCustomMangaInfo.kt new file mode 100644 index 000000000..5a4d2b333 --- /dev/null +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/SetCustomMangaInfo.kt @@ -0,0 +1,11 @@ +package tachiyomi.domain.manga.interactor + +import tachiyomi.domain.manga.model.CustomMangaInfo +import tachiyomi.domain.manga.repository.CustomMangaRepository + +class SetCustomMangaInfo( + private val customMangaRepository: CustomMangaRepository, +) { + + fun set(mangaInfo: CustomMangaInfo) = customMangaRepository.set(mangaInfo) +} diff --git a/domain/src/main/java/tachiyomi/domain/manga/model/CustomMangaInfo.kt b/domain/src/main/java/tachiyomi/domain/manga/model/CustomMangaInfo.kt new file mode 100644 index 000000000..7edaacb10 --- /dev/null +++ b/domain/src/main/java/tachiyomi/domain/manga/model/CustomMangaInfo.kt @@ -0,0 +1,11 @@ +package tachiyomi.domain.manga.model + +data class CustomMangaInfo( + val id: Long, + val title: String?, + val author: String? = null, + val artist: String? = null, + val description: String? = null, + val genre: List? = null, + val status: Long? = null, +) diff --git a/domain/src/main/java/tachiyomi/domain/manga/model/MangaCover.kt b/domain/src/main/java/tachiyomi/domain/manga/model/MangaCover.kt new file mode 100644 index 000000000..fab5572f3 --- /dev/null +++ b/domain/src/main/java/tachiyomi/domain/manga/model/MangaCover.kt @@ -0,0 +1,12 @@ +package tachiyomi.domain.manga.model + +/** + * Contains the required data for MangaCoverFetcher + */ +data class MangaCover( + val mangaId: Long, + val sourceId: Long, + val isMangaFavorite: Boolean, + val url: String?, + val lastModified: Long, +) diff --git a/app/src/main/java/eu/kanade/domain/manga/model/MangaUpdate.kt b/domain/src/main/java/tachiyomi/domain/manga/model/MangaUpdate.kt similarity index 95% rename from app/src/main/java/eu/kanade/domain/manga/model/MangaUpdate.kt rename to domain/src/main/java/tachiyomi/domain/manga/model/MangaUpdate.kt index 142a9519f..9dc7dd297 100644 --- a/app/src/main/java/eu/kanade/domain/manga/model/MangaUpdate.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/model/MangaUpdate.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.manga.model +package tachiyomi.domain.manga.model import eu.kanade.tachiyomi.source.model.UpdateStrategy diff --git a/domain/src/main/java/tachiyomi/domain/manga/repository/CustomMangaRepository.kt b/domain/src/main/java/tachiyomi/domain/manga/repository/CustomMangaRepository.kt new file mode 100644 index 000000000..119ed76ab --- /dev/null +++ b/domain/src/main/java/tachiyomi/domain/manga/repository/CustomMangaRepository.kt @@ -0,0 +1,10 @@ +package tachiyomi.domain.manga.repository + +import tachiyomi.domain.manga.model.CustomMangaInfo + +interface CustomMangaRepository { + + fun get(mangaId: Long): CustomMangaInfo? + + fun set(mangaInfo: CustomMangaInfo) +} diff --git a/app/src/main/java/eu/kanade/domain/source/model/SourceData.kt b/domain/src/main/java/tachiyomi/domain/source/model/SourceData.kt similarity index 80% rename from app/src/main/java/eu/kanade/domain/source/model/SourceData.kt rename to domain/src/main/java/tachiyomi/domain/source/model/SourceData.kt index 44fe16d02..5fe097f27 100644 --- a/app/src/main/java/eu/kanade/domain/source/model/SourceData.kt +++ b/domain/src/main/java/tachiyomi/domain/source/model/SourceData.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.source.model +package tachiyomi.domain.source.model data class SourceData( val id: Long, diff --git a/app/src/main/java/eu/kanade/domain/updates/model/UpdatesWithRelations.kt b/domain/src/main/java/tachiyomi/domain/updates/model/UpdatesWithRelations.kt similarity index 61% rename from app/src/main/java/eu/kanade/domain/updates/model/UpdatesWithRelations.kt rename to domain/src/main/java/tachiyomi/domain/updates/model/UpdatesWithRelations.kt index 82023d44e..5eb44ea1a 100644 --- a/app/src/main/java/eu/kanade/domain/updates/model/UpdatesWithRelations.kt +++ b/domain/src/main/java/tachiyomi/domain/updates/model/UpdatesWithRelations.kt @@ -1,7 +1,7 @@ -package eu.kanade.domain.updates.model +package tachiyomi.domain.updates.model -import eu.kanade.domain.manga.model.MangaCover -import eu.kanade.tachiyomi.data.library.CustomMangaManager +import tachiyomi.domain.manga.interactor.GetCustomMangaInfo +import tachiyomi.domain.manga.model.MangaCover import uy.kohesive.injekt.injectLazy data class UpdatesWithRelations( @@ -20,10 +20,10 @@ data class UpdatesWithRelations( val coverData: MangaCover, ) { // SY --> - val mangaTitle: String = customMangaManager.getManga(mangaId)?.title ?: ogMangaTitle + val mangaTitle: String = getCustomMangaInfo.get(mangaId)?.title ?: ogMangaTitle companion object { - private val customMangaManager: CustomMangaManager by injectLazy() + private val getCustomMangaInfo: GetCustomMangaInfo by injectLazy() } // SY <-- } diff --git a/app/src/test/java/eu/kanade/tachiyomi/util/chapter/LibraryFlagsTest.kt b/domain/src/test/java/tachiyomi/domain/library/model/LibraryFlagsTest.kt similarity index 91% rename from app/src/test/java/eu/kanade/tachiyomi/util/chapter/LibraryFlagsTest.kt rename to domain/src/test/java/tachiyomi/domain/library/model/LibraryFlagsTest.kt index 4e1f935f0..badbee8e6 100644 --- a/app/src/test/java/eu/kanade/tachiyomi/util/chapter/LibraryFlagsTest.kt +++ b/domain/src/test/java/tachiyomi/domain/library/model/LibraryFlagsTest.kt @@ -1,8 +1,5 @@ -package eu.kanade.tachiyomi.util.chapter +package tachiyomi.domain.library.model -import eu.kanade.domain.library.model.LibraryDisplayMode -import eu.kanade.domain.library.model.LibrarySort -import eu.kanade.domain.library.model.plus import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertNotEquals import org.junit.jupiter.api.Test diff --git a/i18n/build.gradle.kts b/i18n/build.gradle.kts index 4a82605de..130a9e619 100644 --- a/i18n/build.gradle.kts +++ b/i18n/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } android { - namespace = "eu.kanade.tachiyomi.i18n" + namespace = "tachiyomi.i18n" lint { disable.addAll(listOf("MissingTranslation", "ExtraTranslation"))