[android] #2519 - Adding LatLon and XY data to Marker for display in InfoWindow. Added NavDrawer icon.

7 files changed, 14 insertions, 9 deletions

diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivity.java
index 5b8447663c..b6b0207c38 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivity.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivity.java
@@ -14,6 +14,7 @@ import com.mapbox.mapboxsdk.annotations.MarkerOptions;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.utils.ApiAccess;
 import com.mapbox.mapboxsdk.views.MapView;
+import java.text.DecimalFormat;
 
 public class PressForMarkerActivity extends AppCompatActivity {
 
@@ -21,6 +22,8 @@ public class PressForMarkerActivity extends AppCompatActivity {
 
     private MapView mMapView;
 
+    private static final DecimalFormat latLonFormatter = new DecimalFormat("#.#####");
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -37,13 +40,11 @@ public class PressForMarkerActivity extends AppCompatActivity {
 
         mMapView = (MapView) findViewById(R.id.pressForMarkerMapView);
         mMapView.setAccessToken(ApiAccess.getToken(this));
-        mMapView.setStyleUrl(MapView.StyleUrls.MAPBOX_STREETS);
+        mMapView.setStyleUrl(MapView.StyleUrls.EMERALD);
         mMapView.onCreate(savedInstanceState);
 
-
-        mMapView.setCenterCoordinate(new LatLng(47.798202, 7.573781));
-        mMapView.setZoomLevel(4);
-
+        mMapView.setCenterCoordinate(new LatLng(45.1855569, 5.7215506));
+        mMapView.setZoomLevel(11);
 
         final GestureDetector gestureDetector = new GestureDetector(this, new GestureDetector.SimpleOnGestureListener() {
             public void onLongPress(final MotionEvent e) {
@@ -52,11 +53,13 @@ public class PressForMarkerActivity extends AppCompatActivity {
 
                 final LatLng position = mMapView.fromScreenLocation(new PointF(x, y));
 
-                Marker marker = mMapView.addMarker(new MarkerOptions()
+                String title = latLonFormatter.format(position.getLatitude()) + ", " + latLonFormatter.format(position.getLongitude());
+                String snippet = "X = " + (int)x + ", Y = " + (int)y;
+
+                mMapView.addMarker(new MarkerOptions()
                         .position(position)
-                        .title("Dropped Pin")
-                        .snippet("Tap for directions")
-                        .sprite("default_marker"));
+                        .title(title)
+                        .snippet(snippet));
             }
         });
 
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_pin_drop_white_24dp.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_pin_drop_white_24dp.png
new file mode 100644
index 0000000000..d545f6f157
--- /dev/null
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_pin_drop_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_pin_drop_white_24dp.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_pin_drop_white_24dp.png
new file mode 100644
index 0000000000..523fd09996
--- /dev/null
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_pin_drop_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_pin_drop_white_24dp.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_pin_drop_white_24dp.png
new file mode 100644
index 0000000000..5cebaab818
--- /dev/null
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_pin_drop_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_pin_drop_white_24dp.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_pin_drop_white_24dp.png
new file mode 100644
index 0000000000..abd6966825
--- /dev/null
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_pin_drop_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_pin_drop_white_24dp.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_pin_drop_white_24dp.png
new file mode 100644
index 0000000000..09dc9a6813
--- /dev/null
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_pin_drop_white_24dp.png
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
index 1a1c1d8307..c90555d10d 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
@@ -86,6 +86,8 @@
                 android:title="@string/action_map_fragment" />
 
             <item android:id="@+id/action_press_for_marker"
+                  android:checkable="false"
+                  android:icon="@drawable/ic_pin_drop_white_24dp"
                   android:title="@string/action_press_for_marker"/>
         </menu>
     </item>