Commit 233ffe6
committed
[google_maps_flutter] Add MapColorScheme support to Android and iOS
Wires MapColorScheme (light/dark/followSystem) through to the native
APIs on Android and iOS. The platform interface and app-facing package
already exposed colorScheme (added in 2.16.0 for web), but the Android
and iOS implementations ignored it.
* Android: calls GoogleMap.setMapColorScheme() with the matching
MapColorScheme constant, both at creation and on runtime configuration
updates.
* iOS: sets GMSMapView.overrideUserInterfaceStyle to light/dark/
unspecified, the documented Google Maps SDK for iOS approach.
The iOS change is mirrored across google_maps_flutter_ios,
google_maps_flutter_ios_sdk9, google_maps_flutter_ios_sdk10, and
google_maps_flutter_ios_shared_code via tool/sync_shared_files.dart. The
colorScheme doc comments in google_maps_flutter and
google_maps_flutter_platform_interface are updated to reflect the new
platform support.
Adds Convert and dispatcher tests plus Dart creation-params tests on
Android, parametrized creation-params tests on iOS, and a native
FGMGoogleMapController test exercising the runtime color scheme update.
Fixes flutter/flutter#1867371 parent c1f7d92 commit 233ffe6
56 files changed
Lines changed: 2128 additions & 918 deletions
File tree
- packages/google_maps_flutter
- google_maps_flutter_android
- android/src
- main
- java/io/flutter/plugins/googlemaps
- kotlin/io/flutter/plugins/googlemaps
- test/java/io/flutter/plugins/googlemaps
- lib/src
- pigeons
- test
- google_maps_flutter_ios_sdk10
- example/ios/RunnerTests
- ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10
- include/google_maps_flutter_ios_sdk10
- lib/src
- pigeons
- test
- google_maps_flutter_ios_sdk9
- example/ios/RunnerTests
- ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9
- include/google_maps_flutter_ios_sdk9
- lib/src
- pigeons
- test
- google_maps_flutter_ios
- example/ios/RunnerTests
- ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios
- include/google_maps_flutter_ios
- lib/src
- pigeons
- test
- google_maps_flutter_platform_interface
- lib/src/types
- google_maps_flutter
- lib/src
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
1 | 5 | | |
2 | 6 | | |
3 | 7 | | |
| |||
Lines changed: 8 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
402 | 402 | | |
403 | 403 | | |
404 | 404 | | |
405 | | - | |
| 405 | + | |
406 | 406 | | |
407 | | - | |
408 | | - | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
409 | 414 | | |
410 | 415 | | |
411 | 416 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
1 | 5 | | |
2 | 6 | | |
3 | 7 | | |
| |||
Lines changed: 12 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
577 | 577 | | |
578 | 578 | | |
579 | 579 | | |
| 580 | + | |
| 581 | + | |
| 582 | + | |
| 583 | + | |
| 584 | + | |
| 585 | + | |
| 586 | + | |
| 587 | + | |
| 588 | + | |
| 589 | + | |
| 590 | + | |
| 591 | + | |
580 | 592 | | |
581 | 593 | | |
582 | 594 | | |
| |||
Lines changed: 7 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| 35 | + | |
35 | 36 | | |
36 | 37 | | |
37 | 38 | | |
| |||
59 | 60 | | |
60 | 61 | | |
61 | 62 | | |
| 63 | + | |
62 | 64 | | |
63 | 65 | | |
64 | 66 | | |
| |||
209 | 211 | | |
210 | 212 | | |
211 | 213 | | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
212 | 219 | | |
Lines changed: 17 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
111 | 111 | | |
112 | 112 | | |
113 | 113 | | |
| 114 | + | |
| 115 | + | |
114 | 116 | | |
115 | 117 | | |
116 | 118 | | |
| |||
245 | 247 | | |
246 | 248 | | |
247 | 249 | | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
248 | 254 | | |
249 | 255 | | |
250 | 256 | | |
| |||
853 | 859 | | |
854 | 860 | | |
855 | 861 | | |
| 862 | + | |
| 863 | + | |
| 864 | + | |
| 865 | + | |
| 866 | + | |
| 867 | + | |
| 868 | + | |
| 869 | + | |
| 870 | + | |
| 871 | + | |
| 872 | + | |
856 | 873 | | |
857 | 874 | | |
858 | 875 | | |
| |||
Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
64 | 64 | | |
65 | 65 | | |
66 | 66 | | |
| 67 | + | |
| 68 | + | |
67 | 69 | | |
0 commit comments