update edge insets for camera viewport

abhishek1508 · abhishek1508 · commit a72f9ce1e85a · 2022-10-06T06:29:31.000-07:00
diff --git a/libnavui-dropin/src/main/java/com/mapbox/navigation/dropin/camera/CameraLayoutObserver.kt b/libnavui-dropin/src/main/java/com/mapbox/navigation/dropin/camera/CameraLayoutObserver.kt
@@ -53,11 +53,11 @@ internal class CameraLayoutObserver(
             is NavigationState.DestinationPreview,
             is NavigationState.FreeDrive,
             is NavigationState.RoutePreview -> {
-                EdgeInsets(vPadding, hPadding, vPadding + bottom, hPadding)
+                EdgeInsets(vPadding, hPadding, bottom, hPadding)
             }
             is NavigationState.ActiveNavigation,
             is NavigationState.Arrival -> {
-                EdgeInsets(vPadding + top, hPadding, vPadding + bottom, hPadding)
+                EdgeInsets(vPadding + top, hPadding, bottom, hPadding)
             }
         }
     }
@@ -68,12 +68,7 @@ internal class CameraLayoutObserver(
         val bottom = mapView.height.toDouble() - binding.roadNameLayout.top.toDouble()
         return when (store.state.value.navigation) {
             is NavigationState.FreeDrive -> {
-                EdgeInsets(
-                    vPaddingLandscape,
-                    hPaddingLandscape,
-                    vPaddingLandscape + bottom,
-                    hPaddingLandscape
-                )
+                EdgeInsets(vPaddingLandscape, hPaddingLandscape, bottom, hPaddingLandscape)
             }
             is NavigationState.DestinationPreview,
             is NavigationState.RoutePreview,
@@ -82,8 +77,8 @@ internal class CameraLayoutObserver(
                 EdgeInsets(
                     vPaddingLandscape,
                     hPaddingLandscape + left,
-                    vPaddingLandscape + bottom,
-                    hPaddingLandscape + right
+                    bottom,
+                    right - hPaddingLandscape
                 )
             }
         }
diff --git a/libnavui-dropin/src/main/res/values/dimens.xml b/libnavui-dropin/src/main/res/values/dimens.xml
@@ -26,9 +26,9 @@
 
     <!-- Overview camera padding to ensure location puck and target pin are not clipped -->
     <dimen name="mapbox_camera_overview_padding_v">50dp</dimen>
-    <dimen name="mapbox_camera_overview_padding_landscape_v">30dp</dimen>
+    <dimen name="mapbox_camera_overview_padding_landscape_v">35dp</dimen>
     <dimen name="mapbox_camera_overview_padding_h">50dp</dimen>
-    <dimen name="mapbox_camera_overview_padding_landscape_h">30dp</dimen>
+    <dimen name="mapbox_camera_overview_padding_landscape_h">35dp</dimen>
 
     <dimen name="mapbox_extendable_button_width">72dp</dimen>
     <dimen name="mapbox_extendable_button_height">52dp</dimen>

Original file line number	Diff line number	Diff line change
`@@ -53,11 +53,11 @@ internal class CameraLayoutObserver(`
`53`	`53`	`is NavigationState.DestinationPreview,`
`54`	`54`	`is NavigationState.FreeDrive,`
`55`	`55`	`is NavigationState.RoutePreview -> {`
`56`		`- EdgeInsets(vPadding, hPadding, vPadding + bottom, hPadding)`
	`56`	`+ EdgeInsets(vPadding, hPadding, bottom, hPadding)`
`57`	`57`	`}`
`58`	`58`	`is NavigationState.ActiveNavigation,`
`59`	`59`	`is NavigationState.Arrival -> {`
`60`		`- EdgeInsets(vPadding + top, hPadding, vPadding + bottom, hPadding)`
	`60`	`+ EdgeInsets(vPadding + top, hPadding, bottom, hPadding)`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`	`}`
`@@ -68,12 +68,7 @@ internal class CameraLayoutObserver(`
`68`	`68`	`val bottom = mapView.height.toDouble() - binding.roadNameLayout.top.toDouble()`
`69`	`69`	`return when (store.state.value.navigation) {`
`70`	`70`	`is NavigationState.FreeDrive -> {`
`71`		`- EdgeInsets(`
`72`		`- vPaddingLandscape,`
`73`		`- hPaddingLandscape,`
`74`		`- vPaddingLandscape + bottom,`
`75`		`- hPaddingLandscape`
`76`		`- )`
	`71`	`+ EdgeInsets(vPaddingLandscape, hPaddingLandscape, bottom, hPaddingLandscape)`
`77`	`72`	`}`
`78`	`73`	`is NavigationState.DestinationPreview,`
`79`	`74`	`is NavigationState.RoutePreview,`
`@@ -82,8 +77,8 @@ internal class CameraLayoutObserver(`
`82`	`77`	`EdgeInsets(`
`83`	`78`	`vPaddingLandscape,`
`84`	`79`	`hPaddingLandscape + left,`
`85`		`- vPaddingLandscape + bottom,`
`86`		`- hPaddingLandscape + right`
	`80`	`+ bottom,`
	`81`	`+ right - hPaddingLandscape`
`87`	`82`	`)`
`88`	`83`	`}`
`89`	`84`	`}`