Skip to content

feat(maps-compose): default mapColorScheme to FOLLOW_SYSTEM in GoogleMap #986

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 1 commit into
base: main
Choose a base branch
from
+31 −2
Open

feat(maps-compose): default mapColorScheme to FOLLOW_SYSTEM in GoogleMap #986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions maps-app/src/androidTest/java/com/google/maps/android/compose/GoogleMapViewTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,35 @@ class GoogleMapViewTests {
assertThat(cameraPositionState.position.target).isEqualTo(startingPosition)
}

@Test
fun testDefaultColorSchemeIsFollowSystem() {
var capturedOptions: GoogleMapOptions? = null
composeTestRule.setContent {
GoogleMap(
mapViewFactory = { context, options ->
capturedOptions = options
MapView(context, options)
}
)
}
assertThat(capturedOptions?.mapColorScheme).isEqualTo(MapColorScheme.FOLLOW_SYSTEM)
}

@Test
fun testDefaultColorSchemeWithGoogleMapOptionsFactory() {
var capturedOptions: GoogleMapOptions? = null
composeTestRule.setContent {
GoogleMap(
googleMapOptionsFactory = { GoogleMapOptions().liteMode(false) },
mapViewFactory = { context, options ->
capturedOptions = options
MapView(context, options)
}
)
}
assertThat(capturedOptions?.mapColorScheme).isEqualTo(MapColorScheme.FOLLOW_SYSTEM)
}

@Test
fun testRightInitialColorScheme() {
var capturedOptions: GoogleMapOptions? = null
Expand Down
4 changes: 2 additions & 2 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 @@ -89,7 +89,7 @@ import kotlinx.coroutines.launch
* @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.
* @param mapColorScheme Defines the color scheme for the Map. Defaults to [ComposeMapColorScheme.FOLLOW_SYSTEM].
* @param content the content of the map
*/
@Composable
Expand All @@ -111,7 +111,7 @@ public fun GoogleMap(
onMyLocationClick: ((Location) -> Unit)? = null,
onPOIClick: ((PointOfInterest) -> Unit)? = null,
contentPadding: PaddingValues = DefaultMapContentPadding,
mapColorScheme: ComposeMapColorScheme? = null,
mapColorScheme: ComposeMapColorScheme? = ComposeMapColorScheme.FOLLOW_SYSTEM,
mapViewFactory: (Context, GoogleMapOptions) -> MapView = ::MapView,
content: @Composable @GoogleMapComposable () -> Unit = {},
) {
Expand Down