Split reader preferences from PreferencesHelper (#8042)

(cherry picked from commit e275897bf9)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderGeneralSettings.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderReadingModeSettings.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerConfig.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt

app/src/main/java/exh/EXHMigrations.kt

@@ -38,6 +38,7 @@ import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.online.all.Hitomi
 import eu.kanade.tachiyomi.source.online.all.NHentai
 import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
+import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
 import eu.kanade.tachiyomi.util.preference.minusAssign
 import eu.kanade.tachiyomi.util.system.DeviceUtil
 import eu.kanade.tachiyomi.util.system.logcat
@@ -98,6 +99,7 @@ object EXHMigrations {
         sourcePreferences: SourcePreferences,
         securityPreferences: SecurityPreferences,
         libraryPreferences: LibraryPreferences,
+        readerPreferences: ReaderPreferences,
     ): Boolean {
         val oldVersion = preferences.ehLastVersionCode().get()
         try {
@@ -265,9 +267,9 @@ object EXHMigrations {
                     }
                 }
                 if (oldVersion under 18) {
-                    val readerTheme = preferences.readerTheme().get()
+                    val readerTheme = readerPreferences.readerTheme().get()
                     if (readerTheme == 4) {
-                        preferences.readerTheme().set(3)
+                        readerPreferences.readerTheme().set(3)
                     }
                     val updateInterval = libraryPreferences.libraryUpdateInterval().get()
                     if (updateInterval == 1 || updateInterval == 2) {
@@ -418,8 +420,8 @@ object EXHMigrations {
                 if (oldVersion under 32) {
                     val oldReaderTap = prefs.getBoolean("reader_tap", false)
                     if (!oldReaderTap) {
-                        preferences.navigationModePager().set(5)
-                        preferences.navigationModeWebtoon().set(5)
+                        readerPreferences.navigationModePager().set(5)
+                        readerPreferences.navigationModeWebtoon().set(5)
                     }
                 }
                 if (oldVersion under 38) {

app/src/main/java/exh/debug/DebugFunctions.kt

@@ -17,6 +17,7 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.network.NetworkPreferences
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.online.all.NHentai
+import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
 import exh.EXHMigrations
 import exh.eh.EHentaiThrottleManager
 import exh.eh.EHentaiUpdateWorker
@@ -38,6 +39,7 @@ object DebugFunctions {
     val sourcePrefs: SourcePreferences by injectLazy()
     val securityPrefs: SecurityPreferences by injectLazy()
     val libraryPrefs: LibraryPreferences by injectLazy()
+    val readerPrefs: ReaderPreferences by injectLazy()
     val sourceManager: SourceManager by injectLazy()
     val updateManga: UpdateManga by injectLazy()
     val getFavorites: GetFavorites by injectLazy()
@@ -49,12 +51,12 @@ object DebugFunctions {
 
     fun forceUpgradeMigration() {
         prefs.ehLastVersionCode().set(1)
-        EXHMigrations.upgrade(app, prefs, networkPrefs, sourcePrefs, securityPrefs, libraryPrefs)
+        EXHMigrations.upgrade(app, prefs, networkPrefs, sourcePrefs, securityPrefs, libraryPrefs, readerPrefs)
     }
 
     fun forceSetupJobs() {
         prefs.ehLastVersionCode().set(0)
-        EXHMigrations.upgrade(app, prefs, networkPrefs, sourcePrefs, securityPrefs, libraryPrefs)
+        EXHMigrations.upgrade(app, prefs, networkPrefs, sourcePrefs, securityPrefs, libraryPrefs, readerPrefs)
     }
 
     fun resetAgedFlagInEXHManga() {