Added Auto Webtoon Mode

app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt

@@ -236,4 +236,6 @@ object PreferenceKeys {
     const val eh_is_hentai_enabled = "eh_is_hentai_enabled"
 
     const val eh_use_new_manga_interface = "eh_use_new_manga_interface"
+
+    const val eh_use_auto_webtoon = "eh_use_auto_webtoon"
 }

app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt

@@ -346,4 +346,6 @@ class PreferencesHelper(val context: Context) {
     fun eh_preload_size() = flowPrefs.getInt(Keys.eh_preload_size, 4)
 
     fun eh_useNewMangaInterface() = flowPrefs.getBoolean(Keys.eh_use_new_manga_interface, true)
+
+    fun eh_useAutoWebtoon() = flowPrefs.getBoolean(Keys.eh_use_auto_webtoon, true)
 }

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt

@@ -115,7 +115,6 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
 
     private var autoscrollSubscription: Subscription? = null
     private val sourceManager: SourceManager by injectLazy()
-    private val prefs: PreferencesHelper by injectLazy()
 
     private val logger = XLog.tag("ReaderActivity")
     // <-- EH

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt

@@ -28,6 +28,7 @@ import eu.kanade.tachiyomi.util.lang.takeBytes
 import eu.kanade.tachiyomi.util.storage.DiskUtil
 import eu.kanade.tachiyomi.util.system.ImageUtil
 import eu.kanade.tachiyomi.util.updateCoverLastModified
+import exh.util.defaultReaderType
 import java.io.File
 import java.util.Date
 import java.util.concurrent.TimeUnit
@@ -447,7 +448,13 @@ class ReaderPresenter(
      */
     fun getMangaViewer(): Int {
         val manga = manga ?: return preferences.defaultViewer()
-        return if (manga.viewer == 0) preferences.defaultViewer() else manga.viewer
+        return if (manga.viewer == 0 && preferences.eh_useAutoWebtoon().get()) {
+            manga.defaultReaderType() ?: if (manga.viewer == 0) preferences.defaultViewer() else manga.viewer
+        } else if (manga.viewer == 0) {
+            preferences.defaultViewer()
+        } else {
+            manga.viewer
+        }
     }
 
     /**

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt

@@ -18,6 +18,7 @@ import eu.kanade.tachiyomi.util.view.invisible
 import eu.kanade.tachiyomi.util.view.visible
 import eu.kanade.tachiyomi.widget.IgnoreFirstSpinnerListener
 import kotlinx.android.synthetic.main.reader_settings_sheet.always_show_chapter_transition
+import kotlinx.android.synthetic.main.reader_settings_sheet.auto_webtoon_mode
 import kotlinx.android.synthetic.main.reader_settings_sheet.background_color
 import kotlinx.android.synthetic.main.reader_settings_sheet.crop_borders
 import kotlinx.android.synthetic.main.reader_settings_sheet.crop_borders_webtoon
@@ -90,6 +91,7 @@ class ReaderSettingsSheet(private val activity: ReaderActivity) : BottomSheetDia
         keepscreen.bindToPreference(preferences.keepScreenOn())
         long_tap.bindToPreference(preferences.readWithLongTap())
         always_show_chapter_transition.bindToPreference(preferences.alwaysShowChapterTransition())
+        auto_webtoon_mode.bindToPreference(preferences.eh_useAutoWebtoon())
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             true_color.visible()

app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt

@@ -210,6 +210,12 @@ class SettingsReaderController : SettingsController() {
                 title = "Preserve reading position on read manga"
                 defaultValue = false
             }
+            switchPreference {
+                key = Keys.eh_use_auto_webtoon
+                title = "Auto Webtoon Mode"
+                summary = "Use auto webtoon mode for manga that are detected to likely use the long strip format"
+                defaultValue = true
+            }
         }
 
         preferenceCategory {