Skip to content

feat(clustering,maps-compose): remove deprecated rememberSaveable key and optimize loops #983

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

Open
dkhawk wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat(clustering,maps-compose): remove deprecated rememberSaveable key and optimize loops #983

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
7311570
feat(clustering,maps-compose): remove deprecated rememberSaveable key…
dkhawk Aug 26, 2026
688b41f
Merge branch 'main' into chore/lint-fixes
dkhawk Sep 1, 2026
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
16 changes: 8 additions & 8 deletions ...compose-utils/src/main/java/com/google/maps/android/compose/clustering/ClusterRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ internal class ComposeUiClusterRenderer<T : ClusterItem>(
clusterItemContentZIndexState.value,
)
}.collect {
keysToViews.forEach { (key, viewInfo) ->
for ((key, viewInfo) in keysToViews) {
when (key) {
is ViewKey.Cluster -> {
getMarker(key.cluster)?.apply {
Expand Down Expand Up @@ -158,15 +158,15 @@ internal class ComposeUiClusterRenderer<T : ClusterItem>(

val keys = clusters.flatMap { it.computeViewKeys() }

with(keysToViews.iterator()) {
forEach { (key, viewInfo) ->
if (key !in keys) {
remove()
viewInfo.onRemove()
}
val iterator = keysToViews.iterator()
while (iterator.hasNext()) {
val (key, viewInfo) = iterator.next()
if (key !in keys) {
iterator.remove()
viewInfo.onRemove()
}
}
keys.forEach { key ->
for (key in keys) {
if (key !in keysToViews.keys) {
createAndAddView(key)
}
Expand Down
2 changes: 0 additions & 2 deletions maps-compose/src/main/java/com/google/maps/android/compose/CameraMoveStartedReason.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
package com.google.maps.android.compose

import androidx.compose.runtime.Immutable
import com.google.maps.android.compose.CameraMoveStartedReason.Companion.fromInt
import com.google.maps.android.compose.CameraMoveStartedReason.NO_MOVEMENT_YET
import com.google.maps.android.compose.CameraMoveStartedReason.UNKNOWN

/**
Expand Down
2 changes: 1 addition & 1 deletion maps-compose/src/main/java/com/google/maps/android/compose/CameraPositionState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public inline fun rememberCameraPositionState(
public inline fun rememberCameraPositionState(
key: String? = null,
crossinline init: CameraPositionState.() -> Unit = {}
): CameraPositionState = rememberSaveable(key = key, saver = CameraPositionState.Saver) {
): CameraPositionState = rememberSaveable(saver = CameraPositionState.Saver) {
CameraPositionState().apply(init)
}

Expand Down
4 changes: 2 additions & 2 deletions maps-compose/src/main/java/com/google/maps/android/compose/Marker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public class MarkerState private constructor(position: LatLng) {
"so it will be changed or removed.",
replaceWith = ReplaceWith(
expression = """
val markerState = rememberSaveable(key = key, saver = MarkerState.Saver) {
val markerState = rememberSaveable(saver = MarkerState.Saver) {
MarkerState(position)
}
"""
Expand All @@ -204,7 +204,7 @@ public class MarkerState private constructor(position: LatLng) {
public fun rememberMarkerState(
key: String? = null,
position: LatLng = LatLng(0.0, 0.0)
): MarkerState = rememberSaveable(key = key, saver = MarkerState.Saver) {
): MarkerState = rememberSaveable(saver = MarkerState.Saver) {
MarkerState(position)
}

Expand Down