admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split transition animation setting for webtoon and pager (#230)

Browse Source 
* Split transition animation setting for webtoon and pager

* Move variables

* Rename config variables back
This commit is contained in:
scb261
2021-02-26 21:51:51 +02:00
committed by GitHub
parent f78836dac4
commit a4c10394b6
10 changed files with 53 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
+3 -1
View File
@@ -17,7 +17,9 @@ object PreferenceKeys {
const val rotation = "pref_rotation_type_key"
const val enableTransitions = "pref_enable_transitions_key"
const val enableTransitionsPager = "pref_enable_transitions_pager_key"
const val enableTransitionsWebtoon = "pref_enable_transitions_webtoon_key"
const val doubleTapAnimationSpeed = "pref_double_tap_anim_speed"
app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+3 -1
View File
@@ -83,7 +83,9 @@ class PreferencesHelper(val context: Context) {
fun rotation() = flowPrefs.getInt(Keys.rotation, 1)
fun pageTransitions() = flowPrefs.getBoolean(Keys.enableTransitions, true)
fun pageTransitionsPager() = flowPrefs.getBoolean(Keys.enableTransitionsPager, true)
fun pageTransitionsWebtoon() = flowPrefs.getBoolean(Keys.enableTransitionsWebtoon, true)
fun doubleTapAnimSpeed() = flowPrefs.getInt(Keys.doubleTapAnimationSpeed, 500)
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt
+5 -1
View File
@@ -72,7 +72,6 @@ class ReaderSettingsSheet(private val activity: ReaderActivity) : BaseBottomShee
binding.keepscreen.bindToPreference(preferences.keepScreenOn())
binding.longTap.bindToPreference(preferences.readWithLongTap())
binding.alwaysShowChapterTransition.bindToPreference(preferences.alwaysShowChapterTransition())
binding.pageTransitions.bindToPreference(preferences.pageTransitions())
// SY -->
binding.autoWebtoonMode.bindToPreference(preferences.useAutoWebtoon())
// SY <--
@@ -105,6 +104,10 @@ class ReaderSettingsSheet(private val activity: ReaderActivity) : BaseBottomShee
binding.pagerPrefsGroup.scaleType.bindToPreference(preferences.imageScaleType(), 1)
binding.pagerPrefsGroup.zoomStart.bindToPreference(preferences.zoomStart(), 1)
binding.pagerPrefsGroup.cropBorders.bindToPreference(preferences.cropBorders())
// SY -->
binding.pagerPrefsGroup.pageTransitionsPager.bindToPreference(preferences.pageTransitionsPager())
// SY <--
}
/**
@@ -125,6 +128,7 @@ class ReaderSettingsSheet(private val activity: ReaderActivity) : BaseBottomShee
// SY -->
binding.webtoonPrefsGroup.zoomOutWebtoon.bindToPreference(preferences.webtoonEnableZoomOut())
binding.webtoonPrefsGroup.cropBordersContinuesVertical.bindToPreference(preferences.cropBordersContinuesVertical())
binding.webtoonPrefsGroup.pageTransitionsWebtoon.bindToPreference(preferences.pageTransitionsWebtoon())
// SY <--
}
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerConfig.kt
-4
View File
@@ -18,7 +18,6 @@ abstract class ViewerConfig(preferences: PreferencesHelper, private val scope: C
var tappingEnabled = true
var tappingInverted = TappingInvertMode.NONE
var longTapEnabled = true
var usePageTransitions = false
var doubleTapAnimDuration = 500
var volumeKeysEnabled = false
var volumeKeysInverted = false
@@ -39,9 +38,6 @@ abstract class ViewerConfig(preferences: PreferencesHelper, private val scope: C
preferences.readWithLongTap()
.register({ longTapEnabled = it })
preferences.pageTransitions()
.register({ usePageTransitions = it })
preferences.doubleTapAnimSpeed()
.register({ doubleTapAnimDuration = it })
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt
+9
View File
@@ -29,6 +29,10 @@ class PagerConfig(
var imageCropBorders = false
private set
// SY -->
var usePageTransitions = false
// SY <--
init {
preferences.imageScaleType()
.register({ imageScaleType = it }, { imagePropertyChangedListener?.invoke() })
@@ -44,6 +48,11 @@ class PagerConfig(
preferences.pagerNavInverted()
.register({ tappingInverted = it }, { navigator.invertMode = it })
// SY -->
preferences.pageTransitionsPager()
.register({ usePageTransitions = it }, { imagePropertyChangedListener?.invoke() })
// SY <--
}
private fun zoomTypeFromPreference(value: Int) {
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt
+5
View File
@@ -26,6 +26,8 @@ class WebtoonConfig(
private set
// SY -->
var usePageTransitions = false
var enableZoomOut = false
private set
@@ -54,6 +56,9 @@ class WebtoonConfig(
preferences.cropBordersContinuesVertical()
.register({ continuesCropBorders = it }, { imagePropertyChangedListener?.invoke() })
preferences.pageTransitionsWebtoon()
.register({ usePageTransitions = it }, { imagePropertyChangedListener?.invoke() })
// SY <--
}
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt
+10 -5
View File
@@ -70,11 +70,6 @@ class SettingsReaderController : SettingsController() {
defaultValue = false
}
}
switchPreference {
key = Keys.enableTransitions
titleRes = R.string.pref_page_transitions
defaultValue = true
}
preferenceCategory {
titleRes = R.string.pref_category_display
@@ -319,6 +314,11 @@ class SettingsReaderController : SettingsController() {
titleRes = R.string.pref_crop_borders
defaultValue = false
}
switchPreference {
key = Keys.enableTransitionsPager
titleRes = R.string.pref_page_transitions
defaultValue = true
}
}
preferenceCategory {
@@ -374,6 +374,11 @@ class SettingsReaderController : SettingsController() {
titleRes = R.string.pref_crop_borders
defaultValue = false
}
switchPreference {
key = Keys.enableTransitionsWebtoon
titleRes = R.string.pref_page_transitions
defaultValue = true
}
switchPreference {
key = Keys.webtoonEnableZoomOut
titleRes = R.string.enable_zoom_out