diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt index 33bed1789..4c4e0a5f2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt @@ -23,10 +23,8 @@ import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.Navigator import cafe.adriel.voyager.navigator.currentOrThrow import com.google.android.material.dialog.MaterialAlertDialogBuilder -import eu.kanade.core.preference.asState import eu.kanade.domain.manga.model.hasCustomCover import eu.kanade.domain.manga.model.toSManga -import eu.kanade.domain.ui.UiPreferences import eu.kanade.presentation.category.components.ChangeCategoryDialog import eu.kanade.presentation.components.NavigatorAdaptiveSheet import eu.kanade.presentation.manga.ChapterSettingsDialog @@ -117,12 +115,6 @@ class MangaScreen( val successState = state as MangaScreenModel.State.Success val isHttpSource = remember { successState.source is HttpSource } - // SY --> - val previewsRowCount by remember { - Injekt.get().previewsRowCount().asState(scope) - } - // SY <-- - LaunchedEffect(successState.manga, screenModel.source) { if (isHttpSource) { try { @@ -205,7 +197,7 @@ class MangaScreen( onEditFetchIntervalClicked = screenModel::showSetFetchIntervalDialog.takeIf { successState.manga.favorite }, - previewsRowCount = previewsRowCount, + previewsRowCount = successState.previewsRowCount, // SY --> onMigrateClicked = { migrateManga(navigator, screenModel.manga!!) }.takeIf { successState.manga.favorite }, onMetadataViewerClicked = { openMetadataViewer(navigator, successState.manga) }, 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 1ed985433..33895fb5a 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 @@ -418,6 +418,7 @@ class MangaScreenModel( PagePreviewState.Unused }, alwaysShowReadingProgress = readerPreferences.preserveReadingPosition().get() && manga.isEhBasedManga(), + previewsRowCount = uiPreferences.previewsRowCount().get(), // SY <-- ) } @@ -1634,6 +1635,7 @@ class MangaScreenModel( val showMergeWithAnother: Boolean, val pagePreviewsState: PagePreviewState, val alwaysShowReadingProgress: Boolean, + val previewsRowCount: Int, // SY <-- ) : State { val processedChapters by lazy { 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 cb17c5fd1..ef79c271e 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 @@ -696,7 +696,8 @@ class ReaderViewModel @JvmOverloads constructor( if (readerPreferences.markReadDupe().get()) { getChaptersByMangaId.await(manga!!.id).sortedByDescending { it.sourceOrder } .filter { - !it.read && it.chapterNumber > 0.0 && it.chapterNumber.toFloat() == readerChapter.chapter.chapter_number + !it.read && it.chapterNumber > 0.0 && + it.chapterNumber.toFloat() == readerChapter.chapter.chapter_number } .also { setReadStatus.await(true, *it.toTypedArray()) } }