Skip to content

[gestures] Refactor gestures configuration options to be aligned better across platforms. #672

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

Merged
pengdev merged 12 commits into from
Sep 29, 2021
Merged

[gestures] Refactor gestures configuration options to be aligned better across platforms. #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0baf65c
[gestures] Refactor gestures naming to be aligned better across platf…
pengdev Sep 24, 2021
95a5b13
Fix scroll mode default value.
pengdev Sep 24, 2021
f5e9d12
Adapt the updated gestures settings.
pengdev Sep 24, 2021
3b6e52c
Implement focal point marker
pengdev Sep 27, 2021
7d2ef39
Use correct pixel ratio.
pengdev Sep 27, 2021
7bde356
Fix pinchToZoomEnabled.
pengdev Sep 27, 2021
88a8d5c
Make quickzoom gesture's focal point to be the clicked position.
pengdev Sep 27, 2021
c3a6fd7
Fix unit tests
pengdev Sep 27, 2021
859775f
Reuse marker image for the style.
pengdev Sep 28, 2021
02bb780
Rename doubleTapToZoomAmount to zoomAnimationAmount
pengdev Sep 28, 2021
b142c17
Move focal point to static.
pengdev Sep 29, 2021
26fd4cb
Fix focal point in public.xml
pengdev Sep 29, 2021
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
55 changes: 25 additions & 30 deletions ...ava/com/mapbox/maps/testapp/gestures/generated/GesturesAttributeParserDefaultValueTest.kt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

55 changes: 25 additions & 30 deletions ...ndroidTest/java/com/mapbox/maps/testapp/gestures/generated/GesturesAttributeParserTest.kt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

74 changes: 48 additions & 26 deletions app/src/main/java/com/mapbox/maps/testapp/examples/GesturesActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.mapbox.maps.testapp.examples

import android.annotation.SuppressLint
import android.graphics.BitmapFactory
import android.os.Bundle
import android.os.Handler
import android.view.*
Expand All @@ -18,7 +19,11 @@ import com.mapbox.geojson.Point
import com.mapbox.maps.CameraOptions
import com.mapbox.maps.MapboxMap
import com.mapbox.maps.Style
import com.mapbox.maps.plugin.PanScrollMode
import com.mapbox.maps.plugin.ScrollMode
import com.mapbox.maps.plugin.annotation.annotations
import com.mapbox.maps.plugin.annotation.generated.PointAnnotationManager
import com.mapbox.maps.plugin.annotation.generated.PointAnnotationOptions
import com.mapbox.maps.plugin.annotation.generated.createPointAnnotationManager
import com.mapbox.maps.plugin.gestures.*
import com.mapbox.maps.testapp.R
import com.mapbox.maps.testapp.databinding.ActivityGesturesBinding
Expand All @@ -34,6 +39,7 @@ class GesturesActivity : AppCompatActivity() {
private lateinit var gesturesManager: AndroidGesturesManager
private lateinit var gestureAlertsAdapter: GestureAlertsAdapter
private var focalPointLatLng: Point? = null
private var pointAnnotationManager: PointAnnotationManager? = null
private lateinit var binding: ActivityGesturesBinding

override fun onCreate(savedInstanceState: Bundle?) {
Expand All @@ -47,7 +53,9 @@ class GesturesActivity : AppCompatActivity() {
.zoom(15.0)
.build()
)
mapboxMap.loadStyleUri(Style.MAPBOX_STREETS)
mapboxMap.loadStyleUri(Style.MAPBOX_STREETS) {
it.addImage(MARKER_IMAGE_ID, BitmapFactory.decodeResource(resources, R.drawable.red_marker))
}

binding.mapView.waitForLayout {
initializeMap()
Expand Down Expand Up @@ -178,15 +186,15 @@ class GesturesActivity : AppCompatActivity() {
item.isChecked = focalPointLatLng == null
}
R.id.menu_gesture_animation -> {
gesturesPlugin.scaleVelocityAnimationEnabled =
!gesturesPlugin.scaleVelocityAnimationEnabled
gesturesPlugin.rotateVelocityAnimationEnabled =
!gesturesPlugin.rotateVelocityAnimationEnabled
gesturesPlugin.flingVelocityAnimationEnabled =
!gesturesPlugin.flingVelocityAnimationEnabled
item.isChecked = gesturesPlugin.scaleVelocityAnimationEnabled &&
gesturesPlugin.rotateVelocityAnimationEnabled &&
gesturesPlugin.flingVelocityAnimationEnabled
gesturesPlugin.pinchToZoomDecelerationEnabled =
!gesturesPlugin.pinchToZoomDecelerationEnabled
gesturesPlugin.rotateDecelerationEnabled =
!gesturesPlugin.rotateDecelerationEnabled
gesturesPlugin.scrollDecelerationEnabled =
!gesturesPlugin.scrollDecelerationEnabled
item.isChecked = gesturesPlugin.pinchToZoomDecelerationEnabled &&
gesturesPlugin.rotateDecelerationEnabled &&
gesturesPlugin.scrollDecelerationEnabled
}
R.id.menu_gesture_rotate -> {
gesturesPlugin.rotateEnabled = !gesturesPlugin.rotateEnabled
Expand All @@ -197,35 +205,42 @@ class GesturesActivity : AppCompatActivity() {
item.isChecked = gesturesPlugin.pitchEnabled
}
R.id.menu_gesture_zoom -> {
gesturesPlugin.zoomEnabled = !gesturesPlugin.zoomEnabled
item.isChecked = gesturesPlugin.zoomEnabled
gesturesPlugin.pinchToZoomEnabled = !gesturesPlugin.pinchToZoomEnabled
item.isChecked = gesturesPlugin.pinchToZoomEnabled
}
R.id.menu_gesture_scroll -> {
gesturesPlugin.scrollEnabled = !gesturesPlugin.scrollEnabled
item.isChecked = gesturesPlugin.scrollEnabled
}
R.id.menu_gesture_double_tap -> {
gesturesPlugin.doubleTapToZoomEnabled = !gesturesPlugin.doubleTapToZoomEnabled
item.isChecked = gesturesPlugin.doubleTapToZoomEnabled
gesturesPlugin.doubleTapToZoomInEnabled = !gesturesPlugin.doubleTapToZoomInEnabled
item.isChecked = gesturesPlugin.doubleTapToZoomInEnabled
}
R.id.menu_gesture_double_touch -> {
gesturesPlugin.doubleTouchToZoomOutEnabled = !gesturesPlugin.doubleTouchToZoomOutEnabled
item.isChecked = gesturesPlugin.doubleTouchToZoomOutEnabled
}
R.id.menu_gesture_quick_zoom -> {
gesturesPlugin.quickZoomEnabled = !gesturesPlugin.quickZoomEnabled
item.isChecked = gesturesPlugin.quickZoomEnabled
}
R.id.menu_gesture_pan_scroll_horizontal_vertical -> {
binding.mapView.gestures.updateSettings {
panScrollMode = PanScrollMode.HORIZONTAL_AND_VERTICAL
scrollMode = ScrollMode.HORIZONTAL_AND_VERTICAL
}
item.isChecked = true
}
R.id.menu_gesture_pan_scroll_horizontal -> {
binding.mapView.gestures.updateSettings {
panScrollMode = PanScrollMode.HORIZONTAL
scrollMode = ScrollMode.HORIZONTAL
}
item.isChecked = true
}
R.id.menu_gesture_pan_scroll_vertical -> {
binding.mapView.gestures.updateSettings {
panScrollMode = PanScrollMode.VERTICAL
scrollMode = ScrollMode.VERTICAL
}
item.isChecked = true
}
}
return true
Expand All @@ -234,17 +249,22 @@ class GesturesActivity : AppCompatActivity() {
private fun fixedFocalPointEnabled(enabled: Boolean) {

if (enabled) {
focalPointLatLng = Point.fromLngLat(-0.12968, 51.50325)
// TODO add marker
// marker = mapboxMap.addMarker(MarkerOptions().position(focalPointLatLng))
focalPointLatLng = FOCAL_POINT
pointAnnotationManager =
binding.mapView.annotations.createPointAnnotationManager(binding.mapView).apply {
create(
PointAnnotationOptions()
.withPoint(FOCAL_POINT)
.withIconImage(MARKER_IMAGE_ID)
)
}
mapboxMap.setCamera(CameraOptions.Builder().center(focalPointLatLng).zoom(16.0).build())
recalculateFocalPoint()
} else {
// TODO add marker
// if (marker != null) {
// mapboxMap.removeMarker(marker)
// marker = null
// }
pointAnnotationManager?.let {
Comment thread
pengdev marked this conversation as resolved.
binding.mapView.annotations.removeAnnotationManager(it)
}
pointAnnotationManager = null
focalPointLatLng = null
gesturesPlugin.focalPoint = null
}
Expand Down Expand Up @@ -376,6 +396,8 @@ class GesturesActivity : AppCompatActivity() {

companion object {
private const val MAX_NUMBER_OF_ALERTS = 30
private const val MARKER_IMAGE_ID = "MARKER_IMAGE_ID"
private val FOCAL_POINT = Point.fromLngLat(-0.12968, 51.50325)
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/mapbox/maps/testapp/examples/InsetMapActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class InsetMapActivity : AppCompatActivity(), OnCameraChangeListener {

gestures.updateSettings {
scrollEnabled = false
zoomEnabled = false
pinchToZoomEnabled = false
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/com/mapbox/maps/testapp/examples/terrain3D/SantaCatalinaActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,8 @@ fun MapView.disablePlugins() {

gestures.pitchEnabled = false
gestures.rotateEnabled = false
gestures.zoomEnabled = false
gestures.pinchToZoomEnabled = false
gestures.doubleTouchToZoomOutEnabled = false
gestures.doubleTapToZoomInEnabled = false
gestures.scrollEnabled = false
}
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_style_switch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
app:mapbox_compassMarginLeft="32dp"
app:mapbox_compassMarginRight="32dp"
app:mapbox_compassMarginTop="32dp"
app:mapbox_gesturesDoubleTapToZoomEnabled="false"
app:mapbox_gesturesDoubleTapToZoomInEnabled="false"
app:mapbox_logoEnabled="true"
app:mapbox_logoGravity="bottom|right"
app:mapbox_logoMarginBottom="32dp"
Expand All @@ -51,7 +51,7 @@
app:mapbox_gesturesRotateEnabled="true"
app:mapbox_gesturesScrollEnabled="false"
app:mapbox_gesturesPitchEnabled="false"
app:mapbox_gesturesZoomEnabled="false" />
app:mapbox_gesturesPinchToZoomEnabled="false" />

<Button
android:id="@+id/satellite_streets_button"
Expand Down
Loading