Make mapId not global (examples)

Author: aednlaxer

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

@@ -5,31 +5,36 @@
 import 'package:flutter/material.dart';
 import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 
-import 'main.dart' as main;
 import 'marker_icons.dart';
 import 'page.dart';
 
 /// Page that demonstrates how to use custom [AdvanceMarker] icons.
 class AdvancedMarkerIconsPage extends GoogleMapExampleAppPage {
   /// Default constructor.
-  const AdvancedMarkerIconsPage({Key? key})
-      : super(
+  const AdvancedMarkerIconsPage({
+    Key? key,
+    required this.mapId,
+  }) : super(
           key: key,
           const Icon(Icons.image_outlined),
           'Advanced marker icons',
         );
 
+  /// Map ID to use for the GoogleMap.
+  final String? mapId;
+
   @override
   Widget build(BuildContext context) {
-    return const _AdvancedMarkerIconsBody();
+    return _AdvancedMarkerIconsBody(mapId);
   }
 }
 
 class _AdvancedMarkerIconsBody extends MarkerIconsBody {
-  const _AdvancedMarkerIconsBody();
+  const _AdvancedMarkerIconsBody(this.mapId);
 
+  /// Map ID to use for the GoogleMap.
   @override
-  String? get mapId => main.mapId;
+  final String? mapId;
 
   @override
   Marker createMarker(

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

@@ -6,32 +6,37 @@ import 'package:flutter/material.dart';
 import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 
 import 'clustering.dart';
-import 'main.dart' as main;
 import 'page.dart';
 
 /// Page for demonstrating advanced marker clustering support.
 /// Same as [ClusteringPage] but works with [AdvancedMarker].
 class AdvancedMarkersClustering extends GoogleMapExampleAppPage {
   /// Default constructor.
-  const AdvancedMarkersClustering({Key? key})
-      : super(
+  const AdvancedMarkersClustering({
+    Key? key,
+    required this.mapId,
+  }) : super(
           key: key,
           const Icon(Icons.place_outlined),
           'Manage clusters of advanced markers',
         );
 
+  /// Map ID to use for the GoogleMap.
+  final String? mapId;
+
   @override
   Widget build(BuildContext context) {
-    return const _AdvancedMarkerClusteringBody();
+    return _AdvancedMarkerClusteringBody(mapId);
   }
 }
 
 /// Same as [ClusteringBody] but works with [AdvancedMarker].
 class _AdvancedMarkerClusteringBody extends ClusteringBody {
-  const _AdvancedMarkerClusteringBody();
+  const _AdvancedMarkerClusteringBody(this.mapId);
 
+  /// Map ID to use for the GoogleMap.
   @override
-  String? get mapId => main.mapId;
+  final String? mapId;
 
   @override
   Marker createMarker({

packages/google_maps_flutter/google_maps_flutter/example/lib/main.dart

@@ -33,8 +33,7 @@ import 'snapshot.dart';
 import 'tile_overlay.dart';
 
 /// Map ID is required for some examples to use advanced markers.
-// ignore: unnecessary_nullable_for_final_variable_declarations, unreachable_from_main
-const String? mapId = null;
+const String? _mapId = null;
 
 final List<GoogleMapExampleAppPage> _allPages = <GoogleMapExampleAppPage>[
   const MapUiPage(),
@@ -43,9 +42,9 @@ final List<GoogleMapExampleAppPage> _allPages = <GoogleMapExampleAppPage>[
   const AnimateCameraPage(),
   const MoveCameraPage(),
   const PlaceMarkerPage(),
-  const PlaceAdvancedMarkerPage(),
+  const PlaceAdvancedMarkerPage(mapId: _mapId),
   const MarkerIconsPage(),
-  const AdvancedMarkerIconsPage(),
+  const AdvancedMarkerIconsPage(mapId: _mapId),
   const ScrollingMapPage(),
   const PlacePolylinePage(),
   const PlacePolygonPage(),
@@ -56,7 +55,7 @@ final List<GoogleMapExampleAppPage> _allPages = <GoogleMapExampleAppPage>[
   const TileOverlayPage(),
   const GroundOverlayPage(),
   const ClusteringPage(),
-  const AdvancedMarkersClustering(),
+  const AdvancedMarkersClustering(mapId: _mapId),
   const MapIdPage(),
   const HeatmapPage(),
 ];

packages/google_maps_flutter/google_maps_flutter/example/lib/place_advanced_marker.dart

@@ -5,34 +5,38 @@
 import 'package:flutter/material.dart';
 import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 
-import 'main.dart' as main;
 import 'page.dart';
 import 'place_marker.dart';
 
 /// Page demonstrating how to use Advanced [Marker] class.
 class PlaceAdvancedMarkerPage extends GoogleMapExampleAppPage {
   /// Default constructor.
-  const PlaceAdvancedMarkerPage({Key? key})
-      : super(const Icon(Icons.place_outlined), 'Place advanced marker',
-            key: key);
+  const PlaceAdvancedMarkerPage({
+    Key? key,
+    required this.mapId,
+  }) : super(
+          const Icon(Icons.place_outlined),
+          'Place advanced marker',
+          key: key,
+        );
+
+  /// Map ID to use for the GoogleMap.
+  final String? mapId;
 
   @override
   Widget build(BuildContext context) {
-    return const _PlaceAdvancedMarkerBody();
+    return _PlaceAdvancedMarkerBody(mapId: mapId);
   }
 }
 
 class _PlaceAdvancedMarkerBody extends PlaceMarkerBody {
-  const _PlaceAdvancedMarkerBody();
+  const _PlaceAdvancedMarkerBody({required super.mapId});
 
   @override
   State<StatefulWidget> createState() => _PlaceAdvancedMarkerBodyState();
 }
 
 class _PlaceAdvancedMarkerBodyState extends PlaceMarkerBodyState {
-  @override
-  String? get mapId => main.mapId;
-
   @override
   Marker createMarker({
     required MarkerId markerId,

packages/google_maps_flutter/google_maps_flutter/example/lib/place_marker.dart

@@ -26,7 +26,13 @@ class PlaceMarkerPage extends GoogleMapExampleAppPage {
 }
 
 class PlaceMarkerBody extends StatefulWidget {
-  const PlaceMarkerBody({super.key});
+  const PlaceMarkerBody({
+    super.key,
+    this.mapId,
+  });
+
+  /// Map ID to use for the GoogleMap.
+  final String? mapId;
 
   @override
   State<StatefulWidget> createState() => PlaceMarkerBodyState();
@@ -270,9 +276,6 @@ class PlaceMarkerBodyState extends State<PlaceMarkerBody> {
     return BytesMapBitmap(bytes.buffer.asUint8List());
   }
 
-  /// Returns the mapId to use for the GoogleMap
-  String? get mapId => null;
-
   /// Creates a marker with given parameters
   Marker createMarker({
     required MarkerId markerId,
@@ -315,9 +318,10 @@ class PlaceMarkerBodyState extends State<PlaceMarkerBody> {
           getHeader(),
           Expanded(
             child: GoogleMap(
-              mapId: mapId,
-              markerType:
-                  mapId != null ? MarkerType.advancedMarker : MarkerType.marker,
+              mapId: widget.mapId,
+              markerType: widget.mapId != null
+                  ? MarkerType.advancedMarker
+                  : MarkerType.marker,
               onMapCreated: _onMapCreated,
               initialCameraPosition: const CameraPosition(
                 target: LatLng(-33.852, 151.211),

packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/lib/main.dart

@@ -28,8 +28,7 @@ import 'package:maps_example_dart/snapshot.dart';
 import 'package:maps_example_dart/tile_overlay.dart';
 
 /// Map ID is required for some examples to use advanced markers.
-// ignore: unnecessary_nullable_for_final_variable_declarations, unreachable_from_main
-const String? mapId = null;
+const String? _mapId = null;
 
 void main() {
   runApp(const MaterialApp(
@@ -40,9 +39,9 @@ void main() {
     AnimateCameraPage(),
     MoveCameraPage(),
     PlaceMarkerPage(),
-    PlaceAdvancedMarkerPage(mapId: mapId),
+    PlaceAdvancedMarkerPage(mapId: _mapId),
     MarkerIconsPage(),
-    AdvancedMarkerIconsPage(mapId: mapId),
+    AdvancedMarkerIconsPage(mapId: _mapId),
     ScrollingMapPage(),
     PlacePolylinePage(),
     PlacePolygonPage(),
@@ -53,7 +52,7 @@ void main() {
     TileOverlayPage(),
     GroundOverlayPage(),
     ClusteringPage(),
-    AdvancedMarkersClusteringPage(mapId: mapId),
+    AdvancedMarkersClusteringPage(mapId: _mapId),
     MapIdPage(),
   ])));
 }

packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/lib/main.dart

@@ -28,8 +28,7 @@ import 'package:maps_example_dart/snapshot.dart';
 import 'package:maps_example_dart/tile_overlay.dart';
 
 /// Map ID is required for some examples to use advanced markers.
-// ignore: unnecessary_nullable_for_final_variable_declarations, unreachable_from_main
-const String? mapId = null;
+const String? _mapId = null;
 
 void main() {
   runApp(const MaterialApp(
@@ -40,9 +39,9 @@ void main() {
     AnimateCameraPage(),
     MoveCameraPage(),
     PlaceMarkerPage(),
-    PlaceAdvancedMarkerPage(mapId: mapId),
+    PlaceAdvancedMarkerPage(mapId: _mapId),
     MarkerIconsPage(),
-    AdvancedMarkerIconsPage(mapId: mapId),
+    AdvancedMarkerIconsPage(mapId: _mapId),
     ScrollingMapPage(),
     PlacePolylinePage(),
     PlacePolygonPage(),
@@ -53,7 +52,7 @@ void main() {
     TileOverlayPage(),
     GroundOverlayPage(),
     ClusteringPage(),
-    AdvancedMarkersClusteringPage(mapId: mapId),
+    AdvancedMarkersClusteringPage(mapId: _mapId),
     MapIdPage(),
   ])));
 }

packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/lib/advanced_marker_icons.dart

@@ -18,7 +18,7 @@ class AdvancedMarkerIconsPage extends GoogleMapExampleAppPage {
           'Advanced marker icons',
         );
 
-  /// Map ID to use for the GoogleMap
+  /// Map ID to use for the GoogleMap.
   final String? mapId;
 
   @override

packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/lib/advanced_markers_clustering.dart

@@ -19,7 +19,7 @@ class AdvancedMarkersClusteringPage extends GoogleMapExampleAppPage {
           'Manage clusters of advanced markers',
         );
 
-  /// Map ID to use for the GoogleMap
+  /// Map ID to use for the GoogleMap.
   final String? mapId;
 
   @override

packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/lib/place_advanced_marker.dart

@@ -17,7 +17,7 @@ class PlaceAdvancedMarkerPage extends GoogleMapExampleAppPage {
   }) : super(const Icon(Icons.place_outlined), 'Place advanced marker',
             key: key);
 
-  /// Map ID to use for the GoogleMap
+  /// Map ID to use for the GoogleMap.
   final String? mapId;
 
   @override