[google_maps_flutter] Add missing exports (#11196)

This adds exports that should have been in #7882, but I missed in review.

Like much of the `google_maps_flutter` APIs currently, advanced markers rely on clients using types that are defined in the platform interface package. This re-exports them, and fixes the examples to not import the platform interface.

Ideally we would have more separation between the API layers, but this is deeply ingrained in the API design of the plugin at this point, so changing it would require a comprehensive overhaul.

## Pre-Review Checklist

[^1]: Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling.

Author: stuartmorgan-g

packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.17.0
+
+* Adds missing re-exports of classes related to advanced markers.
+
 ## 2.16.0
 
 * Adds `colorScheme` support for web cloud-based maps styling brightness.

packages/google_maps_flutter/google_maps_flutter/example/lib/advanced_marker_icons.dart

@@ -4,7 +4,6 @@
 
 import 'package:flutter/material.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
-import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 
 import 'page.dart';
 import 'place_advanced_marker.dart';

packages/google_maps_flutter/google_maps_flutter/example/lib/advanced_markers_clustering.dart

@@ -6,7 +6,6 @@ import 'dart:math';
 
 import 'package:flutter/material.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
-import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 
 import 'clustering.dart';
 import 'page.dart';

packages/google_maps_flutter/google_maps_flutter/example/lib/collision_behavior.dart

@@ -6,7 +6,6 @@ import 'dart:math';
 
 import 'package:flutter/material.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
-import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 
 import 'page.dart';
 import 'place_advanced_marker.dart';

packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart

@@ -14,17 +14,21 @@ import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf
 
 export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart'
     show
+        AdvancedMarker,
+        AdvancedMarkerGlyph,
         ArgumentCallback,
         ArgumentCallbacks,
         AssetMapBitmap,
         BitmapDescriptor,
+        BitmapGlyph,
         BytesMapBitmap,
         CameraPosition,
         CameraPositionCallback,
         CameraTargetBounds,
         CameraUpdate,
         Cap,
         Circle,
+        CircleGlyph,
         CircleId,
         Cluster,
         ClusterManager,
@@ -45,14 +49,17 @@ export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf
         MapStyleException,
         MapType,
         Marker,
+        MarkerCollisionBehavior,
         MarkerId,
         MinMaxZoomPreference,
         PatternItem,
+        PinConfig,
         Polygon,
         PolygonId,
         Polyline,
         PolylineId,
         ScreenCoordinate,
+        TextGlyph,
         Tile,
         TileOverlay,
         TileOverlayId,

packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart

@@ -402,11 +402,12 @@ class GoogleMap extends StatefulWidget {
   ///
   /// [AdvancedMarker] and [Marker]s classes might not be related to each other
   /// in the platform implementation. It's important to set the correct
-  /// [MarkerType] so that the platform implementation can handle the markers:
-  /// * If [MarkerType.advancedMarker] is used, all markers must be of type
-  /// [AdvancedMarker].
-  /// * If [MarkerType.marker] is used, markers cannot be of type
-  /// [AdvancedMarker].
+  /// [GoogleMapMarkerType] so that the platform implementation can handle the
+  /// markers:
+  /// * If [GoogleMapMarkerType.advancedMarker] is used, all markers must be of
+  ///   type [AdvancedMarker].
+  /// * If [GoogleMapMarkerType.marker] is used, markers cannot be of type
+  ///   [AdvancedMarker].
   ///
   /// While some features work with either type, using the incorrect type
   /// may result in unexpected behavior.

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.17.0
 
 environment:
   sdk: ^3.10.0

packages/google_maps_flutter/google_maps_flutter/test/google_maps_flutter_export_test.dart

@@ -0,0 +1,71 @@
+// 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.
+
+// ignore_for_file: unnecessary_statements
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:google_maps_flutter/google_maps_flutter.dart' as main_file;
+
+void main() {
+  group('google_maps_flutter exports', () {
+    test(
+      'ensure google_maps_flutter.dart exports classes from platform interface',
+      () {
+        main_file.AdvancedMarker;
+        main_file.AdvancedMarkerGlyph;
+        main_file.ArgumentCallback;
+        main_file.ArgumentCallbacks;
+        main_file.AssetMapBitmap;
+        main_file.BitmapDescriptor;
+        main_file.BitmapGlyph;
+        main_file.BytesMapBitmap;
+        main_file.CameraPosition;
+        main_file.CameraPositionCallback;
+        main_file.CameraTargetBounds;
+        main_file.CameraUpdate;
+        main_file.Cap;
+        main_file.Circle;
+        main_file.CircleGlyph;
+        main_file.CircleId;
+        main_file.Cluster;
+        main_file.ClusterManager;
+        main_file.ClusterManagerId;
+        main_file.GroundOverlay;
+        main_file.GroundOverlayId;
+        main_file.Heatmap;
+        main_file.HeatmapGradient;
+        main_file.HeatmapGradientColor;
+        main_file.HeatmapId;
+        main_file.HeatmapRadius;
+        main_file.InfoWindow;
+        main_file.JointType;
+        main_file.LatLng;
+        main_file.LatLngBounds;
+        main_file.MapBitmapScaling;
+        main_file.MapColorScheme;
+        main_file.MapStyleException;
+        main_file.MapType;
+        main_file.Marker;
+        main_file.MarkerCollisionBehavior;
+        main_file.MarkerId;
+        main_file.MinMaxZoomPreference;
+        main_file.PatternItem;
+        main_file.PinConfig;
+        main_file.Polygon;
+        main_file.PolygonId;
+        main_file.Polyline;
+        main_file.PolylineId;
+        main_file.ScreenCoordinate;
+        main_file.TextGlyph;
+        main_file.Tile;
+        main_file.TileOverlay;
+        main_file.TileOverlayId;
+        main_file.TileProvider;
+        main_file.WebCameraControlPosition;
+        main_file.WebGestureHandling;
+        main_file.WeightedLatLng;
+      },
+    );
+  });
+}