From ce4d92102e76f065ed056987517b5cca58f74acf Mon Sep 17 00:00:00 2001 From: Vishnu Agarwal <53317018+vishnuagbly@users.noreply.github.com> Date: Sun, 21 Feb 2021 23:35:51 +0530 Subject: [PATCH 1/8] fixed a small bug. in _onMarkerTapped function we were changing markers[markerId] to defaultMarker and than again markers[markerId] to hueGreen marker, while instead we should have changed markers[selectedMarker] to defaultMarker first instead of markers[markerId] --- .../google_maps_flutter/example/lib/place_marker.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/example/lib/place_marker.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/place_marker.dart index 576808c38a5e..4358d30810dc 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/lib/place_marker.dart +++ b/packages/google_maps_flutter/google_maps_flutter/example/lib/place_marker.dart @@ -53,10 +53,10 @@ class PlaceMarkerBodyState extends State { final Marker? tappedMarker = markers[markerId]; if (tappedMarker != null) { setState(() { - if (markers.containsKey(markerId)) { - final Marker resetOld = markers[markerId]! + if (markers.containsKey(selectedMarker)) { + final Marker resetOld = markers[selectedMarker]! .copyWith(iconParam: BitmapDescriptor.defaultMarker); - markers[markerId] = resetOld; + markers[selectedMarker] = resetOld; } selectedMarker = markerId; final Marker newMarker = tappedMarker.copyWith( From f328fd3a74278cdb0f48cdc9df09a08a5195a601 Mon Sep 17 00:00:00 2001 From: Vishnu Agarwal <53317018+vishnuagbly@users.noreply.github.com> Date: Mon, 22 Feb 2021 00:04:45 +0530 Subject: [PATCH 2/8] fixed a typing mistake --- .../google_maps_flutter/example/lib/place_marker.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/example/lib/place_marker.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/place_marker.dart index 4358d30810dc..2b7470d7dcea 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/lib/place_marker.dart +++ b/packages/google_maps_flutter/google_maps_flutter/example/lib/place_marker.dart @@ -56,7 +56,7 @@ class PlaceMarkerBodyState extends State { if (markers.containsKey(selectedMarker)) { final Marker resetOld = markers[selectedMarker]! .copyWith(iconParam: BitmapDescriptor.defaultMarker); - markers[selectedMarker] = resetOld; + markers[selectedMarker!] = resetOld; } selectedMarker = markerId; final Marker newMarker = tappedMarker.copyWith( From 725f7e8853fa61080d284337dfe2f63195b12a9d Mon Sep 17 00:00:00 2001 From: Vishnu Agarwal <53317018+vishnuagbly@users.noreply.github.com> Date: Mon, 22 Feb 2021 00:21:04 +0530 Subject: [PATCH 3/8] Update pubspec.yaml --- 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 8e9ab62d5f38..ba27e537594d 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml @@ -1,7 +1,7 @@ name: google_maps_flutter description: A Flutter plugin for integrating Google Maps in iOS and Android applications. homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter/google_maps_flutter -version: 2.0.0-nullsafety +version: 2.0.1-nullsafety dependencies: flutter: From 359bb470c8b3e57be46f998c9fca7d5e13f7edcb Mon Sep 17 00:00:00 2001 From: Vishnu Agarwal <53317018+vishnuagbly@users.noreply.github.com> Date: Mon, 22 Feb 2021 00:23:59 +0530 Subject: [PATCH 4/8] Update CHANGELOG.md --- packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md index 549aa4e06f3c..33e041a34173 100644 --- a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.1-nullsafety + +* Fix in example app to properly change marker icon. + ## 2.0.0-nullsafety * Migrate to null-safety From 353824f79681458621ff254ee2a568c44fe776e5 Mon Sep 17 00:00:00 2001 From: Vishnu Agarwal <53317018+vishnuagbly@users.noreply.github.com> Date: Mon, 22 Feb 2021 00:38:52 +0530 Subject: [PATCH 5/8] Update pubspec.yaml --- 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 ba27e537594d..fbab15231b25 100644 --- a/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/pubspec.yaml @@ -1,7 +1,7 @@ name: google_maps_flutter description: A Flutter plugin for integrating Google Maps in iOS and Android applications. homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter/google_maps_flutter -version: 2.0.1-nullsafety +version: 2.0.0-nullsafety.1 dependencies: flutter: From 437a6eb786ff5a2251906cf2345bacfaa1a2d48f Mon Sep 17 00:00:00 2001 From: Vishnu Agarwal <53317018+vishnuagbly@users.noreply.github.com> Date: Mon, 22 Feb 2021 00:44:27 +0530 Subject: [PATCH 6/8] Update CHANGELOG.md --- packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md index 33e041a34173..ef64aac534a5 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.0.1-nullsafety +## 2.0.0-nullsafety.1 * Fix in example app to properly change marker icon. From 3e612145cf2d210069c065939eb3b9bba99fdb13 Mon Sep 17 00:00:00 2001 From: Vishnu Agarwal <53317018+vishnuagbly@users.noreply.github.com> Date: Tue, 23 Feb 2021 03:13:34 +0530 Subject: [PATCH 7/8] cleaned code --- .../google_maps_flutter/example/lib/place_marker.dart | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/example/lib/place_marker.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/place_marker.dart index 2b7470d7dcea..55ff29dca0a4 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/lib/place_marker.dart +++ b/packages/google_maps_flutter/google_maps_flutter/example/lib/place_marker.dart @@ -53,10 +53,11 @@ class PlaceMarkerBodyState extends State { final Marker? tappedMarker = markers[markerId]; if (tappedMarker != null) { setState(() { - if (markers.containsKey(selectedMarker)) { - final Marker resetOld = markers[selectedMarker]! + final MarkerId? previousMarkerId = selectedMarker; + if (previousMarkerId != null && markers.containsKey(previousMarkerId)) { + final Marker resetOld = markers[previousMarkerId]! .copyWith(iconParam: BitmapDescriptor.defaultMarker); - markers[selectedMarker!] = resetOld; + markers[previousMarkerId!] = resetOld; } selectedMarker = markerId; final Marker newMarker = tappedMarker.copyWith( From e6cbe85d8410b22da52872707e72ea1ace80849f Mon Sep 17 00:00:00 2001 From: Vishnu Agarwal <53317018+vishnuagbly@users.noreply.github.com> Date: Tue, 23 Feb 2021 03:43:23 +0530 Subject: [PATCH 8/8] Update place_marker.dart --- .../google_maps_flutter/example/lib/place_marker.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter/example/lib/place_marker.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/place_marker.dart index 55ff29dca0a4..c650ca34c1b0 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/lib/place_marker.dart +++ b/packages/google_maps_flutter/google_maps_flutter/example/lib/place_marker.dart @@ -57,7 +57,7 @@ class PlaceMarkerBodyState extends State { if (previousMarkerId != null && markers.containsKey(previousMarkerId)) { final Marker resetOld = markers[previousMarkerId]! .copyWith(iconParam: BitmapDescriptor.defaultMarker); - markers[previousMarkerId!] = resetOld; + markers[previousMarkerId] = resetOld; } selectedMarker = markerId; final Marker newMarker = tappedMarker.copyWith(