[google_maps_flutter] My location button and my location fixes

AUTHORS

@@ -42,6 +42,7 @@ Debkanchan Samadder <[email protected]>
 Audrius Karosevicius <[email protected]>
 Lukasz Piliszczuk <[email protected]>
 SoundReply Solutions GmbH <[email protected]>
+Iurii Dorofeev <[email protected]>
 Rafal Wachol <[email protected]>
 Pau Picas <[email protected]>
 Christian Weder <[email protected]>

packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.6
+
+* Fix references to `myLocationButtonEnabled` in test and example app.
+* Added `isMyLocationEnabled` to `GoogleMapsInspector`.
+
 ## 1.0.5
 
 Overhaul lifecycle management in GoogleMapsPlugin.

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

@@ -347,6 +347,11 @@ public void onSnapshotReady(Bitmap bitmap) {
           result.success(googleMap.getUiSettings().isRotateGesturesEnabled());
           break;
         }
+      case "map#isMyLocationEnabled":
+        {
+          result.success(googleMap.isMyLocationEnabled());
+          break;
+        }
       case "map#isMyLocationButtonEnabled":
         {
           result.success(googleMap.getUiSettings().isMyLocationButtonEnabled());

packages/google_maps_flutter/google_maps_flutter/example/integration_test/google_map_inspector.dart

@@ -61,6 +61,10 @@ class GoogleMapInspector {
     return await _channel.invokeMethod<bool>('map#isScrollGesturesEnabled');
   }
 
+  Future<bool> isMyLocationEnabled() async {
+    return await _channel.invokeMethod<bool>('map#isMyLocationEnabled');
+  }
+
   Future<bool> isMyLocationButtonEnabled() async {
     return await _channel.invokeMethod<bool>('map#isMyLocationButtonEnabled');
   }

packages/google_maps_flutter/google_maps_flutter/example/integration_test/google_maps_test.dart

@@ -541,6 +541,57 @@ void main() {
     expect(secondVisibleRegion.contains(newCenter), isTrue);
   });
 
+  testWidgets('testMyLocation', (WidgetTester tester) async {
+    final Key key = GlobalKey();
+    final Completer<GoogleMapInspector> inspectorCompleter =
+        Completer<GoogleMapInspector>();
+
+    await tester.pumpWidget(Directionality(
+      textDirection: TextDirection.ltr,
+      child: GoogleMap(
+        key: key,
+        initialCameraPosition: _kInitialCameraPosition,
+        myLocationEnabled: true,
+        myLocationButtonEnabled: true,
+        onMapCreated: (GoogleMapController controller) {
+          final GoogleMapInspector inspector =
+              // ignore: invalid_use_of_visible_for_testing_member
+              GoogleMapInspector(controller.channel);
+          inspectorCompleter.complete(inspector);
+        },
+      ),
+    ));
+
+    GoogleMapInspector inspector = await inspectorCompleter.future;
+    bool myLocationEnabled = await inspector.isMyLocationEnabled();
+    expect(myLocationEnabled, true);
+    bool myLocationButtonEnabled = await inspector.isMyLocationButtonEnabled();
+    expect(myLocationButtonEnabled, true);
+
+    await tester.pumpWidget(Directionality(
+      textDirection: TextDirection.ltr,
+      child: GoogleMap(
+        key: key,
+        initialCameraPosition: _kInitialCameraPosition,
+        myLocationEnabled: false,
+        myLocationButtonEnabled: false,
+        onMapCreated: (GoogleMapController controller) {
+          final GoogleMapInspector inspector =
+              // ignore: invalid_use_of_visible_for_testing_member
+              GoogleMapInspector(controller.channel);
+          inspectorCompleter.complete(inspector);
+        },
+      ),
+    ));
+
+    inspector = await inspectorCompleter.future;
+    myLocationEnabled = await inspector.isMyLocationEnabled();
+    expect(myLocationEnabled, false);
+    myLocationButtonEnabled = await inspector.isMyLocationButtonEnabled();
+    expect(myLocationButtonEnabled, false);
+  }, skip: true);
+  //TODO: Remove `skip' when https://github.com/flutter/flutter/issues/12561 will be fixed
+
   testWidgets('testTraffic', (WidgetTester tester) async {
     final Key key = GlobalKey();
     final Completer<GoogleMapInspector> inspectorCompleter =

packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapController.m

@@ -324,6 +324,9 @@ - (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
   } else if ([call.method isEqualToString:@"map#isScrollGesturesEnabled"]) {
     NSNumber* isScrollGesturesEnabled = @(_mapView.settings.scrollGestures);
     result(isScrollGesturesEnabled);
+  } else if ([call.method isEqualToString:@"map#isMyLocationEnabled"]) {
+    NSNumber* isMyLocationEnabled = @(_mapView.myLocationEnabled);
+    result(isMyLocationEnabled);
   } else if ([call.method isEqualToString:@"map#isMyLocationButtonEnabled"]) {
     NSNumber* isMyLocationButtonEnabled = @(_mapView.settings.myLocationButton);
     result(isMyLocationButtonEnabled);

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: 1.0.5
+version: 1.0.6
 
 dependencies:
   flutter:

packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart

@@ -451,27 +451,27 @@ void main() {
         textDirection: TextDirection.ltr,
         child: GoogleMap(
           initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
-          myLocationEnabled: false,
+          myLocationButtonEnabled: false,
         ),
       ),
     );
 
     final FakePlatformGoogleMap platformGoogleMap =
         fakePlatformViewsController.lastCreatedView;
 
-    expect(platformGoogleMap.myLocationButtonEnabled, true);
+    expect(platformGoogleMap.myLocationButtonEnabled, false);
 
     await tester.pumpWidget(
       const Directionality(
         textDirection: TextDirection.ltr,
         child: GoogleMap(
           initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
-          myLocationButtonEnabled: false,
+          myLocationButtonEnabled: true,
         ),
       ),
     );
 
-    expect(platformGoogleMap.myLocationButtonEnabled, false);
+    expect(platformGoogleMap.myLocationButtonEnabled, true);
   });
 
   testWidgets('Is default padding 0', (WidgetTester tester) async {