From d2bb4487e17369bcd4d97709b144f275ce2fcd43 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sat, 2 May 2020 10:41:38 -0400
Subject: [PATCH] Move pager-specific settings into proper category, add
 summary for 32-bit color setting

---
 .../ui/setting/SettingsReaderController.kt    | 48 ++++++++++---------
 app/src/main/res/values/strings.xml           |  3 +-
 2 files changed, 27 insertions(+), 24 deletions(-)

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 b341fba317..78711f20ec 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
@@ -8,6 +8,7 @@ import eu.kanade.tachiyomi.util.preference.defaultValue
 import eu.kanade.tachiyomi.util.preference.entriesRes
 import eu.kanade.tachiyomi.util.preference.intListPreference
 import eu.kanade.tachiyomi.util.preference.preferenceCategory
+import eu.kanade.tachiyomi.util.preference.summaryRes
 import eu.kanade.tachiyomi.util.preference.switchPreference
 import eu.kanade.tachiyomi.util.preference.titleRes
 import eu.kanade.tachiyomi.util.system.hasDisplayCutout
@@ -31,29 +32,6 @@ class SettingsReaderController : SettingsController() {
                 defaultValue = "1"
                 summary = "%s"
             }
-            intListPreference {
-                key = Keys.imageScaleType
-                titleRes = R.string.pref_image_scale_type
-                entriesRes = arrayOf(
-                    R.string.scale_type_fit_screen, R.string.scale_type_stretch,
-                    R.string.scale_type_fit_width, R.string.scale_type_fit_height,
-                    R.string.scale_type_original_size, R.string.scale_type_smart_fit
-                )
-                entryValues = arrayOf("1", "2", "3", "4", "5", "6")
-                defaultValue = "1"
-                summary = "%s"
-            }
-            intListPreference {
-                key = Keys.zoomStart
-                titleRes = R.string.pref_zoom_start
-                entriesRes = arrayOf(
-                    R.string.zoom_start_automatic, R.string.zoom_start_left,
-                    R.string.zoom_start_right, R.string.zoom_start_center
-                )
-                entryValues = arrayOf("1", "2", "3", "4")
-                defaultValue = "1"
-                summary = "%s"
-            }
             intListPreference {
                 key = Keys.rotation
                 titleRes = R.string.pref_rotation_type
@@ -109,6 +87,7 @@ class SettingsReaderController : SettingsController() {
                 switchPreference {
                     key = Keys.trueColor
                     titleRes = R.string.pref_true_color
+                    summaryRes = R.string.pref_true_color_summary
                     defaultValue = false
                 }
             }
@@ -137,6 +116,29 @@ class SettingsReaderController : SettingsController() {
         preferenceCategory {
             titleRes = R.string.pager_viewer
 
+            intListPreference {
+                key = Keys.imageScaleType
+                titleRes = R.string.pref_image_scale_type
+                entriesRes = arrayOf(
+                    R.string.scale_type_fit_screen, R.string.scale_type_stretch,
+                    R.string.scale_type_fit_width, R.string.scale_type_fit_height,
+                    R.string.scale_type_original_size, R.string.scale_type_smart_fit
+                )
+                entryValues = arrayOf("1", "2", "3", "4", "5", "6")
+                defaultValue = "1"
+                summary = "%s"
+            }
+            intListPreference {
+                key = Keys.zoomStart
+                titleRes = R.string.pref_zoom_start
+                entriesRes = arrayOf(
+                    R.string.zoom_start_automatic, R.string.zoom_start_left,
+                    R.string.zoom_start_right, R.string.zoom_start_center
+                )
+                entryValues = arrayOf("1", "2", "3", "4")
+                defaultValue = "1"
+                summary = "%s"
+            }
             switchPreference {
                 key = Keys.enableTransitions
                 titleRes = R.string.pref_page_transitions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9af80d36e5..172eeb62ce 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -216,10 +216,11 @@
     <string name="pref_fullscreen">Fullscreen</string>
     <string name="pref_cutout_short">Show content in cutout area</string>
     <string name="pref_lock_orientation">Lock orientation</string>
-    <string name="pref_page_transitions">Page transitions</string>
+    <string name="pref_page_transitions">Animate page transitions</string>
     <string name="pref_double_tap_anim_speed">Double tap animation speed</string>
     <string name="pref_show_page_number">Show page number</string>
     <string name="pref_true_color">32-bit color</string>
+    <string name="pref_true_color_summary">Reduces banding, but impacts performance</string>
     <string name="pref_crop_borders">Crop borders</string>
     <string name="pref_custom_brightness">Use custom brightness</string>
     <string name="pref_custom_color_filter">Use custom color filter</string>