From caf9219d99c8f46a2c7371e7c4f0cfbba7f546d9 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Wed, 5 Oct 2022 09:26:42 -0400
Subject: [PATCH] Reword some reader settings

---
 app/build.gradle.kts                           |  1 -
 .../setting/ReaderReadingModeSettings.kt       |  8 ++++++--
 .../ui/setting/SettingsReaderController.kt     |  9 +++++----
 .../main/res/layout/reader_pager_settings.xml  | 18 +++++++++---------
 i18n/build.gradle.kts                          |  4 ++++
 i18n/src/main/res/values/strings.xml           | 14 ++++++++------
 6 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 296267df0f..f2062d2eda 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -132,7 +132,6 @@ android {
     }
 
     lint {
-        disable.addAll(listOf("MissingTranslation", "ExtraTranslation"))
         abortOnError = false
         checkReleaseBuilds = false
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderReadingModeSettings.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderReadingModeSettings.kt
index e2fac1745a..8c583aba73 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderReadingModeSettings.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderReadingModeSettings.kt
@@ -69,10 +69,15 @@ class ReaderReadingModeSettings @JvmOverloads constructor(context: Context, attr
         binding.pagerPrefsGroup.root.isVisible = true
 
         binding.pagerPrefsGroup.tappingInverted.bindToPreference(readerPreferences.pagerNavInverted())
+        binding.pagerPrefsGroup.navigatePan.bindToPreference(readerPreferences.navigateToPan())
 
         binding.pagerPrefsGroup.pagerNav.bindToPreference(readerPreferences.navigationModePager())
         readerPreferences.navigationModePager()
-            .asHotFlow { binding.pagerPrefsGroup.tappingInverted.isVisible = it != 5 }
+            .asHotFlow {
+                val isTappingEnabled = it != 5
+                binding.pagerPrefsGroup.tappingInverted.isVisible = isTappingEnabled
+                binding.pagerPrefsGroup.navigatePan.isVisible = isTappingEnabled
+            }
             .launchIn((context as ReaderActivity).lifecycleScope)
         // Makes so that landscape zoom gets hidden away when image scale type is not fit screen
         binding.pagerPrefsGroup.scaleType.bindToPreference(readerPreferences.imageScaleType(), 1)
@@ -83,7 +88,6 @@ class ReaderReadingModeSettings @JvmOverloads constructor(context: Context, attr
 
         binding.pagerPrefsGroup.zoomStart.bindToPreference(readerPreferences.zoomStart(), 1)
         binding.pagerPrefsGroup.cropBorders.bindToPreference(readerPreferences.cropBorders())
-        binding.pagerPrefsGroup.navigatePan.bindToPreference(readerPreferences.navigateToPan())
 
         binding.pagerPrefsGroup.dualPageSplit.bindToPreference(readerPreferences.dualPageSplitPaged())
         // Makes it so that dual page invert gets hidden away when dual page split is turned off
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 ad8d72ce26..0c8c83ff15 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
@@ -164,6 +164,11 @@ class SettingsReaderController : SettingsController() {
                 summary = "%s"
                 visibleIf(readerPreferences.navigationModePager()) { it != 5 }
             }
+            switchPreference {
+                bindTo(readerPreferences.navigateToPan())
+                titleRes = R.string.pref_navigate_pan
+                visibleIf(readerPreferences.navigationModePager()) { it != 5 }
+            }
             intListPreference {
                 bindTo(readerPreferences.imageScaleType())
                 titleRes = R.string.pref_image_scale_type
@@ -199,10 +204,6 @@ class SettingsReaderController : SettingsController() {
                 bindTo(readerPreferences.cropBorders())
                 titleRes = R.string.pref_crop_borders
             }
-            switchPreference {
-                bindTo(readerPreferences.navigateToPan())
-                titleRes = R.string.pref_navigate_pan
-            }
             switchPreference {
                 bindTo(readerPreferences.dualPageSplitPaged())
                 titleRes = R.string.pref_dual_page_split
diff --git a/app/src/main/res/layout/reader_pager_settings.xml b/app/src/main/res/layout/reader_pager_settings.xml
index 086c2d1a55..3da1b46bee 100644
--- a/app/src/main/res/layout/reader_pager_settings.xml
+++ b/app/src/main/res/layout/reader_pager_settings.xml
@@ -30,6 +30,15 @@
         android:entries="@array/invert_tapping_mode"
         app:title="@string/pref_read_with_tapping_inverted" />
 
+    <com.google.android.material.materialswitch.MaterialSwitch
+        android:id="@+id/navigate_pan"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingHorizontal="16dp"
+        android:paddingVertical="16dp"
+        android:text="@string/pref_navigate_pan"
+        android:textColor="?android:attr/textColorSecondary" />
+
     <eu.kanade.tachiyomi.widget.MaterialSpinnerView
         android:id="@+id/scale_type"
         android:layout_width="match_parent"
@@ -62,15 +71,6 @@
         android:text="@string/pref_crop_borders"
         android:textColor="?android:attr/textColorSecondary" />
 
-    <com.google.android.material.materialswitch.MaterialSwitch
-        android:id="@+id/navigate_pan"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="16dp"
-        android:paddingVertical="16dp"
-        android:text="@string/pref_navigate_pan"
-        android:textColor="?android:attr/textColorSecondary" />
-
     <com.google.android.material.materialswitch.MaterialSwitch
         android:id="@+id/dual_page_split"
         android:layout_width="match_parent"
diff --git a/i18n/build.gradle.kts b/i18n/build.gradle.kts
index 44c11460a3..42239ed07c 100644
--- a/i18n/build.gradle.kts
+++ b/i18n/build.gradle.kts
@@ -19,6 +19,10 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
+
+    lint {
+        disable.addAll(listOf("MissingTranslation", "ExtraTranslation"))
+    }
 }
 
 tasks {
diff --git a/i18n/src/main/res/values/strings.xml b/i18n/src/main/res/values/strings.xml
index 3e60f66292..c8ae4d7fba 100644
--- a/i18n/src/main/res/values/strings.xml
+++ b/i18n/src/main/res/values/strings.xml
@@ -2,6 +2,10 @@
 <resources>
     <string name="app_name" translatable="false">Tachiyomi</string>
 
+    <!-- Generic strings -->
+    <string name="on">On</string>
+    <string name="off">Off</string>
+
     <!-- Models -->
     <string name="name">Name</string>
     <string name="categories">Categories</string>
@@ -295,9 +299,9 @@
     <string name="pref_fullscreen">Fullscreen</string>
     <string name="pref_show_navigation_mode">Show tap zones overlay</string>
     <string name="pref_show_navigation_mode_summary">Briefly show when reader is opened</string>
-    <string name="pref_dual_page_split">Dual page split</string>
-    <string name="pref_dual_page_invert">Invert dual page split placement</string>
-    <string name="pref_dual_page_invert_summary">If the placement of the dual page split doesn\'t match reading direction</string>
+    <string name="pref_dual_page_split">Split wide pages</string>
+    <string name="pref_dual_page_invert">Invert split page placement</string>
+    <string name="pref_dual_page_invert_summary">If the placement of the split wide pages don\'t match reading direction</string>
     <string name="pref_long_strip_split">Split tall images (BETA)</string>
     <string name="pref_cutout_short">Show content in cutout area</string>
     <string name="pref_page_transitions">Animate page transitions</string>
@@ -308,8 +312,6 @@
     <string name="pref_true_color">32-bit color</string>
     <string name="pref_true_color_summary">Reduces banding, but may impact performance</string>
     <string name="pref_crop_borders">Crop borders</string>
-    <string name="on">On</string>
-    <string name="off">Off</string>
     <string name="pref_custom_brightness">Custom brightness</string>
     <string name="pref_grayscale">Grayscale</string>
     <string name="pref_inverted_colors">Inverted</string>
@@ -364,7 +366,7 @@
     <string name="scale_type_fit_height">Fit height</string>
     <string name="scale_type_original_size">Original size</string>
     <string name="scale_type_smart_fit">Smart fit</string>
-    <string name="pref_navigate_pan">Navigate to pan</string>
+    <string name="pref_navigate_pan">Pan wide images when tapping</string>
     <string name="pref_landscape_zoom">Zoom landscape image</string>
     <string name="pref_zoom_start">Zoom start position</string>
     <string name="zoom_start_automatic">Automatic</string>