Merge pull request #6609 from vector-im/feature/ons/reset_zoom_level_…

…on_user_focus Live Location Sharing - Reset zoom level while focusing a user (PSG-624)
element-hq · Jul 22, 2022 · 6a9b496 · 6a9b496
2 parents 442180e + 1032254
commit 6a9b496
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/changelog.d/6609.misc b/changelog.d/6609.misc
@@ -0,0 +1 @@
+Live Location Sharing - Reset zoom level while focusing a user
diff --git a/vector/src/main/java/im/vector/app/features/location/MapBoxMapExt.kt b/vector/src/main/java/im/vector/app/features/location/MapBoxMapExt.kt
@@ -28,10 +28,12 @@ fun MapboxMap?.zoomToLocation(locationData: LocationData, preserveCurrentZoomLev
     } else {
         INITIAL_MAP_ZOOM_IN_PREVIEW
     }
-    this?.cameraPosition = CameraPosition.Builder()
-            .target(LatLng(locationData.latitude, locationData.longitude))
-            .zoom(zoomLevel)
-            .build()
+    this?.easeCamera {
+        CameraPosition.Builder()
+                .target(LatLng(locationData.latitude, locationData.longitude))
+                .zoom(zoomLevel)
+                .build()
+    }
 }
 
 fun MapboxMap?.zoomToBounds(latLngBounds: LatLngBounds) {

diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt
@@ -45,6 +45,7 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.core.utils.openLocation
 import im.vector.app.databinding.FragmentLocationLiveMapViewBinding
+import im.vector.app.features.location.LocationData
 import im.vector.app.features.location.UrlMapProvider
 import im.vector.app.features.location.zoomToBounds
 import im.vector.app.features.location.zoomToLocation
@@ -137,11 +138,9 @@ class LocationLiveMapViewFragment @Inject constructor() : VectorBaseFragment<Fra
 
     private fun onSymbolClicked(symbol: Symbol?) {
         symbol?.let {
-            val screenLocation = mapboxMap?.get()?.projection?.toScreenLocation(it.latLng)
-            views.liveLocationPopupAnchor.apply {
-                x = screenLocation?.x ?: 0f
-                y = (screenLocation?.y ?: 0f) - views.liveLocationPopupAnchor.height
-            }
+            mapboxMap
+                    ?.get()
+                    ?.zoomToLocation(LocationData(it.latLng.latitude, it.latLng.longitude, null), preserveCurrentZoomLevel = false)
 
             LocationLiveMapMarkerOptionsDialog(requireContext())
                     .apply {
@@ -273,7 +272,7 @@ class LocationLiveMapViewFragment @Inject constructor() : VectorBaseFragment<Fra
                 .find { it.matrixItem.id == userId }
                 ?.locationData
                 ?.let { locationData ->
-                    mapboxMap?.get()?.zoomToLocation(locationData, preserveCurrentZoomLevel = true)
+                    mapboxMap?.get()?.zoomToLocation(locationData, preserveCurrentZoomLevel = false)
                 }
     }
 

diff --git a/vector/src/main/res/layout/fragment_location_live_map_view.xml b/vector/src/main/res/layout/fragment_location_live_map_view.xml
@@ -8,8 +8,9 @@
 
     <View
         android:id="@+id/liveLocationPopupAnchor"
-        android:layout_width="40dp"
-        android:layout_height="40dp" />
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_gravity="center"/>
 
     <FrameLayout
         android:id="@+id/liveLocationMapFragmentContainer"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Live Location Sharing - Reset zoom level while focusing a user