Skip to content

feat: Add MapView factory to GoogleMap composable #738

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
dkhawk merged 3 commits into from
Aug 29, 2025
Merged

feat: Add MapView factory to GoogleMap composable #738

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
195aea4
feat: Add MapView factory to GoogleMap composable
dkhawk Aug 20, 2025
efd47fb
Merge branch 'main' into feat/add-map-view-factory
dkhawk Aug 20, 2025
8605030
Merge branch 'main' into feat/add-map-view-factory
dkhawk Aug 29, 2025
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
6 changes: 3 additions & 3 deletions maps-compose/src/main/java/com/google/maps/android/compose/GoogleMap.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package com.google.maps.android.compose

import android.content.ComponentCallbacks
import android.content.ComponentCallbacks2
import android.content.Context
import android.content.res.Configuration
import android.location.Location
import android.os.Bundle
Expand Down Expand Up @@ -46,12 +47,10 @@ import androidx.lifecycle.findViewTreeLifecycleOwner
import com.google.android.gms.maps.GoogleMapOptions
import com.google.android.gms.maps.LocationSource
import com.google.android.gms.maps.MapView

import com.google.android.gms.maps.model.LatLng
import com.google.android.gms.maps.model.MapColorScheme
import com.google.android.gms.maps.model.PointOfInterest
import com.google.maps.android.compose.internal.MapsApiAttribution
import com.google.maps.android.compose.meta.AttributionId
import com.google.maps.android.ktx.awaitMap
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.CoroutineStart
Expand Down Expand Up @@ -105,6 +104,7 @@ public fun GoogleMap(
onPOIClick: ((PointOfInterest) -> Unit)? = null,
contentPadding: PaddingValues = DefaultMapContentPadding,
mapColorScheme: ComposeMapColorScheme? = null,
mapViewFactory: (Context, GoogleMapOptions) -> MapView = ::MapView,
content: @Composable @GoogleMapComposable () -> Unit = {},
) {
// When in preview, early return a Box with the received modifier preserving layout
Expand Down Expand Up @@ -165,7 +165,7 @@ public fun GoogleMap(
AndroidView(
modifier = modifier,
factory = { context ->
MapView(context, googleMapOptionsFactory()).also { mapView ->
mapViewFactory(context, googleMapOptionsFactory()).also { mapView ->
val componentCallbacks = object : ComponentCallbacks2 {
override fun onConfigurationChanged(newConfig: Configuration) {}

Expand Down
Loading