[google_maps_flutter] enable/disable indoor view (flutter#826)

* Rebase onto master and fix conflicts

* Updates example with indoor view toggle

Author: Miguel Ruivo

packages/google_maps_flutter/CHANGELOG.md

@@ -1,7 +1,11 @@
 ## 0.5.19
 
+
+* Adds support for toggling Indoor View on or off.
+
 * Allow BitmapDescriptor scaling override
 
+
 ## 0.5.18
 
 * Fixed build issue on iOS.

packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/Convert.java

@@ -308,6 +308,10 @@ static void interpretGoogleMapOptions(Object o, GoogleMapOptionsSink sink) {
     if (myLocationButtonEnabled != null) {
       sink.setMyLocationButtonEnabled(toBoolean(myLocationButtonEnabled));
     }
+    final Object indoorEnabled = data.get("indoorEnabled");
+    if (indoorEnabled != null) {
+      sink.setIndoorEnabled(toBoolean(indoorEnabled));
+    }
   }
 
   /** Returns the dartMarkerId of the interpreted marker. */

packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java

@@ -17,6 +17,7 @@ class GoogleMapBuilder implements GoogleMapOptionsSink {
   private boolean trackCameraPosition = false;
   private boolean myLocationEnabled = false;
   private boolean myLocationButtonEnabled = false;
+  private boolean indoorEnabled = true;
   private Object initialMarkers;
   private Object initialPolygons;
   private Object initialPolylines;
@@ -30,6 +31,7 @@ GoogleMapController build(
     controller.init();
     controller.setMyLocationEnabled(myLocationEnabled);
     controller.setMyLocationButtonEnabled(myLocationButtonEnabled);
+    controller.setIndoorEnabled(indoorEnabled);
     controller.setTrackCameraPosition(trackCameraPosition);
     controller.setInitialMarkers(initialMarkers);
     controller.setInitialPolygons(initialPolygons);
@@ -98,6 +100,11 @@ public void setZoomGesturesEnabled(boolean zoomGesturesEnabled) {
     options.zoomGesturesEnabled(zoomGesturesEnabled);
   }
 
+  @Override
+  public void setIndoorEnabled(boolean indoorEnabled) {
+    this.indoorEnabled = indoorEnabled;
+  }
+
   @Override
   public void setMyLocationEnabled(boolean myLocationEnabled) {
     this.myLocationEnabled = myLocationEnabled;

packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java

@@ -72,6 +72,7 @@ final class GoogleMapController
   private boolean trackCameraPosition = false;
   private boolean myLocationEnabled = false;
   private boolean myLocationButtonEnabled = false;
+  private boolean indoorEnabled = true;
   private boolean disposed = false;
   private final float density;
   private MethodChannel.Result mapReadyResult;
@@ -166,6 +167,7 @@ private CameraPosition getCameraPosition() {
   @Override
   public void onMapReady(GoogleMap googleMap) {
     this.googleMap = googleMap;
+    this.googleMap.setIndoorEnabled(this.indoorEnabled);
     googleMap.setOnInfoWindowClickListener(this);
     if (mapReadyResult != null) {
       mapReadyResult.success(null);
@@ -635,4 +637,8 @@ private int checkSelfPermission(String permission) {
     return context.checkPermission(
         permission, android.os.Process.myPid(), android.os.Process.myUid());
   }
+
+  public void setIndoorEnabled(boolean indoorEnabled) {
+    this.indoorEnabled = indoorEnabled;
+  }
 }

packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java

@@ -32,6 +32,8 @@ interface GoogleMapOptionsSink {
 
   void setMyLocationButtonEnabled(boolean myLocationButtonEnabled);
 
+  void setIndoorEnabled(boolean indoorEnabled);
+
   void setInitialMarkers(Object initialMarkers);
 
   void setInitialPolygons(Object initialPolygons);

packages/google_maps_flutter/example/lib/map_ui.dart

@@ -48,6 +48,7 @@ class MapUiBodyState extends State<MapUiBody> {
   bool _scrollGesturesEnabled = true;
   bool _tiltGesturesEnabled = true;
   bool _zoomGesturesEnabled = true;
+  bool _indoorViewEnabled = true;
   bool _myLocationEnabled = true;
   bool _myLocationButtonEnabled = true;
   GoogleMapController _controller;
@@ -163,9 +164,21 @@ class MapUiBodyState extends State<MapUiBody> {
     );
   }
 
+  Widget _indoorViewToggler() {
+    return FlatButton(
+      child: Text('${_indoorViewEnabled ? 'disable' : 'enable'} indoor'),
+      onPressed: () {
+        setState(() {
+          _indoorViewEnabled = !_indoorViewEnabled;
+        });
+      },
+    );
+  }
+
   Widget _myLocationToggler() {
     return FlatButton(
-      child: Text('${_myLocationEnabled ? 'disable' : 'enable'} my location'),
+      child: Text(
+          '${_myLocationButtonEnabled ? 'disable' : 'enable'} my location button'),
       onPressed: () {
         setState(() {
           _myLocationEnabled = !_myLocationEnabled;
@@ -229,6 +242,7 @@ class MapUiBodyState extends State<MapUiBody> {
       scrollGesturesEnabled: _scrollGesturesEnabled,
       tiltGesturesEnabled: _tiltGesturesEnabled,
       zoomGesturesEnabled: _zoomGesturesEnabled,
+      indoorViewEnabled: _indoorViewEnabled,
       myLocationEnabled: _myLocationEnabled,
       myLocationButtonEnabled: _myLocationButtonEnabled,
       onCameraMove: _updateCameraPosition,
@@ -267,6 +281,7 @@ class MapUiBodyState extends State<MapUiBody> {
               _scrollToggler(),
               _tiltToggler(),
               _zoomToggler(),
+              _indoorViewToggler(),
               _myLocationToggler(),
               _myLocationButtonToggler(),
               _nightModeToggler(),

packages/google_maps_flutter/example/lib/place_marker.dart

@@ -31,7 +31,6 @@ typedef Marker MarkerUpdateAction(Marker marker);
 
 class PlaceMarkerBodyState extends State<PlaceMarkerBody> {
   PlaceMarkerBodyState();
-
   static final LatLng center = const LatLng(-33.86711, 151.1947171);
 
   GoogleMapController controller;

packages/google_maps_flutter/ios/Classes/GoogleMapController.h

@@ -13,6 +13,7 @@
 @protocol FLTGoogleMapOptionsSink
 - (void)setCameraTargetBounds:(GMSCoordinateBounds *)bounds;
 - (void)setCompassEnabled:(BOOL)enabled;
+- (void)setIndoorEnabled:(BOOL)enabled;
 - (void)setMapType:(GMSMapViewType)type;
 - (void)setMinZoom:(float)minZoom maxZoom:(float)maxZoom;
 - (void)setPaddingTop:(float)top left:(float)left bottom:(float)bottom right:(float)right;

packages/google_maps_flutter/ios/Classes/GoogleMapController.m

@@ -279,6 +279,10 @@ - (void)setCompassEnabled:(BOOL)enabled {
   _mapView.settings.compassButton = enabled;
 }
 
+- (void)setIndoorEnabled:(BOOL)enabled {
+  _mapView.indoorEnabled = enabled;
+}
+
 - (void)setMapType:(GMSMapViewType)mapType {
   _mapView.mapType = mapType;
 }
@@ -493,7 +497,11 @@ static void InterpretMapOptions(NSDictionary* data, id<FLTGoogleMapOptionsSink>
   if (compassEnabled) {
     [sink setCompassEnabled:ToBool(compassEnabled)];
   }
-  NSNumber* mapType = data[@"mapType"];
+  id indoorEnabled = data[@"indoorEnabled"];
+  if (indoorEnabled) {
+    [sink setIndoorEnabled:ToBool(indoorEnabled)];
+  }
+  id mapType = data[@"mapType"];
   if (mapType) {
     [sink setMapType:ToMapViewType(mapType)];
   }

packages/google_maps_flutter/lib/src/google_map.dart

@@ -33,6 +33,7 @@ class GoogleMap extends StatefulWidget {
 
     /// If no padding is specified default padding will be 0.
     this.padding = const EdgeInsets.all(0),
+    this.indoorViewEnabled = false,
     this.markers,
     this.polygons,
     this.polylines,
@@ -156,6 +157,9 @@ class GoogleMap extends StatefulWidget {
   ///   * [myLocationEnabled] parameter.
   final bool myLocationButtonEnabled;
 
+  /// Enables or disables the indoor view from the map
+  final bool indoorViewEnabled;
+
   /// Which gestures should be consumed by the map.
   ///
   /// It is possible for other gesture recognizers to be competing with the map on pointer
@@ -354,6 +358,7 @@ class _GoogleMapOptions {
     this.myLocationEnabled,
     this.myLocationButtonEnabled,
     this.padding,
+    this.indoorViewEnabled,
   });
 
   static _GoogleMapOptions fromWidget(GoogleMap map) {
@@ -370,6 +375,7 @@ class _GoogleMapOptions {
       myLocationEnabled: map.myLocationEnabled,
       myLocationButtonEnabled: map.myLocationButtonEnabled,
       padding: map.padding,
+      indoorViewEnabled: map.indoorViewEnabled,
     );
   }
 
@@ -397,6 +403,8 @@ class _GoogleMapOptions {
 
   final EdgeInsets padding;
 
+  final bool indoorViewEnabled;
+
   Map<String, dynamic> toMap() {
     final Map<String, dynamic> optionsMap = <String, dynamic>{};
 
@@ -423,6 +431,7 @@ class _GoogleMapOptions {
       padding?.bottom,
       padding?.right,
     ]);
+    addIfNonNull('indoorEnabled', indoorViewEnabled);
     return optionsMap;
   }