Move logic to W3WGoogleMap

Author: nghianguyen-w3w

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

@@ -1,8 +1,6 @@
 package com.what3words.components.compose.maps
 
 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
@@ -19,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 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
@@ -315,8 +311,6 @@ 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
@@ -379,24 +373,6 @@ 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 ->

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,