From 81cb0d40c6fc33667dee4d1e12571a387312bfdb Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date: Thu, 16 Feb 2023 16:47:02 +0100
Subject: [PATCH] Updating the pin for user location

---
 .../app/features/location/MapTilerMapView.kt  |  4 +++-
 .../preview/LocationPreviewViewModel.kt       |  6 ++---
 .../main/res/drawable/ic_location_user.xml    | 23 ++++++++-----------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt b/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt
index 106a56cc23..bd6fd0a0a5 100644
--- a/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt
+++ b/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt
@@ -103,9 +103,11 @@ class MapTilerMapView @JvmOverloads constructor(
 
     private fun initMapStyle(map: MapboxMap, url: String) {
         map.setStyle(url) { style ->
+            val symbolManager = SymbolManager(this, map, style)
+            symbolManager.iconAllowOverlap = true
             mapRefs = MapRefs(
                     map,
-                    SymbolManager(this, map, style),
+                    symbolManager,
                     style
             )
             pendingState?.let { render(it) }
diff --git a/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewViewModel.kt
index 35b49d8644..10ce406629 100644
--- a/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewViewModel.kt
@@ -45,13 +45,11 @@ class LocationPreviewViewModel @AssistedInject constructor(
     companion object : MavericksViewModelFactory<LocationPreviewViewModel, LocationPreviewViewState> by hiltMavericksViewModelFactory()
 
     init {
-        initialState.pinUserId?.let { userId ->
-            initPin(userId)
-        }
+        initPin(initialState.pinUserId)
         initLocationTracking()
     }
 
-    private fun initPin(userId: String) {
+    private fun initPin(userId: String?) {
         locationPinProvider.create(userId) { pinDrawable ->
             setState { copy(pinDrawable = pinDrawable) }
         }
diff --git a/vector/src/main/res/drawable/ic_location_user.xml b/vector/src/main/res/drawable/ic_location_user.xml
index dc6baca65e..cae89394f1 100644
--- a/vector/src/main/res/drawable/ic_location_user.xml
+++ b/vector/src/main/res/drawable/ic_location_user.xml
@@ -1,14 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="13dp"
-                android:height="13dp" />
-            <solid android:color="?colorPrimary" />
-            <stroke
-                android:width="2dp"
-                android:color="@color/palette_white" />
-        </shape>
-    </item>
-</layer-list>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="28dp"
+    android:viewportWidth="20"
+    android:viewportHeight="28">
+  <path
+      android:pathData="M10,0.667C4.84,0.667 0.667,4.953 0.667,10.254C0.667,15.965 6.56,23.841 8.987,26.84C9.52,27.497 10.493,27.497 11.027,26.84C13.44,23.841 19.333,15.965 19.333,10.254C19.333,4.953 15.16,0.667 10,0.667ZM10,13.678C8.16,13.678 6.667,12.144 6.667,10.254C6.667,8.364 8.16,6.83 10,6.83C11.84,6.83 13.333,8.364 13.333,10.254C13.333,12.144 11.84,13.678 10,13.678Z"
+      android:fillColor="#0DBD8B"/>
+</vector>