Skip to content

Set isRecallButtonEnabled in button state #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 9, 2024
Merged

Set isRecallButtonEnabled in button state #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib-compose/src/main/java/com/what3words/components/compose/maps/W3WMapComponent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package com.what3words.components.compose.maps

import android.Manifest
import android.graphics.PointF
import android.util.Log
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.padding
import androidx.compose.runtime.Composable
Expand Down Expand Up @@ -69,6 +68,10 @@ fun W3WMapComponent(

val mapState by mapManager.mapState.collectAsState()
val buttonState by mapManager.buttonState.collectAsState()

// TODO: Find optimal way to set isRecallButtonEnabled
mapManager.setRecallButtonEnabled(mapConfig.buttonConfig.isRecallButtonEnabled)

val coroutineScope = rememberCoroutineScope { Dispatchers.IO }

val onMarkerClicked = remember(mapManager) {
Expand Down
10 changes: 5 additions & 5 deletions lib-compose/src/main/java/com/what3words/components/compose/maps/W3WMapDefaults.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,15 @@ object W3WMapDefaults {
)
}

private fun defaultButtonConfig(
fun defaultButtonConfig(
isMapSwitchButtonEnabled: Boolean = true,
isMyLocationButtonEnable: Boolean = true,
isRecallButtonEnable: Boolean = false
isMyLocationButtonEnabled: Boolean = true,
isRecallButtonEnabled: Boolean = false
): ButtonConfig {
return ButtonConfig(
isMapSwitchButtonEnabled = isMapSwitchButtonEnabled,
isMyLocationButtonEnabled = isMyLocationButtonEnable,
isRecallButtonEnabled = isRecallButtonEnable
isMyLocationButtonEnabled = isMyLocationButtonEnabled,
isRecallButtonEnabled = isRecallButtonEnabled
)
}

Expand Down
13 changes: 8 additions & 5 deletions lib-compose/src/main/java/com/what3words/components/compose/maps/W3WMapManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ class W3WMapManager(
private val textDataSource: W3WTextDataSource,
private val dispatcher: CoroutineDispatcher = IO,
val mapProvider: MapProvider,
mapConfig: W3WMapDefaults.MapConfig = W3WMapDefaults.defaultMapConfig(),
mapState: W3WMapState = W3WMapState(),
buttonState: W3WButtonsState = W3WButtonsState(),
) {
Expand All @@ -93,8 +92,6 @@ class W3WMapManager(
private val _buttonState: MutableStateFlow<W3WButtonsState> = MutableStateFlow(buttonState)
val buttonState: StateFlow<W3WButtonsState> = _buttonState.asStateFlow()

private val isRecallButtonEnabled = mapConfig.buttonConfig.isRecallButtonEnabled

private val gridCalculationFlow = MutableStateFlow<W3WCameraState<*>?>(null)

init {
Expand Down Expand Up @@ -233,7 +230,7 @@ class W3WMapManager(
}
gridCalculationFlow.value = newCameraState

if (isRecallButtonEnabled) {
if (_buttonState.value.isRecallButtonEnabled) {
handleRecallButton()
}
}
Expand Down Expand Up @@ -362,7 +359,7 @@ class W3WMapManager(
)
}

if (isRecallButtonEnabled) {
if (_buttonState.value.isRecallButtonEnabled) {
handleRecallButton()
}
}
Expand Down Expand Up @@ -454,6 +451,12 @@ class W3WMapManager(
}
}

fun setRecallButtonEnabled(isEnabled: Boolean) {
_buttonState.update {
it.copy(isRecallButtonEnabled = isEnabled)
}
}

private suspend fun updateSelectedScreenLocation() {
withContext(dispatcher) {
val selectedAddress = mapState.value.selectedAddress?.latLng
Expand Down
1 change: 1 addition & 0 deletions lib-compose/src/main/java/com/what3words/components/compose/maps/state/W3WButtonsState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ data class W3WButtonsState(

// Recall button
val isRecallButtonVisible: Boolean = false,
val isRecallButtonEnabled: Boolean = false,
val arrowColor: Color = Color.White,
val backgroundColor: Color = Color.Red,
val rotationDegree: Float = 0F,
Expand Down