Update compose map to reposition google compass based on alignment setting

Author: nghianguyen-w3w

gradle.properties

@@ -23,5 +23,5 @@ android.nonTransitiveRClass=true
 kotlin.code.style=official
 android.nonFinalResIds=false
 LIBRARY_VERSION=2.1.0
-LIBRARY_COMPOSE_VERSION=2.1.3
+LIBRARY_COMPOSE_VERSION=2.1.4
 MAPBOX_DOWNLOADS_TOKEN = "YOUR_MAPBOX_DOWNLOADS_TOKEN"

lib-compose/src/main/java/com/what3words/components/compose/maps/W3WMapComponent.kt

@@ -1,7 +1,8 @@
 package com.what3words.components.compose.maps
 
-import android.Manifest
 import android.graphics.PointF
+import android.view.View
+import android.widget.RelativeLayout
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
@@ -18,8 +19,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.layout.boundsInParent
 import androidx.compose.ui.layout.onGloballyPositioned
-import com.google.accompanist.permissions.ExperimentalPermissionsApi
-import com.google.accompanist.permissions.rememberMultiplePermissionsState
+import androidx.compose.ui.platform.LocalView
+import androidx.core.view.doOnLayout
 import com.what3words.components.compose.maps.W3WMapDefaults.MapColors
 import com.what3words.components.compose.maps.W3WMapDefaults.defaultMapColors
 import com.what3words.components.compose.maps.buttons.MapButtons
@@ -314,6 +315,8 @@ internal fun W3WMapContent(
     onMapViewPortProvided: (W3WGridScreenCell) -> Unit,
     onRecallButtonPositionProvided: ((PointF) -> Unit),
 ) {
+    val view = LocalView.current
+
     var bounds by remember { mutableStateOf(Rect.Zero) }
 
     // Check if the map is initialized, use to prevent LaunchedEffect to re-run on configuration changes
@@ -376,6 +379,24 @@ internal fun W3WMapContent(
         }
     }
 
+    // Reposition Google Map compass to align with app's design
+    LaunchedEffect(mapProvider, mapConfig.isGoogleCompassAlignedRight) {
+        if (mapProvider == MapProvider.GOOGLE_MAP && mapConfig.isGoogleCompassAlignedRight) {
+            val compass = view.findViewWithTag<View>("GoogleMapCompass")
+
+            compass?.doOnLayout {
+                val params = compass.layoutParams as RelativeLayout.LayoutParams
+                params.addRule(RelativeLayout.ALIGN_PARENT_START, 0)
+                params.addRule(RelativeLayout.ALIGN_PARENT_END)
+                params.addRule(RelativeLayout.ALIGN_PARENT_TOP)
+
+                compass.layoutParams = params
+                compass.requestLayout()
+            }
+        }
+    }
+
+
     Box(
         modifier = modifier
             .onGloballyPositioned { coordinates ->
@@ -443,7 +464,7 @@ internal fun W3WMapView(
     onMarkerClicked: ((W3WMarker) -> Unit),
     onMapClicked: ((W3WCoordinates) -> Unit),
     onCameraUpdated: (W3WCameraState<*>) -> Unit,
-    onMapProjectionUpdated:  ((W3WMapProjection) -> Unit)? = null,
+    onMapProjectionUpdated: ((W3WMapProjection) -> Unit)? = null,
 ) {
     when (mapProvider) {
         MapProvider.GOOGLE_MAP -> {

lib-compose/src/main/java/com/what3words/components/compose/maps/W3WMapDefaults.kt

@@ -71,6 +71,7 @@ object W3WMapDefaults {
         val darkModeCustomJsonStyle: String?,
         val isBuildingEnable: Boolean,
         val isCompassButtonEnabled: Boolean,
+        val isGoogleCompassAlignedRight: Boolean,
         val isScaleBarEnabled: Boolean,
         val shouldFocusOnMyLocationOnInitialization: Boolean,
         val gridLineConfig: GridLinesConfig,
@@ -208,6 +209,7 @@ object W3WMapDefaults {
         darkModeCustomJsonStyle: String? = null,
         isBuildingEnable: Boolean = true,
         isCompassButtonEnabled: Boolean = true,
+        isGoogleCompassAlignedRight: Boolean = true,
         isScaleBarEnabled: Boolean = false,
         shouldFocusOnMyLocationOnInitialization: Boolean = true,
         gridLineConfig: GridLinesConfig = defaultGridLinesConfig(),
@@ -220,6 +222,7 @@ object W3WMapDefaults {
             buttonConfig = buttonConfig,
             shouldFocusOnMyLocationOnInitialization = shouldFocusOnMyLocationOnInitialization,
             isCompassButtonEnabled = isCompassButtonEnabled,
+            isGoogleCompassAlignedRight = isGoogleCompassAlignedRight,
             isScaleBarEnabled = isScaleBarEnabled
         )
     }