Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[google_maps_flutter] Migrate to NNBD #3548

Merged
stuartmorgan-g merged 23 commits into from
Feb 19, 2021
Merged

[google_maps_flutter] Migrate to NNBD #3548

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
8ad7f8f
Deps and version updates
stuartmorgan-g Feb 10, 2021
74af2db
Initial cleanup and annotation
stuartmorgan-g Feb 10, 2021
31f3487
Initial apply
stuartmorgan-g Feb 10, 2021
675c88f
Replace Mockito and get the tests passing
stuartmorgan-g Feb 11, 2021
40b9700
Fix from migrating example
stuartmorgan-g Feb 11, 2021
0afb179
annotations
stuartmorgan-g Feb 11, 2021
f7a1a66
Initial migration
stuartmorgan-g Feb 11, 2021
54663a1
Compilation fix
stuartmorgan-g Feb 11, 2021
70f47f7
Adjust for last review changes to interface
stuartmorgan-g Feb 14, 2021
f08ab99
Point to published interface
stuartmorgan-g Feb 15, 2021
7c0a00c
Minor cleanup
stuartmorgan-g Feb 15, 2021
55dcb8a
Revert bogus tool change
stuartmorgan-g Feb 15, 2021
9afdc93
Remove maps from non-NNBD list
stuartmorgan-g Feb 15, 2021
b60eee9
Autoformat
stuartmorgan-g Feb 15, 2021
b5d4514
CHANGELOG fix
stuartmorgan-g Feb 15, 2021
05089e8
Merge branch 'master' into maps-nnbd-appfacing
stuartmorgan-g Feb 16, 2021
8dc2ae2
Pick up deserialization fix
stuartmorgan-g Feb 16, 2021
99c36f3
Don't build maps web with NNBD plugins
stuartmorgan-g Feb 16, 2021
ede5244
Merge branch 'master' into maps-nnbd-appfacing
stuartmorgan-g Feb 16, 2021
6bc0a2f
Fix incorrect 'late's
stuartmorgan-g Feb 16, 2021
41963c8
Review fixes
stuartmorgan-g Feb 17, 2021
a5598a9
Address final review feedback
stuartmorgan-g Feb 17, 2021
77a1348
Remove pointless assert
stuartmorgan-g Feb 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix incorrect 'late's
  • Loading branch information
@stuartmorgan-g
stuartmorgan-g committed Feb 16, 2021
commit 6bc0a2f76ce6e7818f68dd3e49bd58a56dc94e6e
22 changes: 11 additions & 11 deletions packages/google_maps_flutter/google_maps_flutter/example/lib/animate_camera.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class AnimateCamera extends StatefulWidget {
}

class AnimateCameraState extends State<AnimateCamera> {
late GoogleMapController mapController;
GoogleMapController? mapController;

void _onMapCreated(GoogleMapController controller) {
mapController = controller;
Expand Down Expand Up @@ -56,7 +56,7 @@ class AnimateCameraState extends State<AnimateCamera> {
children: <Widget>[
TextButton(
onPressed: () {
mapController.animateCamera(
mapController?.animateCamera(
CameraUpdate.newCameraPosition(
const CameraPosition(
bearing: 270.0,
Expand All @@ -71,7 +71,7 @@ class AnimateCameraState extends State<AnimateCamera> {
),
TextButton(
onPressed: () {
mapController.animateCamera(
mapController?.animateCamera(
CameraUpdate.newLatLng(
const LatLng(56.1725505, 10.1850512),
),
Expand All @@ -81,7 +81,7 @@ class AnimateCameraState extends State<AnimateCamera> {
),
TextButton(
onPressed: () {
mapController.animateCamera(
mapController?.animateCamera(
CameraUpdate.newLatLngBounds(
LatLngBounds(
southwest: const LatLng(-38.483935, 113.248673),
Expand All @@ -95,7 +95,7 @@ class AnimateCameraState extends State<AnimateCamera> {
),
TextButton(
onPressed: () {
mapController.animateCamera(
mapController?.animateCamera(
CameraUpdate.newLatLngZoom(
const LatLng(37.4231613, -122.087159),
11.0,
Expand All @@ -106,7 +106,7 @@ class AnimateCameraState extends State<AnimateCamera> {
),
TextButton(
onPressed: () {
mapController.animateCamera(
mapController?.animateCamera(
CameraUpdate.scrollBy(150.0, -225.0),
);
},
Expand All @@ -118,7 +118,7 @@ class AnimateCameraState extends State<AnimateCamera> {
children: <Widget>[
TextButton(
onPressed: () {
mapController.animateCamera(
mapController?.animateCamera(
CameraUpdate.zoomBy(
-0.5,
const Offset(30.0, 20.0),
Expand All @@ -129,31 +129,31 @@ class AnimateCameraState extends State<AnimateCamera> {
),
TextButton(
onPressed: () {
mapController.animateCamera(
mapController?.animateCamera(
CameraUpdate.zoomBy(-0.5),
);
},
child: const Text('zoomBy'),
),
TextButton(
onPressed: () {
mapController.animateCamera(
mapController?.animateCamera(
CameraUpdate.zoomIn(),
);
},
child: const Text('zoomIn'),
),
TextButton(
onPressed: () {
mapController.animateCamera(
mapController?.animateCamera(
CameraUpdate.zoomOut(),
);
},
child: const Text('zoomOut'),
),
TextButton(
onPressed: () {
mapController.animateCamera(
mapController?.animateCamera(
CameraUpdate.zoomTo(16.0),
);
},
Expand Down
22 changes: 11 additions & 11 deletions packages/google_maps_flutter/google_maps_flutter/example/lib/move_camera.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class MoveCamera extends StatefulWidget {
}

class MoveCameraState extends State<MoveCamera> {
late GoogleMapController mapController;
GoogleMapController? mapController;

void _onMapCreated(GoogleMapController controller) {
mapController = controller;
Expand Down Expand Up @@ -55,7 +55,7 @@ class MoveCameraState extends State<MoveCamera> {
children: <Widget>[
TextButton(
onPressed: () {
mapController.moveCamera(
mapController?.moveCamera(
CameraUpdate.newCameraPosition(
const CameraPosition(
bearing: 270.0,
Expand All @@ -70,7 +70,7 @@ class MoveCameraState extends State<MoveCamera> {
),
TextButton(
onPressed: () {
mapController.moveCamera(
mapController?.moveCamera(
CameraUpdate.newLatLng(
const LatLng(56.1725505, 10.1850512),
),
Expand All @@ -80,7 +80,7 @@ class MoveCameraState extends State<MoveCamera> {
),
TextButton(
onPressed: () {
mapController.moveCamera(
mapController?.moveCamera(
CameraUpdate.newLatLngBounds(
LatLngBounds(
southwest: const LatLng(-38.483935, 113.248673),
Expand All @@ -94,7 +94,7 @@ class MoveCameraState extends State<MoveCamera> {
),
TextButton(
onPressed: () {
mapController.moveCamera(
mapController?.moveCamera(
CameraUpdate.newLatLngZoom(
const LatLng(37.4231613, -122.087159),
11.0,
Expand All @@ -105,7 +105,7 @@ class MoveCameraState extends State<MoveCamera> {
),
TextButton(
onPressed: () {
mapController.moveCamera(
mapController?.moveCamera(
CameraUpdate.scrollBy(150.0, -225.0),
);
},
Expand All @@ -117,7 +117,7 @@ class MoveCameraState extends State<MoveCamera> {
children: <Widget>[
TextButton(
onPressed: () {
mapController.moveCamera(
mapController?.moveCamera(
CameraUpdate.zoomBy(
-0.5,
const Offset(30.0, 20.0),
Expand All @@ -128,31 +128,31 @@ class MoveCameraState extends State<MoveCamera> {
),
TextButton(
onPressed: () {
mapController.moveCamera(
mapController?.moveCamera(
CameraUpdate.zoomBy(-0.5),
);
},
child: const Text('zoomBy'),
),
TextButton(
onPressed: () {
mapController.moveCamera(
mapController?.moveCamera(
CameraUpdate.zoomIn(),
);
},
child: const Text('zoomIn'),
),
TextButton(
onPressed: () {
mapController.moveCamera(
mapController?.moveCamera(
CameraUpdate.zoomOut(),
);
},
child: const Text('zoomOut'),
),
TextButton(
onPressed: () {
mapController.moveCamera(
mapController?.moveCamera(
CameraUpdate.zoomTo(16.0),
);
},
Expand Down