[google_maps_flutter] Migrate to NNBD

packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.0-nullsafety
+
+* Migrate to null-safety
+
 ## 1.2.0
 
 * Support custom tiles.

packages/google_maps_flutter/google_maps_flutter/example/integration_test/google_map_inspector.dart

@@ -1,6 +1,7 @@
 // Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
+// @dart=2.9
 
 import 'dart:typed_data';
 import 'package:flutter/services.dart';

packages/google_maps_flutter/google_maps_flutter/example/integration_test/google_maps_test.dart

@@ -1,6 +1,7 @@
 // Copyright 2019, the Chromium project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
+// @dart=2.9
 
 import 'dart:async';
 import 'dart:io';
@@ -954,10 +955,8 @@ void main() {
     final BitmapDescriptor scaled = await BitmapDescriptor.fromAssetImage(
         imageConfiguration, 'red_square.png',
         mipmaps: false);
-    // ignore: invalid_use_of_visible_for_testing_member
-    expect(mip.toJson()[2], 1);
-    // ignore: invalid_use_of_visible_for_testing_member
-    expect(scaled.toJson()[2], 2);
+    expect((mip.toJson() as List<dynamic>)[2], 1);
+    expect((scaled.toJson() as List<dynamic>)[2], 2);
   });
 
   testWidgets('testTakeSnapshot', (WidgetTester tester) async {

packages/google_maps_flutter/google_maps_flutter/example/lib/animate_camera.dart

@@ -26,7 +26,7 @@ class AnimateCamera extends StatefulWidget {
 }
 
 class AnimateCameraState extends State<AnimateCamera> {
-  GoogleMapController mapController;
+  late GoogleMapController mapController;
 
   void _onMapCreated(GoogleMapController controller) {
     mapController = controller;

packages/google_maps_flutter/google_maps_flutter/example/lib/map_click.dart

@@ -31,9 +31,9 @@ class _MapClickBody extends StatefulWidget {
 class _MapClickBodyState extends State<_MapClickBody> {
   _MapClickBodyState();
 
-  GoogleMapController mapController;
-  LatLng _lastTap;
-  LatLng _lastLongPress;
+  GoogleMapController? mapController;
+  LatLng? _lastTap;
+  LatLng? _lastLongPress;
 
   @override
   Widget build(BuildContext context) {

packages/google_maps_flutter/google_maps_flutter/example/lib/map_coordinates.dart

@@ -31,7 +31,7 @@ class _MapCoordinatesBody extends StatefulWidget {
 class _MapCoordinatesBodyState extends State<_MapCoordinatesBody> {
   _MapCoordinatesBodyState();
 
-  GoogleMapController mapController;
+  GoogleMapController? mapController;
   LatLngBounds _visibleRegion = LatLngBounds(
     southwest: const LatLng(0, 0),
     northeast: const LatLng(0, 0),
@@ -87,7 +87,7 @@ class _MapCoordinatesBodyState extends State<_MapCoordinatesBody> {
         child: const Text('Get Visible Region Bounds'),
         onPressed: () async {
           final LatLngBounds visibleRegion =
-              await mapController.getVisibleRegion();
+              await mapController!.getVisibleRegion();
           setState(() {
             _visibleRegion = visibleRegion;
           });

packages/google_maps_flutter/google_maps_flutter/example/lib/map_ui.dart

@@ -56,7 +56,7 @@ class MapUiBodyState extends State<MapUiBody> {
   bool _myLocationEnabled = true;
   bool _myTrafficEnabled = false;
   bool _myLocationButtonEnabled = true;
-  GoogleMapController _controller;
+  late GoogleMapController _controller;
   bool _nightMode = false;
 
   @override
@@ -249,10 +249,9 @@ class MapUiBodyState extends State<MapUiBody> {
     });
   }
 
+  // Should only be called if _isMapCreated is true.
   Widget _nightModeToggler() {
-    if (!_isMapCreated) {
-      return null;
-    }
+    assert(_isMapCreated);
     return TextButton(
       child: Text('${_nightMode ? 'disable' : 'enable'} night mode'),
       onPressed: () {

packages/google_maps_flutter/google_maps_flutter/example/lib/marker_icons.dart

@@ -29,8 +29,8 @@ class MarkerIconsBody extends StatefulWidget {
 const LatLng _kMapCenter = LatLng(52.4478, -3.5402);
 
 class MarkerIconsBodyState extends State<MarkerIconsBody> {
-  GoogleMapController controller;
-  BitmapDescriptor _markerIcon;
+  GoogleMapController? controller;
+  BitmapDescriptor? _markerIcon;
 
   @override
   Widget build(BuildContext context) {
@@ -48,7 +48,7 @@ class MarkerIconsBodyState extends State<MarkerIconsBody> {
                 target: _kMapCenter,
                 zoom: 7.0,
               ),
-              markers: _createMarker(),
+              markers: <Marker>{_createMarker()},
               onMapCreated: _onMapCreated,
             ),
           ),
@@ -57,17 +57,19 @@ class MarkerIconsBodyState extends State<MarkerIconsBody> {
     );
   }
 
-  Set<Marker> _createMarker() {
-    // TODO(iskakaushik): Remove this when collection literals makes it to stable.
-    // https://github.com/flutter/flutter/issues/28312
-    // ignore: prefer_collection_literals
-    return <Marker>[
-      Marker(
+  Marker _createMarker() {
+    if (_markerIcon != null) {
+      return Marker(
         markerId: MarkerId("marker_1"),
         position: _kMapCenter,
-        icon: _markerIcon,
-      ),
-    ].toSet();
+        icon: _markerIcon!,
+      );
+    } else {
+      return Marker(
+        markerId: MarkerId("marker_1"),
+        position: _kMapCenter,
+      );
+    }
   }
 
   Future<void> _createMarkerImageFromAsset(BuildContext context) async {

packages/google_maps_flutter/google_maps_flutter/example/lib/move_camera.dart

@@ -25,7 +25,7 @@ class MoveCamera extends StatefulWidget {
 }
 
 class MoveCameraState extends State<MoveCamera> {
-  GoogleMapController mapController;
+  late GoogleMapController mapController;
 
   void _onMapCreated(GoogleMapController controller) {
     mapController = controller;

packages/google_maps_flutter/google_maps_flutter/example/lib/padding.dart

@@ -27,7 +27,7 @@ class MarkerIconsBody extends StatefulWidget {
 const LatLng _kMapCenter = LatLng(52.4478, -3.5402);
 
 class MarkerIconsBodyState extends State<MarkerIconsBody> {
-  GoogleMapController controller;
+  GoogleMapController? controller;
 
   EdgeInsets _padding = const EdgeInsets.all(0);
 
@@ -152,10 +152,10 @@ class MarkerIconsBodyState extends State<MarkerIconsBody> {
             onPressed: () {
               setState(() {
                 _padding = EdgeInsets.fromLTRB(
-                    double.tryParse(_leftController.value?.text) ?? 0,
-                    double.tryParse(_topController.value?.text) ?? 0,
-                    double.tryParse(_rightController.value?.text) ?? 0,
-                    double.tryParse(_bottomController.value?.text) ?? 0);
+                    double.tryParse(_leftController.value.text) ?? 0,
+                    double.tryParse(_topController.value.text) ?? 0,
+                    double.tryParse(_rightController.value.text) ?? 0,
+                    double.tryParse(_bottomController.value.text) ?? 0);
               });
             },
           ),

packages/google_maps_flutter/google_maps_flutter/example/lib/place_circle.dart

@@ -28,10 +28,10 @@ class PlaceCircleBody extends StatefulWidget {
 class PlaceCircleBodyState extends State<PlaceCircleBody> {
   PlaceCircleBodyState();
 
-  GoogleMapController controller;
+  GoogleMapController? controller;
   Map<CircleId, Circle> circles = <CircleId, Circle>{};
   int _circleIdCounter = 1;
-  CircleId selectedCircle;
+  CircleId? selectedCircle;
 
   // Values when toggling circle color
   int fillColorsIndex = 0;
@@ -62,12 +62,14 @@ class PlaceCircleBodyState extends State<PlaceCircleBody> {
     });
   }
 
-  void _remove() {
+  void _remove(CircleId circleId) {
     setState(() {
-      if (circles.containsKey(selectedCircle)) {
-        circles.remove(selectedCircle);
+      if (circles.containsKey(circleId)) {
+        circles.remove(circleId);
+      }
+      if (circleId == selectedCircle) {
+        selectedCircle = null;
       }
-      selectedCircle = null;
     });
   }
 
@@ -100,44 +102,45 @@ class PlaceCircleBodyState extends State<PlaceCircleBody> {
     });
   }
 
-  void _toggleVisible() {
-    final Circle circle = circles[selectedCircle];
+  void _toggleVisible(CircleId circleId) {
+    final Circle circle = circles[circleId]!;
     setState(() {
-      circles[selectedCircle] = circle.copyWith(
+      circles[circleId] = circle.copyWith(
         visibleParam: !circle.visible,
       );
     });
   }
 
-  void _changeFillColor() {
-    final Circle circle = circles[selectedCircle];
+  void _changeFillColor(CircleId circleId) {
+    final Circle circle = circles[circleId]!;
     setState(() {
-      circles[selectedCircle] = circle.copyWith(
+      circles[circleId] = circle.copyWith(
         fillColorParam: colors[++fillColorsIndex % colors.length],
       );
     });
   }
 
-  void _changeStrokeColor() {
-    final Circle circle = circles[selectedCircle];
+  void _changeStrokeColor(CircleId circleId) {
+    final Circle circle = circles[circleId]!;
     setState(() {
-      circles[selectedCircle] = circle.copyWith(
+      circles[circleId] = circle.copyWith(
         strokeColorParam: colors[++strokeColorsIndex % colors.length],
       );
     });
   }
 
-  void _changeStrokeWidth() {
-    final Circle circle = circles[selectedCircle];
+  void _changeStrokeWidth(CircleId circleId) {
+    final Circle circle = circles[circleId]!;
     setState(() {
-      circles[selectedCircle] = circle.copyWith(
+      circles[circleId] = circle.copyWith(
         strokeWidthParam: widths[++widthsIndex % widths.length],
       );
     });
   }
 
   @override
   Widget build(BuildContext context) {
+    final CircleId? selectedId = selectedCircle;
     return Column(
       mainAxisAlignment: MainAxisAlignment.spaceEvenly,
       crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -171,34 +174,37 @@ class PlaceCircleBodyState extends State<PlaceCircleBody> {
                         ),
                         TextButton(
                           child: const Text('remove'),
-                          onPressed: (selectedCircle == null) ? null : _remove,
+                          onPressed: (selectedId == null)
+                              ? null
+                              : () => _remove(selectedId),
                         ),
                         TextButton(
                           child: const Text('toggle visible'),
-                          onPressed:
-                              (selectedCircle == null) ? null : _toggleVisible,
+                          onPressed: (selectedId == null)
+                              ? null
+                              : () => _toggleVisible(selectedId),
                         ),
                       ],
                     ),
                     Column(
                       children: <Widget>[
                         TextButton(
                           child: const Text('change stroke width'),
-                          onPressed: (selectedCircle == null)
+                          onPressed: (selectedId == null)
                               ? null
-                              : _changeStrokeWidth,
+                              : () => _changeStrokeWidth(selectedId),
                         ),
                         TextButton(
                           child: const Text('change stroke color'),
-                          onPressed: (selectedCircle == null)
+                          onPressed: (selectedId == null)
                               ? null
-                              : _changeStrokeColor,
+                              : () => _changeStrokeColor(selectedId),
                         ),
                         TextButton(
                           child: const Text('change fill color'),
-                          onPressed: (selectedCircle == null)
+                          onPressed: (selectedId == null)
                               ? null
-                              : _changeFillColor,
+                              : () => _changeFillColor(selectedId),
                         ),
                       ],
                     )