NAVAND-5897: interpolate platform-calculated center to StatusAnimator center

GitOrigin-RevId: dfac1f1fd588069cf35a5d72841283a99577ff32

Author: dzinad

ui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/data/MapboxNavigationViewportDataSource.kt

@@ -223,7 +223,7 @@ class MapboxNavigationViewportDataSource private constructor(
 
     constructor(mapboxMap: MapboxMap) : this(
         mapboxMap,
-        FollowingFramingModeHolder(),
+        null,
         OverviewViewportDataSource(
             mapboxMap,
             InternalViewportDataSourceOptions(
@@ -237,7 +237,7 @@ class MapboxNavigationViewportDataSource private constructor(
     // options and internalOptions must be the same instance in OverviewViewportDataSource and MapboxNavigationViewportDataSource
     internal constructor(
         mapboxMap: MapboxMap,
-        followingFramingModeHolder: FollowingFramingModeHolder,
+        followingFramingModeHolder: FollowingFramingModeHolder?,
         overviewViewportDataSource: OverviewViewportDataSource,
     ) : this(
         mapboxMap,
@@ -762,7 +762,6 @@ class MapboxNavigationViewportDataSource private constructor(
                 followingCenterProperty.fallback = cameraState.center
                 followingZoomProperty.fallback = max(min(cameraState.zoom, maxZoom), minZoom)
             }
-            followingFramingModeHolder?.mode = FollowingFramingMode.NONE
             // nothing to frame
             return
         }
@@ -833,7 +832,6 @@ class MapboxNavigationViewportDataSource private constructor(
 
         if (cameraFrame.isEmpty) {
             logW { "CameraOptions is empty" }
-            followingFramingModeHolder?.mode = FollowingFramingMode.NONE
             return
         }
 

ui-maps/src/main/java/com/mapbox/navigation/ui/maps/internal/camera/FollowingFramingModeHolder.kt

@@ -3,10 +3,20 @@ package com.mapbox.navigation.ui.maps.internal.camera
 import androidx.annotation.RestrictTo
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
-enum class FollowingFramingMode { NONE, LOCATION_INDICATOR, MULTIPLE_POINTS }
+enum class FollowingFramingMode {
+    LOCATION_INDICATOR,
+    MULTIPLE_POINTS,
+}
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
 class FollowingFramingModeHolder {
 
-    var mode: FollowingFramingMode = FollowingFramingMode.NONE
+    var prevMode: FollowingFramingMode = FollowingFramingMode.LOCATION_INDICATOR
+        private set
+
+    var mode: FollowingFramingMode = FollowingFramingMode.LOCATION_INDICATOR
+        set(value) {
+            prevMode = field
+            field = value
+        }
 }

ui-maps/src/test/java/com/mapbox/navigation/ui/maps/internal/camera/FollowingFramingModeHolderTest.kt

@@ -0,0 +1,58 @@
+package com.mapbox.navigation.ui.maps.internal.camera
+
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+
+class FollowingFramingModeHolderTest {
+
+    private lateinit var holder: FollowingFramingModeHolder
+
+    @Before
+    fun setup() {
+        holder = FollowingFramingModeHolder()
+    }
+
+    @Test
+    fun `initial state has LOCATION_INDICATOR mode and prevMode`() {
+        assertEquals(FollowingFramingMode.LOCATION_INDICATOR, holder.mode)
+        assertEquals(FollowingFramingMode.LOCATION_INDICATOR, holder.prevMode)
+    }
+
+    @Test
+    fun `setting mode to different value updates prevMode`() {
+        holder.mode = FollowingFramingMode.LOCATION_INDICATOR
+        holder.mode = FollowingFramingMode.MULTIPLE_POINTS
+
+        assertEquals(FollowingFramingMode.MULTIPLE_POINTS, holder.mode)
+        assertEquals(FollowingFramingMode.LOCATION_INDICATOR, holder.prevMode)
+    }
+
+    @Test
+    fun `setting mode to same value updates prevMode`() {
+        holder.mode = FollowingFramingMode.LOCATION_INDICATOR
+        holder.mode = FollowingFramingMode.LOCATION_INDICATOR
+
+        assertEquals(FollowingFramingMode.LOCATION_INDICATOR, holder.mode)
+        assertEquals(FollowingFramingMode.LOCATION_INDICATOR, holder.prevMode)
+    }
+
+    @Test
+    fun `alternating between two modes works correctly`() {
+        holder.mode = FollowingFramingMode.MULTIPLE_POINTS
+        assertEquals(FollowingFramingMode.MULTIPLE_POINTS, holder.mode)
+        assertEquals(FollowingFramingMode.LOCATION_INDICATOR, holder.prevMode)
+
+        holder.mode = FollowingFramingMode.LOCATION_INDICATOR
+        assertEquals(FollowingFramingMode.LOCATION_INDICATOR, holder.mode)
+        assertEquals(FollowingFramingMode.MULTIPLE_POINTS, holder.prevMode)
+
+        holder.mode = FollowingFramingMode.MULTIPLE_POINTS
+        assertEquals(FollowingFramingMode.MULTIPLE_POINTS, holder.mode)
+        assertEquals(FollowingFramingMode.LOCATION_INDICATOR, holder.prevMode)
+
+        holder.mode = FollowingFramingMode.LOCATION_INDICATOR
+        assertEquals(FollowingFramingMode.LOCATION_INDICATOR, holder.mode)
+        assertEquals(FollowingFramingMode.MULTIPLE_POINTS, holder.prevMode)
+    }
+}