From 1bcdd4323565ad57ae8c337f1cc39faa4270c6d8 Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Tue, 27 Apr 2021 23:51:25 -0400
Subject: [PATCH] Move save pages to manga title setting to Reader section

Also updating some of these strings, because of course I am

Co-Authored-By: arkon <4098258+arkon@users.noreply.github.com>
---
 .../ui/setting/SettingsDownloadController.kt  |  6 ------
 .../ui/setting/SettingsReaderController.kt    | 21 ++++++++++++++-----
 app/src/main/res/values/strings.xml           |  7 ++++---
 3 files changed, 20 insertions(+), 14 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 45a6e62442..53fc096d04 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
@@ -54,12 +54,6 @@ class SettingsDownloadController : SettingsController() {
             titleRes = R.string.only_download_over_wifi
             defaultValue = true
         }
-        switchPreference {
-            key = Keys.folderPerManga
-            titleRes = R.string.save_pages_separately
-            summaryRes = R.string.create_folders_by_manga_title
-            defaultValue = false
-        }
         preferenceCategory {
             titleRes = R.string.remove_after_read
 
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 ea66a6c7cc..8776e16b6b 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
@@ -334,11 +334,6 @@ class SettingsReaderController : SettingsController() {
                 titleRes = R.string.tapping
                 defaultValue = true
             }
-            switchPreference {
-                key = Keys.readWithLongTap
-                titleRes = R.string.long_tap_dialog
-                defaultValue = true
-            }
             switchPreference {
                 key = Keys.readWithVolumeKeys
                 titleRes = R.string.volume_keys
@@ -352,5 +347,21 @@ class SettingsReaderController : SettingsController() {
                 preferences.readWithVolumeKeys().asImmediateFlow { isVisible = it }.launchIn(viewScope)
             }
         }
+
+        preferenceCategory {
+            titleRes = R.string.actions
+
+            switchPreference {
+                key = Keys.readWithLongTap
+                titleRes = R.string.show_on_long_press
+                defaultValue = true
+            }
+            switchPreference {
+                key = Keys.folderPerManga
+                titleRes = R.string.save_pages_separately
+                summaryRes = R.string.create_folders_by_manga_title
+                defaultValue = false
+            }
+        }
     }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1988c335a8..11ea9d97a6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -370,7 +370,6 @@
     <string name="volume_keys">Volume keys</string>
     <string name="invert_volume_keys">Invert volume keys</string>
     <string name="tapping">Tapping</string>
-    <string name="long_tap_dialog">Long tap dialog</string>
     <string name="background_color">Background color</string>
     <string name="white">White</string>
     <string name="black">Black</string>
@@ -432,6 +431,10 @@
     <string name="automatic_can_still_switch">While using automatic page layout, you can still switch between layouts while reading without overriding this setting</string>
     <string name="automatic_orientation">Automatic (based on orientation)</string>
     <string name="webtoon_cannot_change">Cannot change reading mode from webtoon. Edit the series type first to change.</string>
+    <string name="actions">Actions</string>
+    <string name="show_on_long_press">Show on long press</string>
+    <string name="save_pages_separately">Save pages in separate folders</string>
+    <string name="create_folders_by_manga_title">Creates folders according to manga title</string>
     <plurals name="pages_plural">
         <item quantity="one">%1$d page</item>
         <item quantity="other">%1$d pages</item>
@@ -801,8 +804,6 @@
     <string name="ask_on_chapters_page">Delete during global updates, ask on chapters page</string>
     <string name="always_keep">Always keep</string>
     <string name="always_delete">Always delete</string>
-    <string name="save_pages_separately">Save pages in separate folders</string>
-    <string name="create_folders_by_manga_title">Creates folders according to manga title</string>
 
     <!-- Time -->
     <string name="manual">Manual</string>