Merge branch 'feature/34-clicking-my-location-should-animate-t' into develop

Author: sds100

app/src/main/java/com/mapcode/map/MapScreen.kt

@@ -203,15 +203,15 @@ fun MapControls(
             scope.launch {
                 viewModel.cameraPositionState.animate(
                     CameraUpdateFactory.zoomIn(),
-                    ANIMATE_CAMERA_UPDATE_DURATION_MS
+                    MapViewModel.ANIMATE_CAMERA_UPDATE_DURATION_MS
                 )
             }
         },
         onZoomOutClick = {
             scope.launch {
                 viewModel.cameraPositionState.animate(
                     CameraUpdateFactory.zoomOut(),
-                    ANIMATE_CAMERA_UPDATE_DURATION_MS
+                    MapViewModel. ANIMATE_CAMERA_UPDATE_DURATION_MS
                 )
             }
         },
@@ -355,8 +355,6 @@ fun ZoomControls(
     }
 }
 
-private const val ANIMATE_CAMERA_UPDATE_DURATION_MS = 200
-
 @Composable
 fun MapWithCrossHairs(
     modifier: Modifier,
@@ -420,7 +418,7 @@ fun Map(
             scope.launch {
                 cameraPositionState.animate(
                     CameraUpdateFactory.newLatLng(position),
-                    ANIMATE_CAMERA_UPDATE_DURATION_MS
+                    MapViewModel. ANIMATE_CAMERA_UPDATE_DURATION_MS
                 )
             }
         },
@@ -429,15 +427,15 @@ fun Map(
             scope.launch {
                 cameraPositionState.animate(
                     CameraUpdateFactory.newLatLng(LatLng(location.latitude, location.longitude)),
-                    ANIMATE_CAMERA_UPDATE_DURATION_MS
+                    MapViewModel.    ANIMATE_CAMERA_UPDATE_DURATION_MS
                 )
             }
         },
         onPOIClick = { poi ->
             scope.launch {
                 cameraPositionState.animate(
                     CameraUpdateFactory.newLatLng(poi.latLng),
-                    ANIMATE_CAMERA_UPDATE_DURATION_MS
+                    MapViewModel.   ANIMATE_CAMERA_UPDATE_DURATION_MS
                 )
             }
         },

app/src/main/java/com/mapcode/map/MapViewModel.kt

@@ -36,6 +36,7 @@ class MapViewModel @Inject constructor(
 
     companion object {
         private const val UNKNOWN_ADDRESS_ERROR_TIMEOUT: Long = 3000
+        const val ANIMATE_CAMERA_UPDATE_DURATION_MS = 200
     }
 
     private val mapcodes: MutableStateFlow<List<Mapcode>> = MutableStateFlow(emptyList())
@@ -107,11 +108,16 @@ class MapViewModel @Inject constructor(
         }
     }
 
-    private fun moveCamera(lat: Double, long: Double, zoom: Float) {
+    private fun moveCamera(lat: Double, long: Double, zoom: Float, animate: Boolean = false) {
         viewModelScope.launch(dispatchers.main) {
             if (isGoogleMapsSdkLoaded) {
                 val cameraUpdate = CameraUpdateFactory.newLatLngZoom(LatLng(lat, long), zoom)
-                cameraPositionState.move(cameraUpdate)
+
+                if (animate) {
+                    cameraPositionState.animate(cameraUpdate, ANIMATE_CAMERA_UPDATE_DURATION_MS)
+                } else {
+                    cameraPositionState.move(cameraUpdate)
+                }
             }
 
             onCameraMoved(lat, long, zoom)
@@ -126,7 +132,7 @@ class MapViewModel @Inject constructor(
                 showCantFindLocationSnackBar = true
             } else {
                 showCantFindLocationSnackBar = false
-                moveCamera(myLocation.latitude, myLocation.longitude, 16f)
+                moveCamera(myLocation.latitude, myLocation.longitude, 16f, animate = true)
             }
         }
     }