Skip to content

lazily update the focal point for location gesture handling #5801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
LukasPaczos wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

lazily update the focal point for location gesture handling #5801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ...s/src/main/java/com/mapbox/navigation/ui/maps/camera/lifecycle/LocationGesturesManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ import com.mapbox.android.gestures.AndroidGesturesManager

internal class LocationGesturesManager(
context: Context,
private val onUpEventCallback: (AndroidGesturesManager) -> Unit
private val onUpEventCallback: (AndroidGesturesManager) -> Unit,
private val onDownEventCallback: (AndroidGesturesManager) -> Unit,
) : AndroidGesturesManager(context) {
override fun onTouchEvent(motionEvent: MotionEvent?): Boolean {
if (motionEvent != null) {
val action: Int = motionEvent.actionMasked
if (action == MotionEvent.ACTION_UP) {
onUpEventCallback.invoke(this)
when (motionEvent.actionMasked) {
MotionEvent.ACTION_UP -> onUpEventCallback.invoke(this)
MotionEvent.ACTION_DOWN -> onDownEventCallback.invoke(this)
}
}
return super.onTouchEvent(motionEvent)
Expand Down
9 changes: 7 additions & 2 deletions .../java/com/mapbox/navigation/ui/maps/camera/lifecycle/NavigationCameraLifecycleProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ import com.mapbox.android.gestures.AndroidGesturesManager
internal object NavigationCameraLifecycleProvider {
fun getCustomGesturesManager(
context: Context,
onUpEventCallback: (AndroidGesturesManager) -> Unit
): AndroidGesturesManager = LocationGesturesManager(context, onUpEventCallback)
onUpEventCallback: (AndroidGesturesManager) -> Unit,
onDownEventCallback: (AndroidGesturesManager) -> Unit,
): AndroidGesturesManager = LocationGesturesManager(
context,
onUpEventCallback,
onDownEventCallback,
)
}
28 changes: 12 additions & 16 deletions ...main/java/com/mapbox/navigation/ui/maps/camera/lifecycle/NavigationScaleGestureHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import com.mapbox.maps.plugin.animation.CameraAnimationsLifecycleListener
import com.mapbox.maps.plugin.animation.CameraAnimationsPlugin
import com.mapbox.maps.plugin.animation.CameraAnimatorType
import com.mapbox.maps.plugin.animation.MapAnimationOwnerRegistry
import com.mapbox.maps.plugin.delegates.listeners.OnCameraChangeListener
import com.mapbox.maps.plugin.gestures.GesturesPlugin
import com.mapbox.maps.plugin.gestures.OnMoveListener
import com.mapbox.maps.plugin.gestures.generated.GesturesSettings
Expand Down Expand Up @@ -167,10 +166,16 @@ class NavigationScaleGestureHandler(
*/
val customGesturesManager: AndroidGesturesManager =
NavigationCameraLifecycleProvider.getCustomGesturesManager(
context
) { gesturesManager ->
adjustGesturesThresholds(gesturesManager.moveGestureDetector)
}
context,
onUpEventCallback = { gesturesManager: AndroidGesturesManager ->
adjustGesturesThresholds(gesturesManager.moveGestureDetector)
},
onDownEventCallback = {
puckScreenPosition?.let {
adjustFocalPoint(it)
}
}
)

private var puckScreenPosition: Point? = null

Expand Down Expand Up @@ -242,15 +247,10 @@ class NavigationScaleGestureHandler(
}

private val onIndicatorPositionChangedListener =
OnIndicatorPositionChangedListener {
point ->
puckScreenPosition = point.also { adjustFocalPoint(it) }
OnIndicatorPositionChangedListener { point ->
puckScreenPosition = point
}

private val onCameraChangedListener = OnCameraChangeListener {
puckScreenPosition?.let { adjustFocalPoint(it) }
}

private val navigationCameraStateChangedObserver =
NavigationCameraStateChangedObserver {
adjustGesturesThresholds(customGesturesManager.moveGestureDetector)
Expand Down Expand Up @@ -292,8 +292,6 @@ class NavigationScaleGestureHandler(

locationPlugin.addOnIndicatorPositionChangedListener(onIndicatorPositionChangedListener)

mapboxMap.addOnCameraChangeListener(onCameraChangedListener)

navigationCamera.registerNavigationCameraStateChangeObserver(
navigationCameraStateChangedObserver
)
Expand All @@ -317,8 +315,6 @@ class NavigationScaleGestureHandler(

locationPlugin.removeOnIndicatorPositionChangedListener(onIndicatorPositionChangedListener)

mapboxMap.removeOnCameraChangeListener(onCameraChangedListener)

navigationCamera.unregisterNavigationCameraStateChangeObserver(
navigationCameraStateChangedObserver
)
Expand Down