浏览代码

Remove "when tapping" from "Pan wide images" setting

Closes #9343
arkon 1 年之前
父节点
当前提交
ea6e5eebac

+ 5 - 5
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt

@@ -178,11 +178,6 @@ object SettingsReaderScreen : SearchableSettings {
                     ),
                     enabled = navMode != 5,
                 ),
-                Preference.PreferenceItem.SwitchPreference(
-                    pref = readerPreferences.navigateToPan(),
-                    title = stringResource(R.string.pref_navigate_pan),
-                    enabled = navMode != 5,
-                ),
                 Preference.PreferenceItem.ListPreference(
                     pref = imageScaleTypePref,
                     title = stringResource(R.string.pref_image_scale_type),
@@ -215,6 +210,11 @@ object SettingsReaderScreen : SearchableSettings {
                     pref = readerPreferences.cropBorders(),
                     title = stringResource(R.string.pref_crop_borders),
                 ),
+                Preference.PreferenceItem.SwitchPreference(
+                    pref = readerPreferences.navigateToPan(),
+                    title = stringResource(R.string.pref_navigate_pan),
+                    enabled = navMode != 5,
+                ),
                 Preference.PreferenceItem.SwitchPreference(
                     pref = dualPageSplitPref,
                     title = stringResource(R.string.pref_dual_page_split),

+ 9 - 9
app/src/main/res/layout/reader_pager_settings.xml

@@ -30,15 +30,6 @@
         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"
@@ -71,6 +62,15 @@
         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"

+ 1 - 1
i18n/src/main/res/values/strings.xml

@@ -388,7 +388,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">Pan wide images when tapping</string>
+    <string name="pref_navigate_pan">Pan wide images</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>