diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonRecyclerView.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonRecyclerView.kt index 6653f8c47..6f8b08c5c 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonRecyclerView.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonRecyclerView.kt @@ -28,13 +28,21 @@ class WebtoonRecyclerView @JvmOverloads constructor( private var isFixingScroll = false var isPullGestureEnabled: Boolean = false + set(value) { + if (field != value) { + field = value + setEdgeEffectFactory( + if (value) { + PullEffect.Factory() + } else { + EdgeEffectFactory() + }, + ) + } + } var pullThreshold: Float = 0.3f private var pullListener: OnPullGestureListener? = null - init { - setEdgeEffectFactory(PullEffect.Factory()) - } - fun setOnPullGestureListener(listener: OnPullGestureListener?) { pullListener = listener } @@ -248,7 +256,7 @@ class WebtoonRecyclerView @JvmOverloads constructor( override fun createEdgeEffect(view: RecyclerView, direction: Int): EdgeEffect { val pullListener = (view as? WebtoonRecyclerView)?.pullListener - return if (pullListener != null && view.isPullGestureEnabled) { + return if (pullListener != null) { PullEffect(view, direction, view.pullThreshold, pullListener) } else { super.createEdgeEffect(view, direction) diff --git a/app/src/main/res/drawable/ic_gesture.xml b/app/src/main/res/drawable/ic_gesture.xml deleted file mode 100644 index 6c4c9e374..000000000 --- a/app/src/main/res/drawable/ic_gesture.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_gesture_vertical.xml b/app/src/main/res/drawable/ic_gesture_vertical.xml new file mode 100644 index 000000000..026ffdda2 --- /dev/null +++ b/app/src/main/res/drawable/ic_gesture_vertical.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/layout/sheet_reader_config.xml b/app/src/main/res/layout/sheet_reader_config.xml index 042a195b3..6e20d2a23 100644 --- a/app/src/main/res/layout/sheet_reader_config.xml +++ b/app/src/main/res/layout/sheet_reader_config.xml @@ -141,7 +141,7 @@ android:text="@string/enable_pull_gesture_title" android:textAppearance="?textAppearanceListItem" android:textColor="?colorOnSurfaceVariant" - app:drawableStartCompat="@drawable/ic_gesture" /> + app:drawableStartCompat="@drawable/ic_gesture_vertical" />