1 files changed, 46 insertions, 51 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CustomSpriteActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CustomSpriteActivity.java
index 3763b45e7a..8d35e659d3 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CustomSpriteActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CustomSpriteActivity.java
@@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.testapp.activity.style;
 
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
@@ -12,7 +11,6 @@ import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.style.layers.Layer;
 import com.mapbox.mapboxsdk.style.layers.SymbolLayer;
 import com.mapbox.mapboxsdk.style.sources.GeoJsonSource;
@@ -45,56 +43,53 @@ public class CustomSpriteActivity extends AppCompatActivity {
 
     mapView = (MapView) findViewById(R.id.mapView);
     mapView.onCreate(savedInstanceState);
-    mapView.getMapAsync(new OnMapReadyCallback() {
-      @Override
-      public void onMapReady(@NonNull final MapboxMap map) {
-        mapboxMap = map;
-        final FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
-        fab.setColorFilter(ContextCompat.getColor(CustomSpriteActivity.this, R.color.primary));
-        fab.setOnClickListener(new View.OnClickListener() {
-          private Point point;
-
-          @Override
-          public void onClick(View view) {
-            if (point == null) {
-              Timber.i("First click -> Car");
-              // Add an icon to reference later
-              mapboxMap.addImage(CUSTOM_ICON, BitmapFactory.decodeResource(getResources(), R.drawable.ic_car_top));
-
-              // Add a source with a geojson point
-              point = Point.fromCoordinates(Position.fromCoordinates(13.400972d, 52.519003d));
-              source = new GeoJsonSource(
-                "point",
-                FeatureCollection.fromFeatures(new Feature[] {Feature.fromGeometry(point)})
-              );
-              mapboxMap.addSource(source);
-
-              // Add a symbol layer that references that point source
-              layer = new SymbolLayer("layer", "point");
-              layer.setProperties(
-                // Set the id of the sprite to use
-                iconImage(CUSTOM_ICON)
-              );
-
-              // lets add a circle below labels!
-              mapboxMap.addLayerBelow(layer, "waterway-label");
-
-              fab.setImageResource(R.drawable.ic_directions_car_black);
-            } else {
-              // Update point
-              point = Point.fromCoordinates(
-                Position.fromCoordinates(point.getCoordinates().getLongitude() + 0.001,
-                  point.getCoordinates().getLatitude() + 0.001)
-              );
-              source.setGeoJson(FeatureCollection.fromFeatures(new Feature[] {Feature.fromGeometry(point)}));
-
-              // Move the camera as well
-              mapboxMap.moveCamera(CameraUpdateFactory.newLatLng(new LatLng(
-                point.getCoordinates().getLatitude(), point.getCoordinates().getLongitude())));
-            }
+    mapView.getMapAsync(map -> {
+      mapboxMap = map;
+      final FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+      fab.setColorFilter(ContextCompat.getColor(CustomSpriteActivity.this, R.color.primary));
+      fab.setOnClickListener(new View.OnClickListener() {
+        private Point point;
+
+        @Override
+        public void onClick(View view) {
+          if (point == null) {
+            Timber.i("First click -> Car");
+            // Add an icon to reference later
+            mapboxMap.addImage(CUSTOM_ICON, BitmapFactory.decodeResource(getResources(), R.drawable.ic_car_top));
+
+            // Add a source with a geojson point
+            point = Point.fromCoordinates(Position.fromCoordinates(13.400972d, 52.519003d));
+            source = new GeoJsonSource(
+              "point",
+              FeatureCollection.fromFeatures(new Feature[] {Feature.fromGeometry(point)})
+            );
+            mapboxMap.addSource(source);
+
+            // Add a symbol layer that references that point source
+            layer = new SymbolLayer("layer", "point");
+            layer.setProperties(
+              // Set the id of the sprite to use
+              iconImage(CUSTOM_ICON)
+            );
+
+            // lets add a circle below labels!
+            mapboxMap.addLayerBelow(layer, "waterway-label");
+
+            fab.setImageResource(R.drawable.ic_directions_car_black);
+          } else {
+            // Update point
+            point = Point.fromCoordinates(
+              Position.fromCoordinates(point.getCoordinates().getLongitude() + 0.001,
+                point.getCoordinates().getLatitude() + 0.001)
+            );
+            source.setGeoJson(FeatureCollection.fromFeatures(new Feature[] {Feature.fromGeometry(point)}));
+
+            // Move the camera as well
+            mapboxMap.moveCamera(CameraUpdateFactory.newLatLng(new LatLng(
+              point.getCoordinates().getLatitude(), point.getCoordinates().getLongitude())));
           }
-        });
-      }
+        }
+      });
     });
   }