From b53e24e0dbd4affd6066a03ce543c3ecc88bdb99 Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 22 Jan 2023 10:37:13 -0500 Subject: [PATCH] Move more models to domain module --- .../java/eu/kanade/data/history/HistoryMapper.kt | 6 +++--- .../eu/kanade/data/history/HistoryRepositoryImpl.kt | 4 ++-- .../java/eu/kanade/data/manga/MangaRepositoryImpl.kt | 2 +- .../kanade/data/source/SourceDataRepositoryImpl.kt | 2 +- .../main/java/eu/kanade/data/source/SourceMapper.kt | 2 +- .../java/eu/kanade/data/updates/UpdatesMapper.kt | 4 ++-- .../eu/kanade/data/updates/UpdatesRepositoryImpl.kt | 2 +- .../domain/category/interactor/ResetCategoryFlags.kt | 2 +- .../category/interactor/SetDisplayModeForCategory.kt | 4 ++-- .../category/interactor/SetSortModeForCategory.kt | 4 ++-- .../kanade/domain/history/interactor/GetHistory.kt | 2 +- .../domain/history/interactor/RemoveHistory.kt | 2 +- .../domain/history/interactor/UpsertHistory.kt | 2 +- .../domain/history/repository/HistoryRepository.kt | 4 ++-- .../domain/library/service/LibraryPreferences.kt | 4 ++-- .../domain/manga/interactor/SetMangaChapterFlags.kt | 2 +- .../domain/manga/interactor/SetMangaViewerFlags.kt | 2 +- .../eu/kanade/domain/manga/interactor/UpdateManga.kt | 2 +- .../main/java/eu/kanade/domain/manga/model/Manga.kt | 1 + .../java/eu/kanade/domain/manga/model/MangaCover.kt | 11 +---------- .../domain/manga/repository/MangaRepository.kt | 2 +- .../domain/source/repository/SourceDataRepository.kt | 2 +- .../domain/source/service/SourcePreferences.kt | 4 +--- .../kanade/domain/updates/interactor/GetUpdates.kt | 2 +- .../domain/updates/repository/UpdatesRepository.kt | 2 +- .../kanade/presentation/browse/BrowseSourceScreen.kt | 2 +- .../browse/components/BrowseSourceComfortableGrid.kt | 2 +- .../browse/components/BrowseSourceCompactGrid.kt | 2 +- .../browse/components/BrowseSourceList.kt | 2 +- .../browse/components/BrowseSourceToolbar.kt | 2 +- .../browse/components/GlobalSearchCard.kt | 2 +- .../presentation/components/CommonMangaItem.kt | 6 +++--- .../eu/kanade/presentation/history/HistoryScreen.kt | 2 +- .../history/components/HistoryContent.kt | 2 +- .../presentation/history/components/HistoryItem.kt | 2 +- .../library/components/LibraryComfortableGrid.kt | 2 +- .../library/components/LibraryCompactGrid.kt | 2 +- .../library/components/LibraryContent.kt | 2 +- .../presentation/library/components/LibraryList.kt | 2 +- .../presentation/library/components/LibraryPager.kt | 2 +- .../eu/kanade/presentation/updates/UpdatesUiItem.kt | 2 +- .../eu/kanade/tachiyomi/data/backup/BackupManager.kt | 2 +- .../kanade/tachiyomi/data/coil/MangaCoverFetcher.kt | 2 +- .../eu/kanade/tachiyomi/data/coil/MangaCoverKeyer.kt | 2 +- .../kanade/tachiyomi/extension/ExtensionManager.kt | 2 +- .../eu/kanade/tachiyomi/extension/model/Extension.kt | 2 +- .../tachiyomi/glance/UpdatesGridGlanceWidget.kt | 2 +- .../eu/kanade/tachiyomi/source/SourceExtensions.kt | 2 +- .../java/eu/kanade/tachiyomi/source/SourceManager.kt | 2 +- .../ui/browse/migration/search/MigrateDialog.kt | 2 +- .../tachiyomi/ui/history/HistoryScreenModel.kt | 2 +- .../tachiyomi/ui/library/LibraryScreenModel.kt | 6 +++--- .../tachiyomi/ui/library/LibrarySettingsSheet.kt | 8 ++++---- .../eu/kanade/tachiyomi/ui/library/LibraryTab.kt | 2 +- .../eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt | 2 +- .../tachiyomi/ui/updates/UpdatesScreenModel.kt | 2 +- domain/build.gradle.kts | 5 ++++- .../java/tachiyomi}/domain/history/model/History.kt | 2 +- .../tachiyomi}/domain/history/model/HistoryUpdate.kt | 2 +- .../domain/history/model/HistoryWithRelations.kt | 4 ++-- .../java/tachiyomi}/domain/library/model/Flag.kt | 2 +- .../domain/library/model/LibraryDisplayMode.kt | 2 +- .../tachiyomi}/domain/library/model/LibrarySort.kt | 2 +- .../java/tachiyomi/domain/manga/model/MangaCover.kt | 12 ++++++++++++ .../tachiyomi}/domain/manga/model/MangaUpdate.kt | 2 +- .../tachiyomi}/domain/source/model/SourceData.kt | 2 +- .../domain/updates/model/UpdatesWithRelations.kt | 4 ++-- .../domain/library/model}/LibraryFlagsTest.kt | 5 +---- i18n/build.gradle.kts | 2 +- 69 files changed, 100 insertions(+), 98 deletions(-) rename {app/src/main/java/eu/kanade => domain/src/main/java/tachiyomi}/domain/history/model/History.kt (78%) rename {app/src/main/java/eu/kanade => domain/src/main/java/tachiyomi}/domain/history/model/HistoryUpdate.kt (77%) rename {app/src/main/java/eu/kanade => domain/src/main/java/tachiyomi}/domain/history/model/HistoryWithRelations.kt (75%) rename {app/src/main/java/eu/kanade => domain/src/main/java/tachiyomi}/domain/library/model/Flag.kt (94%) rename {app/src/main/java/eu/kanade => domain/src/main/java/tachiyomi}/domain/library/model/LibraryDisplayMode.kt (97%) rename {app/src/main/java/eu/kanade => domain/src/main/java/tachiyomi}/domain/library/model/LibrarySort.kt (99%) create mode 100644 domain/src/main/java/tachiyomi/domain/manga/model/MangaCover.kt rename {app/src/main/java/eu/kanade => domain/src/main/java/tachiyomi}/domain/manga/model/MangaUpdate.kt (94%) rename {app/src/main/java/eu/kanade => domain/src/main/java/tachiyomi}/domain/source/model/SourceData.kt (80%) rename {app/src/main/java/eu/kanade => domain/src/main/java/tachiyomi}/domain/updates/model/UpdatesWithRelations.kt (79%) rename {app/src/test/java/eu/kanade/tachiyomi/util/chapter => domain/src/test/java/tachiyomi/domain/library/model}/LibraryFlagsTest.kt (91%) 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 cb96fee001..0c95b27ed1 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 806571ac67..98a389ccda 100644 --- a/app/src/main/java/eu/kanade/data/history/HistoryRepositoryImpl.kt +++ b/app/src/main/java/eu/kanade/data/history/HistoryRepositoryImpl.kt @@ -1,12 +1,12 @@ package eu.kanade.data.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.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 60d4dbb74c..8da709fd74 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 @@ -11,6 +10,7 @@ import logcat.LogPriority import tachiyomi.data.DatabaseHandler import tachiyomi.data.listOfStringsAdapter 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 6bd19a7670..ee80b888c3 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 20ae07288b..b752ffdd07 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 5ec633e68a..c27d7ba375 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 val updateWithRelationMapper: (Long, String, Long, String, String?, Boolean, Boolean, Long, Long, Boolean, String?, Long, Long, Long) -> UpdatesWithRelations = { mangaId, mangaTitle, chapterId, chapterName, scanlator, read, bookmark, lastPageRead, sourceId, favorite, thumbnailUrl, coverLastModified, _, dateFetch -> 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 6dd8b629ca..5364b1ea82 100644 --- a/app/src/main/java/eu/kanade/data/updates/UpdatesRepositoryImpl.kt +++ b/app/src/main/java/eu/kanade/data/updates/UpdatesRepositoryImpl.kt @@ -1,9 +1,9 @@ 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 tachiyomi.data.DatabaseHandler +import tachiyomi.domain.updates.model.UpdatesWithRelations class UpdatesRepositoryImpl( val databaseHandler: DatabaseHandler, 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 2c75493bd7..b5be470dcf 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 09c46b9259..31f1279664 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,11 +1,11 @@ package eu.kanade.domain.category.interactor -import eu.kanade.domain.library.model.LibraryDisplayMode -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 e58652241b..c179b55091 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,11 +1,11 @@ package eu.kanade.domain.category.interactor -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 cf1d00ed26..2094f0595e 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/RemoveHistory.kt b/app/src/main/java/eu/kanade/domain/history/interactor/RemoveHistory.kt index a2099a1a8a..e182b9ba20 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 31c46b2999..95b2152498 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 f6297c51c4..698357aa52 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,8 +1,8 @@ package eu.kanade.domain.history.repository -import eu.kanade.domain.history.model.HistoryUpdate -import eu.kanade.domain.history.model.HistoryWithRelations import kotlinx.coroutines.flow.Flow +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 bc0a7d8771..9eda330bda 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,7 +1,5 @@ package eu.kanade.domain.library.service -import eu.kanade.domain.library.model.LibraryDisplayMode -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.data.preference.DEVICE_ONLY_ON_WIFI @@ -9,6 +7,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 6362170c19..e8eebcdc9b 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/SetMangaViewerFlags.kt b/app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaViewerFlags.kt index 5673cdbc12..7c058dc07c 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 1e2dea4f24..f8cfcf8594 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,12 +1,12 @@ 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.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 785f57acf5..d938e23b59 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 @@ -8,6 +8,7 @@ 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.model.MangaUpdate import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.io.Serializable 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 6b2d6a42ff..d0dec8cee8 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 5930dd1599..911de41911 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 45fe944f40..9c839d8fcf 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 2fc27ab0d0..db9e01eccb 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 b9e04b880e..fd05d95cc4 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 5b63662c03..8b746b0e1c 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 a718479464..2d27bae36b 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 @@ -27,6 +26,7 @@ import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.LocalSource 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 3239e434be..976e77d85e 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 @@ -12,12 +12,12 @@ 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.CommonMangaItemDefaults import eu.kanade.presentation.components.MangaComfortableGridItem import eu.kanade.presentation.util.plus 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 2ac2e7222d..dd84849d16 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 @@ -12,12 +12,12 @@ 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.CommonMangaItemDefaults import eu.kanade.presentation.components.MangaCompactGridItem import eu.kanade.presentation.util.plus 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 ae695ba165..b86a95b342 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 @@ -9,13 +9,13 @@ 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.CommonMangaItemDefaults import eu.kanade.presentation.components.LazyColumn import eu.kanade.presentation.components.MangaListItem import eu.kanade.presentation.util.plus 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/BrowseSourceToolbar.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt index 2092558a78..9d82dc4dd6 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 @@ -23,6 +22,7 @@ import eu.kanade.presentation.components.SearchToolbar import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.LocalSource +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 f0dec53353..3b9aea1799 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 399a2bf25f..97d54ce2b9 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 34643ca2e4..8b38d310f7 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 aeb5fee85a..0976f7de06 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 a7c157a65e..4c8674dc6e 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 34724a06d6..21b5493037 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 12c0ac8092..42eb3596f7 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 2248d5a6c9..73f889d521 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 @@ -15,7 +15,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 @@ -23,6 +22,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 51d973e41b..4107d4759d 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 f121152fac..1df8dd13ca 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 7da6ab5b19..57d03c2f37 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/data/backup/BackupManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt index 10146fd6f2..2016af3cdb 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 @@ -6,7 +6,6 @@ import android.net.Uri import com.hippo.unifile.UniFile 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.tachiyomi.R @@ -45,6 +44,7 @@ import tachiyomi.data.Manga_sync import tachiyomi.data.Mangas import tachiyomi.data.updateStrategyAdapter import tachiyomi.domain.category.model.Category +import tachiyomi.domain.history.model.HistoryUpdate import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.io.FileOutputStream 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 d7973936b8..1a81cf484a 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 43298c2000..9fa7b95b2f 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/extension/ExtensionManager.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt index ccbbcacd94..1fb87e79f4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt @@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.extension import android.content.Context import android.graphics.drawable.Drawable -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 @@ -23,6 +22,7 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow 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 2dcd1a0c3d..7c21ee0bc4 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 5c85e87be8..44962d062d 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 4f47b3121f..28d5d32921 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 3ad7ebb17a..3bf6ae99fb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt @@ -1,7 +1,6 @@ package eu.kanade.tachiyomi.source import android.content.Context -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 @@ -20,6 +19,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 diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt index 9137fd00c0..25b13cb8e3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt @@ -33,7 +33,6 @@ import eu.kanade.domain.chapter.interactor.UpdateChapter import eu.kanade.domain.chapter.model.toChapterUpdate 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.GetTracks import eu.kanade.domain.track.interactor.InsertTrack @@ -51,6 +50,7 @@ import eu.kanade.tachiyomi.ui.browse.migration.MigrationFlags import eu.kanade.tachiyomi.util.lang.launchIO import eu.kanade.tachiyomi.util.lang.withUIContext import kotlinx.coroutines.flow.update +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/tachiyomi/ui/history/HistoryScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryScreenModel.kt index 0a97d662cc..94d9dd8df2 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 1dd26c932a..04130a46b1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt @@ -23,13 +23,10 @@ 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.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.GetLibraryManga 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.track.interactor.GetTracksPerManga import eu.kanade.presentation.library.components.LibraryToolbarTitle @@ -58,6 +55,9 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.update import tachiyomi.domain.category.model.Category +import tachiyomi.domain.library.model.LibrarySort +import tachiyomi.domain.library.model.sort +import tachiyomi.domain.manga.model.MangaUpdate import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.text.Collator 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 8cf03f52a8..8049fe4bf4 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 @@ -7,10 +7,6 @@ import android.view.View import eu.kanade.domain.base.BasePreferences 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.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 @@ -23,6 +19,10 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job 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 57c4b1a93e..e3f10a0c25 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt @@ -29,7 +29,6 @@ import cafe.adriel.voyager.navigator.currentOrThrow import cafe.adriel.voyager.navigator.tab.LocalTabNavigator import cafe.adriel.voyager.navigator.tab.TabOptions 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 @@ -57,6 +56,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 object LibraryTab : Tab { 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 ce2dfceccc..3b97c9d88a 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 @@ -14,7 +14,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.GetManga import eu.kanade.domain.manga.interactor.SetMangaViewerFlags import eu.kanade.domain.manga.model.Manga @@ -76,6 +75,7 @@ import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import logcat.LogPriority +import tachiyomi.domain.history.model.HistoryUpdate 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/updates/UpdatesScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesScreenModel.kt index fe4bf9591b..5bd2c99909 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 @@ -44,6 +43,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/domain/build.gradle.kts b/domain/build.gradle.kts index cfbcc19263..19e8d8935d 100644 --- a/domain/build.gradle.kts +++ b/domain/build.gradle.kts @@ -10,10 +10,13 @@ android { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } - } dependencies { implementation(platform(kotlinx.coroutines.bom)) implementation(kotlinx.bundles.coroutines) + + implementation(project(":source-api")) + + 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 b8a1cf3c10..bb2917ad99 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 8cd7f5a2ef..62738c33bc 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 75% 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 f3662b9148..590544e932 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,6 +1,6 @@ -package eu.kanade.domain.history.model +package tachiyomi.domain.history.model -import eu.kanade.domain.manga.model.MangaCover +import tachiyomi.domain.manga.model.MangaCover import java.util.Date data class HistoryWithRelations( 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 95203841a2..655d19bf9d 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 37c53c64f5..236d00235d 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 cf1b567995..1d133724c8 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/model/MangaCover.kt b/domain/src/main/java/tachiyomi/domain/manga/model/MangaCover.kt new file mode 100644 index 0000000000..fab5572f30 --- /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 94% 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 03035fe070..1abf0c028a 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/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 44fe16d020..5fe097f277 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 79% 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 fdba51c69f..bc2bd2be43 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,6 +1,6 @@ -package eu.kanade.domain.updates.model +package tachiyomi.domain.updates.model -import eu.kanade.domain.manga.model.MangaCover +import tachiyomi.domain.manga.model.MangaCover data class UpdatesWithRelations( val mangaId: Long, 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 4e1f935f0a..badbee8e68 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 beee80656c..95af9a2d04 100644 --- a/i18n/build.gradle.kts +++ b/i18n/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } android { - namespace = "eu.kanade.tachiyomi.i18n" + namespace = "tachiyomi.i18n" lint { disable.addAll(listOf("MissingTranslation", "ExtraTranslation"))