From 9cb7faf8c7adbc162b7fd043b167ed7dd37fea48 Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Wed, 19 Nov 2025 09:31:17 -0500 Subject: [PATCH 01/29] Adds support for color scheme --- .../lib/google_maps_flutter.dart | 1 + .../lib/src/google_map.dart | 5 ++++ .../lib/src/types/map_color_scheme.dart | 2 ++ .../lib/src/types/map_configuration.dart | 9 +++++++ .../lib/src/types/types.dart | 1 + .../lib/src/convert.dart | 26 +++++++++++++++++++ 6 files changed, 44 insertions(+) create mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_color_scheme.dart diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart index 7ca650dceb75..fc08344f9949 100644 --- a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart +++ b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart @@ -29,6 +29,7 @@ export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf Cluster, ClusterManager, ClusterManagerId, + ColorScheme, GroundOverlay, GroundOverlayId, Heatmap, diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart index 44f6dd5d8129..0fa415539510 100644 --- a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart +++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart @@ -134,6 +134,7 @@ class GoogleMap extends StatefulWidget { this.onTap, this.onLongPress, this.cloudMapId, + this.colorScheme, }); /// Callback method for when the map is ready to be used. @@ -373,6 +374,9 @@ class GoogleMap extends StatefulWidget { /// for more details. final String? cloudMapId; + /// Color scheme for the map + final MapColorScheme? colorScheme; + /// Creates a [State] for this [GoogleMap]. @override State createState() => _GoogleMapState(); @@ -724,6 +728,7 @@ MapConfiguration _configurationFromMapWidget(GoogleMap map) { trafficEnabled: map.trafficEnabled, buildingsEnabled: map.buildingsEnabled, cloudMapId: map.cloudMapId, + colorScheme: map.colorScheme, // A null style in the widget means no style, which is expressed as '' in // the configuration to distinguish from no change (null). style: map.style ?? '', diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_color_scheme.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_color_scheme.dart new file mode 100644 index 000000000000..93ebd0ed8989 --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_color_scheme.dart @@ -0,0 +1,2 @@ +/// The color scheme of the map to be used with cloud styles +enum MapColorScheme { light, dark, followSystem } diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart index 235ec580b2e7..4629ef2d5826 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart @@ -42,6 +42,7 @@ class MapConfiguration { String? cloudMapId, this.style, this.markerType, + this.colorScheme, }) : mapId = mapId ?? cloudMapId; /// This setting controls how the API handles gestures on the map. Web only. @@ -152,6 +153,9 @@ class MapConfiguration { @Deprecated('cloudMapId is deprecated. Use mapId instead.') String? get cloudMapId => mapId; + /// Preferred color scheme for the map in web platform + final MapColorScheme? colorScheme; + /// Returns a new options object containing only the values of this instance /// that are different from [other]. MapConfiguration diffFrom(MapConfiguration other) { @@ -225,6 +229,7 @@ class MapConfiguration { ? buildingsEnabled : null, mapId: mapId != other.mapId ? mapId : null, + colorScheme: colorScheme != other.colorScheme ? colorScheme : null, style: style != other.style ? style : null, markerType: markerType != other.markerType ? markerType : null, ); @@ -264,6 +269,7 @@ class MapConfiguration { buildingsEnabled: diff.buildingsEnabled ?? buildingsEnabled, mapId: diff.mapId ?? mapId, style: diff.style ?? style, + colorScheme: diff.colorScheme ?? colorScheme, markerType: diff.markerType ?? markerType, ); } @@ -293,6 +299,7 @@ class MapConfiguration { trafficEnabled == null && buildingsEnabled == null && mapId == null && + colorScheme == null && style == null && markerType == null; @@ -329,6 +336,7 @@ class MapConfiguration { buildingsEnabled == other.buildingsEnabled && mapId == other.mapId && style == other.style && + colorScheme == other.colorScheme && markerType == other.markerType; } @@ -358,6 +366,7 @@ class MapConfiguration { buildingsEnabled, mapId, style, + colorScheme, markerType, ]); } diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart index a2483a24c544..80e380674337 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart @@ -19,6 +19,7 @@ export 'heatmap.dart'; export 'heatmap_updates.dart'; export 'joint_type.dart'; export 'location.dart'; +export 'map_color_scheme.dart'; export 'map_configuration.dart'; export 'map_objects.dart'; export 'map_widget_configuration.dart'; diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart index b647d95a9882..6cf74b190b48 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart @@ -131,9 +131,35 @@ gmaps.MapOptions _configurationAndStyleToGmapsOptions( options.mapId = configuration.mapId; + // Convert the color scheme, if any, and set it + final gmaps.ColorScheme? jsColorScheme = _toJsColorScheme( + configuration.colorScheme, + ); + if (jsColorScheme != null) { + options.colorScheme = jsColorScheme; + } + return options; } +/// Converts a [MapColorScheme] into a [gmaps.ColorScheme] +gmaps.ColorScheme? _toJsColorScheme(MapColorScheme? scheme) { + // Guard clause for null + if (scheme == null) { + return null; + } + + // Map to gmaps.ColorScheme + switch (scheme) { + case MapColorScheme.dark: + return gmaps.ColorScheme.DARK; + case MapColorScheme.light: + return gmaps.ColorScheme.LIGHT; + case MapColorScheme.followSystem: + return gmaps.ColorScheme.FOLLOW_SYSTEM; + } +} + gmaps.MapTypeId _gmapTypeIDForPluginType(MapType type) { switch (type) { case MapType.satellite: From 838a768c8e070f23b099ba227975ad0566d6e707 Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Wed, 19 Nov 2025 09:49:10 -0500 Subject: [PATCH 02/29] adds color scheme to exportrs --- .../google_maps_flutter/lib/google_maps_flutter.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart index fc08344f9949..267b6cb9d77d 100644 --- a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart +++ b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart @@ -29,7 +29,6 @@ export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf Cluster, ClusterManager, ClusterManagerId, - ColorScheme, GroundOverlay, GroundOverlayId, Heatmap, @@ -42,6 +41,7 @@ export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf LatLng, LatLngBounds, MapBitmapScaling, + MapColorScheme, MapStyleException, MapType, Marker, From e8c04e6be1bd5babfc24dc96ef347420fa471d2a Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Wed, 19 Nov 2025 10:01:33 -0500 Subject: [PATCH 03/29] Renames to match naming convention --- .../google_maps_flutter_web/lib/src/convert.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart index 6cf74b190b48..15830cf77658 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart @@ -132,7 +132,7 @@ gmaps.MapOptions _configurationAndStyleToGmapsOptions( options.mapId = configuration.mapId; // Convert the color scheme, if any, and set it - final gmaps.ColorScheme? jsColorScheme = _toJsColorScheme( + final gmaps.ColorScheme? jsColorScheme = _gmapTypeColorSchemeForPluginColor( configuration.colorScheme, ); if (jsColorScheme != null) { @@ -143,7 +143,7 @@ gmaps.MapOptions _configurationAndStyleToGmapsOptions( } /// Converts a [MapColorScheme] into a [gmaps.ColorScheme] -gmaps.ColorScheme? _toJsColorScheme(MapColorScheme? scheme) { +gmaps.ColorScheme? _gmapTypeColorSchemeForPluginColor(MapColorScheme? scheme) { // Guard clause for null if (scheme == null) { return null; From 5854d68882c731c1b8a9bedd43858f29d6b00eed Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Wed, 19 Nov 2025 11:08:55 -0500 Subject: [PATCH 04/29] Bumps version and updates changelog --- .../google_maps_flutter/google_maps_flutter_web/CHANGELOG.md | 3 ++- .../google_maps_flutter/google_maps_flutter_web/pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md index 0cb861a490ff..836f8b55cb66 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md @@ -1,6 +1,7 @@ -## NEXT +## 0.5.14+4 * Updates minimum supported SDK version to Flutter 3.32/Dart 3.8. +* Adds `colorScheme` support for cloud-based maps styling brightness. ## 0.5.14+3 diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml index fee2e779f676..679bfcbb56e2 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_web description: Web platform implementation of google_maps_flutter repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_web issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 0.5.14+3 +version: 0.5.14+4 environment: sdk: ^3.8.0 From ca8153c97856075fa63df3f84dae1d9086525639 Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Thu, 20 Nov 2025 09:28:50 -0500 Subject: [PATCH 05/29] updates the pubspec.yaml files to have path-based dependency overrides --- .../google_maps_flutter_web/example/pubspec.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml index addf03ad32e4..8129d334c5e8 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml @@ -28,9 +28,8 @@ flutter: assets: - assets/ +# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. +# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins dependency_overrides: - # Override the google_maps_flutter dependency on google_maps_flutter_web. - # TODO(ditman): Unwind the circular dependency. This will create problems - # if we need to make a breaking change to google_maps_flutter_web. - google_maps_flutter_web: - path: ../ + google_maps_flutter: {path: ../../../../packages/google_maps_flutter/google_maps_flutter} + google_maps_flutter_web: {path: ../} From c75420c9989417f95841b2af30588b6fe3e52019 Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Thu, 20 Nov 2025 09:46:51 -0500 Subject: [PATCH 06/29] Updates pubspec.yaml of other touched plugins --- .../google_maps_flutter/example/pubspec.yaml | 5 +++++ .../google_maps_flutter/google_maps_flutter/pubspec.yaml | 5 +++++ .../google_maps_flutter_android/example/pubspec.yaml | 4 ++++ .../google_maps_flutter_android/pubspec.yaml | 4 ++++ .../google_maps_flutter_ios/example/ios14/pubspec.yaml | 4 ++++ .../google_maps_flutter_ios/example/ios15/pubspec.yaml | 4 ++++ .../example/shared/maps_example_dart/pubspec.yaml | 4 ++++ .../google_maps_flutter/google_maps_flutter_ios/pubspec.yaml | 4 ++++ .../google_maps_flutter_web/example/pubspec.yaml | 1 + .../google_maps_flutter/google_maps_flutter_web/pubspec.yaml | 4 ++++ 10 files changed, 39 insertions(+) diff --git a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml index 0e002e4f535a..1e4a18727c4e 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml @@ -33,3 +33,8 @@ flutter: uses-material-design: true assets: - assets/ +# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. +# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins +dependency_overrides: + google_maps_flutter_platform_interface: {path: ../../../../packages/google_maps_flutter/google_maps_flutter_platform_interface} + google_maps_flutter_web: {path: ../../../../packages/google_maps_flutter/google_maps_flutter_web} diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml index 7f16bf9fb631..d8ab919d3a0c 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml @@ -41,3 +41,8 @@ topics: # The example deliberately includes limited-use secrets. false_secrets: - /example/web/index.html +# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. +# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins +dependency_overrides: + google_maps_flutter_platform_interface: {path: ../../../packages/google_maps_flutter/google_maps_flutter_platform_interface} + google_maps_flutter_web: {path: ../../../packages/google_maps_flutter/google_maps_flutter_web} diff --git a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml index e556fa6acf9c..4a767a98dedd 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml @@ -33,3 +33,7 @@ flutter: uses-material-design: true assets: - assets/ +# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. +# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins +dependency_overrides: + google_maps_flutter_platform_interface: {path: ../../../../packages/google_maps_flutter/google_maps_flutter_platform_interface} diff --git a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml index 4c272074a70e..9dd46dd0a596 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml @@ -37,3 +37,7 @@ topics: - google-maps - google-maps-flutter - map +# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. +# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins +dependency_overrides: + google_maps_flutter_platform_interface: {path: ../../../packages/google_maps_flutter/google_maps_flutter_platform_interface} diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/pubspec.yaml index d4192ad9642d..03bd0cf862e6 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/pubspec.yaml @@ -32,3 +32,7 @@ flutter: uses-material-design: true assets: - assets/ +# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. +# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins +dependency_overrides: + google_maps_flutter_platform_interface: {path: ../../../../../packages/google_maps_flutter/google_maps_flutter_platform_interface} diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/pubspec.yaml index d4192ad9642d..03bd0cf862e6 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/pubspec.yaml @@ -32,3 +32,7 @@ flutter: uses-material-design: true assets: - assets/ +# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. +# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins +dependency_overrides: + google_maps_flutter_platform_interface: {path: ../../../../../packages/google_maps_flutter/google_maps_flutter_platform_interface} diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml index a0c48d88f369..80d8e58509af 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml @@ -27,3 +27,7 @@ dev_dependencies: flutter: uses-material-design: true +# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. +# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins +dependency_overrides: + google_maps_flutter_platform_interface: {path: ../../../../../../packages/google_maps_flutter/google_maps_flutter_platform_interface} diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml index 2dfd81cc2c1b..de62dc302a8f 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml @@ -35,3 +35,7 @@ topics: - google-maps - google-maps-flutter - map +# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. +# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins +dependency_overrides: + google_maps_flutter_platform_interface: {path: ../../../packages/google_maps_flutter/google_maps_flutter_platform_interface} diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml index 8129d334c5e8..253b21d7fe34 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml @@ -32,4 +32,5 @@ flutter: # See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins dependency_overrides: google_maps_flutter: {path: ../../../../packages/google_maps_flutter/google_maps_flutter} + google_maps_flutter_platform_interface: {path: ../../../../packages/google_maps_flutter/google_maps_flutter_platform_interface} google_maps_flutter_web: {path: ../} diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml index 679bfcbb56e2..47e10c112baf 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml @@ -40,3 +40,7 @@ topics: # The example deliberately includes limited-use secrets. false_secrets: - /example/web/index.html +# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. +# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins +dependency_overrides: + google_maps_flutter_platform_interface: {path: ../../../packages/google_maps_flutter/google_maps_flutter_platform_interface} From 5d53e4984ab1ddbc4ce7b43d9781e9ff7abc6a95 Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Thu, 20 Nov 2025 10:14:39 -0500 Subject: [PATCH 07/29] adds CHANGELOG entries to affected federated packages. Reverts mistaken pubspec bump --- .../google_maps_flutter_android/CHANGELOG.md | 4 ++++ .../google_maps_flutter_platform_interface/CHANGELOG.md | 1 + .../lib/src/types/map_color_scheme.dart | 4 ++++ .../google_maps_flutter/google_maps_flutter_web/CHANGELOG.md | 2 +- .../google_maps_flutter/google_maps_flutter_web/pubspec.yaml | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md index d7d88983c3e9..a0c65959e608 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Adds support for `colorScheme` for cloud-based maps styling brightness in web. + ## 2.18.5 * Updates to Pigeon 26. diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md index 7183bed62b73..fbef7e049c8c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md @@ -1,6 +1,7 @@ ## NEXT * Updates minimum supported SDK version to Flutter 3.32/Dart 3.8. +* Adds support for `colorScheme` for cloud-based maps styling brightness in web. ## 2.14.0 diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_color_scheme.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_color_scheme.dart index 93ebd0ed8989..2499fd8308a8 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_color_scheme.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_color_scheme.dart @@ -1,2 +1,6 @@ +// Copyright 2013 The Flutter Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + /// The color scheme of the map to be used with cloud styles enum MapColorScheme { light, dark, followSystem } diff --git a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md index 836f8b55cb66..91b406c8094f 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.5.14+4 +## NEXT * Updates minimum supported SDK version to Flutter 3.32/Dart 3.8. * Adds `colorScheme` support for cloud-based maps styling brightness. diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml index 47e10c112baf..4d399c209c86 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_web description: Web platform implementation of google_maps_flutter repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_web issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 0.5.14+4 +version: 0.5.14+3 environment: sdk: ^3.8.0 From 24a65c49178f6fd898e86720a15eb74d178eba9d Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Thu, 20 Nov 2025 10:18:26 -0500 Subject: [PATCH 08/29] Sets default color scheme to follow system and adds simple unit tests --- .../lib/src/google_map.dart | 4 +- .../test/google_map_test.dart | 45 +++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart index 0fa415539510..778d25f70b2c 100644 --- a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart +++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart @@ -134,7 +134,7 @@ class GoogleMap extends StatefulWidget { this.onTap, this.onLongPress, this.cloudMapId, - this.colorScheme, + this.colorScheme = MapColorScheme.followSystem, }); /// Callback method for when the map is ready to be used. @@ -375,7 +375,7 @@ class GoogleMap extends StatefulWidget { final String? cloudMapId; /// Color scheme for the map - final MapColorScheme? colorScheme; + final MapColorScheme colorScheme; /// Creates a [State] for this [GoogleMap]. @override diff --git a/packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart b/packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart index e5a1fca9a30b..16850e57efa0 100644 --- a/packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart @@ -659,4 +659,49 @@ void main() { expect(map.tileOverlaySets.length, 1); }); + + testWidgets('Is default color scheme follow system', ( + WidgetTester tester, + ) async { + await tester.pumpWidget( + const Directionality( + textDirection: TextDirection.ltr, + child: GoogleMap( + initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)), + ), + ), + ); + + final PlatformMapStateRecorder map = platform.lastCreatedMap; + + expect(map.mapConfiguration.colorScheme, MapColorScheme.followSystem); + }); + + testWidgets('Can update default color scheme', (WidgetTester tester) async { + await tester.pumpWidget( + const Directionality( + textDirection: TextDirection.ltr, + child: GoogleMap( + initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)), + colorScheme: MapColorScheme.light, + ), + ), + ); + + final PlatformMapStateRecorder map = platform.lastCreatedMap; + + expect(map.mapConfiguration.colorScheme, MapColorScheme.light); + + await tester.pumpWidget( + const Directionality( + textDirection: TextDirection.ltr, + child: GoogleMap( + initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)), + colorScheme: MapColorScheme.dark, + ), + ), + ); + + expect(map.mapConfiguration.colorScheme, MapColorScheme.dark); + }); } From ba0aa0cbdf5f07b756488ba8311d22a848bd27a0 Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Thu, 20 Nov 2025 10:25:11 -0500 Subject: [PATCH 09/29] Updates comment --- .../google_maps_flutter/lib/src/google_map.dart | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart index 778d25f70b2c..b335aa68a27d 100644 --- a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart +++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart @@ -374,7 +374,10 @@ class GoogleMap extends StatefulWidget { /// for more details. final String? cloudMapId; - /// Color scheme for the map + /// Color scheme for the cloud-style map. Web only. + /// + /// See https://developers.google.com/maps/documentation/javascript/mapcolorscheme + /// for more details. final MapColorScheme colorScheme; /// Creates a [State] for this [GoogleMap]. From 47ff9356ba3b39ec4024f086a7f9e6210588f83a Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Thu, 20 Nov 2025 12:51:19 -0500 Subject: [PATCH 10/29] Fixes unit test and adds comments to clarify setting color scheme at map initialization. Adds comments to MapColorScheme enum. --- .../google_maps_flutter/lib/src/google_map.dart | 2 ++ .../google_maps_flutter/test/google_map_test.dart | 14 +------------- .../lib/src/types/map_color_scheme.dart | 11 ++++++++++- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart index b335aa68a27d..b926a1841ec6 100644 --- a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart +++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart @@ -375,6 +375,8 @@ class GoogleMap extends StatefulWidget { final String? cloudMapId; /// Color scheme for the cloud-style map. Web only. + /// The colorScheme option can only be set when the map is initialized; + /// setting this option after the map is created will have no effect. /// /// See https://developers.google.com/maps/documentation/javascript/mapcolorscheme /// for more details. diff --git a/packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart b/packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart index 16850e57efa0..da1ebcbe586f 100644 --- a/packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart @@ -677,7 +677,7 @@ void main() { expect(map.mapConfiguration.colorScheme, MapColorScheme.followSystem); }); - testWidgets('Can update default color scheme', (WidgetTester tester) async { + testWidgets('Can set color scheme to non-default', (WidgetTester tester) async { await tester.pumpWidget( const Directionality( textDirection: TextDirection.ltr, @@ -691,17 +691,5 @@ void main() { final PlatformMapStateRecorder map = platform.lastCreatedMap; expect(map.mapConfiguration.colorScheme, MapColorScheme.light); - - await tester.pumpWidget( - const Directionality( - textDirection: TextDirection.ltr, - child: GoogleMap( - initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)), - colorScheme: MapColorScheme.dark, - ), - ), - ); - - expect(map.mapConfiguration.colorScheme, MapColorScheme.dark); }); } diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_color_scheme.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_color_scheme.dart index 2499fd8308a8..3af7b9db2903 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_color_scheme.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_color_scheme.dart @@ -3,4 +3,13 @@ // found in the LICENSE file. /// The color scheme of the map to be used with cloud styles -enum MapColorScheme { light, dark, followSystem } +enum MapColorScheme { + /// The light color scheme for the map + light, + + /// The dark color scheme for the map + dark, + + /// The system default color scheme for the map + followSystem, +} From d5130468a0befb812a6d9b72e5c15fb54b7ed0cf Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Thu, 20 Nov 2025 13:38:24 -0500 Subject: [PATCH 11/29] format tests --- .../google_maps_flutter/test/google_map_test.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart b/packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart index da1ebcbe586f..2b0f254efe5a 100644 --- a/packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart @@ -677,7 +677,9 @@ void main() { expect(map.mapConfiguration.colorScheme, MapColorScheme.followSystem); }); - testWidgets('Can set color scheme to non-default', (WidgetTester tester) async { + testWidgets('Can set color scheme to non-default', ( + WidgetTester tester, + ) async { await tester.pumpWidget( const Directionality( textDirection: TextDirection.ltr, From 5a03b720152313716b586676fe61c275deaeb917 Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Thu, 20 Nov 2025 13:49:22 -0500 Subject: [PATCH 12/29] Ran the update-release-info tool to fix changelogs --- packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md | 3 ++- packages/google_maps_flutter/google_maps_flutter/pubspec.yaml | 2 +- .../google_maps_flutter_android/CHANGELOG.md | 2 +- .../google_maps_flutter_android/pubspec.yaml | 2 +- .../google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md | 4 ++++ .../google_maps_flutter/google_maps_flutter_ios/pubspec.yaml | 2 +- .../google_maps_flutter_platform_interface/CHANGELOG.md | 2 +- .../google_maps_flutter_platform_interface/pubspec.yaml | 2 +- .../google_maps_flutter/google_maps_flutter_web/CHANGELOG.md | 4 ++-- .../google_maps_flutter/google_maps_flutter_web/pubspec.yaml | 2 +- 10 files changed, 15 insertions(+), 10 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md index 64bc5dc7a8b2..d623b27f3b1d 100644 --- a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md @@ -1,5 +1,6 @@ -## NEXT +## 2.14.1 +* Adds `colorScheme` support for web cloud-based maps styling brightness. * Updates minimum supported SDK version to Flutter 3.32/Dart 3.8. ## 2.14.0 diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml index d8ab919d3a0c..59ce0e35ff6c 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter description: A Flutter plugin for integrating Google Maps in iOS and Android applications. repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.14.0 +version: 2.14.1 environment: sdk: ^3.8.0 diff --git a/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md index a0c65959e608..0dfa8641f33b 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md @@ -1,4 +1,4 @@ -## NEXT +## 2.18.6 * Adds support for `colorScheme` for cloud-based maps styling brightness in web. diff --git a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml index 9dd46dd0a596..880752874896 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_android description: Android implementation of the google_maps_flutter plugin. repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.18.5 +version: 2.18.6 environment: sdk: ^3.9.0 diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md index 2cfb1ae67baa..63551f884539 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.15.8 + +* Adds `colorScheme` support for web cloud-based maps styling brightness. + ## 2.15.7 * Updates to Pigeon 26. diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml index de62dc302a8f..6bce6f51d2dc 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_ios description: iOS implementation of the google_maps_flutter plugin. repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_ios issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.15.7 +version: 2.15.8 environment: sdk: ^3.8.0 diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md index fbef7e049c8c..c29b41b82cd6 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md @@ -1,4 +1,4 @@ -## NEXT +## 2.14.1 * Updates minimum supported SDK version to Flutter 3.32/Dart 3.8. * Adds support for `colorScheme` for cloud-based maps styling brightness in web. diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml index 9f98762bd09a..9aa5ed828406 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml @@ -4,7 +4,7 @@ repository: https://github.com/flutter/packages/tree/main/packages/google_maps_f issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 # NOTE: We strongly prefer non-breaking changes, even at the expense of a # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes -version: 2.14.0 +version: 2.14.1 environment: sdk: ^3.8.0 diff --git a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md index 91b406c8094f..c9c6ed5a9ba1 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md @@ -1,7 +1,7 @@ -## NEXT +## 0.5.14+4 +* Adds `colorScheme` support for web cloud-based maps styling brightness. * Updates minimum supported SDK version to Flutter 3.32/Dart 3.8. -* Adds `colorScheme` support for cloud-based maps styling brightness. ## 0.5.14+3 diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml index 4d399c209c86..47e10c112baf 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_web description: Web platform implementation of google_maps_flutter repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_web issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 0.5.14+3 +version: 0.5.14+4 environment: sdk: ^3.8.0 From edc897217e06c2cf8a404207e98b48f1e08d881f Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Thu, 20 Nov 2025 16:32:21 -0500 Subject: [PATCH 13/29] fixes version change and changelog for platform interface --- .../google_maps_flutter_platform_interface/CHANGELOG.md | 5 ++++- .../google_maps_flutter_platform_interface/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md index 7b92092c3322..859514aa4452 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md @@ -1,8 +1,11 @@ +## 2.14.2 + +* Adds support for `colorScheme` for cloud-based maps styling brightness in web. + ## 2.14.1 * Replaces internal use of deprecated methods. * Updates minimum supported SDK version to Flutter 3.32/Dart 3.8. -* Adds support for `colorScheme` for cloud-based maps styling brightness in web. ## 2.14.0 diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml index 9aa5ed828406..5e6d7aaba8a5 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml @@ -4,7 +4,7 @@ repository: https://github.com/flutter/packages/tree/main/packages/google_maps_f issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 # NOTE: We strongly prefer non-breaking changes, even at the expense of a # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes -version: 2.14.1 +version: 2.14.2 environment: sdk: ^3.8.0 From 4344c6fcfd3b2a6be77a728e2ffd279612b768c5 Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Wed, 3 Dec 2025 15:16:11 -0500 Subject: [PATCH 14/29] Reverts all changes for to google_maps_flutter_android and _ios --- .../google_maps_flutter_android/example/pubspec.yaml | 4 ---- .../google_maps_flutter_android/pubspec.yaml | 4 ---- .../google_maps_flutter_ios/example/ios14/pubspec.yaml | 4 ---- .../google_maps_flutter_ios/example/ios15/pubspec.yaml | 4 ---- .../example/shared/maps_example_dart/pubspec.yaml | 4 ---- .../google_maps_flutter_ios/pubspec.yaml | 6 +----- 6 files changed, 1 insertion(+), 25 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml index 201159cef15e..58cec3dcf1a5 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml @@ -33,7 +33,3 @@ flutter: uses-material-design: true assets: - assets/ -# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. -# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins -dependency_overrides: - google_maps_flutter_platform_interface: {path: ../../../../packages/google_maps_flutter/google_maps_flutter_platform_interface} diff --git a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml index 203a80205586..9563058d4d2f 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml @@ -37,7 +37,3 @@ topics: - google-maps - google-maps-flutter - map -# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. -# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins -dependency_overrides: - google_maps_flutter_platform_interface: {path: ../../../packages/google_maps_flutter/google_maps_flutter_platform_interface} diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/pubspec.yaml index bf92241cf97a..125a5a2ac4d2 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/pubspec.yaml @@ -32,7 +32,3 @@ flutter: uses-material-design: true assets: - assets/ -# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. -# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins -dependency_overrides: - google_maps_flutter_platform_interface: {path: ../../../../../packages/google_maps_flutter/google_maps_flutter_platform_interface} diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/pubspec.yaml index bf92241cf97a..125a5a2ac4d2 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/pubspec.yaml @@ -32,7 +32,3 @@ flutter: uses-material-design: true assets: - assets/ -# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. -# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins -dependency_overrides: - google_maps_flutter_platform_interface: {path: ../../../../../packages/google_maps_flutter/google_maps_flutter_platform_interface} diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml index 81a824023cec..c29432c7f7aa 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/pubspec.yaml @@ -27,7 +27,3 @@ dev_dependencies: flutter: uses-material-design: true -# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. -# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins -dependency_overrides: - google_maps_flutter_platform_interface: {path: ../../../../../../packages/google_maps_flutter/google_maps_flutter_platform_interface} diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml index 35dc1a074962..7127ea1c22b7 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_ios description: iOS implementation of the google_maps_flutter plugin. repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_ios issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.15.8 +version: 2.15.7 environment: sdk: ^3.8.0 @@ -35,7 +35,3 @@ topics: - google-maps - google-maps-flutter - map -# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. -# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins -dependency_overrides: - google_maps_flutter_platform_interface: {path: ../../../packages/google_maps_flutter/google_maps_flutter_platform_interface} From 01e3dc80d7d1df889dd60345fce020b26308270c Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Wed, 3 Dec 2025 15:19:12 -0500 Subject: [PATCH 15/29] Makes colorscheme nullable, removes default setting, fixes comments in google_map --- .../google_maps_flutter/lib/src/google_map.dart | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart index b926a1841ec6..57e08894aeba 100644 --- a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart +++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart @@ -134,7 +134,7 @@ class GoogleMap extends StatefulWidget { this.onTap, this.onLongPress, this.cloudMapId, - this.colorScheme = MapColorScheme.followSystem, + this.colorScheme, }); /// Callback method for when the map is ready to be used. @@ -375,12 +375,13 @@ class GoogleMap extends StatefulWidget { final String? cloudMapId; /// Color scheme for the cloud-style map. Web only. + /// /// The colorScheme option can only be set when the map is initialized; /// setting this option after the map is created will have no effect. /// /// See https://developers.google.com/maps/documentation/javascript/mapcolorscheme /// for more details. - final MapColorScheme colorScheme; + final MapColorScheme? colorScheme; /// Creates a [State] for this [GoogleMap]. @override From 4730f74cde380fc934ca1ecec5c22754c516eb86 Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Wed, 3 Dec 2025 15:27:32 -0500 Subject: [PATCH 16/29] Fixes minor version bump in pubspec and changelogs --- .../google_maps_flutter/google_maps_flutter/CHANGELOG.md | 2 +- .../google_maps_flutter/google_maps_flutter/pubspec.yaml | 2 +- .../google_maps_flutter_platform_interface/CHANGELOG.md | 2 +- .../google_maps_flutter_platform_interface/pubspec.yaml | 2 +- .../google_maps_flutter/google_maps_flutter_web/CHANGELOG.md | 5 ++++- .../google_maps_flutter/google_maps_flutter_web/pubspec.yaml | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md index 09be06c28cd5..150979461c5a 100644 --- a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md @@ -1,4 +1,4 @@ -## 2.14.1 +## 2.15.0 * Adds `colorScheme` support for web cloud-based maps styling brightness. * Replaces internal use of deprecated methods. diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml index 59ce0e35ff6c..5a5fd6b49e4f 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter description: A Flutter plugin for integrating Google Maps in iOS and Android applications. repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.14.1 +version: 2.15.0 environment: sdk: ^3.8.0 diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md index 859514aa4452..dfe0160fdc38 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md @@ -1,4 +1,4 @@ -## 2.14.2 +## 2.15.0 * Adds support for `colorScheme` for cloud-based maps styling brightness in web. diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml index 5e6d7aaba8a5..92bf349686d9 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml @@ -4,7 +4,7 @@ repository: https://github.com/flutter/packages/tree/main/packages/google_maps_f issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 # NOTE: We strongly prefer non-breaking changes, even at the expense of a # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes -version: 2.14.2 +version: 2.15.0 environment: sdk: ^3.8.0 diff --git a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md index defa1c3b5b18..039e5792a1b4 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md @@ -1,6 +1,9 @@ -## 0.5.14+4 +## 0.6.0+5 * Adds `colorScheme` support for web cloud-based maps styling brightness. + +## 0.5.14+4 + * Updates minimum supported SDK version to Flutter 3.32/Dart 3.8. * Updates minimum supported SDK version to Flutter 3.35/Dart 3.9. diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml index 16f8c9e823e3..23b186f5378b 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_web description: Web platform implementation of google_maps_flutter repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_web issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 0.5.14+4 +version: 0.6.0+4 environment: sdk: ^3.9.0 From 3fde10c2b0426c324dbe9c2f1e055df501527102 Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Wed, 3 Dec 2025 15:32:44 -0500 Subject: [PATCH 17/29] Resolves conflicts --- .../google_maps_flutter/google_maps_flutter/CHANGELOG.md | 5 ++++- .../google_maps_flutter_web/CHANGELOG.md | 6 +----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md index 150979461c5a..ab263fea8195 100644 --- a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md @@ -1,6 +1,9 @@ -## 2.15.0 +## 2.16.0 * Adds `colorScheme` support for web cloud-based maps styling brightness. + +## 2.15.0 + * Replaces internal use of deprecated methods. * Updates minimum supported SDK version to Flutter 3.32/Dart 3.8. * Updates README to reflect currently supported OS versions for the latest diff --git a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md index 039e5792a1b4..5b6e2bc24143 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md @@ -1,10 +1,6 @@ -## 0.6.0+5 +## 0.6.0+4 * Adds `colorScheme` support for web cloud-based maps styling brightness. - -## 0.5.14+4 - -* Updates minimum supported SDK version to Flutter 3.32/Dart 3.8. * Updates minimum supported SDK version to Flutter 3.35/Dart 3.9. ## 0.5.14+3 From 89e5820b23ba61a318e0854b5ba43d98ae3865e6 Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Wed, 3 Dec 2025 15:40:21 -0500 Subject: [PATCH 18/29] Fixes comments and adds unit tests. --- .../lib/src/types/map_color_scheme.dart | 8 +++---- .../test/types/map_configuration_test.dart | 22 +++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_color_scheme.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_color_scheme.dart index 3af7b9db2903..743d3a104a73 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_color_scheme.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_color_scheme.dart @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -/// The color scheme of the map to be used with cloud styles +/// The color scheme of the map to be used with cloud styles. enum MapColorScheme { - /// The light color scheme for the map + /// The light color scheme for the map. light, - /// The dark color scheme for the map + /// The dark color scheme for the map. dark, - /// The system default color scheme for the map + /// The system default color scheme for the map. followSystem, } diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/types/map_configuration_test.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/types/map_configuration_test.dart index 493f5cc13936..e8564565457f 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/types/map_configuration_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/types/map_configuration_test.dart @@ -485,6 +485,22 @@ void main() { // The hash code should change. expect(empty.hashCode, isNot(diff.hashCode)); }); + + test('handle colorScheme', () async { + const diff = MapConfiguration(colorScheme: MapColorScheme.followSystem); + + const empty = MapConfiguration(); + final MapConfiguration updated = diffBase.applyDiff(diff); + + // A diff applied to empty options should be the diff itself. + expect(empty.applyDiff(diff), diff); + // The diff from empty options should be the diff itself. + expect(diff.diffFrom(empty), diff); + // A diff applied to non-empty options should update that field. + expect(updated.colorScheme, MapColorScheme.followSystem); + // The hash code should change. + expect(empty.hashCode, isNot(diff.hashCode)); + }); }); group('isEmpty', () { @@ -641,5 +657,11 @@ void main() { expect(diff.isEmpty, false); }); + + test('is false with colorScheme', () async { + const diff = MapConfiguration(colorScheme: MapColorScheme.followSystem); + + expect(diff.isEmpty, false); + }); }); } From 2cc8021a596cd7f8db636a1fec0baf094c8bc160 Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Wed, 3 Dec 2025 15:45:43 -0500 Subject: [PATCH 19/29] Fixes comments. Adds fallthrough handling for color scheme enum mapping --- .../lib/src/google_map.dart | 3 +- .../lib/src/types/map_configuration.dart | 4 ++- .../lib/src/convert.dart | 35 +++++++++---------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart index 57e08894aeba..137c02160331 100644 --- a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart +++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart @@ -379,8 +379,7 @@ class GoogleMap extends StatefulWidget { /// The colorScheme option can only be set when the map is initialized; /// setting this option after the map is created will have no effect. /// - /// See https://developers.google.com/maps/documentation/javascript/mapcolorscheme - /// for more details. + /// See https://developers.google.com/maps/documentation/javascript/mapcolorscheme for more details. final MapColorScheme? colorScheme; /// Creates a [State] for this [GoogleMap]. diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart index 4629ef2d5826..f5f17c610a8a 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart @@ -153,7 +153,9 @@ class MapConfiguration { @Deprecated('cloudMapId is deprecated. Use mapId instead.') String? get cloudMapId => mapId; - /// Preferred color scheme for the map in web platform + /// Preferred color scheme for the cloud-styled map. Web only. + /// + /// See https://developers.google.com/maps/documentation/javascript/mapcolorscheme for more details. final MapColorScheme? colorScheme; /// Returns a new options object containing only the values of this instance diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart index cecdc3937a27..39fef122ca01 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart @@ -142,24 +142,6 @@ gmaps.MapOptions _configurationAndStyleToGmapsOptions( return options; } -/// Converts a [MapColorScheme] into a [gmaps.ColorScheme] -gmaps.ColorScheme? _gmapTypeColorSchemeForPluginColor(MapColorScheme? scheme) { - // Guard clause for null - if (scheme == null) { - return null; - } - - // Map to gmaps.ColorScheme - switch (scheme) { - case MapColorScheme.dark: - return gmaps.ColorScheme.DARK; - case MapColorScheme.light: - return gmaps.ColorScheme.LIGHT; - case MapColorScheme.followSystem: - return gmaps.ColorScheme.FOLLOW_SYSTEM; - } -} - gmaps.MapTypeId _gmapTypeIDForPluginType(MapType type) { switch (type) { case MapType.satellite: @@ -181,6 +163,23 @@ gmaps.MapTypeId _gmapTypeIDForPluginType(MapType type) { return gmaps.MapTypeId.ROADMAP; } +gmaps.ColorScheme? _gmapTypeColorSchemeForPluginColor(MapColorScheme? scheme) { + if (scheme == null) { + return null; + } + + switch (scheme) { + case MapColorScheme.dark: + return gmaps.ColorScheme.DARK; + case MapColorScheme.light: + return gmaps.ColorScheme.LIGHT; + case MapColorScheme.followSystem: + return gmaps.ColorScheme.FOLLOW_SYSTEM; + } + // ignore: dead_code + return gmaps.ColorScheme.FOLLOW_SYSTEM; +} + gmaps.MapOptions _applyInitialPosition( CameraPosition initialPosition, gmaps.MapOptions options, From 51e97d1e7995cdf130a2ff8871801611fa551ccb Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Thu, 4 Dec 2025 11:05:08 -0500 Subject: [PATCH 20/29] fixes default color scheme null --- .../google_maps_flutter/test/google_map_test.dart | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart b/packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart index 02e2612590a9..678922d89632 100644 --- a/packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart @@ -660,9 +660,7 @@ void main() { expect(map.tileOverlaySets.length, 1); }); - testWidgets('Is default color scheme follow system', ( - WidgetTester tester, - ) async { + testWidgets('Is default color scheme null', (WidgetTester tester) async { await tester.pumpWidget( const Directionality( textDirection: TextDirection.ltr, @@ -674,7 +672,7 @@ void main() { final PlatformMapStateRecorder map = platform.lastCreatedMap; - expect(map.mapConfiguration.colorScheme, MapColorScheme.followSystem); + expect(map.mapConfiguration.colorScheme, null); }); testWidgets('Can set color scheme to non-default', ( From 17b73a046d53dfe90399ec263c64603e4545aaee Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Thu, 4 Dec 2025 12:06:40 -0500 Subject: [PATCH 21/29] fixes google_maps version --- packages/google_maps_flutter/google_maps_flutter/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml index 5a5fd6b49e4f..874e277d93ac 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter description: A Flutter plugin for integrating Google Maps in iOS and Android applications. repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.15.0 +version: 2.16.0 environment: sdk: ^3.8.0 From 1b9b4a45d90bf6c3084feecf59d0f39c132b5d1a Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Thu, 4 Dec 2025 12:08:18 -0500 Subject: [PATCH 22/29] fixing versioning --- .../google_maps_flutter/google_maps_flutter_web/CHANGELOG.md | 2 +- .../google_maps_flutter/google_maps_flutter_web/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md index 5b6e2bc24143..bd33e91d3582 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.6.0+4 +## 0.5.15+4 * Adds `colorScheme` support for web cloud-based maps styling brightness. * Updates minimum supported SDK version to Flutter 3.35/Dart 3.9. diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml index 23b186f5378b..565c939421b8 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_web description: Web platform implementation of google_maps_flutter repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_web issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 0.6.0+4 +version: 0.5.15+4 environment: sdk: ^3.9.0 From 42aecea0825a1621837b5fda307eaf91d3e4847c Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Thu, 4 Dec 2025 12:10:32 -0500 Subject: [PATCH 23/29] reverts remaining accidental clobbered changes from main rebase in ios and android --- .../google_maps_flutter_android/CHANGELOG.md | 3 --- .../google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md | 1 - .../google_maps_flutter/google_maps_flutter_ios/pubspec.yaml | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md index ff4a4b8fd1b3..280ec0de9aa2 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md @@ -1,6 +1,3 @@ -## 2.18.6 - -* Adds support for `colorScheme` for cloud-based maps styling brightness in web. ## 2.18.8 * Bumps com.google.maps.android:android-maps-utils from 3.6.0 to 3.19.1. diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md index 562cd5d2c39b..b2b80b419e85 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md @@ -1,6 +1,5 @@ ## 2.15.8 -* Adds `colorScheme` support for web cloud-based maps styling brightness. * Replaces internal use of deprecated methods. ## 2.15.7 diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml index 7127ea1c22b7..eb4fe6d3a4eb 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_ios description: iOS implementation of the google_maps_flutter plugin. repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_ios issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.15.7 +version: 2.15.8 environment: sdk: ^3.8.0 From 69f7b2b98d1ff18fd9a6b9b1f1aaa52621720861 Mon Sep 17 00:00:00 2001 From: Marty Fuhry Date: Thu, 4 Dec 2025 13:33:12 -0500 Subject: [PATCH 24/29] Fixes the version mismatch in the changelog and pubspec --- .../google_maps_flutter/google_maps_flutter/CHANGELOG.md | 5 +---- .../google_maps_flutter/google_maps_flutter/pubspec.yaml | 2 +- .../google_maps_flutter/google_maps_flutter_web/CHANGELOG.md | 2 +- .../google_maps_flutter/google_maps_flutter_web/pubspec.yaml | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md index ab263fea8195..8c7ae71dbac3 100644 --- a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md @@ -1,7 +1,3 @@ -## 2.16.0 - -* Adds `colorScheme` support for web cloud-based maps styling brightness. - ## 2.15.0 * Replaces internal use of deprecated methods. @@ -10,6 +6,7 @@ versions of the endorsed platform implementations. * Applications built with older versions of Flutter will continue to use compatible versions of the platform implementations. +* Adds `colorScheme` support for web cloud-based maps styling brightness. ## 2.14.0 diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml index 874e277d93ac..5a5fd6b49e4f 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter description: A Flutter plugin for integrating Google Maps in iOS and Android applications. repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.16.0 +version: 2.15.0 environment: sdk: ^3.8.0 diff --git a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md index bd33e91d3582..37f3725e1148 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.5.15+4 +## 0.5.15 * Adds `colorScheme` support for web cloud-based maps styling brightness. * Updates minimum supported SDK version to Flutter 3.35/Dart 3.9. diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml index 565c939421b8..010375444ee7 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_web description: Web platform implementation of google_maps_flutter repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_web issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 0.5.15+4 +version: 0.5.15 environment: sdk: ^3.9.0 From 711e0e02ccfcbdfc05072488a77e8b7227ec43f3 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 18 Mar 2026 09:40:25 -0400 Subject: [PATCH 25/29] Revert all but _web --- .../google_maps_flutter/CHANGELOG.md | 4 --- .../google_maps_flutter/example/pubspec.yaml | 5 --- .../lib/google_maps_flutter.dart | 1 - .../lib/src/google_map.dart | 10 ------ .../google_maps_flutter/pubspec.yaml | 7 +--- .../test/google_map_test.dart | 33 ------------------- .../CHANGELOG.md | 4 --- .../lib/src/types/map_color_scheme.dart | 15 --------- .../lib/src/types/map_configuration.dart | 11 ------- .../lib/src/types/types.dart | 1 - .../pubspec.yaml | 2 +- .../test/types/map_configuration_test.dart | 22 ------------- 12 files changed, 2 insertions(+), 113 deletions(-) delete mode 100644 packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_color_scheme.dart diff --git a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md index 3cdccf6d0f0e..dfc5bf9edd4a 100644 --- a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md @@ -1,7 +1,3 @@ -## 2.16.0 - -* Adds `colorScheme` support for web cloud-based maps styling brightness. - ## 2.15.0 * Adds support for advanced markers, and new example pages showing their usage. diff --git a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml index 6dff6be63c02..6bd36da0ee9a 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml @@ -32,8 +32,3 @@ flutter: uses-material-design: true assets: - assets/ -# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. -# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins -dependency_overrides: - google_maps_flutter_platform_interface: {path: ../../../../packages/google_maps_flutter/google_maps_flutter_platform_interface} - google_maps_flutter_web: {path: ../../../../packages/google_maps_flutter/google_maps_flutter_web} diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart index 267b6cb9d77d..7ca650dceb75 100644 --- a/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart +++ b/packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart @@ -41,7 +41,6 @@ export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf LatLng, LatLngBounds, MapBitmapScaling, - MapColorScheme, MapStyleException, MapType, Marker, diff --git a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart index 7d82dc7cc31e..8a5e2e42936d 100644 --- a/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart +++ b/packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart @@ -144,7 +144,6 @@ class GoogleMap extends StatefulWidget { this.onTap, this.onLongPress, this.markerType = GoogleMapMarkerType.marker, - this.colorScheme, String? mapId, @Deprecated('cloudMapId is deprecated. Use mapId instead.') String? cloudMapId, @@ -412,14 +411,6 @@ class GoogleMap extends StatefulWidget { /// may result in unexpected behavior. final GoogleMapMarkerType markerType; - /// Color scheme for the cloud-style map. Web only. - /// - /// The colorScheme option can only be set when the map is initialized; - /// setting this option after the map is created will have no effect. - /// - /// See https://developers.google.com/maps/documentation/javascript/mapcolorscheme for more details. - final MapColorScheme? colorScheme; - /// Creates a [State] for this [GoogleMap]. @override State createState() => _GoogleMapState(); @@ -776,7 +767,6 @@ MapConfiguration _configurationFromMapWidget(GoogleMap map) { trafficEnabled: map.trafficEnabled, buildingsEnabled: map.buildingsEnabled, markerType: mapConfigurationMarkerType, - colorScheme: map.colorScheme, // A null mapId in the widget means no map ID, which is expressed as '' in // the configuration to distinguish from no change (null). mapId: map.mapId ?? '', diff --git a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml index 34eec18a8991..2c82f88af681 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter description: A Flutter plugin for integrating Google Maps in iOS and Android applications. repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.16.0 +version: 2.15.0 environment: sdk: ^3.10.0 @@ -41,8 +41,3 @@ topics: # The example deliberately includes limited-use secrets. false_secrets: - /example/web/index.html -# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. -# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins -dependency_overrides: - google_maps_flutter_platform_interface: {path: ../../../packages/google_maps_flutter/google_maps_flutter_platform_interface} - google_maps_flutter_web: {path: ../../../packages/google_maps_flutter/google_maps_flutter_web} diff --git a/packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart b/packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart index d0737800f585..86e12c28c4f6 100644 --- a/packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart @@ -660,39 +660,6 @@ void main() { expect(map.tileOverlaySets.length, 1); }); - testWidgets('Is default color scheme null', (WidgetTester tester) async { - await tester.pumpWidget( - const Directionality( - textDirection: TextDirection.ltr, - child: GoogleMap( - initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)), - ), - ), - ); - - final PlatformMapStateRecorder map = platform.lastCreatedMap; - - expect(map.mapConfiguration.colorScheme, null); - }); - - testWidgets('Can set color scheme to non-default', ( - WidgetTester tester, - ) async { - await tester.pumpWidget( - const Directionality( - textDirection: TextDirection.ltr, - child: GoogleMap( - initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)), - colorScheme: MapColorScheme.light, - ), - ), - ); - - final PlatformMapStateRecorder map = platform.lastCreatedMap; - - expect(map.mapConfiguration.colorScheme, MapColorScheme.light); - }); - testWidgets('Default markerType is "marker"', (WidgetTester tester) async { await tester.pumpWidget( const Directionality( diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md index 6a6c637674a7..1c192e498b60 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/CHANGELOG.md @@ -1,7 +1,3 @@ -## 2.15.0 - -* Adds support for `colorScheme` for cloud-based maps styling brightness in web. - ## 2.14.2 * Adds documentation about iOS rendering issue with `PinConfig`. diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_color_scheme.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_color_scheme.dart deleted file mode 100644 index 743d3a104a73..000000000000 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_color_scheme.dart +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2013 The Flutter Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -/// The color scheme of the map to be used with cloud styles. -enum MapColorScheme { - /// The light color scheme for the map. - light, - - /// The dark color scheme for the map. - dark, - - /// The system default color scheme for the map. - followSystem, -} diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart index f5f17c610a8a..235ec580b2e7 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/map_configuration.dart @@ -42,7 +42,6 @@ class MapConfiguration { String? cloudMapId, this.style, this.markerType, - this.colorScheme, }) : mapId = mapId ?? cloudMapId; /// This setting controls how the API handles gestures on the map. Web only. @@ -153,11 +152,6 @@ class MapConfiguration { @Deprecated('cloudMapId is deprecated. Use mapId instead.') String? get cloudMapId => mapId; - /// Preferred color scheme for the cloud-styled map. Web only. - /// - /// See https://developers.google.com/maps/documentation/javascript/mapcolorscheme for more details. - final MapColorScheme? colorScheme; - /// Returns a new options object containing only the values of this instance /// that are different from [other]. MapConfiguration diffFrom(MapConfiguration other) { @@ -231,7 +225,6 @@ class MapConfiguration { ? buildingsEnabled : null, mapId: mapId != other.mapId ? mapId : null, - colorScheme: colorScheme != other.colorScheme ? colorScheme : null, style: style != other.style ? style : null, markerType: markerType != other.markerType ? markerType : null, ); @@ -271,7 +264,6 @@ class MapConfiguration { buildingsEnabled: diff.buildingsEnabled ?? buildingsEnabled, mapId: diff.mapId ?? mapId, style: diff.style ?? style, - colorScheme: diff.colorScheme ?? colorScheme, markerType: diff.markerType ?? markerType, ); } @@ -301,7 +293,6 @@ class MapConfiguration { trafficEnabled == null && buildingsEnabled == null && mapId == null && - colorScheme == null && style == null && markerType == null; @@ -338,7 +329,6 @@ class MapConfiguration { buildingsEnabled == other.buildingsEnabled && mapId == other.mapId && style == other.style && - colorScheme == other.colorScheme && markerType == other.markerType; } @@ -368,7 +358,6 @@ class MapConfiguration { buildingsEnabled, mapId, style, - colorScheme, markerType, ]); } diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart index 80e380674337..a2483a24c544 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/types.dart @@ -19,7 +19,6 @@ export 'heatmap.dart'; export 'heatmap_updates.dart'; export 'joint_type.dart'; export 'location.dart'; -export 'map_color_scheme.dart'; export 'map_configuration.dart'; export 'map_objects.dart'; export 'map_widget_configuration.dart'; diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml index 3f0790182d2e..06c5b6b8834e 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/pubspec.yaml @@ -4,7 +4,7 @@ repository: https://github.com/flutter/packages/tree/main/packages/google_maps_f issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 # NOTE: We strongly prefer non-breaking changes, even at the expense of a # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes -version: 2.15.0 +version: 2.14.2 environment: sdk: ^3.9.0 diff --git a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/types/map_configuration_test.dart b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/types/map_configuration_test.dart index e8564565457f..493f5cc13936 100644 --- a/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/types/map_configuration_test.dart +++ b/packages/google_maps_flutter/google_maps_flutter_platform_interface/test/types/map_configuration_test.dart @@ -485,22 +485,6 @@ void main() { // The hash code should change. expect(empty.hashCode, isNot(diff.hashCode)); }); - - test('handle colorScheme', () async { - const diff = MapConfiguration(colorScheme: MapColorScheme.followSystem); - - const empty = MapConfiguration(); - final MapConfiguration updated = diffBase.applyDiff(diff); - - // A diff applied to empty options should be the diff itself. - expect(empty.applyDiff(diff), diff); - // The diff from empty options should be the diff itself. - expect(diff.diffFrom(empty), diff); - // A diff applied to non-empty options should update that field. - expect(updated.colorScheme, MapColorScheme.followSystem); - // The hash code should change. - expect(empty.hashCode, isNot(diff.hashCode)); - }); }); group('isEmpty', () { @@ -657,11 +641,5 @@ void main() { expect(diff.isEmpty, false); }); - - test('is false with colorScheme', () async { - const diff = MapConfiguration(colorScheme: MapColorScheme.followSystem); - - expect(diff.isEmpty, false); - }); }); } From 583036f073b3a30eb289c64c57ecec194d0c81a3 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 18 Mar 2026 09:44:51 -0400 Subject: [PATCH 26/29] Update pubspecs --- .../google_maps_flutter_web/example/pubspec.yaml | 10 +++++----- .../google_maps_flutter_web/pubspec.yaml | 6 +----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml index ce274faca051..a82a05b9be17 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml @@ -28,9 +28,9 @@ flutter: assets: - assets/ -# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. -# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins dependency_overrides: - google_maps_flutter: {path: ../../../../packages/google_maps_flutter/google_maps_flutter} - google_maps_flutter_platform_interface: {path: ../../../../packages/google_maps_flutter/google_maps_flutter_platform_interface} - google_maps_flutter_web: {path: ../} + # Override the google_maps_flutter dependency on google_maps_flutter_web. + # TODO(ditman): Unwind the circular dependency. This will create problems + # if we need to make a breaking change to google_maps_flutter_web. + google_maps_flutter_web: + path: ../ diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml index 2c5944a78a19..423d547c4abe 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml @@ -23,7 +23,7 @@ dependencies: flutter_web_plugins: sdk: flutter google_maps: ^8.1.0 - google_maps_flutter_platform_interface: ^2.14.0 + google_maps_flutter_platform_interface: ^2.15.0 sanitize_html: ^2.0.0 stream_transform: ^2.0.0 web: ^1.0.0 @@ -40,7 +40,3 @@ topics: # The example deliberately includes limited-use secrets. false_secrets: - /example/web/index.html -# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE. -# See https://github.com/flutter/flutter/blob/master/docs/ecosystem/contributing/README.md#changing-federated-plugins -dependency_overrides: - google_maps_flutter_platform_interface: {path: ../../../packages/google_maps_flutter/google_maps_flutter_platform_interface} From 5b5556196f6e7f1301f71b97ef486131f0cdc37e Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 18 Mar 2026 09:45:02 -0400 Subject: [PATCH 27/29] Address my review comment --- .../google_maps_flutter_web/lib/src/convert.dart | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart index 315387e9b06a..5d217b8e05cc 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart @@ -176,8 +176,13 @@ gmaps.ColorScheme? _gmapTypeColorSchemeForPluginColor(MapColorScheme? scheme) { case MapColorScheme.followSystem: return gmaps.ColorScheme.FOLLOW_SYSTEM; } + // The enum comes from a different package, which could get a new value at + // any time, so provide a fallback that ensures this won't break when used + // with a version that contains new values. This is deliberately outside + // the switch rather than a `default` so that the linter will flag the + // switch as needing an update. // ignore: dead_code - return gmaps.ColorScheme.FOLLOW_SYSTEM; + return null; } gmaps.MapOptions _applyInitialPosition( From 5ec5bf99667281ca152cd33390b873b048d94110 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 18 Mar 2026 09:45:44 -0400 Subject: [PATCH 28/29] Adjust CHANGELOG wording --- .../google_maps_flutter/google_maps_flutter_web/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md index 9de65320bc7f..07df4664dc2a 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.6.2 -* Adds `colorScheme` support for web cloud-based maps styling brightness. +* Adds `colorScheme` support for controlling cloud-based map brightness. ## 0.6.1 From 23fdbedbeb638361c0c1b3492cd6645fca75f81c Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 18 Mar 2026 09:46:25 -0400 Subject: [PATCH 29/29] Remove unnecessary implementation comment --- .../google_maps_flutter_web/lib/src/convert.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart index 5d217b8e05cc..efbf2398ff49 100644 --- a/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart +++ b/packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart @@ -131,7 +131,6 @@ gmaps.MapOptions _configurationAndStyleToGmapsOptions( options.mapId = configuration.mapId; - // Convert the color scheme, if any, and set it final gmaps.ColorScheme? jsColorScheme = _gmapTypeColorSchemeForPluginColor( configuration.colorScheme, );