tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] expose quick zoom option xml attribute

Browse Source
This commit is contained in:
Łukasz Paczos
2019-01-25 10:47:29 +01:00
committed by Łukasz Paczos
parent be94efa402
commit d7cd06eb55
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
View File

@@ -158,6 +158,8 @@ public class MapboxMapOptions implements Parcelable {
typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiTiltGestures, true));
mapboxMapOptions.doubleTapGesturesEnabled(
typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiDoubleTapGestures, true));
mapboxMapOptions.quickZoomGesturesEnabled(
typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiQuickZoomGestures, true));
mapboxMapOptions.maxZoomPreference(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraZoomMax,
MapboxConstants.MAXIMUM_ZOOM));

1
platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
View File

@@ -31,6 +31,7 @@
<public name="mapbox_uiRotateGestures" type="attr" />
<public name="mapbox_uiTiltGestures" type="attr" />
<public name="mapbox_uiDoubleTapGestures" type="attr" />
<public name="mapbox_uiQuickZoomGestures" type="attr" />
<!--Compass-->
<public name="mapbox_uiCompass" type="attr" />

1
platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml
View File

@@ -24,6 +24,7 @@
<attr name="mapbox_uiRotateGestures" format="boolean"/>
<attr name="mapbox_uiTiltGestures" format="boolean"/>
<attr name="mapbox_uiDoubleTapGestures" format="boolean"/>
<attr name="mapbox_uiQuickZoomGestures" format="boolean"/>
<!--Compass-->
<attr name="mapbox_uiCompass" format="boolean"/>

13
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/GestureDetectorActivity.java
View File

@@ -124,11 +124,6 @@ public class GestureDetectorActivity extends AppCompatActivity {
mapView.onSaveInstanceState(outState);
}
@Override
protected void onRestoreInstanceState(Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState);
}
private void initializeMap() {
gesturesManager = mapboxMap.getGesturesManager();
@@ -139,7 +134,7 @@ public class GestureDetectorActivity extends AppCompatActivity {
attachListeners();
focusOnAPoint(mapboxMap.getUiSettings().getFocalPoint() != null);
fixedFocalPointEnabled(mapboxMap.getUiSettings().getFocalPoint() != null);
}
public void attachListeners() {
@@ -239,7 +234,7 @@ public class GestureDetectorActivity extends AppCompatActivity {
UiSettings uiSettings = mapboxMap.getUiSettings();
switch (item.getItemId()) {
case R.id.menu_gesture_focus_point:
focusOnAPoint(focalPointLatLng == null);
fixedFocalPointEnabled(focalPointLatLng == null);
return true;
case R.id.menu_gesture_animation:
uiSettings.setScaleVelocityAnimationEnabled(!uiSettings.isScaleVelocityAnimationEnabled());
@@ -268,8 +263,8 @@ public class GestureDetectorActivity extends AppCompatActivity {
return super.onOptionsItemSelected(item);
}
private void focusOnAPoint(boolean focus) {
if (focus) {
private void fixedFocalPointEnabled(boolean enabled) {
if (enabled) {
focalPointLatLng = new LatLng(51.50325, -0.12968);
marker = mapboxMap.addMarker(new MarkerOptions().position(focalPointLatLng));
mapboxMap.easeCamera(CameraUpdateFactory.newLatLngZoom(focalPointLatLng, 16));