mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-06-26 11:07:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reword some reader settings

Browse Source
This commit is contained in:
arkon
2022-10-05 09:26:42 -04:00
parent 3b62396442
commit caf9219d99
6 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderReadingModeSettings.kt
View File

@ -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

9
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt
View File

@ -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

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

@ -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"