diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt index c4c5a6d81..a65e337c8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt @@ -22,7 +22,7 @@ class SettingsReaderController : SettingsController() { titleRes = R.string.pref_category_reader preferenceCategory { - titleRes = R.string.pref_category_general + titleRes = R.string.pref_category_reading_mode intListPreference { key = Keys.defaultViewer @@ -35,6 +35,43 @@ class SettingsReaderController : SettingsController() { defaultValue = "2" summary = "%s" } + intListPreference { + key = Keys.doubleTapAnimationSpeed + titleRes = R.string.pref_double_tap_anim_speed + entries = arrayOf(context.getString(R.string.double_tap_anim_speed_0), context.getString(R.string.double_tap_anim_speed_fast), context.getString(R.string.double_tap_anim_speed_normal)) + entryValues = arrayOf("1", "250", "500") // using a value of 0 breaks the image viewer, so min is 1 + defaultValue = "500" + summary = "%s" + } + switchPreference { + key = Keys.showReadingMode + titleRes = R.string.pref_show_reading_mode + summaryRes = R.string.pref_show_reading_mode_summary + defaultValue = true + } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + switchPreference { + key = Keys.trueColor + titleRes = R.string.pref_true_color + summaryRes = R.string.pref_true_color_summary + defaultValue = false + } + } + switchPreference { + key = Keys.cropBorders + titleRes = R.string.pref_crop_borders + defaultValue = false + } + switchPreference { + key = Keys.enableTransitions + titleRes = R.string.pref_page_transitions + defaultValue = true + } + } + + preferenceCategory { + titleRes = R.string.pref_category_display + intListPreference { key = Keys.rotation titleRes = R.string.pref_rotation_type @@ -54,14 +91,6 @@ class SettingsReaderController : SettingsController() { defaultValue = "1" summary = "%s" } - intListPreference { - key = Keys.doubleTapAnimationSpeed - titleRes = R.string.pref_double_tap_anim_speed - entries = arrayOf(context.getString(R.string.double_tap_anim_speed_0), context.getString(R.string.double_tap_anim_speed_fast), context.getString(R.string.double_tap_anim_speed_normal)) - entryValues = arrayOf("1", "250", "500") // using a value of 0 breaks the image viewer, so min is 1 - defaultValue = "500" - summary = "%s" - } switchPreference { key = Keys.fullscreen titleRes = R.string.pref_fullscreen @@ -86,30 +115,6 @@ class SettingsReaderController : SettingsController() { titleRes = R.string.pref_show_page_number defaultValue = true } - switchPreference { - key = Keys.showReadingMode - titleRes = R.string.pref_show_reading_mode - summaryRes = R.string.pref_show_reading_mode_summary - defaultValue = true - } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - switchPreference { - key = Keys.trueColor - titleRes = R.string.pref_true_color - summaryRes = R.string.pref_true_color_summary - defaultValue = false - } - } - switchPreference { - key = Keys.cropBorders - titleRes = R.string.pref_crop_borders - defaultValue = false - } - switchPreference { - key = Keys.enableTransitions - titleRes = R.string.pref_page_transitions - defaultValue = true - } } preferenceCategory { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1ff6d19d6..e047a703b 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -294,6 +294,7 @@ B A Always show chapter transition + Reading mode Reading Side padding None