Reorganize reader settings. Update Conductor version

app/build.gradle

@@ -203,7 +203,7 @@ dependencies {
     implementation 'me.gujun.android.taggroup:library:1.4@aar'
 
     // Conductor
-    implementation "com.github.inorichi.Conductor:conductor:05c4d4d"
+    implementation "com.github.inorichi.Conductor:conductor:be8b3c5"
     implementation ("com.bluelinelabs:conductor-support:2.1.5-SNAPSHOT") {
         exclude group: "com.bluelinelabs", module: "conductor"
     }

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

@@ -76,8 +76,8 @@ class SettingsReaderController : SettingsController() {
             defaultValue = true
         }
         switchPreference {
-            key = Keys.enableTransitions
-            titleRes = R.string.pref_page_transitions
+            key = Keys.keepScreenOn
+            titleRes = R.string.pref_keep_screen_on
             defaultValue = true
         }
         switchPreference {
@@ -85,20 +85,28 @@ class SettingsReaderController : SettingsController() {
             titleRes = R.string.pref_show_page_number
             defaultValue = true
         }
+        preferenceCategory {
+            titleRes = R.string.pager_viewer
+
+            switchPreference {
+                key = Keys.enableTransitions
+                titleRes = R.string.pref_page_transitions
+                defaultValue = true
+            }
             switchPreference {
                 key = Keys.cropBorders
                 titleRes = R.string.pref_crop_borders
                 defaultValue = false
             }
+        }
+        preferenceCategory {
+            titleRes = R.string.webtoon_viewer
+
             switchPreference {
                 key = Keys.cropBordersWebtoon
-            titleRes = R.string.pref_crop_borders_webtoon
+                titleRes = R.string.pref_crop_borders
                 defaultValue = false
             }
-        switchPreference {
-            key = Keys.keepScreenOn
-            titleRes = R.string.pref_keep_screen_on
-            defaultValue = true
         }
         preferenceCategory {
             titleRes = R.string.pref_reader_navigation

app/src/main/res/values/strings.xml

@@ -190,6 +190,7 @@
     <string name="right_to_left_viewer">Right to left</string>
     <string name="vertical_viewer">Vertical</string>
     <string name="webtoon_viewer">Webtoon</string>
+    <string name="pager_viewer">Pager</string>
     <string name="pref_image_decoder">Image decoder</string>
     <string name="pref_image_scale_type">Scale type</string>
     <string name="scale_type_fit_screen">Fit screen</string>