Skip to content

Commit 5d1211b

Browse files
committed
Rename method
1 parent a39de09 commit 5d1211b

4 files changed

Lines changed: 15 additions & 12 deletions

File tree

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ open class GestureHandler {
693693
return interactionController?.shouldHandlerBeCancelledBy(this, handler) ?: false
694694
}
695695

696-
open fun shouldBeginWithRecorded(recorded: List<GestureHandler>): Boolean = true
696+
open fun shouldBeginWithRecordedHandlers(recorded: List<GestureHandler>): Boolean = true
697697

698698
fun isWithinBounds(view: View?, posX: Float, posY: Float): Boolean {
699699
if (RNSVGHitTester.isSvgElement(view!!)) {

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandlerOrchestrator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ class GestureHandlerOrchestrator(
453453
handler.activationIndex = Int.MAX_VALUE
454454
handler.prepare(view, this)
455455

456-
if (!handler.shouldBeginWithRecorded(gestureHandlers)) {
456+
if (!handler.shouldBeginWithRecordedHandlers(gestureHandlers)) {
457457
handler.cancel()
458458
}
459459

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/NativeViewGestureHandler.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ class NativeViewGestureHandler : GestureHandler() {
8383

8484
override fun shouldBeCancelledBy(handler: GestureHandler): Boolean = !disallowInterruption
8585

86-
override fun shouldBeginWithRecorded(recorded: List<GestureHandler>): Boolean =
87-
hook.shouldBeginWithRecorded(recorded, this)
86+
override fun shouldBeginWithRecordedHandlers(recorded: List<GestureHandler>): Boolean =
87+
hook.shouldBeginWithRecordedHandlers(recorded, this)
8888

8989
override fun onPrepare() {
9090
when (val view = view) {
@@ -281,7 +281,8 @@ class NativeViewGestureHandler : GestureHandler() {
281281
* @param recorded handlers already recorded for the current touch
282282
* @param handler the handler being recorded
283283
*/
284-
fun shouldBeginWithRecorded(recorded: List<GestureHandler>, handler: NativeViewGestureHandler): Boolean = true
284+
fun shouldBeginWithRecordedHandlers(recorded: List<GestureHandler>, handler: NativeViewGestureHandler): Boolean =
285+
true
285286

286287
/**
287288
* Passes the event down to the underlying view using the correct method.

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerButtonViewManager.kt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -740,13 +740,15 @@ class RNGestureHandlerButtonViewManager :
740740
isTouched = false
741741
}
742742

743-
override fun shouldBeginWithRecorded(recorded: List<GestureHandler>, handler: NativeViewGestureHandler): Boolean =
744-
recorded.all {
745-
it.shouldRecognizeSimultaneously(handler) ||
746-
handler.shouldRecognizeSimultaneously(it) ||
747-
it.view == this ||
748-
it is HoverGestureHandler
749-
}
743+
override fun shouldBeginWithRecordedHandlers(
744+
recorded: List<GestureHandler>,
745+
handler: NativeViewGestureHandler,
746+
): Boolean = recorded.all {
747+
it.shouldRecognizeSimultaneously(handler) ||
748+
handler.shouldRecognizeSimultaneously(it) ||
749+
it.view == this ||
750+
it is HoverGestureHandler
751+
}
750752

751753
private fun tryFreeingResponder() {
752754
if (touchResponder === this) {

0 commit comments

Comments
 (0)