Skip to content
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

chore: not adding by default the MapColorScheme #603

Merged
merged 2 commits into from
Jul 9, 2024
Merged

chore: not adding by default the MapColorScheme #603

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
a2d8124
fix: not adding by default the MapColorScheme
kikoso Jul 9, 2024
0f4ad8b
doc: doc updated
kikoso Jul 9, 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
7 changes: 3 additions & 4 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 @@ -70,8 +70,7 @@ import kotlinx.coroutines.awaitCancellation
* @param onPOIClick lambda invoked when a POI is clicked
* @param contentPadding the padding values used to signal that portions of the map around the edges
* may be obscured. The map will move the Google logo, etc. to avoid overlapping the padding.
* @param mapColorScheme Defines the color scheme for the Map. By default it will be
* [ComposeMapColorScheme.FOLLOW_SYSTEM].
* @param mapColorScheme Defines the color scheme for the Map.
* @param content the content of the map
*/
@Composable
Expand All @@ -92,7 +91,7 @@ public fun GoogleMap(
onMyLocationClick: ((Location) -> Unit)? = null,
onPOIClick: ((PointOfInterest) -> Unit)? = null,
contentPadding: PaddingValues = DefaultMapContentPadding,
mapColorScheme: ComposeMapColorScheme = ComposeMapColorScheme.FOLLOW_SYSTEM,
mapColorScheme: ComposeMapColorScheme? = null,
content: @Composable @GoogleMapComposable () -> Unit = {},
) {
// When in preview, early return a Box with the received modifier preserving layout
Expand Down Expand Up @@ -139,7 +138,7 @@ public fun GoogleMap(
locationSource = currentLocationSource,
mapProperties = currentMapProperties,
mapUiSettings = currentUiSettings,
colorMapScheme = currentColorScheme.value
colorMapScheme = currentColorScheme?.value
)

MapClickListenerUpdater()
Expand Down
8 changes: 6 additions & 2 deletions maps-compose/src/main/java/com/google/maps/android/compose/MapUpdater.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ internal inline fun MapUpdater(
locationSource: LocationSource?,
mapProperties: MapProperties,
mapUiSettings: MapUiSettings,
colorMapScheme: Int,
colorMapScheme: Int?,
) {
val map = (currentComposer.applier as MapApplier).map
val mapView = (currentComposer.applier as MapApplier).mapView
Expand Down Expand Up @@ -141,7 +141,11 @@ internal inline fun MapUpdater(
set(mapProperties.mapType) { map.mapType = it.value }
set(mapProperties.maxZoomPreference) { map.setMaxZoomPreference(it) }
set(mapProperties.minZoomPreference) { map.setMinZoomPreference(it) }
set(colorMapScheme) { map.mapColorScheme = it }
set(colorMapScheme) {
if (it != null) {
map.mapColorScheme = it
}
}
set(contentPadding) {
val node = this
with(this.density) {
Expand Down
Loading