Update test app to v5.0 of the SDK (#300)

* update test app to 5.0 snapshot

* add remaining onStart/onStop method calls

* add missing prefix xml namespace app

* fix issue with duplicated layers (different layers must have different ids)

Author: zugaldia

mapbox/app/build.gradle

@@ -41,9 +41,9 @@ dependencies {
     compile "com.android.support:recyclerview-v7:25.1.0"
 
     // Mapbox SDK
-    compile('com.mapbox.mapboxsdk:mapbox-android-sdk:4.2.1@aar') {
-        transitive = true
-        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-java-services'
+    compile ('com.mapbox.mapboxsdk:mapbox-android-sdk:5.0.0-SNAPSHOT@aar') {
+        transitive=true
+        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-java-geojson'
     }
 
     // Leak Canary

mapbox/app/src/main/java/com/mapbox/services/android/testapp/MasApplication.java

@@ -4,7 +4,7 @@
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.mapbox.mapboxsdk.MapboxAccountManager;
+import com.mapbox.mapboxsdk.Mapbox;
 import com.squareup.leakcanary.LeakCanary;
 
 public class MasApplication extends Application {
@@ -26,6 +26,6 @@ public void onCreate() {
     if (TextUtils.isEmpty(mapboxAccessToken)) {
       Log.w(LOG_TAG, "Warning: access token isn't set.");
     }
-    MapboxAccountManager.start(getApplicationContext(), mapboxAccessToken);
+    Mapbox.getInstance(getApplicationContext(), mapboxAccessToken);
   }
 }

mapbox/app/src/main/java/com/mapbox/services/android/testapp/Utils.java

@@ -1,33 +1,27 @@
 package com.mapbox.services.android.testapp;
 
 import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 import android.support.annotation.NonNull;
 
-import com.mapbox.mapboxsdk.constants.MapboxConstants;
+import com.mapbox.mapboxsdk.Mapbox;
 
 public class Utils {
 
   /**
    * <p>
    * Returns the Mapbox access token set in the app resources.
    * </p>
-   * It will first search the application manifest for a {@link MapboxConstants#KEY_META_DATA_MANIFEST}
-   * meta-data value. If not found it will then attempt to load the access token from the
+   * It will first search for a token in the Mapbox object. If not found it
+   * will then attempt to load the access token from the
    * {@code res/values/dev.xml} development file.
    *
    * @param context The {@link Context} of the {@link android.app.Activity} or {@link android.app.Fragment}.
    * @return The Mapbox access token or null if not found.
-   * @see MapboxConstants#KEY_META_DATA_MANIFEST
    */
   public static String getMapboxAccessToken(@NonNull Context context) {
     try {
       // Read out AndroidManifest
-      PackageManager packageManager = context.getPackageManager();
-      ApplicationInfo appInfo = packageManager
-        .getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA);
-      String token = appInfo.metaData.getString(MapboxConstants.KEY_META_DATA_MANIFEST);
+      String token = Mapbox.getAccessToken();
       if (token == null || token.isEmpty()) {
         throw new IllegalArgumentException();
       }

mapbox/app/src/main/java/com/mapbox/services/android/testapp/directions/DirectionsV5Activity.java

@@ -158,6 +158,12 @@ private void showMessage(String message) {
     Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
   }
 
+  @Override
+  protected void onStart() {
+    super.onStart();
+    mapView.onStart();
+  }
+
   @Override
   public void onResume() {
     super.onResume();
@@ -176,6 +182,12 @@ protected void onSaveInstanceState(Bundle outState) {
     mapView.onSaveInstanceState(outState);
   }
 
+  @Override
+  protected void onStop() {
+    super.onStop();
+    mapView.onStop();
+  }
+
   @Override
   protected void onDestroy() {
     super.onDestroy();

mapbox/app/src/main/java/com/mapbox/services/android/testapp/directions/RouteUtilsV5Activity.java

@@ -255,6 +255,12 @@ private void showMessage(String message) {
     Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
   }
 
+  @Override
+  protected void onStart() {
+    super.onStart();
+    mapView.onStart();
+  }
+
   @Override
   public void onResume() {
     super.onResume();
@@ -273,6 +279,12 @@ protected void onSaveInstanceState(Bundle outState) {
     mapView.onSaveInstanceState(outState);
   }
 
+  @Override
+  protected void onStop() {
+    super.onStop();
+    mapView.onStop();
+  }
+
   @Override
   protected void onDestroy() {
     super.onDestroy();

mapbox/app/src/main/java/com/mapbox/services/android/testapp/distance/DistanceActivity.java

@@ -177,7 +177,7 @@ public void onFailure(Call<DistanceResponse> call, Throwable throwable) {
   private void addMarkers() {
     for (int i = 0; i < restaurants.size(); i++) {
       CircleLayer circleLayer = new CircleLayer(
-        "circle-layer",
+              restaurants.get(i).getStringProperty("name") + "-circle-layer",
         restaurants.get(i).getStringProperty("name") + "-source"
       ).withProperties(
         circleColor(Color.parseColor("#e55e5e")),
@@ -233,6 +233,12 @@ private void updateLayers() {
     }
   }
 
+  @Override
+  protected void onStart() {
+    super.onStart();
+    mapView.onStart();
+  }
+
   @Override
   public void onResume() {
     super.onResume();
@@ -251,6 +257,12 @@ public void onLowMemory() {
     mapView.onLowMemory();
   }
 
+  @Override
+  protected void onStop() {
+    super.onStop();
+    mapView.onStop();
+  }
+
   @Override
   protected void onDestroy() {
     super.onDestroy();

mapbox/app/src/main/java/com/mapbox/services/android/testapp/geocoding/GeocodingReverseActivity.java

@@ -67,6 +67,12 @@ public void onMapClick(@NonNull LatLng point) {
     });
   }
 
+  @Override
+  protected void onStart() {
+    super.onStart();
+    mapView.onStart();
+  }
+
   @Override
   public void onResume() {
     super.onResume();
@@ -85,6 +91,12 @@ protected void onSaveInstanceState(Bundle outState) {
     mapView.onSaveInstanceState(outState);
   }
 
+  @Override
+  protected void onStop() {
+    super.onStop();
+    mapView.onStop();
+  }
+
   @Override
   protected void onDestroy() {
     super.onDestroy();

mapbox/app/src/main/java/com/mapbox/services/android/testapp/geocoding/GeocodingWidgetActivity.java

@@ -104,6 +104,12 @@ private void updateMap(double latitude, double longitude) {
     mapboxMap.animateCamera(CameraUpdateFactory.newCameraPosition(cameraPosition), 5000, null);
   }
 
+  @Override
+  protected void onStart() {
+    super.onStart();
+    mapView.onStart();
+  }
+
   @Override
   public void onResume() {
     super.onResume();
@@ -122,6 +128,12 @@ protected void onSaveInstanceState(Bundle outState) {
     mapView.onSaveInstanceState(outState);
   }
 
+  @Override
+  protected void onStop() {
+    super.onStop();
+    mapView.onStop();
+  }
+
   @Override
   protected void onDestroy() {
     super.onDestroy();

mapbox/app/src/main/java/com/mapbox/services/android/testapp/nav/OffRouteDetectionActivity.java

@@ -122,6 +122,12 @@ public void onMapClick(@NonNull LatLng point) {
     });
   } // End onCreate
 
+  @Override
+  protected void onStart() {
+    super.onStart();
+    mapView.onStart();
+  }
+
   @Override
   public void onResume() {
     super.onResume();
@@ -144,6 +150,12 @@ public void onLowMemory() {
     mapView.onLowMemory();
   }
 
+  @Override
+  protected void onStop() {
+    super.onStop();
+    mapView.onStop();
+  }
+
   @Override
   protected void onDestroy() {
     super.onDestroy();
@@ -329,7 +341,7 @@ public void run() {
           // and starts outside the current user view. Without this, the user must
           // intentionally execute a gesture before the view marker reappears on
           // the map.
-          map.getMarkerViewManager().scheduleViewMarkerInvalidation();
+          map.getMarkerViewManager().update();
 
           // Rotate the car (marker) to the correct orientation.
           car.setRotation((float) computeHeading(car.getPosition(), routePoints.get(count)));

mapbox/app/src/main/java/com/mapbox/services/android/testapp/nav/SnapToRouteActivity.java

@@ -9,7 +9,7 @@
 import android.view.View;
 import android.widget.Toast;
 
-import com.mapbox.mapboxsdk.MapboxAccountManager;
+import com.mapbox.mapboxsdk.Mapbox;
 import com.mapbox.mapboxsdk.annotations.Marker;
 import com.mapbox.mapboxsdk.annotations.MarkerOptions;
 import com.mapbox.mapboxsdk.annotations.Polyline;
@@ -230,7 +230,7 @@ private void getRoute(Position origin, Position destination) throws ServicesExce
       .setOverview(DirectionsCriteria.OVERVIEW_FULL)
       .setSteps(true)
       .setProfile(DirectionsCriteria.PROFILE_DRIVING)
-      .setAccessToken(MapboxAccountManager.getInstance().getAccessToken())
+      .setAccessToken(Mapbox.getAccessToken())
       .build();
 
     Log.i(TAG, "Request: " + client.cloneCall().request());
@@ -311,6 +311,12 @@ private void drawStepPolyline() {
       .width(5));
   }
 
+  @Override
+  protected void onStart() {
+    super.onStart();
+    mapView.onStart();
+  }
+
   @Override
   public void onResume() {
     super.onResume();
@@ -329,6 +335,13 @@ public void onLowMemory() {
     mapView.onLowMemory();
   }
 
+  @Override
+  protected void onStop() {
+    super.onStop();
+    mapView.onStop();
+  }
+
+
   @Override
   protected void onDestroy() {
     super.onDestroy();