diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 296267df0..f2062d2ed 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 e2fac1745..8c583aba7 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 ad8d72ce2..0c8c83ff1 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 086c2d1a5..3da1b46be 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" /> + + - - Tachiyomi + + On + Off + Name Categories @@ -295,9 +299,9 @@ Fullscreen Show tap zones overlay Briefly show when reader is opened - Dual page split - Invert dual page split placement - If the placement of the dual page split doesn\'t match reading direction + Split wide pages + Invert split page placement + If the placement of the split wide pages don\'t match reading direction Split tall images (BETA) Show content in cutout area Animate page transitions @@ -308,8 +312,6 @@ 32-bit color Reduces banding, but may impact performance Crop borders - On - Off Custom brightness Grayscale Inverted @@ -364,7 +366,7 @@ Fit height Original size Smart fit - Navigate to pan + Pan wide images when tapping Zoom landscape image Zoom start position Automatic