yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

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

Browse Source 
Closes #9343
This commit is contained in:
arkon 2023-04-27 22:54:07 -04:00
parent 9cc25ff345
commit ea6e5eebac
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt
View File

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

18
app/src/main/res/layout/reader_pager_settings.xml
View File

@ -30,15 +30,6 @@
android:entries="@array/invert_tapping_mode" android:entries="@array/invert_tapping_mode"
app:title="@string/pref_read_with_tapping_inverted" /> 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 <eu.kanade.tachiyomi.widget.MaterialSpinnerView
android:id="@+id/scale_type" android:id="@+id/scale_type"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -71,6 +62,15 @@
android:text="@string/pref_crop_borders" android:text="@string/pref_crop_borders"
android:textColor="?android:attr/textColorSecondary" /> 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 <com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/dual_page_split" android:id="@+id/dual_page_split"
android:layout_width="match_parent" android:layout_width="match_parent"

2
i18n/src/main/res/values/strings.xml
View File

@ -388,7 +388,7 @@
<string name="scale_type_fit_height">Fit height</string> <string name="scale_type_fit_height">Fit height</string>
<string name="scale_type_original_size">Original size</string> <string name="scale_type_original_size">Original size</string>
<string name="scale_type_smart_fit">Smart fit</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_landscape_zoom">Zoom landscape image</string>
<string name="pref_zoom_start">Zoom start position</string> <string name="pref_zoom_start">Zoom start position</string>
<string name="zoom_start_automatic">Automatic</string> <string name="zoom_start_automatic">Automatic</string>