Skip to content

Task/mt 7211 update color by list and selected for markers selected address #59

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
kaytran2992 merged 2 commits into from
Dec 5, 2024
Merged

Task/mt 7211 update color by list and selected for markers selected address #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64bf96a
Update multi color for mapbox
kaytran2992 Dec 4, 2024
05821f1
Update markers and selected multi colors
kaytran2992 Dec 4, 2024
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: 3 additions & 2 deletions 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 @@ -322,9 +322,9 @@ internal fun W3WMapView(
layoutConfig = layoutConfig,
mapConfig = mapConfig,
state = mapState,
content = content,
onMapClicked = onMapClicked,
onMarkerClicked = onMarkerClicked,
content = content,
onCameraUpdated = {
onCameraUpdated.invoke(it)
}
Expand All @@ -337,8 +337,9 @@ internal fun W3WMapView(
layoutConfig = layoutConfig,
mapConfig = mapConfig,
state = mapState,
onMapClicked = onMapClicked,
content = content,
onMapClicked = onMapClicked,
onMarkerClicked = onMarkerClicked,
onCameraUpdated = {
onCameraUpdated.invoke(it)
}
Expand Down
61 changes: 32 additions & 29 deletions ...ain/java/com/what3words/components/compose/maps/providers/googlemap/W3WGoogleMapDrawer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,9 @@ private fun DrawZoomInSelectedAddress(
fun W3WGoogleMapDrawMarkers(
zoomLevel: Float,
zoomSwitchLevel: Float,
selectedMarkerID: Long? = null,
listMarkers: ImmutableMap<String, ImmutableList<W3WMarker>>,
onMarkerClicked: (W3WMarker) -> Unit
selectedMarkerID: Long? = null,
onMarkerClicked: (W3WMarker) -> Unit,
) {
if (zoomLevel < zoomSwitchLevel) {
DrawZoomOutMarkers(
Expand All @@ -241,29 +241,34 @@ fun W3WGoogleMapDrawMarkers(
)
} else {
DrawZoomInMarkers(
listMarkers = listMarkers,
onMarkerClicked = onMarkerClicked
listMarkers = listMarkers
)
}
}

@Composable
private fun DrawZoomInMarkers(
listMarkers: ImmutableMap<String, ImmutableList<W3WMarker>>,
onMarkerClicked: ((W3WMarker) -> Unit)? = null,
) {
val context = LocalContext.current
val density = LocalDensity.current.density

listMarkers.forEach { markers ->
markers.value.forEach { marker ->
val bitmap = BitmapDescriptorFactory.fromBitmap(
getFillGridMarkerBitmap(
context,
density,
marker.color
)
)
listMarkers.forEach { (listId, markers) ->
markers.forEach { marker ->
val color by remember(marker, listId, listMarkers) {
derivedStateOf {
if (isExistInOtherList(listId, marker, listMarkers)) {
MUlTI_MAKERS_COLOR_DEFAULT
} else {
marker.color
}
}
}

val bitmap = remember(marker.id, color) {
BitmapDescriptorFactory.fromBitmap(getFillGridMarkerBitmap(context, density, color))
}

val square = marker.square

GroundOverlay(
Expand All @@ -284,31 +289,29 @@ private fun DrawZoomInMarkers(

@Composable
private fun DrawZoomOutMarkers(
selectedMarkerID: Long? = null,
listMarkers: ImmutableMap<String, ImmutableList<W3WMarker>>,
selectedMarkerID: Long? = null,
onMarkerClicked: (W3WMarker) -> Unit
) {
val context = LocalContext.current
val density = LocalDensity.current.density

val currentOnMarkerClicked by rememberUpdatedState(onMarkerClicked)

listMarkers.forEach { (listId, markerList) ->
markerList.forEach { marker ->
val icon = remember(marker, listId) {
val color = if (isExistInOtherList(listId, marker, listMarkers)) {
MUlTI_MAKERS_COLOR_DEFAULT
} else {
marker.color
listMarkers.forEach { (listId, markers) ->
markers.forEach { marker ->
val color by remember(marker, listId, listMarkers) {
derivedStateOf {
if (isExistInOtherList(listId, marker, listMarkers)) {
MUlTI_MAKERS_COLOR_DEFAULT
} else {
marker.color
}
}
}

BitmapDescriptorFactory.fromBitmap(
getPinBitmap(
context,
density = density,
colorMarker = color
)
)
val icon = remember(marker.id, color) {
BitmapDescriptorFactory.fromBitmap(getPinBitmap(context, density, color))
}

Marker(
Expand Down
4 changes: 3 additions & 1 deletion ...ompose/src/main/java/com/what3words/components/compose/maps/providers/mapbox/W3WMapBox.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import com.mapbox.maps.plugin.locationcomponent.location
import com.mapbox.maps.toCameraOptions
import com.what3words.components.compose.maps.W3WMapDefaults
import com.what3words.components.compose.maps.mapper.toMapBoxMapType
import com.what3words.components.compose.maps.models.W3WMarker
import com.what3words.components.compose.maps.state.W3WMapState
import com.what3words.components.compose.maps.state.camera.W3WCameraState
import com.what3words.components.compose.maps.state.camera.W3WMapboxCameraState
Expand Down Expand Up @@ -52,6 +53,7 @@ fun W3WMapBox(
mapConfig: W3WMapDefaults.MapConfig,
state: W3WMapState,
content: (@Composable () -> Unit)? = null,
onMarkerClicked: (W3WMarker) -> Unit,
onMapClicked: ((W3WCoordinates) -> Unit),
onCameraUpdated: (W3WCameraState<*>) -> Unit
) {
Expand Down Expand Up @@ -141,7 +143,7 @@ fun W3WMapBox(
}
}

W3WMapBoxDrawer(state, mapConfig)
W3WMapBoxDrawer(state, mapConfig, onMarkerClicked)
content?.invoke()
}
}
Expand Down
121 changes: 89 additions & 32 deletions ...src/main/java/com/what3words/components/compose/maps/providers/mapbox/W3WMapBoxDrawers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ package com.what3words.components.compose.maps.providers.mapbox

import android.content.Context
import androidx.compose.runtime.Composable
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.asImageBitmap
import androidx.compose.ui.graphics.painter.BitmapPainter
Expand All @@ -21,9 +25,13 @@ import com.mapbox.maps.extension.style.sources.generated.ImageSource
import com.mapbox.maps.extension.style.sources.getSourceAs
import com.mapbox.maps.extension.style.sources.updateImage
import com.what3words.components.compose.maps.W3WMapDefaults
import com.what3words.components.compose.maps.W3WMapDefaults.MUlTI_MAKERS_COLOR_DEFAULT
import com.what3words.components.compose.maps.models.W3WLatLng
import com.what3words.components.compose.maps.models.W3WMarker
import com.what3words.components.compose.maps.state.MarkerStatus
import com.what3words.components.compose.maps.state.W3WMapState
import com.what3words.components.compose.maps.state.isExistInOtherList
import com.what3words.components.compose.maps.state.isMarkerInSavedList
import com.what3words.components.compose.maps.utils.getFillGridMarkerBitmap
import com.what3words.components.compose.maps.utils.getMarkerBitmap
import com.what3words.components.compose.maps.utils.getPinBitmap
Expand All @@ -34,7 +42,18 @@ import kotlinx.collections.immutable.ImmutableMap

@Composable
@MapboxMapComposable
fun W3WMapBoxDrawer(state: W3WMapState, mapConfig: W3WMapDefaults.MapConfig) {
fun W3WMapBoxDrawer(
state: W3WMapState,
mapConfig: W3WMapDefaults.MapConfig,
onMarkerClicked: (W3WMarker) -> Unit
) {
// Check if selectedMarker exists in the saved list
val markerStatus by remember(state.listMakers, state.selectedAddress) {
derivedStateOf {
state.selectedAddress?.let { isMarkerInSavedList(state.listMakers, it) }
}
}

state.cameraState?.let { cameraState ->
if (mapConfig.gridLineConfig.isGridEnabled && cameraState.getZoomLevel() >= mapConfig.gridLineConfig.zoomSwitchLevel) {
W3WMapBoxDrawGridLines(
Expand All @@ -47,9 +66,11 @@ fun W3WMapBoxDrawer(state: W3WMapState, mapConfig: W3WMapDefaults.MapConfig) {

if (state.listMakers.isNotEmpty()) {
W3WMapBoxDrawMarkers(
cameraState.getZoomLevel(),
mapConfig.gridLineConfig.zoomSwitchLevel,
state.listMakers
zoomLevel = cameraState.getZoomLevel(),
zoomSwitchLevel = mapConfig.gridLineConfig.zoomSwitchLevel,
listMakers = state.listMakers,
selectedMarkerID = if (markerStatus != MarkerStatus.NotSaved) state.selectedAddress?.id else null,
onMarkerClicked = onMarkerClicked
)
}

Expand All @@ -58,7 +79,9 @@ fun W3WMapBoxDrawer(state: W3WMapState, mapConfig: W3WMapDefaults.MapConfig) {
W3WMapBoxDrawSelectedAddress(
zoomLevel = cameraState.getZoomLevel(),
zoomSwitchLevel = mapConfig.gridLineConfig.zoomSwitchLevel,
selectedMarker = state.selectedAddress
selectedMarker = state.selectedAddress.copy(
color = if (markerStatus == MarkerStatus.InMultipleList) MUlTI_MAKERS_COLOR_DEFAULT else state.selectedAddress.color
),
)
}
}
Expand Down Expand Up @@ -110,10 +133,16 @@ fun W3WMapBoxDrawSelectedAddress(
fun W3WMapBoxDrawMarkers(
zoomLevel: Float,
zoomSwitchLevel: Float,
listMakers: ImmutableMap<String, ImmutableList<W3WMarker>>
) {
listMakers: ImmutableMap<String, ImmutableList<W3WMarker>>,
selectedMarkerID: Long? = null,
onMarkerClicked: (W3WMarker) -> Unit,
) {
if (zoomLevel < zoomSwitchLevel) {
DrawZoomOutMarkers(listMakers)
DrawZoomOutMarkers(
listMakers,
selectedMarkerID,
onMarkerClicked
)
} else {
DrawZoomInMarkers(listMakers)
}
Expand All @@ -123,26 +152,49 @@ fun W3WMapBoxDrawMarkers(
@MapboxMapComposable
private fun DrawZoomOutMarkers(
listMarkers: ImmutableMap<String, ImmutableList<W3WMarker>>,
selectedMarkerID: Long? = null,
onMarkerClicked: (W3WMarker) -> Unit,
) {
val context = LocalContext.current
val density = LocalDensity.current.density
val currentOnMarkerClicked by rememberUpdatedState(onMarkerClicked)

listMarkers.forEach { (_, markerList) ->
markerList.forEach { marker ->
val icon = rememberIconImage(
key = marker.words,
painter = BitmapPainter(
getPinBitmap(context, density, marker.color).asImageBitmap()
)
)
listMarkers.forEach { (listId, markers) ->
markers.forEach { marker ->
if(selectedMarkerID != marker.id) {
val color by remember(marker, listId, listMarkers) {
derivedStateOf {
if (isExistInOtherList(listId, marker, listMarkers)) {
MUlTI_MAKERS_COLOR_DEFAULT
} else {
marker.color
}
}
}

PointAnnotation(
point = Point.fromLngLat(
marker.latLng.lng,
marker.latLng.lat
val bitmap = remember(color) {
getPinBitmap(context, density, color)
}

val icon = rememberIconImage(
key = marker.id,
painter = BitmapPainter(
bitmap.asImageBitmap()
)
)
) {
iconImage = icon

PointAnnotation(
point = Point.fromLngLat(
marker.latLng.lng,
marker.latLng.lat
)
) {
iconImage = icon
interactionsState.onClicked {
currentOnMarkerClicked(marker)
true
}
}
}
}
}
Expand All @@ -156,15 +208,22 @@ private fun DrawZoomInMarkers(
val context = LocalContext.current
val density = LocalDensity.current.density

listMarkers.forEach { (_, markerList) ->
markerList.forEach { marker ->
listMarkers.forEach { (listId, markers) ->
markers.forEach { marker ->
val square = marker.square
val color by remember(marker, listId, listMarkers) {
derivedStateOf {
if (isExistInOtherList(listId, marker, listMarkers)) {
MUlTI_MAKERS_COLOR_DEFAULT
} else {
marker.color
}
}
}

val bitmap = getFillGridMarkerBitmap(
context,
density,
marker.color
)
val bitmap = remember(marker.id, color) {
getFillGridMarkerBitmap(context, density, color)
}

MapEffect(Unit) {
val imageSource: ImageSource = it.mapboxMap.getSourceAs(marker.id.toString())!!
Expand Down Expand Up @@ -251,6 +310,4 @@ private fun getGridSelectedBorderSizeBasedOnZoomLevel(

else -> context.resources.getDimension(R.dimen.grid_selected_width_mapbox_2px).toDouble()
}
}

private const val ID_SAVED_ADDRESS_IMAGE_SOURCE = "image_source-saved-address-%s"
}