[android] remove usage of the deprecated OnMapChange listener

2 files changed, 39 insertions, 18 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
index 92c5949ec1..88b09bb959 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
@@ -16,6 +16,7 @@ import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
+
 import com.mapbox.mapboxsdk.annotations.Icon;
 import com.mapbox.mapboxsdk.annotations.MarkerOptions;
 import com.mapbox.mapboxsdk.annotations.MarkerViewOptions;
@@ -25,7 +26,6 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.testapp.R;
 import com.mapbox.mapboxsdk.testapp.utils.GeoParseUtil;
 import com.mapbox.mapboxsdk.testapp.utils.IconUtils;
-import timber.log.Timber;
 
 import java.io.IOException;
 import java.lang.ref.WeakReference;
@@ -35,6 +35,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Random;
 
+import timber.log.Timber;
+
 /**
  * Test activity showcasing adding a large amount of Markers or MarkerViews.
  */
@@ -224,12 +226,17 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
 
         viewCountView = (TextView) findViewById(R.id.countView);
 
-        mapView.addOnMapChangedListener(change -> {
-          if (change == MapView.REGION_IS_CHANGING || change == MapView.REGION_DID_CHANGE) {
-            if (!mapboxMap.getMarkerViewManager().getMarkerViewAdapters().isEmpty()) {
-              viewCountView.setText(String.format(Locale.getDefault(), "ViewCache size %d",
-                mapboxMap.getMarkerViewManager().getMarkerViewContainer().getChildCount()));
-            }
+        mapView.addOnCameraIsChangingListener(new MapView.OnCameraIsChangingListener() {
+          @Override
+          public void onCameraIsChanging() {
+            onCameraChange();
+          }
+        });
+
+        mapView.addOnCameraDidChangeListener(new MapView.OnCameraDidChangeListener() {
+          @Override
+          public void onCameraDidChange(boolean animated) {
+            onCameraChange();
           }
         });
 
@@ -243,6 +250,13 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
           });
       }
     }
+
+    private void onCameraChange() {
+      if (!mapboxMap.getMarkerViewManager().getMarkerViewAdapters().isEmpty()) {
+        viewCountView.setText(String.format(Locale.getDefault(), "ViewCache size %d",
+          mapboxMap.getMarkerViewManager().getMarkerViewContainer().getChildCount()));
+      }
+    }
   }
 
   private static class LoadLocationTask extends AsyncTask<Void, Integer, List<LatLng>> {
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java
index 4b21dea076..fc35434be0 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java
@@ -58,6 +58,7 @@ public class MarkerViewActivity extends AppCompatActivity {
 
   private MapboxMap mapboxMap;
   private MapView mapView;
+  private TextView viewCountView;
 
   // MarkerView location updates
   private MarkerView movingMarkerOne;
@@ -77,7 +78,7 @@ public class MarkerViewActivity extends AppCompatActivity {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_marker_view);
 
-    final TextView viewCountView = (TextView) findViewById(R.id.countView);
+    viewCountView = (TextView) findViewById(R.id.countView);
     mapView = (MapView) findViewById(R.id.mapView);
     mapView.onCreate(savedInstanceState);
     mapView.getMapAsync(mapboxMap -> {
@@ -140,18 +141,12 @@ public class MarkerViewActivity extends AppCompatActivity {
       markerViewManager.addMarkerViewAdapter(new CountryAdapter(MarkerViewActivity.this, mapboxMap));
       markerViewManager.addMarkerViewAdapter(new TextAdapter(MarkerViewActivity.this, mapboxMap));
 
-      final ViewGroup markerViewContainer = markerViewManager.getMarkerViewContainer();
 
       // add a change listener to validate the size of amount of child views
-      mapView.addOnMapChangedListener(change -> {
-        if (change == MapView.REGION_IS_CHANGING || change == MapView.REGION_DID_CHANGE) {
-          if (!markerViewManager.getMarkerViewAdapters().isEmpty() && viewCountView != null) {
-            viewCountView.setText(String.format(
-              Locale.getDefault(),
-              getString(R.string.viewcache_size),
-              markerViewContainer.getChildCount())
-            );
-          }
+      mapView.addOnCameraDidChangeListener(new MapView.OnCameraDidChangeListener() {
+        @Override
+        public void onCameraDidChange(boolean animated) {
+          setViewCount();
         }
       });
 
@@ -194,6 +189,18 @@ public class MarkerViewActivity extends AppCompatActivity {
     });
   }
 
+  private void setViewCount() {
+    final MarkerViewManager markerViewManager = mapboxMap.getMarkerViewManager();
+    final ViewGroup markerViewContainer = markerViewManager.getMarkerViewContainer();
+    if (!markerViewManager.getMarkerViewAdapters().isEmpty() && viewCountView != null) {
+      viewCountView.setText(String.format(
+        Locale.getDefault(),
+        getString(R.string.viewcache_size),
+        markerViewContainer.getChildCount())
+      );
+    }
+  }
+
   private void loopMarkerRotate() {
     rotateUpdateHandler.postDelayed(rotateMarkerRunnable, 800);
   }