Skip to content

Commit f1a3305

Browse files
BrayanDSOlukstbit
authored andcommitted
fix(study-screen): whiteboard gestures
only whiteboard gestures worked. Now, if the gestures can trigger other actions from the reviewer as well.
1 parent e5fab4c commit f1a3305

2 files changed

Lines changed: 13 additions & 3 deletions

File tree

AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,8 +560,12 @@ class ReviewerFragment :
560560
doubleBackCallback.isEnabled =
561561
isEnabled && compat.isUsingSystemGestureNavigation(requireContext())
562562
if (whiteboardFragment == null && isEnabled) {
563+
val whiteboardFragment = WhiteboardFragment()
564+
whiteboardFragment.gestureFallbackListener = { gesture ->
565+
bindingMap.onGesture(gesture)
566+
}
563567
childFragmentManager.commit {
564-
add(R.id.whiteboard_container, WhiteboardFragment::class.java, null, WhiteboardFragment::class.jvmName)
568+
add(R.id.whiteboard_container, whiteboardFragment, WhiteboardFragment::class.jvmName)
565569
}
566570
}
567571
}

AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/whiteboard/WhiteboardFragment.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ class WhiteboardFragment :
7575
private var eraserPopup: PopupWindow? = null
7676
private var brushConfigPopup: PopupWindow? = null
7777

78+
/** Called when no bindings used the triggered gestures */
79+
var gestureFallbackListener: ((Gesture) -> Unit)? = null
80+
7881
override fun onViewCreated(
7982
view: View,
8083
savedInstanceState: Bundle?,
@@ -165,9 +168,12 @@ class WhiteboardFragment :
165168
2 -> Gesture.TWO_FINGER_TAP
166169
3 -> Gesture.THREE_FINGER_TAP
167170
4 -> Gesture.FOUR_FINGER_TAP
168-
else -> null
171+
else -> return@setOnMultiTouchListener
169172
}
170-
gesture?.let { bindingMap.onGesture(it) }
173+
val result = bindingMap.onGesture(gesture)
174+
if (!result) {
175+
gestureFallbackListener?.invoke(gesture)
176+
}
171177
}
172178
}
173179

0 commit comments

Comments
 (0)