diff options
author | Tobrun <tobrun@mapbox.com> | 2017-08-01 08:54:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-01 08:54:16 +0200 |
commit | 11b8f2dcb23bc076a8e6f939de458d001f79eeeb (patch) | |
tree | ab415aefe1e3e1920fae7d4006a14a317af41147 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java | |
parent | 685b8b2c84e47d8126e924ff3fddc22a96237680 (diff) | |
download | qtlocation-mapboxgl-11b8f2dcb23bc076a8e6f939de458d001f79eeeb.tar.gz |
[android] - move ZoomButtonController creation to view initalisation (#9587)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java index 848a898f94..766e2a051d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java @@ -120,6 +120,7 @@ public class MapView extends FrameLayout { myLocationView = (MyLocationView) view.findViewById(R.id.userLocationView); attrView = (ImageView) view.findViewById(R.id.attributionView); logoView = (ImageView) view.findViewById(R.id.logoView); + mapZoomButtonController = new MapZoomButtonController(new ZoomButtonsController(this)); // add accessibility support setContentDescription(context.getString(R.string.mapbox_mapActionDescription)); @@ -180,7 +181,7 @@ public class MapView extends FrameLayout { mapKeyListener = new MapKeyListener(transform, trackingSettings, uiSettings); MapZoomControllerListener zoomListener = new MapZoomControllerListener(mapGestureDetector, uiSettings, transform); - mapZoomButtonController = new MapZoomButtonController(this, uiSettings, zoomListener); + mapZoomButtonController.bind(uiSettings, zoomListener); // inject widgets with MapboxMap compassView.setMapboxMap(mapboxMap); @@ -557,9 +558,7 @@ public class MapView extends FrameLayout { @CallSuper protected void onDetachedFromWindow() { super.onDetachedFromWindow(); - if (mapZoomButtonController != null) { - mapZoomButtonController.setVisible(false); - } + mapZoomButtonController.setVisible(false); } // Called when view is hidden and shown @@ -569,7 +568,7 @@ public class MapView extends FrameLayout { return; } - if (mapZoomButtonController != null && nativeMapView != null) { + if (nativeMapView != null) { mapZoomButtonController.setVisible(visibility == View.VISIBLE); } } |