From fc1a04d0e4f8b05e5a44aa77df6015be86e7c7d0 Mon Sep 17 00:00:00 2001
From: Neslihan <tur.neslihan@gmail.com>
Date: Mon, 15 May 2017 11:56:40 +0300
Subject: [PATCH] Add custom map marker icons

---
 .../free/nrw/commons/nearby/NearbyController.java |  12 ++++++++++--
 .../nrw/commons/nearby/NearbyMapFragment.java     |   5 +++--
 .../main/res/drawable-mdpi/custom_map_marker.png  | Bin 0 -> 993 bytes
 3 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/drawable-mdpi/custom_map_marker.png

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java
index ba2aec1d9..e5fc3182c 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java
@@ -2,9 +2,11 @@ package fr.free.nrw.commons.nearby;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.graphics.drawable.Icon;
 import android.preference.PreferenceManager;
 
+import com.mapbox.mapboxsdk.annotations.Icon;
+import com.mapbox.mapboxsdk.annotations.IconFactory;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -13,6 +15,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
+import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.location.LatLng;
 import timber.log.Timber;
 
@@ -86,13 +89,17 @@ public class NearbyController {
      */
     public static List<NearbyBaseMarker> loadAttractionsFromLocationToBaseMarkerOptions(
             LatLng curLatLng,
-            List<Place> placeList) {
+            List<Place> placeList,
+            Context context) {
         List<NearbyBaseMarker> baseMarkerOptionses = new ArrayList<>();
         placeList = placeList.subList(0, Math.min(placeList.size(), MAX_RESULTS));
         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(
@@ -100,6 +107,7 @@ public class NearbyController {
                             place.location.latitude,
                             place.location.longitude));
             nearbyBaseMarker.place(place);
+            nearbyBaseMarker.icon(icon);
 
             baseMarkerOptionses.add(nearbyBaseMarker);
         }
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
index 77512139e..b58fa8d5b 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
@@ -55,8 +55,9 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
             Type curLatLngType = new TypeToken<fr.free.nrw.commons.location.LatLng>() {}.getType();
             curLatLng = gson.fromJson(gsonLatLng, curLatLngType);
             baseMarkerOptionses = NearbyController
-                    .loadAttractionsFromLocationToBaseMarkerOptions(curLatLng, placeList);
-
+                    .loadAttractionsFromLocationToBaseMarkerOptions(curLatLng,
+                            placeList,
+                            getActivity());
         }
         Mapbox.getInstance(getActivity(),
                 getString(R.string.mapbox_commons_app_token));
diff --git a/app/src/main/res/drawable-mdpi/custom_map_marker.png b/app/src/main/res/drawable-mdpi/custom_map_marker.png
new file mode 100644
index 0000000000000000000000000000000000000000..0634167c52db9b1331f1cd671b211f2b16b9faaf
GIT binary patch
literal 993
zcmV<710MW|P)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00004b3#c}2nYxW
zd<bNS00009a7bBm000<0000<00e)?22mk;88FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H1171l)K~zYIt(IF%TXh`AKmS2*ZY={rNUNC4t&A}j=Mq=cITOvY
zsgIInzB_MkZt=lKqsdIX%=-gg;w8=pye!VZHm8mloJJVym;<Gd!fFfc2DU&;59Q~>
zDCy;#_SE=GPELN8|M&C1obx+Ji3ny)-P5s$+UA`&oL(%pR+O@k$&8>aju4Ly%IWvM
zG^JAxsP1^c!!6rirg6gos;bu*7S2Xa68!U7IrrHg{~4(EJpK?jc{^EK<1RDt>y}O>
z2#+3;o;N!y2CBOrZldM>U%8>C*%T~mT566!|9x`y<MVoH<1KQx9jzD!V6m^m-SV#5
zy47kLsM<UB(Xe5E#jvco>U}itKB$+f)*Vpi*}<CPxmZ#OcJ+UUH!_MdIY+p*iC<dU
z32fY1tYLR;HxIP0Z7U2p=CASOx39A~KD`>-xG=-rp<zCcP4ctv(E?>htDdy}8CKhi
zfP4G8@?cr3LfAia2KVHp{Djrks+1~PkUmi1$aA$cJFX1rmI7FpmuZ{u7bsWRq0wdz
zn8}Rgy3Uyp4cek15TGFu%MYZJ6C#m$bHJrkAlFUQx`|nIpYm0UIqM5Fmd5q!^nue8
zXL4P!*ck9^F@&X+;?m6p$38!M$~>^|*m2_1!Q4=Hdk15#`l8Zhpli!+Lbq<qnL%=%
z@ylQ6NgKDeM-IP&$9pI@W=$s8HE@E>QvqDbIYR53=-cFD)a%P19Gy5OU%mKPWx(4X
zY~;?p1K3^W8h6&xsU-ehpY(V6_0opDR4#r$#q`*#6~O?mPIel>N&*4s`Ry(Ki4K~E
zEyTkF{V$a&DG3z$T_ZB~0<vrlcs2N%TsT?Wj?4l9<fjk5=33}PSy((eMEB6qa%E+K
z0Q}`Y%))HgFt4Q+_<Q^rksp`-7oc1?K0@&F(=2IPaZ=#Q$n$dc{a!O#=2i$u??>Md
z9zIf(m<oI%r`~zPtd41*QmUHnw~sJ2-m@B<iJa$L*K>NGAwwO*7hkC=;6|Vhu&z$7
z##6_>r#{4DbMnKdPZ08tt_%?%4a@>D5h>pOGQisar*5+K-fh?%O$?saZP36XFf2Oa
zrGV=J4`4A6HL?s45s|2_Zpj~Er4+CZu&sctId{eNE!0--*=tV3xKsQKDk)1U7KRrI
P00000NkvXXu0mjfN=e#{

literal 0
HcmV?d00001