From 899f0ae86fa95e8889ee16d0fd655d95e0360a4d Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 26 Feb 2023 16:47:29 -0500 Subject: [PATCH] Minor refactoring (cherry picked from commit 5b2e937d5fdeadc8a9a994b99b3f6b7a277f2513) # Conflicts: # app/src/main/java/eu/kanade/domain/source/model/SourcePagingSourceType.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt --- .../java/eu/kanade/core/preference/CheckboxState.kt | 10 ++++++++++ .../{prefs => preference}/PreferenceMutableState.kt | 2 +- .../main/java/eu/kanade/core/prefs/CheckboxState.kt | 12 ------------ .../eu/kanade/data/source/EHentaiPagingSource.kt | 1 + .../eu/kanade/data/source/SourceRepositoryImpl.kt | 9 +++++---- .../domain/source/interactor/GetRemoteManga.kt | 2 +- .../domain/source/model/SourcePagingSourceType.kt | 7 ------- .../domain/source/repository/SourceRepository.kt | 2 +- .../kanade/presentation/browse/BrowseSourceScreen.kt | 2 +- .../presentation/category/ChangeCategoryDialog.kt | 4 ++-- .../library/components/LibraryContent.kt | 2 +- .../presentation/library/components/LibraryPager.kt | 2 +- .../java/eu/kanade/tachiyomi/ui/browse/BrowseTab.kt | 2 +- .../tachiyomi/ui/browse/source/SourcesScreenModel.kt | 2 +- .../browse/source/browse/BrowseSourceScreenModel.kt | 4 ++-- .../ui/browse/source/feed/SourceFeedScreenModel.kt | 2 +- .../eu/kanade/tachiyomi/ui/history/HistoryTab.kt | 2 +- .../java/eu/kanade/tachiyomi/ui/home/HomeScreen.kt | 2 +- .../tachiyomi/ui/library/LibraryScreenModel.kt | 4 ++-- .../ui/library/LibrarySettingsScreenModel.kt | 2 +- .../eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt | 2 +- .../main/java/eu/kanade/tachiyomi/ui/more/MoreTab.kt | 2 +- .../tachiyomi/ui/updates/UpdatesScreenModel.kt | 2 +- .../eu/kanade/tachiyomi/ui/updates/UpdatesTab.kt | 2 +- app/src/main/java/exh/debug/DebugToggles.kt | 2 +- app/src/main/java/exh/debug/SettingsDebugScreen.kt | 2 +- app/src/main/java/exh/log/EHDebugModeOverlay.kt | 2 +- .../exh/md/follows/MangaDexFollowsPagingSource.kt | 2 +- .../exh/md/follows/MangaDexFollowsScreenModel.kt | 2 +- .../exh/md/similar/MangaDexSimilarPagingSource.kt | 4 ++-- .../exh/md/similar/MangaDexSimilarScreenModel.kt | 2 +- app/src/main/java/exh/recs/RecommendsPagingSource.kt | 4 ++-- app/src/main/java/exh/recs/RecommendsScreenModel.kt | 2 +- .../tachiyomi}/data/source/SourcePagingSource.kt | 6 ++++-- 34 files changed, 53 insertions(+), 58 deletions(-) create mode 100644 app/src/main/java/eu/kanade/core/preference/CheckboxState.kt rename app/src/main/java/eu/kanade/core/{prefs => preference}/PreferenceMutableState.kt (96%) delete mode 100644 app/src/main/java/eu/kanade/core/prefs/CheckboxState.kt delete mode 100644 app/src/main/java/eu/kanade/domain/source/model/SourcePagingSourceType.kt rename {app/src/main/java/eu/kanade => data/src/main/java/tachiyomi}/data/source/SourcePagingSource.kt (94%) diff --git a/app/src/main/java/eu/kanade/core/preference/CheckboxState.kt b/app/src/main/java/eu/kanade/core/preference/CheckboxState.kt new file mode 100644 index 000000000..12635d04f --- /dev/null +++ b/app/src/main/java/eu/kanade/core/preference/CheckboxState.kt @@ -0,0 +1,10 @@ +package eu.kanade.core.preference + +import androidx.compose.ui.state.ToggleableState +import tachiyomi.core.preference.CheckboxState + +fun CheckboxState.TriState.asToggleableState() = when (this) { + is CheckboxState.TriState.Exclude -> ToggleableState.Indeterminate + is CheckboxState.TriState.Include -> ToggleableState.On + is CheckboxState.TriState.None -> ToggleableState.Off +} diff --git a/app/src/main/java/eu/kanade/core/prefs/PreferenceMutableState.kt b/app/src/main/java/eu/kanade/core/preference/PreferenceMutableState.kt similarity index 96% rename from app/src/main/java/eu/kanade/core/prefs/PreferenceMutableState.kt rename to app/src/main/java/eu/kanade/core/preference/PreferenceMutableState.kt index c33b24091..2c641ccc0 100644 --- a/app/src/main/java/eu/kanade/core/prefs/PreferenceMutableState.kt +++ b/app/src/main/java/eu/kanade/core/preference/PreferenceMutableState.kt @@ -1,4 +1,4 @@ -package eu.kanade.core.prefs +package eu.kanade.core.preference import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf diff --git a/app/src/main/java/eu/kanade/core/prefs/CheckboxState.kt b/app/src/main/java/eu/kanade/core/prefs/CheckboxState.kt deleted file mode 100644 index c3b54ecab..000000000 --- a/app/src/main/java/eu/kanade/core/prefs/CheckboxState.kt +++ /dev/null @@ -1,12 +0,0 @@ -package eu.kanade.core.prefs - -import androidx.compose.ui.state.ToggleableState -import tachiyomi.core.preference.CheckboxState - -fun CheckboxState.TriState.asState(): ToggleableState { - return when (this) { - is CheckboxState.TriState.Exclude -> ToggleableState.Indeterminate - is CheckboxState.TriState.Include -> ToggleableState.On - is CheckboxState.TriState.None -> ToggleableState.Off - } -} diff --git a/app/src/main/java/eu/kanade/data/source/EHentaiPagingSource.kt b/app/src/main/java/eu/kanade/data/source/EHentaiPagingSource.kt index 545313457..9a31fd301 100644 --- a/app/src/main/java/eu/kanade/data/source/EHentaiPagingSource.kt +++ b/app/src/main/java/eu/kanade/data/source/EHentaiPagingSource.kt @@ -7,6 +7,7 @@ import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.online.all.EHentai import exh.metadata.metadata.base.RaisedSearchMetadata import tachiyomi.core.util.lang.awaitSingle +import tachiyomi.data.source.SourcePagingSource abstract class EHentaiPagingSource(override val source: EHentai) : SourcePagingSource(source) { diff --git a/app/src/main/java/eu/kanade/data/source/SourceRepositoryImpl.kt b/app/src/main/java/eu/kanade/data/source/SourceRepositoryImpl.kt index c1bc78cd6..1902fd35b 100644 --- a/app/src/main/java/eu/kanade/data/source/SourceRepositoryImpl.kt +++ b/app/src/main/java/eu/kanade/data/source/SourceRepositoryImpl.kt @@ -1,6 +1,5 @@ package eu.kanade.data.source -import eu.kanade.domain.source.model.SourcePagingSourceType import eu.kanade.domain.source.repository.SourceRepository import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.SourceManager @@ -10,6 +9,10 @@ import exh.source.MERGED_SOURCE_ID import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import tachiyomi.data.DatabaseHandler +import tachiyomi.data.source.SourceLatestPagingSource +import tachiyomi.data.source.SourcePagingSourceType +import tachiyomi.data.source.SourcePopularPagingSource +import tachiyomi.data.source.SourceSearchPagingSource import tachiyomi.domain.source.model.Source import tachiyomi.domain.source.model.SourceWithCount import tachiyomi.source.local.LocalSource @@ -37,9 +40,7 @@ class SourceRepositoryImpl( sourceIdsWithCount .filterNot { it.source == LocalSource.ID /* SY --> */ || it.source == MERGED_SOURCE_ID /* SY <-- */ } .map { (sourceId, count) -> - val source = sourceManager.getOrStub(sourceId).run { - sourceMapper(this) - } + val source = sourceMapper(sourceManager.getOrStub(sourceId)) source to count } } diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/GetRemoteManga.kt b/app/src/main/java/eu/kanade/domain/source/interactor/GetRemoteManga.kt index 0fefeeee6..3a2574b81 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/GetRemoteManga.kt +++ b/app/src/main/java/eu/kanade/domain/source/interactor/GetRemoteManga.kt @@ -1,8 +1,8 @@ package eu.kanade.domain.source.interactor -import eu.kanade.domain.source.model.SourcePagingSourceType import eu.kanade.domain.source.repository.SourceRepository import eu.kanade.tachiyomi.source.model.FilterList +import tachiyomi.data.source.SourcePagingSourceType class GetRemoteManga( private val repository: SourceRepository, diff --git a/app/src/main/java/eu/kanade/domain/source/model/SourcePagingSourceType.kt b/app/src/main/java/eu/kanade/domain/source/model/SourcePagingSourceType.kt deleted file mode 100644 index e7199c9f9..000000000 --- a/app/src/main/java/eu/kanade/domain/source/model/SourcePagingSourceType.kt +++ /dev/null @@ -1,7 +0,0 @@ -package eu.kanade.domain.source.model - -import androidx.paging.PagingSource -import eu.kanade.tachiyomi.source.model.SManga -import exh.metadata.metadata.base.RaisedSearchMetadata - -typealias SourcePagingSourceType = PagingSource */ Pair/*SY <-- */> diff --git a/app/src/main/java/eu/kanade/domain/source/repository/SourceRepository.kt b/app/src/main/java/eu/kanade/domain/source/repository/SourceRepository.kt index 5b6c2b215..0783815bb 100644 --- a/app/src/main/java/eu/kanade/domain/source/repository/SourceRepository.kt +++ b/app/src/main/java/eu/kanade/domain/source/repository/SourceRepository.kt @@ -1,8 +1,8 @@ package eu.kanade.domain.source.repository -import eu.kanade.domain.source.model.SourcePagingSourceType import eu.kanade.tachiyomi.source.model.FilterList import kotlinx.coroutines.flow.Flow +import tachiyomi.data.source.SourcePagingSourceType import tachiyomi.domain.source.model.Source import tachiyomi.domain.source.model.SourceWithCount 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 0dc6cad07..a1a5bcc6f 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt @@ -16,7 +16,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.paging.LoadState import androidx.paging.compose.LazyPagingItems -import eu.kanade.data.source.NoResultsException import eu.kanade.presentation.browse.components.BrowseSourceComfortableGrid import eu.kanade.presentation.browse.components.BrowseSourceCompactGrid import eu.kanade.presentation.browse.components.BrowseSourceEHentaiList @@ -28,6 +27,7 @@ import eu.kanade.tachiyomi.source.SourceManager import exh.metadata.metadata.base.RaisedSearchMetadata import exh.source.isEhBasedSource import kotlinx.coroutines.flow.StateFlow +import tachiyomi.data.source.NoResultsException import tachiyomi.domain.library.model.LibraryDisplayMode import tachiyomi.domain.manga.model.Manga import tachiyomi.presentation.core.components.material.Scaffold diff --git a/app/src/main/java/eu/kanade/presentation/category/ChangeCategoryDialog.kt b/app/src/main/java/eu/kanade/presentation/category/ChangeCategoryDialog.kt index 91b75cf4b..68f073f9e 100644 --- a/app/src/main/java/eu/kanade/presentation/category/ChangeCategoryDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/category/ChangeCategoryDialog.kt @@ -21,7 +21,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import eu.kanade.core.prefs.asState +import eu.kanade.core.preference.asToggleableState import eu.kanade.tachiyomi.R import tachiyomi.core.preference.CheckboxState import tachiyomi.domain.category.model.Category @@ -110,7 +110,7 @@ fun ChangeCategoryDialog( when (checkbox) { is CheckboxState.TriState -> { TriStateCheckbox( - state = checkbox.asState(), + state = checkbox.asToggleableState(), onClick = { onChange(checkbox) }, ) } 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 5195b8434..834a045c2 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,7 @@ import androidx.compose.runtime.rememberCoroutineScope 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.core.preference.PreferenceMutableState import eu.kanade.tachiyomi.ui.library.LibraryItem import kotlinx.coroutines.delay import kotlinx.coroutines.launch 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 6c9fc418b..c3bba5f47 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 @@ -16,7 +16,7 @@ import androidx.compose.ui.Alignment 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.core.preference.PreferenceMutableState import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.library.LibraryItem import tachiyomi.domain.library.model.LibraryDisplayMode diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseTab.kt index 07a2fadf8..eb24428cb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseTab.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseTab.kt @@ -15,7 +15,7 @@ import cafe.adriel.voyager.core.model.rememberScreenModel import cafe.adriel.voyager.navigator.Navigator import cafe.adriel.voyager.navigator.tab.LocalTabNavigator import cafe.adriel.voyager.navigator.tab.TabOptions -import eu.kanade.core.prefs.asState +import eu.kanade.core.preference.asState import eu.kanade.domain.ui.UiPreferences import eu.kanade.presentation.components.TabbedScreen import eu.kanade.presentation.extensions.RequestStoragePermission diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesScreenModel.kt index 9b8cd8dab..c86b3507c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesScreenModel.kt @@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable import androidx.compose.runtime.getValue import cafe.adriel.voyager.core.model.StateScreenModel import cafe.adriel.voyager.core.model.coroutineScope -import eu.kanade.core.prefs.asState +import eu.kanade.core.preference.asState import eu.kanade.domain.base.BasePreferences import eu.kanade.domain.source.interactor.GetEnabledSources import eu.kanade.domain.source.interactor.GetShowLatest diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt index b595baefb..e17041ce2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt @@ -13,7 +13,7 @@ import androidx.paging.filter import androidx.paging.map import cafe.adriel.voyager.core.model.StateScreenModel import cafe.adriel.voyager.core.model.coroutineScope -import eu.kanade.core.prefs.asState +import eu.kanade.core.preference.asState import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.chapter.interactor.SetMangaDefaultChapterFlags import eu.kanade.domain.chapter.interactor.SyncChaptersWithTrackServiceTwoWay @@ -27,7 +27,6 @@ import eu.kanade.domain.source.interactor.DeleteSavedSearchById import eu.kanade.domain.source.interactor.GetExhSavedSearch import eu.kanade.domain.source.interactor.GetRemoteManga import eu.kanade.domain.source.interactor.InsertSavedSearch -import eu.kanade.domain.source.model.SourcePagingSourceType import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.domain.track.model.toDomainTrack import eu.kanade.domain.ui.UiPreferences @@ -73,6 +72,7 @@ import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.lang.withNonCancellableContext import tachiyomi.core.util.lang.withUIContext import tachiyomi.core.util.system.logcat +import tachiyomi.data.source.SourcePagingSourceType import tachiyomi.domain.category.interactor.GetCategories import tachiyomi.domain.category.interactor.SetMangaCategories import tachiyomi.domain.category.model.Category diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedScreenModel.kt index 1e31dab92..5ed61900b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedScreenModel.kt @@ -7,7 +7,7 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.produceState import cafe.adriel.voyager.core.model.StateScreenModel import cafe.adriel.voyager.core.model.coroutineScope -import eu.kanade.core.prefs.asState +import eu.kanade.core.preference.asState import eu.kanade.domain.manga.interactor.UpdateManga import eu.kanade.domain.manga.model.copyFrom import eu.kanade.domain.manga.model.toDomainManga diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryTab.kt index 73e4853ce..577b2bb53 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryTab.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryTab.kt @@ -19,7 +19,7 @@ import cafe.adriel.voyager.navigator.Navigator import cafe.adriel.voyager.navigator.currentOrThrow import cafe.adriel.voyager.navigator.tab.LocalTabNavigator import cafe.adriel.voyager.navigator.tab.TabOptions -import eu.kanade.core.prefs.asState +import eu.kanade.core.preference.asState import eu.kanade.domain.ui.UiPreferences import eu.kanade.presentation.history.HistoryScreen import eu.kanade.presentation.history.components.HistoryDeleteAllDialog diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/home/HomeScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/home/HomeScreen.kt index b575bd01d..4c27082e5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/home/HomeScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/home/HomeScreen.kt @@ -34,7 +34,7 @@ import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import cafe.adriel.voyager.navigator.tab.LocalTabNavigator import cafe.adriel.voyager.navigator.tab.TabNavigator -import eu.kanade.core.prefs.asState +import eu.kanade.core.preference.asState import eu.kanade.core.util.fastFilter import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.domain.source.service.SourcePreferences 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 e6769c6c7..cc3b97cff 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 @@ -10,8 +10,8 @@ import androidx.compose.ui.util.fastForEach import androidx.compose.ui.util.fastMap import cafe.adriel.voyager.core.model.StateScreenModel import cafe.adriel.voyager.core.model.coroutineScope -import eu.kanade.core.prefs.PreferenceMutableState -import eu.kanade.core.prefs.asState +import eu.kanade.core.preference.PreferenceMutableState +import eu.kanade.core.preference.asState import eu.kanade.core.util.fastDistinctBy import eu.kanade.core.util.fastFilter import eu.kanade.core.util.fastFilterNot diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsScreenModel.kt index 1e3672774..6201dde59 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsScreenModel.kt @@ -3,7 +3,7 @@ package eu.kanade.tachiyomi.ui.library import androidx.compose.runtime.getValue import cafe.adriel.voyager.core.model.ScreenModel import cafe.adriel.voyager.core.model.coroutineScope -import eu.kanade.core.prefs.asState +import eu.kanade.core.preference.asState import eu.kanade.domain.base.BasePreferences import eu.kanade.domain.category.interactor.SetDisplayModeForCategory import eu.kanade.domain.category.interactor.SetSortModeForCategory 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 2446dcfe6..c8a885a47 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 @@ -8,7 +8,7 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import cafe.adriel.voyager.core.model.StateScreenModel import cafe.adriel.voyager.core.model.coroutineScope -import eu.kanade.core.prefs.asState +import eu.kanade.core.preference.asState import eu.kanade.core.util.addOrRemove import eu.kanade.domain.chapter.interactor.GetMergedChapterByMangaId import eu.kanade.domain.chapter.interactor.SetMangaDefaultChapterFlags diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreTab.kt index 66fe49267..74c72e777 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreTab.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreTab.kt @@ -17,7 +17,7 @@ import cafe.adriel.voyager.navigator.Navigator import cafe.adriel.voyager.navigator.currentOrThrow import cafe.adriel.voyager.navigator.tab.LocalTabNavigator import cafe.adriel.voyager.navigator.tab.TabOptions -import eu.kanade.core.prefs.asState +import eu.kanade.core.preference.asState import eu.kanade.domain.base.BasePreferences import eu.kanade.domain.ui.UiPreferences import eu.kanade.presentation.more.MoreScreen 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 bf08babc5..7555ef883 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 @@ -8,7 +8,7 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import cafe.adriel.voyager.core.model.StateScreenModel import cafe.adriel.voyager.core.model.coroutineScope -import eu.kanade.core.prefs.asState +import eu.kanade.core.preference.asState import eu.kanade.core.util.addOrRemove import eu.kanade.core.util.insertSeparators import eu.kanade.domain.chapter.interactor.SetReadStatus diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesTab.kt index 1f8db149d..24ab0c5fb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesTab.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesTab.kt @@ -18,7 +18,7 @@ import cafe.adriel.voyager.navigator.Navigator import cafe.adriel.voyager.navigator.currentOrThrow import cafe.adriel.voyager.navigator.tab.LocalTabNavigator import cafe.adriel.voyager.navigator.tab.TabOptions -import eu.kanade.core.prefs.asState +import eu.kanade.core.preference.asState import eu.kanade.domain.ui.UiPreferences import eu.kanade.presentation.updates.UpdateScreen import eu.kanade.presentation.updates.UpdatesDeleteConfirmationDialog diff --git a/app/src/main/java/exh/debug/DebugToggles.kt b/app/src/main/java/exh/debug/DebugToggles.kt index a81224206..37ef010b2 100644 --- a/app/src/main/java/exh/debug/DebugToggles.kt +++ b/app/src/main/java/exh/debug/DebugToggles.kt @@ -1,6 +1,6 @@ package exh.debug -import eu.kanade.core.prefs.PreferenceMutableState +import eu.kanade.core.preference.PreferenceMutableState import kotlinx.coroutines.CoroutineScope import tachiyomi.core.preference.PreferenceStore import uy.kohesive.injekt.injectLazy diff --git a/app/src/main/java/exh/debug/SettingsDebugScreen.kt b/app/src/main/java/exh/debug/SettingsDebugScreen.kt index 78fa180f0..52974a37f 100644 --- a/app/src/main/java/exh/debug/SettingsDebugScreen.kt +++ b/app/src/main/java/exh/debug/SettingsDebugScreen.kt @@ -45,7 +45,7 @@ import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.unit.dp import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow -import eu.kanade.core.prefs.PreferenceMutableState +import eu.kanade.core.preference.PreferenceMutableState import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget import eu.kanade.presentation.more.settings.widget.TrailingWidgetBuffer diff --git a/app/src/main/java/exh/log/EHDebugModeOverlay.kt b/app/src/main/java/exh/log/EHDebugModeOverlay.kt index 9ecafcca8..db2cb947d 100644 --- a/app/src/main/java/exh/log/EHDebugModeOverlay.kt +++ b/app/src/main/java/exh/log/EHDebugModeOverlay.kt @@ -32,7 +32,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import eu.kanade.core.prefs.asState +import eu.kanade.core.preference.asState import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.R diff --git a/app/src/main/java/exh/md/follows/MangaDexFollowsPagingSource.kt b/app/src/main/java/exh/md/follows/MangaDexFollowsPagingSource.kt index 7639c39a4..dc8e6c501 100644 --- a/app/src/main/java/exh/md/follows/MangaDexFollowsPagingSource.kt +++ b/app/src/main/java/exh/md/follows/MangaDexFollowsPagingSource.kt @@ -1,8 +1,8 @@ package exh.md.follows -import eu.kanade.data.source.SourcePagingSource import eu.kanade.tachiyomi.source.model.MangasPage import eu.kanade.tachiyomi.source.online.all.MangaDex +import tachiyomi.data.source.SourcePagingSource /** * LatestUpdatesPager inherited from the general Pager. diff --git a/app/src/main/java/exh/md/follows/MangaDexFollowsScreenModel.kt b/app/src/main/java/exh/md/follows/MangaDexFollowsScreenModel.kt index 237e09410..41da4cde2 100644 --- a/app/src/main/java/exh/md/follows/MangaDexFollowsScreenModel.kt +++ b/app/src/main/java/exh/md/follows/MangaDexFollowsScreenModel.kt @@ -1,6 +1,5 @@ package exh.md.follows -import eu.kanade.domain.source.model.SourcePagingSourceType import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.online.all.MangaDex import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceScreenModel @@ -9,6 +8,7 @@ import exh.source.getMainSource import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.update +import tachiyomi.data.source.SourcePagingSourceType import tachiyomi.domain.manga.model.Manga class MangaDexFollowsScreenModel(sourceId: Long) : BrowseSourceScreenModel(sourceId, null) { diff --git a/app/src/main/java/exh/md/similar/MangaDexSimilarPagingSource.kt b/app/src/main/java/exh/md/similar/MangaDexSimilarPagingSource.kt index ed4a32d24..00f800f16 100644 --- a/app/src/main/java/exh/md/similar/MangaDexSimilarPagingSource.kt +++ b/app/src/main/java/exh/md/similar/MangaDexSimilarPagingSource.kt @@ -1,13 +1,13 @@ package exh.md.similar -import eu.kanade.data.source.NoResultsException -import eu.kanade.data.source.SourcePagingSource import eu.kanade.domain.manga.model.toSManga import eu.kanade.tachiyomi.source.model.MangasPage import eu.kanade.tachiyomi.source.model.MetadataMangasPage import eu.kanade.tachiyomi.source.online.all.MangaDex import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope +import tachiyomi.data.source.NoResultsException +import tachiyomi.data.source.SourcePagingSource import tachiyomi.domain.manga.model.Manga /** diff --git a/app/src/main/java/exh/md/similar/MangaDexSimilarScreenModel.kt b/app/src/main/java/exh/md/similar/MangaDexSimilarScreenModel.kt index d8dc77806..9137c09de 100644 --- a/app/src/main/java/exh/md/similar/MangaDexSimilarScreenModel.kt +++ b/app/src/main/java/exh/md/similar/MangaDexSimilarScreenModel.kt @@ -1,6 +1,5 @@ package exh.md.similar -import eu.kanade.domain.source.model.SourcePagingSourceType import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.online.all.MangaDex import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceScreenModel @@ -10,6 +9,7 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.update import kotlinx.coroutines.runBlocking +import tachiyomi.data.source.SourcePagingSourceType import tachiyomi.domain.manga.interactor.GetManga import tachiyomi.domain.manga.model.Manga import uy.kohesive.injekt.Injekt diff --git a/app/src/main/java/exh/recs/RecommendsPagingSource.kt b/app/src/main/java/exh/recs/RecommendsPagingSource.kt index 53096c32c..de4072c14 100644 --- a/app/src/main/java/exh/recs/RecommendsPagingSource.kt +++ b/app/src/main/java/exh/recs/RecommendsPagingSource.kt @@ -1,7 +1,5 @@ package exh.recs -import eu.kanade.data.source.NoResultsException -import eu.kanade.data.source.SourcePagingSource import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.NetworkHelper @@ -28,6 +26,8 @@ import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.MediaType.Companion.toMediaType import okhttp3.RequestBody.Companion.toRequestBody import tachiyomi.core.util.system.logcat +import tachiyomi.data.source.NoResultsException +import tachiyomi.data.source.SourcePagingSource import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.track.interactor.GetTracks import uy.kohesive.injekt.Injekt diff --git a/app/src/main/java/exh/recs/RecommendsScreenModel.kt b/app/src/main/java/exh/recs/RecommendsScreenModel.kt index 7b91e40d4..80da8afc5 100644 --- a/app/src/main/java/exh/recs/RecommendsScreenModel.kt +++ b/app/src/main/java/exh/recs/RecommendsScreenModel.kt @@ -1,10 +1,10 @@ package exh.recs -import eu.kanade.domain.source.model.SourcePagingSourceType import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceScreenModel import kotlinx.coroutines.runBlocking +import tachiyomi.data.source.SourcePagingSourceType import tachiyomi.domain.manga.interactor.GetManga import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/data/source/SourcePagingSource.kt b/data/src/main/java/tachiyomi/data/source/SourcePagingSource.kt similarity index 94% rename from app/src/main/java/eu/kanade/data/source/SourcePagingSource.kt rename to data/src/main/java/tachiyomi/data/source/SourcePagingSource.kt index ff9ac221c..d53d3cb91 100644 --- a/app/src/main/java/eu/kanade/data/source/SourcePagingSource.kt +++ b/data/src/main/java/tachiyomi/data/source/SourcePagingSource.kt @@ -1,7 +1,7 @@ -package eu.kanade.data.source +package tachiyomi.data.source +import androidx.paging.PagingSource import androidx.paging.PagingState -import eu.kanade.domain.source.model.SourcePagingSourceType import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.MangasPage @@ -11,6 +11,8 @@ import exh.metadata.metadata.base.RaisedSearchMetadata import tachiyomi.core.util.lang.awaitSingle import tachiyomi.core.util.lang.withIOContext +typealias SourcePagingSourceType = PagingSource */ Pair/*SY <-- */> + abstract class SourcePagingSource( protected open val source: CatalogueSource, ) : SourcePagingSourceType() {