From 224fcada17f2bf02f2ec9057ff172f3b77b879cb Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Tue, 27 Apr 2021 17:46:16 -0400
Subject: [PATCH] Move save pages to manga title setting to Reader section

---
 .../ui/setting/SettingsDownloadController.kt  |  7 -------
 .../ui/setting/SettingsReaderController.kt    | 21 ++++++++++++++-----
 app/src/main/res/values/strings.xml           |  7 ++++---
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt
index 983557119..48b0eee93 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt
@@ -27,7 +27,6 @@ import eu.kanade.tachiyomi.util.preference.preference
 import eu.kanade.tachiyomi.util.preference.preferenceCategory
 import eu.kanade.tachiyomi.util.preference.switchPreference
 import eu.kanade.tachiyomi.util.preference.titleRes
-import eu.kanade.tachiyomi.util.preference.summaryRes
 import eu.kanade.tachiyomi.util.system.toast
 import eu.kanade.tachiyomi.widget.materialdialogs.QuadStateCheckBox
 import eu.kanade.tachiyomi.widget.materialdialogs.listItemsQuadStateMultiChoice
@@ -67,12 +66,6 @@ class SettingsDownloadController : SettingsController() {
             titleRes = R.string.pref_download_only_over_wifi
             defaultValue = true
         }
-        switchPreference {
-            key = Keys.folderPerManga
-            titleRes = R.string.pref_create_folder_per_manga
-            summaryRes = R.string.pref_create_folder_per_manga_summary
-            defaultValue = false
-        }
         preferenceCategory {
             titleRes = R.string.pref_category_delete_chapters
 
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 6524d3b81..1492875b0 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
@@ -297,11 +297,6 @@ class SettingsReaderController : SettingsController() {
                 titleRes = R.string.pref_read_with_tapping
                 defaultValue = true
             }
-            switchPreference {
-                key = Keys.readWithLongTap
-                titleRes = R.string.pref_read_with_long_tap
-                defaultValue = true
-            }
             switchPreference {
                 key = Keys.readWithVolumeKeys
                 titleRes = R.string.pref_read_with_volume_keys
@@ -315,5 +310,21 @@ class SettingsReaderController : SettingsController() {
                 preferences.readWithVolumeKeys().asImmediateFlow { isVisible = it }.launchIn(viewScope)
             }
         }
+
+        preferenceCategory {
+            titleRes = R.string.pref_reader_actions
+
+            switchPreference {
+                key = Keys.readWithLongTap
+                titleRes = R.string.pref_read_with_long_tap
+                defaultValue = true
+            }
+            switchPreference {
+                key = Keys.folderPerManga
+                titleRes = R.string.pref_create_folder_per_manga
+                summaryRes = R.string.pref_create_folder_per_manga_summary
+                defaultValue = false
+            }
+        }
     }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index da7b08ca3..131a2fa3f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -291,7 +291,10 @@
     <string name="tapping_inverted_horizontal">Horizontal</string>
     <string name="tapping_inverted_vertical">Vertical</string>
     <string name="tapping_inverted_both">Both</string>
-    <string name="pref_read_with_long_tap">Long tap dialog</string>
+    <string name="pref_reader_actions">Actions</string>
+    <string name="pref_read_with_long_tap">Show on long tap</string>
+    <string name="pref_create_folder_per_manga">Saves pages into separate folders</string>
+    <string name="pref_create_folder_per_manga_summary">Creates folders according to manga title</string>
     <string name="pref_reader_theme">Background color</string>
     <string name="white_background">White</string>
     <string name="gray_background">Gray</string>
@@ -367,8 +370,6 @@
     <string name="pref_category_auto_download">Auto-download</string>
     <string name="pref_download_new">Download new chapters</string>
     <string name="pref_download_new_categories_details">Manga in excluded categories will not be downloaded even if they are also in included categories.</string>
-    <string name="pref_create_folder_per_manga">Saves pages into separate folders</string>
-    <string name="pref_create_folder_per_manga_summary">Creates folders according to manga title</string>
 
       <!-- Tracking section -->
     <string name="pref_auto_update_manga_sync">Update chapter progress after reading</string>