Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,17 @@ import com.google.android.gms.maps.model.Marker
* workaround, the contained window is temporarily attached to the MapView so
* that the contents of the ComposeViews are rendered.
*
* Eventually when info windows are no longer implemented this way, this
* implementation should be updated.
* As of compose-ui 1.10, [ComposeView] skips drawing when detached (isShown == false).
* To work around this, the view is kept attached to the [MapView] until the info window
* is closed, at which point [disposeForMarker] must be called.
*/
internal class ComposeInfoWindowAdapter(
private val mapView: MapView,
private val markerNodeFinder: (Marker) -> MarkerNode?
) : GoogleMap.InfoWindowAdapter {

private val renderHandles = mutableMapOf<Marker, ComposeUiViewRenderer.RenderHandle>()

override fun getInfoContents(marker: Marker): View? {
val markerNode = markerNodeFinder(marker) ?: return null
val content = markerNode.infoContent
Expand All @@ -49,7 +52,8 @@ internal class ComposeInfoWindowAdapter(
val view = ComposeView(mapView.context).apply {
setContent { content(marker) }
}
mapView.renderComposeViewOnce(view, parentContext = markerNode.compositionContext)
renderHandles.remove(marker)?.dispose()
renderHandles[marker] = mapView.startRenderingComposeView(view, markerNode.compositionContext)
return view
}

Expand All @@ -62,8 +66,13 @@ internal class ComposeInfoWindowAdapter(
val view = ComposeView(mapView.context).apply {
setContent { infoWindow(marker) }
}
mapView.renderComposeViewOnce(view, parentContext = markerNode.compositionContext)
renderHandles.remove(marker)?.dispose()
renderHandles[marker] = mapView.startRenderingComposeView(view, markerNode.compositionContext)
return view
}

fun disposeForMarker(marker: Marker) {
renderHandles.remove(marker)?.dispose()
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,15 @@ internal class MapApplier(
inputHandlerCallback = { onInfoWindowClick }
)
}
val composeInfoWindowAdapter = ComposeInfoWindowAdapter(
mapView,
markerNodeFinder = { marker ->
decorations.firstOrNull { it is MarkerNode && it.marker == marker }
as MarkerNode?
}
)
map.setOnInfoWindowCloseListener { marker ->
composeInfoWindowAdapter.disposeForMarker(marker)
decorations.findInputCallback<MarkerNode, Marker, Unit>(
nodeMatchPredicate = { it.marker == marker },
marker = marker,
Expand Down Expand Up @@ -209,15 +217,7 @@ internal class MapApplier(
)
}
})
map.setInfoWindowAdapter(
ComposeInfoWindowAdapter(
mapView,
markerNodeFinder = { marker ->
decorations.firstOrNull { it is MarkerNode && it.marker == marker }
as MarkerNode?
}
)
)
map.setInfoWindowAdapter(composeInfoWindowAdapter)
}
}

Expand Down
Loading