Use vector icons for nearby-map markers (#786)

Author: akaita

app/src/androidTest/java/fr/free/nrw/commons/NearbyControllerTest.java

@@ -25,7 +25,7 @@ public class NearbyControllerTest {
 
     @Before
     public void setup() {
-        instrumentationContext = InstrumentationRegistry.getContext();
+        instrumentationContext = InstrumentationRegistry.getTargetContext();
     }
 
     @Test public void testNullAttractions() {

app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java

@@ -2,9 +2,10 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.graphics.Bitmap;
 import android.preference.PreferenceManager;
+import android.support.graphics.drawable.VectorDrawableCompat;
 
-import com.mapbox.mapboxsdk.annotations.Icon;
 import com.mapbox.mapboxsdk.annotations.IconFactory;
 
 import java.util.ArrayList;
@@ -18,6 +19,7 @@
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.location.LatLng;
+import fr.free.nrw.commons.utils.UiUtils;
 import timber.log.Timber;
 
 import static fr.free.nrw.commons.utils.LengthUtils.computeDistanceBetween;
@@ -98,21 +100,24 @@ public static List<NearbyBaseMarker> loadAttractionsFromLocationToBaseMarkerOpti
 
         placeList = placeList.subList(0, Math.min(placeList.size(), MAX_RESULTS));
 
+        Bitmap icon = UiUtils.getBitmap(
+                VectorDrawableCompat.create(
+                        context.getResources(), R.drawable.ic_custom_map_marker, context.getTheme()
+                ));
+
         for (Place place: placeList) {
             String distance = formatDistanceBetween(curLatLng, place.location);
             place.setDistance(distance);
 
-            Icon icon = IconFactory.getInstance(context)
-                    .fromResource(R.drawable.custom_map_marker);
-
             NearbyBaseMarker nearbyBaseMarker = new NearbyBaseMarker();
             nearbyBaseMarker.title(place.name);
             nearbyBaseMarker.position(
                     new com.mapbox.mapboxsdk.geometry.LatLng(
                             place.location.getLatitude(),
                             place.location.getLongitude()));
             nearbyBaseMarker.place(place);
-            nearbyBaseMarker.icon(icon);
+            nearbyBaseMarker.icon(IconFactory.getInstance(context)
+                    .fromBitmap(icon));
 
             baseMarkerOptions.add(nearbyBaseMarker);
         }

app/src/main/java/fr/free/nrw/commons/utils/UiUtils.java

@@ -0,0 +1,22 @@
+package fr.free.nrw.commons.utils;
+
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.support.graphics.drawable.VectorDrawableCompat;
+
+public class UiUtils {
+
+    /**
+     * Draws a vectorial image onto a bitmap.
+     * @param vectorDrawable vectorial image
+     * @return bitmap representation of the vectorial image
+     */
+    public static Bitmap getBitmap(VectorDrawableCompat vectorDrawable) {
+        Bitmap bitmap = Bitmap.createBitmap(vectorDrawable.getIntrinsicWidth(),
+                vectorDrawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        vectorDrawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+        vectorDrawable.draw(canvas);
+        return bitmap;
+    }
+}

app/src/main/res/drawable-mdpi/custom_map_marker.png

@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="28dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="28.0">
+    <path
+        android:fillAlpha="0.1"
+        android:fillColor="#000000"
+        android:pathData="M6.072,22.223a6.031,3.672 0,1 0,12.062 0a6.031,3.672 0,1 0,-12.062 0z"
+        android:strokeWidth="1" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#f84d4d"
+        android:pathData="M11.575,11.62C10.689,11.462 9.902,10.759 9.625,9.878 9.553,9.65 9.535,9.499 9.538,9.14c0.004,-0.397 0.019,-0.492 0.13,-0.787 0.236,-0.631 0.646,-1.099 1.212,-1.382 0.386,-0.193 0.709,-0.272 1.116,-0.272 0.676,0 1.263,0.247 1.744,0.734 0.355,0.359 0.541,0.682 0.657,1.136 0.327,1.278 -0.442,2.611 -1.723,2.987 -0.282,0.083 -0.817,0.114 -1.099,0.063z"
+        android:strokeWidth="1" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#006699"
+        android:pathData="M11.617,21.707C10.518,20.424 9.338,18.864 8.395,17.449 6.524,14.641 5.455,12.305 5.102,10.255 5.014,9.744 5.006,8.628 5.088,8.137 5.348,6.561 6.043,5.221 7.158,4.148 9.148,2.231 12.016,1.668 14.593,2.688c2.043,0.809 3.607,2.581 4.162,4.719 0.174,0.67 0.204,0.933 0.203,1.761 -0.001,0.81 -0.035,1.098 -0.22,1.857 -0.614,2.524 -2.571,5.977 -5.383,9.501 -0.645,0.809 -1.321,1.61 -1.358,1.61 -0.008,0 -0.179,-0.193 -0.381,-0.428zM12.617,11.603c0.783,-0.188 1.457,-0.795 1.738,-1.564 0.516,-1.415 -0.317,-2.962 -1.783,-3.312 -0.216,-0.052 -0.317,-0.059 -0.661,-0.047 -0.354,0.012 -0.441,0.025 -0.682,0.104 -0.673,0.221 -1.205,0.695 -1.506,1.344 -0.176,0.38 -0.218,0.584 -0.217,1.054 0.001,0.324 0.014,0.452 0.064,0.635 0.266,0.97 1.077,1.689 2.079,1.844 0.243,0.038 0.68,0.012 0.968,-0.057z"
+        android:strokeAlpha="1"
+        android:strokeColor="#003b59"
+        android:strokeWidth="1" />
+</vector>