Move ZoomButtonController creation to view initalisation

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java

@@ -120,6 +120,7 @@ private void initialise(@NonNull final Context context, @NonNull final MapboxMap
  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 @@ private void initialiseMap() {
  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);
@@ -556,9 +557,7 @@ public void onSurfaceTextureUpdated(SurfaceTexture surface) {
  @CallSuper
  protected void onDetachedFromWindow() {
  super.onDetachedFromWindow();
- if (mapZoomButtonController != null) {
- mapZoomButtonController.setVisible(false);
- }
+ mapZoomButtonController.setVisible(false);
  }
 
  // Called when view is hidden and shown
@@ -568,7 +567,7 @@ protected void onVisibilityChanged(@NonNull View changedView, int visibility) {
  return;
  }
 
- if (mapZoomButtonController != null && nativeMapView != null) {
+ if (nativeMapView != null) {
  mapZoomButtonController.setVisible(visibility == View.VISIBLE);
  }
  }

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapZoomButtonController.java

@@ -1,7 +1,6 @@
 package com.mapbox.mapboxsdk.maps;
 
 import android.support.annotation.NonNull;
-import android.view.View;
 import android.widget.ZoomButtonsController;
 
 import com.mapbox.mapboxsdk.constants.MapboxConstants;
@@ -12,21 +11,25 @@
  * Allows single touch only devices to zoom in and out.
  * </p>
  */
-final class MapZoomButtonController extends ZoomButtonsController {
+final class MapZoomButtonController {
 
  private UiSettings uiSettings;
+ private ZoomButtonsController zoomButtonsController;
 
- MapZoomButtonController(@NonNull View ownerView, @NonNull UiSettings uiSettings, @NonNull OnZoomListener listener) {
- super(ownerView);
+ MapZoomButtonController(@NonNull ZoomButtonsController zoomButtonsController) {
+ this.zoomButtonsController = zoomButtonsController;
+ this.zoomButtonsController.setZoomSpeed(MapboxConstants.ANIMATION_DURATION);
+ }
+
+ void bind(UiSettings uiSettings, ZoomButtonsController.OnZoomListener onZoomListener) {
  this.uiSettings = uiSettings;
- setZoomSpeed(MapboxConstants.ANIMATION_DURATION);
- setOnZoomListener(listener);
+ zoomButtonsController.setOnZoomListener(onZoomListener);
  }
 
- @Override
- public void setVisible(boolean visible) {
- if (uiSettings.isZoomControlsEnabled()) {
- super.setVisible(visible);
+ void setVisible(boolean visible) {
+ if (uiSettings != null && !uiSettings.isZoomControlsEnabled()) {
+ return;
  }
+ zoomButtonsController.setVisible(visible);
  }
 }