Merge pull request #12 from toru-matsushita/master

Added zoomControlsEnabled flag

Author: LuisThein

example/pubspec.lock

@@ -80,8 +80,8 @@ packages:
       name: google_maps_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.27"
-  google_maps_flutter_platform_interface:
+    version: "0.5.28+1"
+  image:
     dependency: transitive
     description:
       name: google_maps_flutter_platform_interface

lib/src/camera.dart

@@ -80,6 +80,8 @@ class CameraPosition {
 }
 
 class CameraUpdate {
+  CameraUpdate._(this._json);
+
   static newCameraPosition(CameraPosition cameraPosition) {
     if (Platform.isIOS) {
       return appleMaps.CameraUpdate.newCameraPosition(
@@ -137,4 +139,9 @@ class CameraUpdate {
       return googleMaps.CameraUpdate.zoomTo(zoom);
     }
   }
+
+  final dynamic _json;
+
+  /// Converts this object to something serializable in JSON.
+  dynamic toJson() => _json;
 }

lib/src/platform_maps.dart

@@ -16,6 +16,7 @@ class PlatformMap extends StatefulWidget {
     this.padding,
     this.rotateGesturesEnabled = true,
     this.scrollGesturesEnabled = true,
+    this.zoomControlsEnabled = true,
     this.zoomGesturesEnabled = true,
     this.tiltGestureEnabled = true,
     this.myLocationEnabled = false,
@@ -58,6 +59,12 @@ class PlatformMap extends StatefulWidget {
   /// True if the map view should respond to scroll gestures.
   final bool scrollGesturesEnabled;
 
+  /// True if the map view should show zoom controls. This includes two buttons
+  /// to zoom in and zoom out. The default value is to show zoom controls.
+  ///
+  /// This is only supported on Android. And this field is silently ignored on iOS.
+  final bool zoomControlsEnabled;
+
   /// True if the map view should respond to zoom gestures.
   final bool zoomGesturesEnabled;
 
@@ -189,6 +196,7 @@ class _PlatformMapState extends State<PlatformMap> {
         onCameraMoveStarted: widget.onCameraMoveStarted,
         tiltGesturesEnabled: widget.tiltGestureEnabled,
         rotateGesturesEnabled: widget.rotateGesturesEnabled,
+        zoomControlsEnabled: widget.zoomControlsEnabled,
         zoomGesturesEnabled: widget.zoomGesturesEnabled,
         scrollGesturesEnabled: widget.scrollGesturesEnabled,
         onMapCreated: _onMapCreated,

lib/src/ui.dart

@@ -36,4 +36,7 @@ class MinMaxZoomPreference {
 
   googleMaps.MinMaxZoomPreference get googleMapsZoomPreference =>
       googleMaps.MinMaxZoomPreference(this.maxZoom, this.maxZoom);
+
+  /// Converts this object to something serializable in JSON.
+  dynamic toJson() => <dynamic>[minZoom, maxZoom];
 }

pubspec.lock

@@ -73,8 +73,8 @@ packages:
       name: google_maps_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.27"
-  google_maps_flutter_platform_interface:
+    version: "0.5.28+1"
+  image:
     dependency: transitive
     description:
       name: google_maps_flutter_platform_interface

pubspec.yaml

@@ -12,7 +12,7 @@ dependencies:
   flutter:
     sdk: flutter
 
-  google_maps_flutter: ^0.5.21+7
+  google_maps_flutter: ^0.5.28+1
 
   apple_maps_flutter: ^0.1.1+1