Implement dark mode for button

Author: QuocNguyen-w3w

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

@@ -21,8 +21,8 @@ import androidx.compose.ui.layout.onGloballyPositioned
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.rememberMultiplePermissionsState
 import com.what3words.components.compose.maps.buttons.W3WMapButtons
-import com.what3words.components.compose.maps.models.W3WLocationSource
 import com.what3words.components.compose.maps.models.W3WGridScreenCell
+import com.what3words.components.compose.maps.models.W3WLocationSource
 import com.what3words.components.compose.maps.models.W3WMapProjection
 import com.what3words.components.compose.maps.models.W3WMapType
 import com.what3words.components.compose.maps.models.W3WMarker
@@ -84,9 +84,11 @@ fun W3WMapComponent(
         mapManager.setMapConfig(currentMapConfig.value)
     }
 
-    // TODO: Find optimal way to set isRecallButtonEnabled
-    LaunchedEffect(mapConfig.buttonConfig.isRecallButtonUsed) {
-        mapManager.setRecallButtonEnabled(mapConfig.buttonConfig.isRecallButtonUsed)
+    LaunchedEffect(Unit) {
+        mapManager.setRecallButtonEnabled(mapConfig.buttonConfig.isRecallButtonAvailable)
+        locationSource?.locationStatus?.collect { status ->
+            mapManager.updateLocationStatus(status)
+        }
     }
 
     LaunchedEffect(mapState.selectedAddress) {
@@ -314,6 +316,7 @@ internal fun W3WMapContent(
                 buttonConfig = mapConfig.buttonConfig,
                 buttonState = buttonState,
                 isLocationEnabled = mapState.isMyLocationEnabled,
+                isDarkMode = mapState.isDarkMode,
                 onMapTypeClicked = onMapTypeClicked,
                 onMyLocationClicked = onMyLocationClicked,
                 onRecallClicked = onRecallClicked,
@@ -461,16 +464,12 @@ private fun fetchCurrentLocation(
                     animate = true
                 )
 
-
                 if (location.hasAccuracy()) {
                     mapManager.updateAccuracyDistance(location.accuracy)
                 }
             } catch (e: Exception) {
                 onError?.invoke(W3WError("Location fetch failed: ${e.message}"))
             }
-            it.isActive.collect { isActive ->
-                mapManager.updateIsLocationActive(isActive)
-            }
         }
     }
 }

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

@@ -94,9 +94,9 @@ object W3WMapDefaults {
 
     @Immutable
     data class ButtonConfig(
-        val isMapSwitchButtonUsed: Boolean,
-        val isMyLocationButtonUsed: Boolean,
-        val isRecallButtonUsed: Boolean,
+        val isMapSwitchButtonAvailable: Boolean,
+        val isMyLocationButtonAvailable: Boolean,
+        val isRecallButtonAvailable: Boolean,
     )
 
     @Immutable
@@ -151,14 +151,14 @@ object W3WMapDefaults {
     }
 
     fun defaultButtonConfig(
-        isMapSwitchButtonUsed: Boolean = true,
-        isMyLocationButtonUsed: Boolean = true,
-        isRecallButtonUsed: Boolean = false
+        isMapSwitchButtonAvailable: Boolean = true,
+        isMyLocationButtonAvailable: Boolean = true,
+        isRecallButtonAvailable: Boolean = false
     ): ButtonConfig {
         return ButtonConfig(
-            isMapSwitchButtonUsed = isMapSwitchButtonUsed,
-            isMyLocationButtonUsed = isMyLocationButtonUsed,
-            isRecallButtonUsed = isRecallButtonUsed
+            isMapSwitchButtonAvailable = isMapSwitchButtonAvailable,
+            isMyLocationButtonAvailable = isMyLocationButtonAvailable,
+            isRecallButtonAvailable = isRecallButtonAvailable
         )
     }
 

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

@@ -28,6 +28,7 @@ import com.what3words.components.compose.maps.models.W3WMarker
 import com.what3words.components.compose.maps.models.W3WMarkerColor
 import com.what3words.components.compose.maps.models.W3WMarkerWithList
 import com.what3words.components.compose.maps.models.W3WZoomOption
+import com.what3words.components.compose.maps.state.LocationStatus
 import com.what3words.components.compose.maps.state.W3WButtonsState
 import com.what3words.components.compose.maps.state.W3WMapState
 import com.what3words.components.compose.maps.state.camera.W3WCameraState
@@ -760,9 +761,9 @@ class W3WMapManager(
         }
     }
 
-    fun updateIsLocationActive(isActive: Boolean) {
+    fun updateLocationStatus(locationStatus: LocationStatus) {
         _buttonState.update {
-            it.copy(isLocationActive = isActive)
+            it.copy(locationStatus = locationStatus)
         }
     }