Merge reader settings and color filter sheets

Heavily influenced by fe2543b9d5 (diff-8f47d7b7b53769ac18c28fe9978140c6bef44709879567acab2c6ef3270cd3a8)

app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt

@@ -20,7 +20,7 @@ class LibrarySettingsSheet(
     router: Router,
     private val trackManager: TrackManager = Injekt.get(),
     onGroupClickListener: (ExtendedNavigationView.Group) -> Unit
-) : TabbedBottomSheetDialog(router) {
+) : TabbedBottomSheetDialog(router.activity!!) {
 
     val filters: Filter
     private val sort: Sort

app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt

@@ -17,7 +17,7 @@ class ChaptersSettingsSheet(
     private val router: Router,
     private val presenter: MangaPresenter,
     onGroupClickListener: (ExtendedNavigationView.Group) -> Unit
-) : TabbedBottomSheetDialog(router) {
+) : TabbedBottomSheetDialog(router.activity!!) {
 
     val filters: Filter
     private val sort: Sort

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

@@ -45,7 +45,6 @@ import eu.kanade.tachiyomi.ui.reader.model.ReaderChapter
 import eu.kanade.tachiyomi.ui.reader.model.ReaderPage
 import eu.kanade.tachiyomi.ui.reader.model.ViewerChapters
 import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
-import eu.kanade.tachiyomi.ui.reader.setting.ReaderColorFilterSheet
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsSheet
 import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType
 import eu.kanade.tachiyomi.ui.reader.viewer.BaseViewer
@@ -365,17 +364,6 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
             }
             .launchIn(lifecycleScope)
 
-        binding.actionCustomFilter.setOnClickListener {
-            val sheet = ReaderColorFilterSheet(this)
-                // Remove dimmed backdrop so changes can be previewed
-                .apply { window?.setDimAmount(0f) }
-
-            // Hide toolbars while sheet is open for better preview
-            sheet.setOnDismissListener { setMenuVisibility(true) }
-            setMenuVisibility(false)
-
-            sheet.show()
-        }
         binding.actionSettings.setOnClickListener {
             ReaderSettingsSheet(this).show()
         }
@@ -393,7 +381,7 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
      * Sets the visibility of the menu according to [visible] and with an optional parameter to
      * [animate] the views.
      */
-    private fun setMenuVisibility(visible: Boolean, animate: Boolean = true) {
+    fun setMenuVisibility(visible: Boolean, animate: Boolean = true) {
         menuVisible = visible
         if (visible) {
             if (preferences.fullscreen().get()) {

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

@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.ui.reader.setting
+package eu.kanade.tachiyomi.ui.reader
 
 import android.content.Context
 import android.graphics.Canvas

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

@@ -1,20 +1,21 @@
 package eu.kanade.tachiyomi.ui.reader.setting
 
-import android.view.ViewGroup
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
 import android.widget.SeekBar
 import androidx.annotation.ColorInt
 import androidx.core.graphics.alpha
 import androidx.core.graphics.blue
 import androidx.core.graphics.green
 import androidx.core.graphics.red
+import androidx.core.widget.NestedScrollView
 import androidx.lifecycle.lifecycleScope
-import com.google.android.material.bottomsheet.BottomSheetBehavior
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.databinding.ReaderColorFilterSheetBinding
+import eu.kanade.tachiyomi.databinding.ReaderColorFilterSettingsBinding
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import eu.kanade.tachiyomi.widget.IgnoreFirstSpinnerListener
 import eu.kanade.tachiyomi.widget.SimpleSeekBarListener
-import eu.kanade.tachiyomi.widget.sheet.BaseBottomSheetDialog
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.sample
@@ -23,30 +24,27 @@ import uy.kohesive.injekt.injectLazy
 /**
  * Color filter sheet to toggle custom filter and brightness overlay.
  */
-class ReaderColorFilterSheet(private val activity: ReaderActivity) : BaseBottomSheetDialog(activity) {
+class ReaderColorFilterSettings @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
+    NestedScrollView(context, attrs) {
 
     private val preferences: PreferencesHelper by injectLazy()
 
-    private var sheetBehavior: BottomSheetBehavior<*>? = null
+    private val binding = ReaderColorFilterSettingsBinding.inflate(LayoutInflater.from(context), this, false)
-
-    private val binding = ReaderColorFilterSheetBinding.inflate(activity.layoutInflater, null, false)
 
     init {
-        setContentView(binding.root)
+        addView(binding.root)
-
-        sheetBehavior = BottomSheetBehavior.from(binding.root.parent as ViewGroup)
 
         preferences.colorFilter().asFlow()
             .onEach { setColorFilter(it) }
-            .launchIn(activity.lifecycleScope)
+            .launchIn((context as ReaderActivity).lifecycleScope)
 
         preferences.colorFilterMode().asFlow()
             .onEach { setColorFilter(preferences.colorFilter().get()) }
-            .launchIn(activity.lifecycleScope)
+            .launchIn(context.lifecycleScope)
 
         preferences.customBrightness().asFlow()
             .onEach { setCustomBrightness(it) }
-            .launchIn(activity.lifecycleScope)
+            .launchIn(context.lifecycleScope)
 
         // Get color and update values
         val color = preferences.colorFilterValue().get()
@@ -131,12 +129,6 @@ class ReaderColorFilterSheet(private val activity: ReaderActivity) : BaseBottomS
         )
     }
 
-    override fun onStart() {
-        super.onStart()
-        sheetBehavior?.skipCollapsed = true
-        sheetBehavior?.state = BottomSheetBehavior.STATE_EXPANDED
-    }
-
     /**
      * Set enabled status of seekBars belonging to color filter
      * @param enabled determines if seekBar gets enabled
@@ -184,7 +176,7 @@ class ReaderColorFilterSheet(private val activity: ReaderActivity) : BaseBottomS
             preferences.customBrightnessValue().asFlow()
                 .sample(100)
                 .onEach { setCustomBrightnessValue(it) }
-                .launchIn(activity.lifecycleScope)
+                .launchIn((context as ReaderActivity).lifecycleScope)
         } else {
             setCustomBrightnessValue(0, true)
         }
@@ -212,7 +204,7 @@ class ReaderColorFilterSheet(private val activity: ReaderActivity) : BaseBottomS
             preferences.colorFilterValue().asFlow()
                 .sample(100)
                 .onEach { setColorFilterValue(it) }
-                .launchIn(activity.lifecycleScope)
+                .launchIn((context as ReaderActivity).lifecycleScope)
         }
         setColorFilterSeekBar(enabled)
     }

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

@@ -0,0 +1,167 @@
+package eu.kanade.tachiyomi.ui.reader.setting
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.CompoundButton
+import android.widget.Spinner
+import androidx.annotation.ArrayRes
+import androidx.core.view.isVisible
+import androidx.core.widget.NestedScrollView
+import androidx.lifecycle.lifecycleScope
+import com.tfcporciuncula.flow.Preference
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.data.preference.asImmediateFlow
+import eu.kanade.tachiyomi.databinding.ReaderGeneralSettingsBinding
+import eu.kanade.tachiyomi.ui.reader.ReaderActivity
+import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerViewer
+import eu.kanade.tachiyomi.ui.reader.viewer.webtoon.WebtoonViewer
+import eu.kanade.tachiyomi.widget.IgnoreFirstSpinnerListener
+import kotlinx.coroutines.flow.launchIn
+import uy.kohesive.injekt.injectLazy
+
+/**
+ * Sheet to show reader and viewer preferences.
+ */
+class ReaderGeneralSettings @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
+    NestedScrollView(context, attrs) {
+
+    private val preferences: PreferencesHelper by injectLazy()
+
+    private val binding = ReaderGeneralSettingsBinding.inflate(LayoutInflater.from(context), this, false)
+
+    init {
+        addView(binding.root)
+
+        initGeneralPreferences()
+
+        when ((context as ReaderActivity).viewer) {
+            is PagerViewer -> initPagerPreferences()
+            is WebtoonViewer -> initWebtoonPreferences()
+        }
+    }
+
+    /**
+     * Init general reader preferences.
+     */
+    private fun initGeneralPreferences() {
+        binding.viewer.onItemSelectedListener = IgnoreFirstSpinnerListener { position ->
+            (context as ReaderActivity).presenter.setMangaViewer(position)
+
+            val mangaViewer = (context as ReaderActivity).presenter.getMangaViewer()
+            if (mangaViewer == ReadingModeType.WEBTOON.prefValue || mangaViewer == ReadingModeType.CONTINUOUS_VERTICAL.prefValue) {
+                initWebtoonPreferences()
+            } else {
+                initPagerPreferences()
+            }
+        }
+        binding.viewer.setSelection((context as ReaderActivity).presenter.manga?.viewer ?: 0, false)
+
+        binding.rotationMode.bindToPreference(preferences.rotation(), 1)
+        binding.backgroundColor.bindToIntPreference(preferences.readerTheme(), R.array.reader_themes_values)
+        binding.showPageNumber.bindToPreference(preferences.showPageNumber())
+        binding.fullscreen.bindToPreference(preferences.fullscreen())
+        binding.keepscreen.bindToPreference(preferences.keepScreenOn())
+        binding.longTap.bindToPreference(preferences.readWithLongTap())
+        binding.alwaysShowChapterTransition.bindToPreference(preferences.alwaysShowChapterTransition())
+        binding.pageTransitions.bindToPreference(preferences.pageTransitions())
+
+        // If the preference is explicitly disabled, that means the setting was configured since there is a cutout
+        if ((context as ReaderActivity).hasCutout || !preferences.cutoutShort().get()) {
+            binding.cutoutShort.isVisible = true
+            binding.cutoutShort.bindToPreference(preferences.cutoutShort())
+        }
+    }
+
+    /**
+     * Init the preferences for the pager reader.
+     */
+    private fun initPagerPreferences() {
+        binding.webtoonPrefsGroup.root.isVisible = false
+        binding.pagerPrefsGroup.root.isVisible = true
+
+        binding.pagerPrefsGroup.tappingPrefsGroup.isVisible = preferences.readWithTapping().get()
+
+        binding.pagerPrefsGroup.tappingInverted.bindToPreference(preferences.pagerNavInverted())
+
+        binding.pagerPrefsGroup.pagerNav.bindToPreference(preferences.navigationModePager())
+        binding.pagerPrefsGroup.scaleType.bindToPreference(preferences.imageScaleType(), 1)
+        binding.pagerPrefsGroup.zoomStart.bindToPreference(preferences.zoomStart(), 1)
+        binding.pagerPrefsGroup.cropBorders.bindToPreference(preferences.cropBorders())
+
+        // Makes so that dual page invert gets hidden away when turning of dual page split
+        binding.dualPageSplit.bindToPreference(preferences.dualPageSplitPaged())
+        preferences.dualPageSplitPaged()
+            .asImmediateFlow { binding.dualPageInvert.isVisible = it }
+            .launchIn((context as ReaderActivity).lifecycleScope)
+        binding.dualPageInvert.bindToPreference(preferences.dualPageInvertPaged())
+    }
+
+    /**
+     * Init the preferences for the webtoon reader.
+     */
+    private fun initWebtoonPreferences() {
+        binding.pagerPrefsGroup.root.isVisible = false
+        binding.webtoonPrefsGroup.root.isVisible = true
+
+        binding.webtoonPrefsGroup.tappingPrefsGroup.isVisible = preferences.readWithTapping().get()
+
+        binding.webtoonPrefsGroup.tappingInverted.bindToPreference(preferences.webtoonNavInverted())
+
+        binding.webtoonPrefsGroup.webtoonNav.bindToPreference(preferences.navigationModeWebtoon())
+        binding.webtoonPrefsGroup.cropBordersWebtoon.bindToPreference(preferences.cropBordersWebtoon())
+        binding.webtoonPrefsGroup.webtoonSidePadding.bindToIntPreference(preferences.webtoonSidePadding(), R.array.webtoon_side_padding_values)
+
+        // Makes so that dual page invert gets hidden away when turning of dual page split
+        binding.dualPageSplit.bindToPreference(preferences.dualPageSplitWebtoon())
+        preferences.dualPageSplitWebtoon()
+            .asImmediateFlow { binding.dualPageInvert.isVisible = it }
+            .launchIn((context as ReaderActivity).lifecycleScope)
+        binding.dualPageInvert.bindToPreference(preferences.dualPageInvertWebtoon())
+    }
+
+    /**
+     * Binds a checkbox or switch view with a boolean preference.
+     */
+    private fun CompoundButton.bindToPreference(pref: Preference<Boolean>) {
+        isChecked = pref.get()
+        setOnCheckedChangeListener { _, isChecked -> pref.set(isChecked) }
+    }
+
+    /**
+     * Binds a spinner to an int preference with an optional offset for the value.
+     */
+    private fun Spinner.bindToPreference(pref: Preference<Int>, offset: Int = 0) {
+        onItemSelectedListener = IgnoreFirstSpinnerListener { position ->
+            pref.set(position + offset)
+        }
+        setSelection(pref.get() - offset, false)
+    }
+
+    /**
+     * Binds a spinner to an enum preference.
+     */
+    private inline fun <reified T : Enum<T>> Spinner.bindToPreference(pref: Preference<T>) {
+        val enumConstants = T::class.java.enumConstants
+
+        onItemSelectedListener = IgnoreFirstSpinnerListener { position ->
+            enumConstants?.get(position)?.let { pref.set(it) }
+        }
+
+        enumConstants?.indexOf(pref.get())?.let { setSelection(it, false) }
+    }
+
+    /**
+     * Binds a spinner to an int preference. The position of the spinner item must
+     * correlate with the [intValues] resource item (in arrays.xml), which is a <string-array>
+     * of int values that will be parsed here and applied to the preference.
+     */
+    private fun Spinner.bindToIntPreference(pref: Preference<Int>, @ArrayRes intValuesResource: Int) {
+        val intValues = resources.getStringArray(intValuesResource).map { it.toIntOrNull() }
+        onItemSelectedListener = IgnoreFirstSpinnerListener { position ->
+            pref.set(intValues[position]!!)
+        }
+        setSelection(intValues.indexOf(pref.get()), false)
+    }
+}

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

@@ -1,174 +1,36 @@
 package eu.kanade.tachiyomi.ui.reader.setting
 
-import android.os.Bundle
+import com.google.android.material.tabs.TabLayout
-import android.widget.CompoundButton
-import android.widget.Spinner
-import androidx.annotation.ArrayRes
-import androidx.core.view.isVisible
-import androidx.core.widget.NestedScrollView
-import androidx.lifecycle.lifecycleScope
-import com.tfcporciuncula.flow.Preference
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.data.preference.asImmediateFlow
-import eu.kanade.tachiyomi.databinding.ReaderSettingsSheetBinding
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
-import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerViewer
+import eu.kanade.tachiyomi.widget.SimpleTabSelectedListener
-import eu.kanade.tachiyomi.ui.reader.viewer.webtoon.WebtoonViewer
+import eu.kanade.tachiyomi.widget.sheet.TabbedBottomSheetDialog
-import eu.kanade.tachiyomi.widget.IgnoreFirstSpinnerListener
-import eu.kanade.tachiyomi.widget.sheet.BaseBottomSheetDialog
-import kotlinx.coroutines.flow.launchIn
-import uy.kohesive.injekt.injectLazy
 
-/**
+class ReaderSettingsSheet(private val activity: ReaderActivity) : TabbedBottomSheetDialog(activity) {
- * Sheet to show reader and viewer preferences.
- */
-class ReaderSettingsSheet(private val activity: ReaderActivity) : BaseBottomSheetDialog(activity) {
 
-    private val preferences: PreferencesHelper by injectLazy()
+    private val generalSettings = ReaderGeneralSettings(activity)
+    private val colorFilterSettings = ReaderColorFilterSettings(activity)
 
-    private val binding = ReaderSettingsSheetBinding.inflate(activity.layoutInflater, null, false)
+    private val sheetBackgroundDim = window?.attributes?.dimAmount ?: 0.25f
 
     init {
-        val scroll = NestedScrollView(activity)
+        binding.tabs.addOnTabSelectedListener(object : SimpleTabSelectedListener() {
-        scroll.addView(binding.root)
+            // Remove dimmed backdrop so color filter changes can be previewed
-        setContentView(scroll)
+            override fun onTabSelected(tab: TabLayout.Tab?) {
-    }
+                val isFilterTab = tab?.position == 1
-
+                window?.setDimAmount(if (isFilterTab) 0f else sheetBackgroundDim)
-    /**
+                activity.setMenuVisibility(!isFilterTab)
-     * Called when the sheet is created. It initializes the listeners and values of the preferences.
-     */
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        initGeneralPreferences()
-
-        when (activity.viewer) {
-            is PagerViewer -> initPagerPreferences()
-            is WebtoonViewer -> initWebtoonPreferences()
-        }
-    }
-
-    /**
-     * Init general reader preferences.
-     */
-    private fun initGeneralPreferences() {
-        binding.viewer.onItemSelectedListener = IgnoreFirstSpinnerListener { position ->
-            activity.presenter.setMangaViewer(position)
-
-            val mangaViewer = activity.presenter.getMangaViewer()
-            if (mangaViewer == ReadingModeType.WEBTOON.prefValue || mangaViewer == ReadingModeType.CONTINUOUS_VERTICAL.prefValue) {
-                initWebtoonPreferences()
-            } else {
-                initPagerPreferences()
             }
-        }
+        })
-        binding.viewer.setSelection(activity.presenter.manga?.viewer ?: 0, false)
-
-        binding.rotationMode.bindToPreference(preferences.rotation(), 1)
-        binding.backgroundColor.bindToIntPreference(preferences.readerTheme(), R.array.reader_themes_values)
-        binding.showPageNumber.bindToPreference(preferences.showPageNumber())
-        binding.fullscreen.bindToPreference(preferences.fullscreen())
-        binding.keepscreen.bindToPreference(preferences.keepScreenOn())
-        binding.longTap.bindToPreference(preferences.readWithLongTap())
-        binding.alwaysShowChapterTransition.bindToPreference(preferences.alwaysShowChapterTransition())
-        binding.pageTransitions.bindToPreference(preferences.pageTransitions())
-
-        // If the preference is explicitly disabled, that means the setting was configured since there is a cutout
-        if (activity.hasCutout || !preferences.cutoutShort().get()) {
-            binding.cutoutShort.isVisible = true
-            binding.cutoutShort.bindToPreference(preferences.cutoutShort())
-        }
     }
 
-    /**
+    override fun getTabViews() = listOf(
-     * Init the preferences for the pager reader.
+        generalSettings,
-     */
+        colorFilterSettings,
-    private fun initPagerPreferences() {
+    )
-        binding.webtoonPrefsGroup.root.isVisible = false
-        binding.pagerPrefsGroup.root.isVisible = true
 
-        binding.pagerPrefsGroup.tappingPrefsGroup.isVisible = preferences.readWithTapping().get()
+    override fun getTabTitles() = listOf(
-
+        R.string.action_settings,
-        binding.pagerPrefsGroup.tappingInverted.bindToPreference(preferences.pagerNavInverted())
+        R.string.custom_filter,
-
+    )
-        binding.pagerPrefsGroup.pagerNav.bindToPreference(preferences.navigationModePager())
-        binding.pagerPrefsGroup.scaleType.bindToPreference(preferences.imageScaleType(), 1)
-        binding.pagerPrefsGroup.zoomStart.bindToPreference(preferences.zoomStart(), 1)
-        binding.pagerPrefsGroup.cropBorders.bindToPreference(preferences.cropBorders())
-
-        // Makes so that dual page invert gets hidden away when turning of dual page split
-        binding.dualPageSplit.bindToPreference(preferences.dualPageSplitPaged())
-        preferences.dualPageSplitPaged()
-            .asImmediateFlow { binding.dualPageInvert.isVisible = it }
-            .launchIn(activity.lifecycleScope)
-        binding.dualPageInvert.bindToPreference(preferences.dualPageInvertPaged())
-    }
-
-    /**
-     * Init the preferences for the webtoon reader.
-     */
-    private fun initWebtoonPreferences() {
-        binding.pagerPrefsGroup.root.isVisible = false
-        binding.webtoonPrefsGroup.root.isVisible = true
-
-        binding.webtoonPrefsGroup.tappingPrefsGroup.isVisible = preferences.readWithTapping().get()
-
-        binding.webtoonPrefsGroup.tappingInverted.bindToPreference(preferences.webtoonNavInverted())
-
-        binding.webtoonPrefsGroup.webtoonNav.bindToPreference(preferences.navigationModeWebtoon())
-        binding.webtoonPrefsGroup.cropBordersWebtoon.bindToPreference(preferences.cropBordersWebtoon())
-        binding.webtoonPrefsGroup.webtoonSidePadding.bindToIntPreference(preferences.webtoonSidePadding(), R.array.webtoon_side_padding_values)
-
-        // Makes so that dual page invert gets hidden away when turning of dual page split
-        binding.dualPageSplit.bindToPreference(preferences.dualPageSplitWebtoon())
-        preferences.dualPageSplitWebtoon()
-            .asImmediateFlow { binding.dualPageInvert.isVisible = it }
-            .launchIn(activity.lifecycleScope)
-        binding.dualPageInvert.bindToPreference(preferences.dualPageInvertWebtoon())
-    }
-
-    /**
-     * Binds a checkbox or switch view with a boolean preference.
-     */
-    private fun CompoundButton.bindToPreference(pref: Preference<Boolean>) {
-        isChecked = pref.get()
-        setOnCheckedChangeListener { _, isChecked -> pref.set(isChecked) }
-    }
-
-    /**
-     * Binds a spinner to an int preference with an optional offset for the value.
-     */
-    private fun Spinner.bindToPreference(pref: Preference<Int>, offset: Int = 0) {
-        onItemSelectedListener = IgnoreFirstSpinnerListener { position ->
-            pref.set(position + offset)
-        }
-        setSelection(pref.get() - offset, false)
-    }
-
-    /**
-     * Binds a spinner to an enum preference.
-     */
-    private inline fun <reified T : Enum<T>> Spinner.bindToPreference(pref: Preference<T>) {
-        val enumConstants = T::class.java.enumConstants
-
-        onItemSelectedListener = IgnoreFirstSpinnerListener { position ->
-            enumConstants?.get(position)?.let { pref.set(it) }
-        }
-
-        enumConstants?.indexOf(pref.get())?.let { setSelection(it, false) }
-    }
-
-    /**
-     * Binds a spinner to an int preference. The position of the spinner item must
-     * correlate with the [intValues] resource item (in arrays.xml), which is a <string-array>
-     * of int values that will be parsed here and applied to the preference.
-     */
-    private fun Spinner.bindToIntPreference(pref: Preference<Int>, @ArrayRes intValuesResource: Int) {
-        val intValues = resources.getStringArray(intValuesResource).map { it.toIntOrNull() }
-        onItemSelectedListener = IgnoreFirstSpinnerListener { position ->
-            pref.set(intValues[position]!!)
-        }
-        setSelection(intValues.indexOf(pref.get()), false)
-    }
 }

app/src/main/java/eu/kanade/tachiyomi/widget/SimpleTabSelectedListener.kt

@@ -0,0 +1,14 @@
+package eu.kanade.tachiyomi.widget
+
+import com.google.android.material.tabs.TabLayout
+
+open class SimpleTabSelectedListener : TabLayout.OnTabSelectedListener {
+    override fun onTabSelected(tab: TabLayout.Tab?) {
+    }
+
+    override fun onTabUnselected(tab: TabLayout.Tab?) {
+    }
+
+    override fun onTabReselected(tab: TabLayout.Tab?) {
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/widget/sheet/TabbedBottomSheetDialog.kt

@@ -1,14 +1,14 @@
 package eu.kanade.tachiyomi.widget.sheet
 
+import android.app.Activity
 import android.view.View
 import android.view.ViewGroup
-import com.bluelinelabs.conductor.Router
 import eu.kanade.tachiyomi.databinding.CommonTabbedSheetBinding
 import eu.kanade.tachiyomi.widget.ViewPagerAdapter
 
-abstract class TabbedBottomSheetDialog(private val router: Router) : BaseBottomSheetDialog(router.activity!!) {
+abstract class TabbedBottomSheetDialog(private val activity: Activity) : BaseBottomSheetDialog(activity) {
 
-    val binding: CommonTabbedSheetBinding = CommonTabbedSheetBinding.inflate(router.activity!!.layoutInflater)
+    val binding: CommonTabbedSheetBinding = CommonTabbedSheetBinding.inflate(activity.layoutInflater)
 
     init {
         val adapter = LibrarySettingsSheetAdapter()
@@ -34,7 +34,7 @@ abstract class TabbedBottomSheetDialog(private val router: Router) : BaseBottomS
         }
 
         override fun getPageTitle(position: Int): CharSequence {
-            return router.activity!!.resources!!.getString(getTabTitles()[position])
+            return activity.resources!!.getString(getTabTitles()[position])
         }
     }
 }

app/src/main/res/drawable/ic_brightness_4_24dp.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/black"
-        android:pathData="M20,8.69L20,4h-4.69L12,0.69 8.69,4L4,4v4.69L0.69,12 4,15.31L4,20h4.69L12,23.31 15.31,20L20,20v-4.69L23.31,12 20,8.69zM18,14.48L18,18h-3.52L12,20.48 9.52,18L6,18v-3.52L3.52,12 6,9.52L6,6h3.52L12,3.52 14.48,6L18,6v3.52L20.48,12 18,14.48zM12.29,7c-0.74,0 -1.45,0.17 -2.08,0.46 1.72,0.79 2.92,2.53 2.92,4.54s-1.2,3.75 -2.92,4.54c0.63,0.29 1.34,0.46 2.08,0.46 2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5z" />
-</vector>

app/src/main/res/layout/reader_activity.xml

@@ -37,7 +37,7 @@
 
     </FrameLayout>
 
-    <eu.kanade.tachiyomi.ui.reader.setting.ReaderColorFilterView
+    <eu.kanade.tachiyomi.ui.reader.ReaderColorFilterView
         android:id="@+id/color_overlay"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -171,25 +171,12 @@
                     android:background="?selectableItemBackgroundBorderless"
                     android:contentDescription="@string/pref_rotation_type"
                     android:padding="@dimen/material_layout_keylines_screen_edge_margin"
-                    app:layout_constraintEnd_toStartOf="@id/action_custom_filter"
+                    app:layout_constraintEnd_toStartOf="@id/action_settings"
                     app:layout_constraintStart_toEndOf="@+id/action_reader_mode"
                     app:layout_constraintTop_toTopOf="parent"
                     app:srcCompat="@drawable/ic_screen_rotation_24dp"
                     app:tint="?attr/colorOnPrimary" />
 
-                <ImageButton
-                    android:id="@+id/action_custom_filter"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:background="?selectableItemBackgroundBorderless"
-                    android:contentDescription="@string/custom_filter"
-                    android:padding="@dimen/material_layout_keylines_screen_edge_margin"
-                    app:layout_constraintEnd_toStartOf="@id/action_settings"
-                    app:layout_constraintStart_toEndOf="@+id/action_rotation"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_brightness_4_24dp"
-                    app:tint="?attr/colorOnPrimary" />
-
                 <ImageButton
                     android:id="@+id/action_settings"
                     android:layout_width="wrap_content"
@@ -198,7 +185,7 @@
                     android:contentDescription="@string/action_settings"
                     android:padding="@dimen/material_layout_keylines_screen_edge_margin"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="@id/action_custom_filter"
+                    app:layout_constraintStart_toEndOf="@id/action_rotation"
                     app:layout_constraintTop_toTopOf="parent"
                     app:srcCompat="@drawable/ic_settings_24dp"
                     app:tint="?attr/colorOnPrimary" />

app/src/main/res/layout/reader_color_filter_settings.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="16dp">
@@ -13,7 +14,8 @@
             android:id="@+id/spinner_end"
             android:layout_width="16dp"
             android:layout_height="0dp"
-            app:layout_constraintStart_toEndOf="parent" />
+            app:layout_constraintStart_toEndOf="parent"
+            tools:ignore="MissingConstraints" />
 
         <!-- Color filter -->
 
@@ -242,6 +244,6 @@
             android:orientation="vertical"
             app:layout_constraintGuide_percent="0.5" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-</ScrollView>
+</androidx.core.widget.NestedScrollView>

app/src/main/res/layout/reader_general_settings.xml

@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipToPadding="false"
+    android:paddingStart="24dp"
+    android:paddingTop="0dp"
+    android:paddingEnd="24dp"
+    android:paddingBottom="24dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+                <ImageView
+                    android:id="@id/pull_up_bar"
+                    android:layout_width="wrap_content"
+                    android:layout_height="24dp"
+                    android:alpha="0.5"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/ic_drag_pill_24dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:tint="?attr/colorOnBackground"
+                    tools:ignore="ContentDescription" />
+
+                <android.widget.Space
+                    android:id="@+id/spinner_end"
+                    android:layout_width="16dp"
+                    android:layout_height="0dp"
+                    app:layout_constraintStart_toEndOf="parent"
+                    tools:ignore="MissingConstraints" />
+
+                <!-- Series-specific preferences -->
+
+                <TextView
+                    android:id="@+id/series_prefs"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:text="@string/pref_category_for_this_series"
+                    android:textColor="?attr/colorAccent"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/pull_up_bar" />
+
+                <TextView
+                    android:id="@+id/viewer_text"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:text="@string/viewer"
+                    app:layout_constraintBaseline_toBaselineOf="@id/viewer"
+                    app:layout_constraintEnd_toStartOf="@id/verticalcenter"
+                    app:layout_constraintStart_toStartOf="parent" />
+
+                <androidx.appcompat.widget.AppCompatSpinner
+                    android:id="@+id/viewer"
+                    android:layout_width="0dp"
+                    android:layout_height="24dp"
+                    android:layout_marginTop="20dp"
+                    android:entries="@array/viewers_selector"
+                    app:layout_constraintEnd_toEndOf="@id/spinner_end"
+                    app:layout_constraintStart_toEndOf="@id/verticalcenter"
+                    app:layout_constraintTop_toBottomOf="@id/series_prefs" />
+
+                <!-- General display preferences -->
+
+                <TextView
+                    android:id="@+id/general_prefs"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="32dp"
+                    android:text="@string/pref_category_general"
+                    android:textColor="?attr/colorAccent"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/viewer" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/page_transitions"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/pref_page_transitions"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:layout_constraintTop_toBottomOf="@id/general_prefs" />
+
+                <!-- General reading mode preferences -->
+
+                <TextView
+                    android:id="@+id/display_prefs"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="24dp"
+                    android:text="@string/pref_category_display"
+                    android:textColor="?attr/colorAccent"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/page_transitions" />
+
+                <TextView
+                    android:id="@+id/rotation_mode_text"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
+                    android:text="@string/pref_rotation_type"
+                    app:layout_constraintBaseline_toBaselineOf="@id/rotation_mode"
+                    app:layout_constraintEnd_toStartOf="@id/verticalcenter"
+                    app:layout_constraintStart_toStartOf="parent" />
+
+                <androidx.appcompat.widget.AppCompatSpinner
+                    android:id="@+id/rotation_mode"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
+                    android:entries="@array/rotation_type"
+                    app:layout_constraintEnd_toEndOf="@id/spinner_end"
+                    app:layout_constraintStart_toEndOf="@id/verticalcenter"
+                    app:layout_constraintTop_toBottomOf="@id/display_prefs" />
+
+                <TextView
+                    android:id="@+id/background_color_text"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:text="@string/pref_reader_theme"
+                    app:layout_constraintBaseline_toBaselineOf="@id/background_color"
+                    app:layout_constraintEnd_toStartOf="@id/background_color"
+                    app:layout_constraintStart_toStartOf="parent" />
+
+                <androidx.appcompat.widget.AppCompatSpinner
+                    android:id="@+id/background_color"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
+                    android:entries="@array/reader_themes"
+                    app:layout_constraintEnd_toEndOf="@id/spinner_end"
+                    app:layout_constraintStart_toEndOf="@id/verticalcenter"
+                    app:layout_constraintTop_toBottomOf="@id/rotation_mode" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/show_page_number"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:text="@string/pref_show_page_number"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:layout_constraintTop_toBottomOf="@id/background_color" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/fullscreen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/pref_fullscreen"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:layout_constraintTop_toBottomOf="@id/show_page_number" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/dual_page_split"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/pref_dual_page_split"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:layout_constraintTop_toBottomOf="@id/fullscreen" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/dual_page_invert"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/pref_dual_page_invert"
+                    android:textColor="?android:attr/textColorSecondary"
+                    android:visibility="gone"
+                    app:layout_constraintTop_toBottomOf="@id/dual_page_split"
+                    tools:visibility="visible" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/cutout_short"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/pref_cutout_short"
+                    android:textColor="?android:attr/textColorSecondary"
+                    android:visibility="gone"
+                    app:layout_constraintTop_toBottomOf="@id/dual_page_invert"
+                    tools:visibility="visible" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/keepscreen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/pref_keep_screen_on"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:layout_constraintTop_toBottomOf="@id/cutout_short" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/long_tap"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/pref_read_with_long_tap"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:layout_constraintTop_toBottomOf="@id/keepscreen" />
+
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/always_show_chapter_transition"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/pref_always_show_chapter_transition"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:layout_constraintTop_toBottomOf="@id/long_tap" />
+
+                <android.widget.Space
+                    android:id="@+id/end_general_preferences"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    app:layout_constraintBottom_toBottomOf="@id/always_show_chapter_transition" />
+
+                <!-- Pager preferences -->
+
+                <include
+                    android:id="@+id/pager_prefs_group"
+                    layout="@layout/reader_pager_settings"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/always_show_chapter_transition"
+                    tools:visibility="visible" />
+
+                <!-- Webtoon preferences -->
+
+                <include
+                    android:id="@+id/webtoon_prefs_group"
+                    layout="@layout/reader_webtoon_settings"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/always_show_chapter_transition" />
+
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/verticalcenter"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    app:layout_constraintGuide_percent="0.5" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.core.widget.NestedScrollView>

app/src/main/res/layout/reader_settings_sheet.xml

@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clipToPadding="false"
-    android:orientation="vertical"
-    android:paddingStart="24dp"
-    android:paddingTop="0dp"
-    android:paddingEnd="24dp"
-    android:paddingBottom="24dp">
-
-    <ImageView
-        android:id="@id/pull_up_bar"
-        android:layout_width="wrap_content"
-        android:layout_height="24dp"
-        android:alpha="0.5"
-        android:scaleType="fitCenter"
-        android:src="@drawable/ic_drag_pill_24dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:tint="?attr/colorOnBackground"
-        tools:ignore="ContentDescription" />
-
-    <android.widget.Space
-        android:id="@+id/spinner_end"
-        android:layout_width="16dp"
-        android:layout_height="0dp"
-        app:layout_constraintStart_toEndOf="parent" />
-
-    <!-- Series-specific preferences -->
-
-    <TextView
-        android:id="@+id/series_prefs"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="@string/pref_category_for_this_series"
-        android:textColor="?attr/colorAccent"
-        android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/pull_up_bar" />
-
-    <TextView
-        android:id="@+id/viewer_text"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="@string/viewer"
-        app:layout_constraintBaseline_toBaselineOf="@id/viewer"
-        app:layout_constraintEnd_toStartOf="@id/verticalcenter"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <androidx.appcompat.widget.AppCompatSpinner
-        android:id="@+id/viewer"
-        android:layout_width="0dp"
-        android:layout_height="24dp"
-        android:layout_marginTop="20dp"
-        android:entries="@array/viewers_selector"
-        app:layout_constraintEnd_toEndOf="@id/spinner_end"
-        app:layout_constraintStart_toEndOf="@id/verticalcenter"
-        app:layout_constraintTop_toBottomOf="@id/series_prefs" />
-
-    <!-- General display preferences -->
-
-    <TextView
-        android:id="@+id/general_prefs"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="32dp"
-        android:text="@string/pref_category_general"
-        android:textColor="?attr/colorAccent"
-        android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/viewer" />
-
-    <com.google.android.material.switchmaterial.SwitchMaterial
-        android:id="@+id/page_transitions"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/pref_page_transitions"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintTop_toBottomOf="@id/general_prefs" />
-
-    <!-- General reading mode preferences -->
-
-    <TextView
-        android:id="@+id/display_prefs"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:text="@string/pref_category_display"
-        android:textColor="?attr/colorAccent"
-        android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/page_transitions" />
-
-    <TextView
-        android:id="@+id/rotation_mode_text"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
-        android:text="@string/pref_rotation_type"
-        app:layout_constraintBaseline_toBaselineOf="@id/rotation_mode"
-        app:layout_constraintEnd_toStartOf="@id/verticalcenter"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <androidx.appcompat.widget.AppCompatSpinner
-        android:id="@+id/rotation_mode"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
-        android:entries="@array/rotation_type"
-        app:layout_constraintEnd_toEndOf="@id/spinner_end"
-        app:layout_constraintStart_toEndOf="@id/verticalcenter"
-        app:layout_constraintTop_toBottomOf="@id/display_prefs" />
-
-    <TextView
-        android:id="@+id/background_color_text"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="@string/pref_reader_theme"
-        app:layout_constraintBaseline_toBaselineOf="@id/background_color"
-        app:layout_constraintEnd_toStartOf="@id/background_color"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <androidx.appcompat.widget.AppCompatSpinner
-        android:id="@+id/background_color"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
-        android:entries="@array/reader_themes"
-        app:layout_constraintEnd_toEndOf="@id/spinner_end"
-        app:layout_constraintStart_toEndOf="@id/verticalcenter"
-        app:layout_constraintTop_toBottomOf="@id/rotation_mode" />
-
-    <com.google.android.material.switchmaterial.SwitchMaterial
-        android:id="@+id/show_page_number"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:text="@string/pref_show_page_number"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintTop_toBottomOf="@id/background_color" />
-
-    <com.google.android.material.switchmaterial.SwitchMaterial
-        android:id="@+id/fullscreen"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/pref_fullscreen"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintTop_toBottomOf="@id/show_page_number" />
-
-    <com.google.android.material.switchmaterial.SwitchMaterial
-        android:id="@+id/dual_page_split"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/pref_dual_page_split"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintTop_toBottomOf="@id/fullscreen" />
-
-    <com.google.android.material.switchmaterial.SwitchMaterial
-        android:id="@+id/dual_page_invert"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/pref_dual_page_invert"
-        android:textColor="?android:attr/textColorSecondary"
-        android:visibility="gone"
-        app:layout_constraintTop_toBottomOf="@id/dual_page_split"
-        tools:visibility="visible" />
-
-    <com.google.android.material.switchmaterial.SwitchMaterial
-        android:id="@+id/cutout_short"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/pref_cutout_short"
-        android:textColor="?android:attr/textColorSecondary"
-        android:visibility="gone"
-        app:layout_constraintTop_toBottomOf="@id/dual_page_invert"
-        tools:visibility="visible" />
-
-    <com.google.android.material.switchmaterial.SwitchMaterial
-        android:id="@+id/keepscreen"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/pref_keep_screen_on"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintTop_toBottomOf="@id/cutout_short" />
-
-    <com.google.android.material.switchmaterial.SwitchMaterial
-        android:id="@+id/long_tap"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/pref_read_with_long_tap"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintTop_toBottomOf="@id/keepscreen" />
-
-    <com.google.android.material.switchmaterial.SwitchMaterial
-        android:id="@+id/always_show_chapter_transition"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/pref_always_show_chapter_transition"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintTop_toBottomOf="@id/long_tap" />
-
-    <android.widget.Space
-        android:id="@+id/end_general_preferences"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="@id/always_show_chapter_transition" />
-
-    <!-- Pager preferences -->
-
-    <include
-        android:id="@+id/pager_prefs_group"
-        layout="@layout/reader_pager_settings"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/always_show_chapter_transition"
-        tools:visibility="visible" />
-
-    <!-- Webtoon preferences -->
-
-    <include
-        android:id="@+id/webtoon_prefs_group"
-        layout="@layout/reader_webtoon_settings"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/always_show_chapter_transition" />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/verticalcenter"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.5" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>