Update google compass icon position (#143)

* Update compose map to reposition google compass based on alignment setting

* Add docstring

* Move logic to W3WGoogleMap

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,6 +1,5 @@
 package com.what3words.components.compose.maps
 
-import android.Manifest
 import android.graphics.PointF
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
@@ -18,8 +17,6 @@ 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 com.what3words.components.compose.maps.W3WMapDefaults.MapColors
 import com.what3words.components.compose.maps.W3WMapDefaults.defaultMapColors
 import com.what3words.components.compose.maps.buttons.MapButtons
@@ -443,7 +440,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

@@ -61,6 +61,7 @@ object W3WMapDefaults {
      * @property darkModeCustomJsonStyle The custom JSON style for dark mode
      * @property isBuildingEnable Whether 3D buildings are enabled on the map
      * @property isCompassButtonEnabled Whether the compass button is enabled on the map
+     * @property isGoogleCompassAlignedRight Whether the compass button should be aligned to the right on Google Maps
      * @property isScaleBarEnabled Whether the scale bar is enabled on the map
      * @property shouldFocusOnMyLocationOnInitialization Whether to automatically focus on user's location during map initialization
      * @property gridLineConfig The configuration for grid lines on the map
@@ -71,6 +72,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 +210,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 +223,7 @@ object W3WMapDefaults {
             buttonConfig = buttonConfig,
             shouldFocusOnMyLocationOnInitialization = shouldFocusOnMyLocationOnInitialization,
             isCompassButtonEnabled = isCompassButtonEnabled,
+            isGoogleCompassAlignedRight = isGoogleCompassAlignedRight,
             isScaleBarEnabled = isScaleBarEnabled
         )
     }

lib-compose/src/main/java/com/what3words/components/compose/maps/providers/googlemap/W3WGoogleMap.kt

@@ -1,6 +1,8 @@
 package com.what3words.components.compose.maps.providers.googlemap
 
 import android.graphics.Point
+import android.view.View
+import android.widget.RelativeLayout
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -9,6 +11,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalView
+import androidx.core.view.doOnLayout
 import com.google.android.gms.maps.Projection
 import com.google.android.gms.maps.model.LatLngBounds
 import com.google.android.gms.maps.model.MapStyleOptions
@@ -116,6 +120,24 @@ fun W3WGoogleMap(
         onCameraUpdated(state.cameraState)
     }
 
+    // Reposition Google Map compass to align with app's design
+    val view = LocalView.current
+    LaunchedEffect(mapConfig.isGoogleCompassAlignedRight) {
+        if (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()
+            }
+        }
+    }
+
     GoogleMap(
         modifier = modifier,
         cameraPositionState = cameraPositionState,