From 228565bd4ff77024f9a6173aa2f3cd7ed5094a18 Mon Sep 17 00:00:00 2001 From: Kaushik Iska Date: Tue, 5 Mar 2019 11:35:50 -0800 Subject: [PATCH 1/4] trackCameraPosition is inferred from GoogleMap.onCameraMove --- .../google_maps_flutter/lib/src/google_map.dart | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/packages/google_maps_flutter/lib/src/google_map.dart b/packages/google_maps_flutter/lib/src/google_map.dart index fca62f1ca5b7..9f609c131d13 100644 --- a/packages/google_maps_flutter/lib/src/google_map.dart +++ b/packages/google_maps_flutter/lib/src/google_map.dart @@ -9,10 +9,9 @@ typedef void MapCreatedCallback(GoogleMapController controller); /// Callback that receives updates to the camera position. /// /// This callback is triggered when the platform Google Map -/// registers a camera movement. This will be called with null if -/// [GoogleMap.trackCameraPosition] is false. +/// registers a camera movement. /// -/// This is used in [GoogleMap.onCameraMove] and [GoogleMap.onMapOptionsUpdate]. +/// This is used in [GoogleMap.onCameraMove]. typedef void CameraPositionCallback(CameraPosition position); class GoogleMap extends StatefulWidget { @@ -28,7 +27,6 @@ class GoogleMap extends StatefulWidget { this.scrollGesturesEnabled = true, this.zoomGesturesEnabled = true, this.tiltGesturesEnabled = true, - this.trackCameraPosition = false, this.myLocationEnabled = false, this.markers, this.onCameraMoveStarted, @@ -67,9 +65,6 @@ class GoogleMap extends StatefulWidget { /// True if the map view should respond to tilt gestures. final bool tiltGesturesEnabled; - /// True if the map view should relay camera move events to Flutter. - final bool trackCameraPosition; - /// Markers to be placed on the map. final Set markers; @@ -81,8 +76,6 @@ class GoogleMap extends StatefulWidget { /// 2. Programmatically initiated animation. /// 3. Camera motion initiated in response to user gestures on the map. /// For example: pan, tilt, pinch to zoom, or rotate. - /// - /// Note: This is callback is called even if [trackCameraPosition] is false. final VoidCallback onCameraMoveStarted; /// Called repeatedly as the camera continues to move after an @@ -90,8 +83,6 @@ class GoogleMap extends StatefulWidget { /// /// This may be called as often as once every frame and should /// not perform expensive operations. - /// - /// This is only called if [trackCameraPosition] is true. final CameraPositionCallback onCameraMove; /// Called when camera movement has ended, there are no pending @@ -259,7 +250,7 @@ class _GoogleMapOptions { rotateGesturesEnabled: map.rotateGesturesEnabled, scrollGesturesEnabled: map.scrollGesturesEnabled, tiltGesturesEnabled: map.tiltGesturesEnabled, - trackCameraPosition: map.trackCameraPosition, + trackCameraPosition: map.onCameraMove != null, zoomGesturesEnabled: map.zoomGesturesEnabled, myLocationEnabled: map.myLocationEnabled, ); From 826a86fc19d8eba920ed7e36cd5a4070be0d5176 Mon Sep 17 00:00:00 2001 From: Kaushik Iska Date: Tue, 5 Mar 2019 11:37:01 -0800 Subject: [PATCH 2/4] Update changelog --- packages/google_maps_flutter/CHANGELOG.md | 4 ++++ packages/google_maps_flutter/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md index 36915e553bd0..cdc2002fd745 100644 --- a/packages/google_maps_flutter/CHANGELOG.md +++ b/packages/google_maps_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.5.0 + +* trackCameraPosition is inferred from GoogleMap.onCameraMove being set. + ## 0.4.0 * Change events are call backs on GoogleMap widget. diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml index 81169e44ff68..88e4f9c3dda8 100644 --- a/packages/google_maps_flutter/pubspec.yaml +++ b/packages/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. author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter -version: 0.4.0 +version: 0.5.0 dependencies: flutter: From a4b4f3fda12e1e9a1222eaab610be3835574baf3 Mon Sep 17 00:00:00 2001 From: Kaushik Iska Date: Tue, 5 Mar 2019 11:45:41 -0800 Subject: [PATCH 3/4] update test --- packages/google_maps_flutter/CHANGELOG.md | 5 +---- packages/google_maps_flutter/example/lib/map_ui.dart | 1 - packages/google_maps_flutter/pubspec.yaml | 2 +- packages/google_maps_flutter/test/google_map_test.dart | 7 +++---- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/packages/google_maps_flutter/CHANGELOG.md b/packages/google_maps_flutter/CHANGELOG.md index cdc2002fd745..f02bb0961266 100644 --- a/packages/google_maps_flutter/CHANGELOG.md +++ b/packages/google_maps_flutter/CHANGELOG.md @@ -1,11 +1,8 @@ -## 0.5.0 - -* trackCameraPosition is inferred from GoogleMap.onCameraMove being set. - ## 0.4.0 * Change events are call backs on GoogleMap widget. * GoogleMapController no longer handles change events. +* trackCameraPosition is inferred from GoogleMap.onCameraMove being set. ## 0.3.0+3 diff --git a/packages/google_maps_flutter/example/lib/map_ui.dart b/packages/google_maps_flutter/example/lib/map_ui.dart index 486d87b9073c..d3661218578e 100644 --- a/packages/google_maps_flutter/example/lib/map_ui.dart +++ b/packages/google_maps_flutter/example/lib/map_ui.dart @@ -175,7 +175,6 @@ class MapUiBodyState extends State { final GoogleMap googleMap = GoogleMap( onMapCreated: onMapCreated, initialCameraPosition: _kInitialPosition, - trackCameraPosition: true, compassEnabled: _compassEnabled, cameraTargetBounds: _cameraTargetBounds, minMaxZoomPreference: _minMaxZoomPreference, diff --git a/packages/google_maps_flutter/pubspec.yaml b/packages/google_maps_flutter/pubspec.yaml index 88e4f9c3dda8..81169e44ff68 100644 --- a/packages/google_maps_flutter/pubspec.yaml +++ b/packages/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. author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter -version: 0.5.0 +version: 0.4.0 dependencies: flutter: diff --git a/packages/google_maps_flutter/test/google_map_test.dart b/packages/google_maps_flutter/test/google_map_test.dart index 50c36744f607..d475d80952a7 100644 --- a/packages/google_maps_flutter/test/google_map_test.dart +++ b/packages/google_maps_flutter/test/google_map_test.dart @@ -303,7 +303,6 @@ void main() { textDirection: TextDirection.ltr, child: GoogleMap( initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)), - trackCameraPosition: false, ), ), ); @@ -314,11 +313,11 @@ void main() { expect(platformGoogleMap.trackCameraPosition, false); await tester.pumpWidget( - const Directionality( + Directionality( textDirection: TextDirection.ltr, child: GoogleMap( - initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)), - trackCameraPosition: true, + initialCameraPosition: const CameraPosition(target: LatLng(10.0, 15.0)), + onCameraMove: (CameraPosition position) {}, ), ), ); From 85efb224278c2a3013673be658092e85d979c1a9 Mon Sep 17 00:00:00 2001 From: Kaushik Iska Date: Tue, 5 Mar 2019 11:48:58 -0800 Subject: [PATCH 4/4] format --- packages/google_maps_flutter/test/google_map_test.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/test/google_map_test.dart b/packages/google_maps_flutter/test/google_map_test.dart index d475d80952a7..833ae0cece0f 100644 --- a/packages/google_maps_flutter/test/google_map_test.dart +++ b/packages/google_maps_flutter/test/google_map_test.dart @@ -316,7 +316,8 @@ void main() { Directionality( textDirection: TextDirection.ltr, child: GoogleMap( - initialCameraPosition: const CameraPosition(target: LatLng(10.0, 15.0)), + initialCameraPosition: + const CameraPosition(target: LatLng(10.0, 15.0)), onCameraMove: (CameraPosition position) {}, ), ),