1 files changed, 2 insertions, 105 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 88b09bb959..1c798b1d7a 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
@@ -1,11 +1,8 @@
 package com.mapbox.mapboxsdk.testapp.activity.annotation;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
 import android.app.ProgressDialog;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v4.content.res.ResourcesCompat;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
@@ -14,37 +11,30 @@ import android.view.View;
 import android.widget.AdapterView;
 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;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.maps.MapView;
 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 java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 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.
+ * Test activity showcasing adding a large amount of Markers.
  */
 public class BulkMarkerActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener {
 
   private MapboxMap mapboxMap;
   private MapView mapView;
-  private boolean customMarkerView;
   private List<LatLng> locations;
   private ProgressDialog progressDialog;
 
@@ -56,11 +46,6 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
     mapView = (MapView) findViewById(R.id.mapView);
     mapView.onCreate(savedInstanceState);
     mapView.getMapAsync(mapboxMap -> BulkMarkerActivity.this.mapboxMap = mapboxMap);
-
-    final View fab = findViewById(R.id.fab);
-    if (fab != null) {
-      fab.setOnClickListener(new FabClickListener());
-    }
   }
 
   @Override
@@ -99,38 +84,11 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
     }
 
     mapboxMap.clear();
-
     if (locations.size() < amount) {
       amount = locations.size();
     }
 
-    if (customMarkerView) {
-      showViewMarkers(amount);
-    } else {
-      showGlMarkers(amount);
-    }
-  }
-
-  private void showViewMarkers(int amount) {
-    DecimalFormat formatter = new DecimalFormat("#.#####");
-    Random random = new Random();
-    int randomIndex;
-
-    int color = ResourcesCompat.getColor(getResources(), R.color.redAccent, getTheme());
-    Icon icon = IconUtils.drawableToIcon(this, R.drawable.ic_droppin, color);
-
-    List<MarkerViewOptions> markerOptionsList = new ArrayList<>();
-    for (int i = 0; i < amount; i++) {
-      randomIndex = random.nextInt(locations.size());
-      LatLng latLng = locations.get(randomIndex);
-      MarkerViewOptions markerOptions = new MarkerViewOptions()
-        .position(latLng)
-        .icon(icon)
-        .title(String.valueOf(i))
-        .snippet(formatter.format(latLng.getLatitude()) + ", " + formatter.format(latLng.getLongitude()));
-      markerOptionsList.add(markerOptions);
-    }
-    mapboxMap.addMarkerViews(markerOptionsList);
+    showGlMarkers(amount);
   }
 
   private void showGlMarkers(int amount) {
@@ -198,67 +156,6 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
     mapView.onLowMemory();
   }
 
-  private class FabClickListener implements View.OnClickListener {
-
-    private TextView viewCountView;
-
-    @Override
-    public void onClick(final View view) {
-      if (mapboxMap != null) {
-        customMarkerView = true;
-
-        // remove fab
-        view.animate().alpha(0).setListener(new AnimatorListenerAdapter() {
-          @Override
-          public void onAnimationEnd(Animator animation) {
-            super.onAnimationEnd(animation);
-            view.setVisibility(View.GONE);
-          }
-        }).start();
-
-        // reload markers
-        Spinner spinner = (Spinner) findViewById(R.id.spinner);
-        if (spinner != null) {
-          int amount = Integer.valueOf(
-            getResources().getStringArray(R.array.bulk_marker_list)[spinner.getSelectedItemPosition()]);
-          showMarkers(amount);
-        }
-
-        viewCountView = (TextView) findViewById(R.id.countView);
-
-        mapView.addOnCameraIsChangingListener(new MapView.OnCameraIsChangingListener() {
-          @Override
-          public void onCameraIsChanging() {
-            onCameraChange();
-          }
-        });
-
-        mapView.addOnCameraDidChangeListener(new MapView.OnCameraDidChangeListener() {
-          @Override
-          public void onCameraDidChange(boolean animated) {
-            onCameraChange();
-          }
-        });
-
-        mapboxMap.getMarkerViewManager().setOnMarkerViewClickListener(
-          (marker, view1, adapter) -> {
-            Toast.makeText(
-              BulkMarkerActivity.this,
-              "Hello " + marker.getId(),
-              Toast.LENGTH_SHORT).show();
-            return false;
-          });
-      }
-    }
-
-    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>> {
 
     private WeakReference<BulkMarkerActivity> activity;