From 230aec370ca088e3c3290db9c3a64ee873a01f6c Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Fri, 27 Oct 2023 17:13:27 -0400 Subject: [PATCH] Fix import of reader preferences in reader (cherry picked from commit 90281affc4bcd12c07cb036f948497002f78c197) --- .../main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt | 2 +- .../java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 feefa3d43..a86c6730e 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 @@ -322,7 +322,7 @@ class ReaderViewModel( val context = Injekt.get() // val source = sourceManager.getOrStub(manga.source) - loader = ChapterLoader(context, downloadManager, downloadProvider, manga, source, /* SY --> */sourceManager, mergedReferences, mergedManga/* SY <-- */) + loader = ChapterLoader(context, downloadManager, downloadProvider, manga, source, /* SY --> */sourceManager, readerPreferences, mergedReferences, mergedManga/* SY <-- */) loadChapter(loader!!, chapterList.first { chapterId == it.chapter.id } /* SY --> */, page/* SY <-- */) Result.success(true) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt index b3a03ac9c..3024040f0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt @@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.source.online.all.MergedSource import eu.kanade.tachiyomi.ui.reader.model.ReaderChapter -import exh.debug.DebugFunctions.readerPrefs +import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.system.logcat import tachiyomi.domain.manga.model.Manga @@ -28,6 +28,7 @@ class ChapterLoader( private val source: Source, // SY --> private val sourceManager: SourceManager, + private val readerPrefs: ReaderPreferences, private val mergedReferences: List, private val mergedManga: Map, // SY <--