1 files changed, 32 insertions, 31 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java
index 729a08758e..1154cccb6e 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java
@@ -20,11 +20,13 @@ import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.maps.UiSettings;
 import com.mapbox.mapboxsdk.testapp.R;
 
-public class ScrollByActivity extends AppCompatActivity {
+public class ScrollByActivity extends AppCompatActivity implements OnMapReadyCallback {
 
     public static final int MULTIPLIER_PER_PIXEL = 50;
 
-    private MapView mMapView;
+    private MapView mapView;
+    private MapboxMap mapboxMap;
+    private SeekBar xBar, yBar;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -40,35 +42,36 @@ public class ScrollByActivity extends AppCompatActivity {
             actionBar.setDisplayShowHomeEnabled(true);
         }
 
-        final SeekBar xBar = (SeekBar) findViewById(R.id.seekbar_move_x);
+        xBar = (SeekBar) findViewById(R.id.seekbar_move_x);
         TextView xText = (TextView) findViewById(R.id.textview_x);
         xBar.setOnSeekBarChangeListener(new PixelBarChangeListener(xText, R.string.scrollby_x_value));
 
-        final SeekBar yBar = (SeekBar) findViewById(R.id.seekbar_move_y);
+        yBar = (SeekBar) findViewById(R.id.seekbar_move_y);
         TextView yText = (TextView) findViewById(R.id.textview_y);
         yBar.setOnSeekBarChangeListener(new PixelBarChangeListener(yText, R.string.scrollby_y_value));
 
-        mMapView = (MapView) findViewById(R.id.mapView);
-        mMapView.setTag(true);
-        mMapView.onCreate(savedInstanceState);
-        mMapView.getMapAsync(new OnMapReadyCallback() {
+        mapView = (MapView) findViewById(R.id.mapView);
+        mapView.setTag(true);
+        mapView.onCreate(savedInstanceState);
+        mapView.getMapAsync(this);
+    }
+
+    @Override
+    public void onMapReady(MapboxMap map) {
+        mapboxMap = map;
+        UiSettings uiSettings = mapboxMap.getUiSettings();
+        uiSettings.setLogoEnabled(false);
+        uiSettings.setAttributionEnabled(false);
+
+        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+        fab.setColorFilter(ContextCompat.getColor(ScrollByActivity.this, R.color.primary));
+        fab.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onMapReady(@NonNull final MapboxMap mapboxMap) {
-                UiSettings uiSettings = mapboxMap.getUiSettings();
-                uiSettings.setLogoEnabled(false);
-                uiSettings.setAttributionEnabled(false);
-
-                FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
-                fab.setColorFilter(ContextCompat.getColor(ScrollByActivity.this, R.color.primary));
-                fab.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        mapboxMap.easeCamera(CameraUpdateFactory.scrollBy(
-                                        xBar.getProgress() * MULTIPLIER_PER_PIXEL,
-                                        yBar.getProgress() * MULTIPLIER_PER_PIXEL)
-                        );
-                    }
-                });
+            public void onClick(View v) {
+                mapboxMap.easeCamera(CameraUpdateFactory.scrollBy(
+                        xBar.getProgress() * MULTIPLIER_PER_PIXEL,
+                        yBar.getProgress() * MULTIPLIER_PER_PIXEL)
+                );
             }
         });
     }
@@ -76,31 +79,31 @@ public class ScrollByActivity extends AppCompatActivity {
     @Override
     public void onResume() {
         super.onResume();
-        mMapView.onResume();
+        mapView.onResume();
     }
 
     @Override
     public void onPause() {
         super.onPause();
-        mMapView.onPause();
+        mapView.onPause();
     }
 
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        mMapView.onSaveInstanceState(outState);
+        mapView.onSaveInstanceState(outState);
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        mMapView.onDestroy();
+        mapView.onDestroy();
     }
 
     @Override
     public void onLowMemory() {
         super.onLowMemory();
-        mMapView.onLowMemory();
+        mapView.onLowMemory();
     }
 
     @Override
@@ -141,6 +144,4 @@ public class ScrollByActivity extends AppCompatActivity {
 
         }
     }
-
-
 }
\ No newline at end of file