[android] - replace anonymous inner classes with lambda

6 files changed, 100 insertions, 147 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/CustomLocationEngineActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/CustomLocationEngineActivity.java
index 626f7c372d..ff2559089c 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/CustomLocationEngineActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/CustomLocationEngineActivity.java
@@ -4,12 +4,10 @@ import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
 
 import com.mapbox.mapboxsdk.Mapbox;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.testapp.R;
 
 /**
@@ -28,21 +26,15 @@ public class CustomLocationEngineActivity extends BaseLocationActivity {
 
     mapView = (MapView) findViewById(R.id.mapView);
     mapView.onCreate(savedInstanceState);
-    mapView.getMapAsync(new OnMapReadyCallback() {
-      @Override
-      public void onMapReady(MapboxMap map) {
-        mapboxMap = map;
-        mapboxMap.setLocationSource(MockLocationEngine.getInstance());
-      }
+    mapView.getMapAsync(map -> {
+      mapboxMap = map;
+      mapboxMap.setLocationSource(MockLocationEngine.getInstance());
     });
 
     locationToggleFab = (FloatingActionButton) findViewById(R.id.fabLocationToggle);
-    locationToggleFab.setOnClickListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View view) {
-        if (mapboxMap != null) {
-          enableLocation(!mapboxMap.isMyLocationEnabled());
-        }
+    locationToggleFab.setOnClickListener(view -> {
+      if (mapboxMap != null) {
+        enableLocation(!mapboxMap.isMyLocationEnabled());
       }
     });
   }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MockLocationEngine.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MockLocationEngine.java
index df52ccf727..f4b54551bf 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MockLocationEngine.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MockLocationEngine.java
@@ -21,12 +21,9 @@ public class MockLocationEngine extends LocationEngine {
   private static int counter;
 
   MockLocationEngine(Location start, Location end) {
-    locationAnimator = new LocationAnimator(start, end, new ValueAnimator.AnimatorUpdateListener() {
-      @Override
-      public void onAnimationUpdate(ValueAnimator animation) {
-        for (LocationEngineListener listener : locationListeners) {
-          listener.onLocationChanged((Location) animation.getAnimatedValue());
-        }
+    locationAnimator = new LocationAnimator(start, end, animation -> {
+      for (LocationEngineListener listener : locationListeners) {
+        listener.onLocationChanged((Location) animation.getAnimatedValue());
       }
     });
   }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationDrawableActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationDrawableActivity.java
index 62b4f4b987..000042306f 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationDrawableActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationDrawableActivity.java
@@ -14,7 +14,6 @@ import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.testapp.R;
 import com.mapbox.services.android.telemetry.location.LocationEngineListener;
 
@@ -50,12 +49,9 @@ public class MyLocationDrawableActivity extends BaseLocationActivity implements
     parent.addView(mapView);
 
     mapView.onCreate(savedInstanceState);
-    mapView.getMapAsync(new OnMapReadyCallback() {
-      @Override
-      public void onMapReady(MapboxMap map) {
-        mapboxMap = map;
-        toggleGps(true);
-      }
+    mapView.getMapAsync(map -> {
+      mapboxMap = map;
+      toggleGps(true);
     });
   }
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java
index 44ee030885..d496f76bc7 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java
@@ -15,7 +15,6 @@ import com.mapbox.mapboxsdk.constants.MyLocationTracking;
 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.maps.TrackingSettings;
 import com.mapbox.mapboxsdk.maps.widgets.MyLocationViewSettings;
 import com.mapbox.mapboxsdk.testapp.R;
@@ -37,80 +36,65 @@ public class MyLocationTintActivity extends BaseLocationActivity implements Loca
 
     mapView = (MapView) findViewById(R.id.mapView);
     mapView.onCreate(savedInstanceState);
-    mapView.getMapAsync(new OnMapReadyCallback() {
-      @Override
-      public void onMapReady(MapboxMap map) {
-        mapboxMap = map;
-
-        // enable location updates
-        toggleGps(!mapboxMap.isMyLocationEnabled());
-
-        // add some padding
-        final MyLocationViewSettings myLocationViewSettings = mapboxMap.getMyLocationViewSettings();
-        myLocationViewSettings.setPadding(0, 500, 0, 0);
-
-        // enable tracking
-        TrackingSettings settings = mapboxMap.getTrackingSettings();
-        settings.setDismissLocationTrackingOnGesture(false);
-        settings.setMyLocationTrackingMode(MyLocationTracking.TRACKING_FOLLOW);
-
-        // handle default button clicks
-        ViewUtils.attachClickListener(
-          MyLocationTintActivity.this,
-          R.id.default_user_dot_coloring_button,
-          new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-              myLocationViewSettings.setAccuracyTintColor(ContextCompat.getColor(
-                MyLocationTintActivity.this, R.color.mapbox_blue));
-              myLocationViewSettings.setForegroundTintColor(ContextCompat.getColor(
-                MyLocationTintActivity.this, R.color.mapbox_blue));
-              myLocationViewSettings.setBackgroundTintColor(Color.WHITE);
-            }
-          });
-
-        // handle tint user dot button clicks
-        ViewUtils.attachClickListener(
-          MyLocationTintActivity.this,
-          R.id.tint_user_dot_button,
-          new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-              myLocationViewSettings.setAccuracyTintColor(
-                ContextCompat.getColor(MyLocationTintActivity.this, R.color.mapboxGreen));
-              myLocationViewSettings.setForegroundTintColor(
-                ContextCompat.getColor(MyLocationTintActivity.this, R.color.mapboxGreen));
-              myLocationViewSettings.setBackgroundTintColor(Color.WHITE);
-            }
-          });
-
-        // handle tint accuracy ring button clicks
-        ViewUtils.attachClickListener(
-          MyLocationTintActivity.this,
-          R.id.user_accuracy_ring_tint_button,
-          new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-              myLocationViewSettings.setAccuracyTintColor(
-                ContextCompat.getColor(MyLocationTintActivity.this, R.color.accent));
-              myLocationViewSettings.setForegroundTintColor(
-                ContextCompat.getColor(MyLocationTintActivity.this, R.color.mapbox_blue));
-              myLocationViewSettings.setBackgroundTintColor(Color.WHITE);
-            }
-          });
-
-        ViewUtils.attachClickListener(
-          MyLocationTintActivity.this,
-          R.id.user_dot_transparent_button,
-          new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-              myLocationViewSettings.setForegroundTintColor(Color.TRANSPARENT);
-              myLocationViewSettings.setBackgroundTintColor(Color.TRANSPARENT);
-            }
-          }
-        );
-      }
+    mapView.getMapAsync(map -> {
+      mapboxMap = map;
+
+      // enable location updates
+      toggleGps(!mapboxMap.isMyLocationEnabled());
+
+      // add some padding
+      final MyLocationViewSettings myLocationViewSettings = mapboxMap.getMyLocationViewSettings();
+      myLocationViewSettings.setPadding(0, 500, 0, 0);
+
+      // enable tracking
+      TrackingSettings settings = mapboxMap.getTrackingSettings();
+      settings.setDismissLocationTrackingOnGesture(false);
+      settings.setMyLocationTrackingMode(MyLocationTracking.TRACKING_FOLLOW);
+
+      // handle default button clicks
+      ViewUtils.attachClickListener(
+        MyLocationTintActivity.this,
+        R.id.default_user_dot_coloring_button,
+        view -> {
+          myLocationViewSettings.setAccuracyTintColor(ContextCompat.getColor(
+            MyLocationTintActivity.this, R.color.mapbox_blue));
+          myLocationViewSettings.setForegroundTintColor(ContextCompat.getColor(
+            MyLocationTintActivity.this, R.color.mapbox_blue));
+          myLocationViewSettings.setBackgroundTintColor(Color.WHITE);
+        });
+
+      // handle tint user dot button clicks
+      ViewUtils.attachClickListener(
+        MyLocationTintActivity.this,
+        R.id.tint_user_dot_button,
+        view -> {
+          myLocationViewSettings.setAccuracyTintColor(
+            ContextCompat.getColor(MyLocationTintActivity.this, R.color.mapboxGreen));
+          myLocationViewSettings.setForegroundTintColor(
+            ContextCompat.getColor(MyLocationTintActivity.this, R.color.mapboxGreen));
+          myLocationViewSettings.setBackgroundTintColor(Color.WHITE);
+        });
+
+      // handle tint accuracy ring button clicks
+      ViewUtils.attachClickListener(
+        MyLocationTintActivity.this,
+        R.id.user_accuracy_ring_tint_button,
+        view -> {
+          myLocationViewSettings.setAccuracyTintColor(
+            ContextCompat.getColor(MyLocationTintActivity.this, R.color.accent));
+          myLocationViewSettings.setForegroundTintColor(
+            ContextCompat.getColor(MyLocationTintActivity.this, R.color.mapbox_blue));
+          myLocationViewSettings.setBackgroundTintColor(Color.WHITE);
+        });
+
+      ViewUtils.attachClickListener(
+        MyLocationTintActivity.this,
+        R.id.user_dot_transparent_button,
+        view -> {
+          myLocationViewSettings.setForegroundTintColor(Color.TRANSPARENT);
+          myLocationViewSettings.setBackgroundTintColor(Color.TRANSPARENT);
+        }
+      );
     });
 
   }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationToggleActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationToggleActivity.java
index 718c10c7cb..ea3a6f14bc 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationToggleActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationToggleActivity.java
@@ -2,11 +2,9 @@ package com.mapbox.mapboxsdk.testapp.activity.userlocation;
 
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
-import android.view.View;
 
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.testapp.R;
 
 import timber.log.Timber;
@@ -27,20 +25,12 @@ public class MyLocationToggleActivity extends BaseLocationActivity {
 
     mapView = (MapView) findViewById(R.id.mapView);
     mapView.onCreate(savedInstanceState);
-    mapView.getMapAsync(new OnMapReadyCallback() {
-      @Override
-      public void onMapReady(MapboxMap map) {
-        mapboxMap = map;
-      }
-    });
+    mapView.getMapAsync(map -> mapboxMap = map);
 
     locationToggleFab = (FloatingActionButton) findViewById(R.id.fabLocationToggle);
-    locationToggleFab.setOnClickListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View view) {
-        if (mapboxMap != null) {
-          toggleGps(!mapboxMap.isMyLocationEnabled());
-        }
+    locationToggleFab.setOnClickListener(view -> {
+      if (mapboxMap != null) {
+        toggleGps(!mapboxMap.isMyLocationEnabled());
       }
     });
   }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTrackingModeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTrackingModeActivity.java
index d910a19d5d..5ebe43e68c 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTrackingModeActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTrackingModeActivity.java
@@ -125,41 +125,35 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements
     bearingSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
     setCheckBoxes();
 
-    mapboxMap.setOnMyLocationTrackingModeChangeListener(new MapboxMap.OnMyLocationTrackingModeChangeListener() {
-      @Override
-      public void onMyLocationTrackingModeChange(@MyLocationTracking.Mode int myLocationTrackingMode) {
-        locationSpinner.setOnItemSelectedListener(null);
-        switch (myLocationTrackingMode) {
-          case MyLocationTracking.TRACKING_NONE:
-            locationSpinner.setSelection(TRACKING_NONE_INDEX);
-            break;
-          case MyLocationTracking.TRACKING_FOLLOW:
-            locationSpinner.setSelection(TRACKING_FOLLOW_INDEX);
-            break;
-        }
-        locationSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
+    mapboxMap.setOnMyLocationTrackingModeChangeListener(myLocationTrackingMode -> {
+      locationSpinner.setOnItemSelectedListener(null);
+      switch (myLocationTrackingMode) {
+        case MyLocationTracking.TRACKING_NONE:
+          locationSpinner.setSelection(TRACKING_NONE_INDEX);
+          break;
+        case MyLocationTracking.TRACKING_FOLLOW:
+          locationSpinner.setSelection(TRACKING_FOLLOW_INDEX);
+          break;
       }
+      locationSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
     });
 
-    mapboxMap.setOnMyBearingTrackingModeChangeListener(new MapboxMap.OnMyBearingTrackingModeChangeListener() {
-      @Override
-      public void onMyBearingTrackingModeChange(@MyBearingTracking.Mode int myBearingTrackingMode) {
-        bearingSpinner.setOnItemSelectedListener(null);
-        switch (myBearingTrackingMode) {
-          case MyBearingTracking.NONE:
-            bearingSpinner.setSelection(BEARING_NONE_INDEX);
-            break;
-
-          case MyBearingTracking.GPS:
-            bearingSpinner.setSelection(BEARING_GPS_INDEX);
-            break;
-
-          case MyBearingTracking.COMPASS:
-            bearingSpinner.setSelection(BEARING_COMPASS_INDEX);
-            break;
-        }
-        bearingSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
+    mapboxMap.setOnMyBearingTrackingModeChangeListener(myBearingTrackingMode -> {
+      bearingSpinner.setOnItemSelectedListener(null);
+      switch (myBearingTrackingMode) {
+        case MyBearingTracking.NONE:
+          bearingSpinner.setSelection(BEARING_NONE_INDEX);
+          break;
+
+        case MyBearingTracking.GPS:
+          bearingSpinner.setSelection(BEARING_GPS_INDEX);
+          break;
+
+        case MyBearingTracking.COMPASS:
+          bearingSpinner.setSelection(BEARING_COMPASS_INDEX);
+          break;
       }
+      bearingSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
     });
   }