1 files changed, 135 insertions, 120 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.java
index cf522d7f39..c70e263be5 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.java
@@ -31,142 +31,157 @@ import com.mapbox.mapboxsdk.testapp.R;
  */
 public class DynamicInfoWindowAdapterActivity extends AppCompatActivity implements OnMapReadyCallback {
 
-    private MapboxMap mapboxMap;
-    private MapView mapView;
+  private MapboxMap mapboxMap;
+  private MapView mapView;
 
-    private LatLng paris = new LatLng(48.864716, 2.349014);
+  private LatLng paris = new LatLng(48.864716, 2.349014);
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_infowindow_adapter);
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.activity_infowindow_adapter);
 
-        setupActionBar();
+    setupActionBar();
 
-        mapView = (MapView) findViewById(R.id.mapView);
-        mapView.onCreate(savedInstanceState);
-        mapView.getMapAsync(this);
-    }
-
-    @Override
-    public void onMapReady(MapboxMap map) {
-
-        mapboxMap = map;
-
-        //Add info window adapter
-        addCustomInfoWindowAdapter(mapboxMap);
-
-        //Keep info windows open on click
-        mapboxMap.getUiSettings().setDeselectMarkersOnTap(false);
-
-        //Add a marker
-        final MarkerView marker = addMarker(mapboxMap);
-        mapboxMap.selectMarker(marker);
-
-        //On map click, change the info window contents
-        mapboxMap.setOnMapClickListener(new MapboxMap.OnMapClickListener() {
-            @Override
-            public void onMapClick(@NonNull LatLng point) {
-                //Distance from click to marker
-                double distanceKm = marker.getPosition().distanceTo(point) / 1000;
-
-                //Get the info window
-                InfoWindow infoWindow = marker.getInfoWindow();
-
-                //Get the view from the info window
-                if (infoWindow != null && infoWindow.getView() != null) {
-                    //Set the new text on the text view in the info window
-                    ((TextView) infoWindow.getView()).setText(String.format("%.2fkm", distanceKm));
-
-                    //Update the info window position (as the text length changes)
-                    infoWindow.update();
-                }
-            }
-        });
+    mapView = (MapView) findViewById(R.id.mapView);
+    mapView.onCreate(savedInstanceState);
+    mapView.getMapAsync(this);
+  }
 
-        //Focus on Paris
-        mapboxMap.animateCamera(CameraUpdateFactory.newLatLng(paris));
-    }
+  @Override
+  public void onMapReady(MapboxMap map) {
 
-    private MarkerView addMarker(MapboxMap mapboxMap) {
-        IconFactory iconFactory = IconFactory.getInstance(this);
-        Drawable iconDrawable = ContextCompat.getDrawable(this, R.drawable.ic_location_city_24dp);
-        iconDrawable.setColorFilter(getResources().getColor(R.color.mapbox_blue), PorterDuff.Mode.SRC_IN);
+    mapboxMap = map;
 
-        return mapboxMap.addMarker(
-                new MarkerViewOptions()
-                        .position(paris)
-                        .icon(iconFactory.fromDrawable(iconDrawable))
-        );
-    }
+    //Add info window adapter
+    addCustomInfoWindowAdapter(mapboxMap);
 
-    private void addCustomInfoWindowAdapter(final MapboxMap mapboxMap) {
-        final int padding = (int) getResources().getDimension(R.dimen.attr_margin);
-        mapboxMap.setInfoWindowAdapter(new MapboxMap.InfoWindowAdapter() {
-
-            @Nullable
-            @Override
-            public View getInfoWindow(@NonNull Marker marker) {
-                TextView textView = new TextView(DynamicInfoWindowAdapterActivity.this);
-                textView.setText(marker.getTitle());
-                textView.setBackgroundColor(Color.WHITE);
-                textView.setText("Click the map to calculate the distance");
-                textView.setPadding(padding, padding, padding, padding);
-
-                return textView;
-            }
-        });
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        mapView.onResume();
-    }
+    //Keep info windows open on click
+    mapboxMap.getUiSettings().setDeselectMarkersOnTap(false);
 
-    @Override
-    public void onPause() {
-        super.onPause();
-        mapView.onPause();
-    }
+    //Add a marker
+    final MarkerView marker = addMarker(mapboxMap);
+    mapboxMap.selectMarker(marker);
 
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        mapView.onSaveInstanceState(outState);
-    }
+    //On map click, change the info window contents
+    mapboxMap.setOnMapClickListener(new MapboxMap.OnMapClickListener() {
+      @Override
+      public void onMapClick(@NonNull LatLng point) {
+        //Distance from click to marker
+        double distanceKm = marker.getPosition().distanceTo(point) / 1000;
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        mapView.onDestroy();
-    }
+        //Get the info window
+        InfoWindow infoWindow = marker.getInfoWindow();
 
-    @Override
-    public void onLowMemory() {
-        super.onLowMemory();
-        mapView.onLowMemory();
-    }
+        //Get the view from the info window
+        if (infoWindow != null && infoWindow.getView() != null) {
+          //Set the new text on the text view in the info window
+          ((TextView) infoWindow.getView()).setText(String.format("%.2fkm", distanceKm));
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                onBackPressed();
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
+          //Update the info window position (as the text length changes)
+          infoWindow.update();
         }
+      }
+    });
+
+    //Focus on Paris
+    mapboxMap.animateCamera(CameraUpdateFactory.newLatLng(paris));
+  }
+
+  private MarkerView addMarker(MapboxMap mapboxMap) {
+    IconFactory iconFactory = IconFactory.getInstance(this);
+    Drawable iconDrawable = ContextCompat.getDrawable(this, R.drawable.ic_location_city_24dp);
+    iconDrawable.setColorFilter(
+      ContextCompat.getColor(DynamicInfoWindowAdapterActivity.this, R.color.mapbox_blue),
+      PorterDuff.Mode.SRC_IN
+    );
+
+    return mapboxMap.addMarker(
+      new MarkerViewOptions()
+        .position(paris)
+        .icon(iconFactory.fromDrawable(iconDrawable))
+    );
+  }
+
+  private void addCustomInfoWindowAdapter(final MapboxMap mapboxMap) {
+    final int padding = (int) getResources().getDimension(R.dimen.attr_margin);
+    mapboxMap.setInfoWindowAdapter(new MapboxMap.InfoWindowAdapter() {
+
+      @Nullable
+      @Override
+      public View getInfoWindow(@NonNull Marker marker) {
+        TextView textView = new TextView(DynamicInfoWindowAdapterActivity.this);
+        textView.setText(marker.getTitle());
+        textView.setBackgroundColor(Color.WHITE);
+        textView.setText("Click the map to calculate the distance");
+        textView.setPadding(padding, padding, padding, padding);
+
+        return textView;
+      }
+    });
+  }
+
+  @Override
+  protected void onStart() {
+    super.onStart();
+    mapView.onStart();
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    mapView.onResume();
+  }
+
+  @Override
+  protected void onPause() {
+    super.onPause();
+    mapView.onPause();
+  }
+
+  @Override
+  protected void onStop() {
+    super.onStop();
+    mapView.onStop();
+  }
+
+  @Override
+  protected void onSaveInstanceState(Bundle outState) {
+    super.onSaveInstanceState(outState);
+    mapView.onSaveInstanceState(outState);
+  }
+
+  @Override
+  protected void onDestroy() {
+    super.onDestroy();
+    mapView.onDestroy();
+  }
+
+  @Override
+  public void onLowMemory() {
+    super.onLowMemory();
+    mapView.onLowMemory();
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    switch (item.getItemId()) {
+      case android.R.id.home:
+        onBackPressed();
+        return true;
+      default:
+        return super.onOptionsItemSelected(item);
     }
+  }
 
-    private void setupActionBar() {
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
+  private void setupActionBar() {
+    Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+    setSupportActionBar(toolbar);
 
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setDisplayShowHomeEnabled(true);
-        }
+    ActionBar actionBar = getSupportActionBar();
+    if (actionBar != null) {
+      actionBar.setDisplayHomeAsUpEnabled(true);
+      actionBar.setDisplayShowHomeEnabled(true);
     }
+  }
 }