From 0e11a00025109ce3a08810b24cc43ca10bf2bf32 Mon Sep 17 00:00:00 2001
From: neslihanturan <tur.neslihan@gmail.com>
Date: Fri, 16 Mar 2018 18:48:15 +0300
Subject: [PATCH 1/2] Change current location marker icon

---
 .../nrw/commons/nearby/NearbyMapFragment.java     |   8 +++++++-
 .../main/res/drawable/current_location_marker.png | Bin 0 -> 882 bytes
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable/current_location_marker.png

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 6a1475e5a..82f64a389 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
@@ -30,6 +30,8 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import com.mapbox.mapboxsdk.Mapbox;
+import com.mapbox.mapboxsdk.annotations.Icon;
+import com.mapbox.mapboxsdk.annotations.IconFactory;
 import com.mapbox.mapboxsdk.annotations.Marker;
 import com.mapbox.mapboxsdk.annotations.MarkerOptions;
 import com.mapbox.mapboxsdk.annotations.PolygonOptions;
@@ -421,10 +423,14 @@ public class NearbyMapFragment extends DaggerFragment {
         if (currentLocationMarker != null) {
             currentLocationMarker.remove(); // Remove previous marker, we are not Hansel and Gretel
         }
+
+        Icon icon = IconFactory.getInstance(getContext()).fromResource(R.drawable.current_location_marker);
+
         MarkerOptions currentLocationMarkerOptions = new MarkerOptions()
                 .position(new LatLng(curLatLng.getLatitude(), curLatLng.getLongitude()));
-        currentLocationMarker = mapboxMap.addMarker(currentLocationMarkerOptions);
+        currentLocationMarkerOptions.setIcon(icon); // Set custom icon
 
+        currentLocationMarker = mapboxMap.addMarker(currentLocationMarkerOptions);
 
         List<LatLng> circle = createCircleArray(curLatLng.getLatitude(), curLatLng.getLongitude(),
                 curLatLng.getAccuracy() * 2, 100);
diff --git a/app/src/main/res/drawable/current_location_marker.png b/app/src/main/res/drawable/current_location_marker.png
new file mode 100644
index 0000000000000000000000000000000000000000..7dcd14c25c43c2ef4d934596870b1992fca09751
GIT binary patch
literal 882
zcmV-&1C9KNP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000NE000NE0S3ikh5!Hn8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10`EygK~zYIt(M(x6IT>Q*Euueu|4)Ua#A%8q4*+Ah+LIa?p2i{
zK)q~vhw=(MM<1bi2l4`;CA}jeNEk?js!<v+R<RY2J&w=(onAO0s9+O<zx%zGbhNd<
zBbXGeMSTaeIE&HoF_eu2uoY?9CF!+EcIw0kp~oS_IB@MLR%GIuF{{9ufXiq~CsSP{
z2Rh_&oaI?@neGlB7QHXfT2?(=XTWu#`6aJd4t?C{7(0zI0i;Q6<r!v*^nx6FLa^D-
zvh7vz5h5Kg&{|&GrxHi}npgZZcul3%!J71nm07}Ug=S##hlJmse8bCkC1(Py<+m?b
zNECOoJ$`6<d=bWz&}XqEVtI-78;3v562CoOq<JclCv;KuaFdWb1)ueU7w3lqL@D~|
zKIMYXk8zhf)m>cB;;o?8z;Xs$&kwovkH_5Dm6#9>9D2+-ikn%J^;%=}v=SgGQAF_b
z;5GAM!bSK1s06KAT(ShW6G;(3)*ot1_|%+ZR$3i07lohZWg9D}STRyoZ)|B(X1>G}
z32UK``?>Jbgk4;n@|{}3l0gS4B#Y62?6d^Y5L*itgAP(E8;NEnO)#b<NE1v6Gs;Ge
z)-?Ud#HU7s5Tj+0wj#ygNJ^4v@uf+eXpU?}DxET^PC2w3hSL&QIg}I}mR%AVwurT6
zH{;?@OOPqi#o!ShvE2DyM7m5P$gwwHCj4A@Weyc&*vH}7{hK0|07jQyBG}9?@X9vE
zbi_H5wIDZ7Gu7O~rw=EmqERCn4%rSYwic_rxrjjkm#VY_gDs`lZq$h03P5OY4c{!W
z(RX=pWr=??=K0|{1F`ZooqmA_rp?CRb$T#rx3PueC~h6MSZKB<->1qfVXnff{-|&^
z#uv^zlB$PW=(DZ`w;jbw=u?c2$-Y;aE`DIMCsH>11^)VYWu8ey9n9c4uAx{Z!!_V5
zQf2^<9FcMW>?Q`!ovZlgFa7_CZh(P@`JrzMRpR@QO!~I`2PeTrHcTy4)&Kwi07*qo
IM6N<$g3qIgtN;K2

literal 0
HcmV?d00001


From e7eb89ec437d877ab84fdcfee68dfa381f59ae6a Mon Sep 17 00:00:00 2001
From: neslihanturan <tur.neslihan@gmail.com>
Date: Fri, 16 Mar 2018 18:53:49 +0300
Subject: [PATCH 2/2] Remove unnecesarry file

---
 app/src/main/res/drawable/blue_location_dot.xml | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 app/src/main/res/drawable/blue_location_dot.xml

diff --git a/app/src/main/res/drawable/blue_location_dot.xml b/app/src/main/res/drawable/blue_location_dot.xml
deleted file mode 100644
index a8b409b1d..000000000
--- a/app/src/main/res/drawable/blue_location_dot.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-</selector>
\ No newline at end of file