[google_maps_flutter] Federate mobile implementations (#6171)

Author: stuartmorgan-g

.github/dependabot.yml

@@ -57,15 +57,23 @@ updates:
     open-pull-requests-limit: 10
 
   - package-ecosystem: "gradle"
-    directory: "/packages/google_maps_flutter/google_maps_flutter/android"
+    directory: "/packages/google_maps_flutter/google_maps_flutter/example/android/app"
     commit-message:
       prefix: "[google_maps]"
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
 
   - package-ecosystem: "gradle"
-    directory: "/packages/google_maps_flutter/google_maps_flutter/example/android/app"
+    directory: "/packages/google_maps_flutter/google_maps_flutter_android/android"
+    commit-message:
+      prefix: "[google_maps]"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+
+  - package-ecosystem: "gradle"
+    directory: "/packages/google_maps_flutter/google_maps_flutter_android/example/android/app"
     commit-message:
       prefix: "[google_maps]"
     schedule:

CODEOWNERS

@@ -30,7 +30,7 @@ packages/**/*_web/**                                     @ditman
 packages/camera/camera_android/**                        @camsim99
 packages/espresso/**                                     @GaryQian
 packages/flutter_plugin_android_lifecycle/**             @GaryQian
-packages/google_maps_flutter/google_maps_flutter/android/**  @GaryQian
+packages/google_maps_flutter/google_maps_flutter_android/**  @GaryQian
 packages/google_sign_in/google_sign_in_android/**        @camsim99
 packages/image_picker/image_picker_android/**            @GaryQian
 packages/in_app_purchase/in_app_purchase_android/**      @GaryQian
@@ -42,7 +42,7 @@ packages/video_player/video_player_android/**            @camsim99
 
 # - iOS
 packages/camera/camera_avfoundation/**                   @hellohuanlin
-packages/google_maps_flutter/google_maps_flutter/ios/**  @cyanglaz
+packages/google_maps_flutter/google_maps_flutter_ios/**  @cyanglaz
 packages/google_sign_in/google_sign_in_ios/**            @jmagman
 packages/image_picker/image_picker_ios/**                @cyanglaz
 packages/in_app_purchase/in_app_purchase_storekit/**     @cyanglaz

packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md

@@ -13,25 +13,14 @@ import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 import 'package:integration_test/integration_test.dart';
 
-import 'google_map_inspector.dart';
-
 const LatLng _kInitialMapCenter = LatLng(0, 0);
 const double _kInitialZoomLevel = 5;
 const CameraPosition _kInitialCameraPosition =
     CameraPosition(target: _kInitialMapCenter, zoom: _kInitialZoomLevel);
 
 void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-
-  // TODO(stuartmorgan): Remove this once mobile implementations are federated
-  // and registering their own inpector implementations, and just call
-  // enableDebugInspection.
-  if (GoogleMapsFlutterPlatform.instance is MethodChannelGoogleMapsFlutter) {
-    GoogleMapsInspectorPlatform.instance = MethodChannelGoogleMapsInspector(
-        GoogleMapsFlutterPlatform.instance as MethodChannelGoogleMapsFlutter);
-  } else {
-    GoogleMapsFlutterPlatform.instance.enableDebugInspection();
-  }
+  GoogleMapsFlutterPlatform.instance.enableDebugInspection();
 
   testWidgets('testCompassToggle', (WidgetTester tester) async {
     final Key key = GlobalKey();
@@ -474,7 +463,6 @@ void main() {
               .round());
     }
     await tester.binding.setSurfaceSize(null);
-    AndroidGoogleMapsFlutter.useAndroidViewSurface = false;
   });
 
   testWidgets('testGetVisibleRegion', (WidgetTester tester) async {

packages/google_maps_flutter/google_maps_flutter/android/settings.gradle

@@ -29,14 +29,6 @@ flutter_ios_podfile_setup
 
 target 'Runner' do
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
-  target 'RunnerTests' do
-    inherit! :search_paths
-
-    pod 'OCMock', '~> 3.9.1'
-  end
-  target 'RunnerUITests' do
-    inherit! :search_paths
-  end
 end
 
 post_install do |installer|

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

@@ -13,6 +13,7 @@ import 'dart:typed_data';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
+import 'package:google_maps_flutter_android/google_maps_flutter_android.dart';
 import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 
 export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart'

packages/google_maps_flutter/google_maps_flutter/example/ios/Podfile

@@ -40,6 +40,9 @@ class UnknownMapObjectIdError extends Error {
 }
 
 /// Android specific settings for [GoogleMap].
+// TODO(stuartmorgan): Deprecate this in favor of pointing people who want to
+// change this to using the Android implementation Dart class directly. This
+// should be done as part of switching the default to hybrid composition.
 class AndroidGoogleMapsFlutter {
   AndroidGoogleMapsFlutter._();
 
@@ -55,7 +58,7 @@ class AndroidGoogleMapsFlutter {
   static bool get useAndroidViewSurface {
     final GoogleMapsFlutterPlatform platform =
         GoogleMapsFlutterPlatform.instance;
-    if (platform is MethodChannelGoogleMapsFlutter) {
+    if (platform is GoogleMapsFlutterAndroid) {
       return platform.useAndroidViewSurface;
     }
     return false;
@@ -73,7 +76,7 @@ class AndroidGoogleMapsFlutter {
   static set useAndroidViewSurface(bool useAndroidViewSurface) {
     final GoogleMapsFlutterPlatform platform =
         GoogleMapsFlutterPlatform.instance;
-    if (platform is MethodChannelGoogleMapsFlutter) {
+    if (platform is GoogleMapsFlutterAndroid) {
       platform.useAndroidViewSurface = useAndroidViewSurface;
     }
   }

packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart

@@ -3,6 +3,9 @@ description: A Flutter plugin for integrating Google Maps in iOS and Android app
 repository: https://github.com/flutter/plugins/tree/main/packages/google_maps_flutter/google_maps_flutter
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
 version: 2.1.10
+# Temporarily disable publishing to allow moving Android and iOS
+# implementations.
+publish_to: none
 
 environment:
   sdk: ">=2.14.0 <3.0.0"
@@ -12,15 +15,18 @@ flutter:
   plugin:
     platforms:
       android:
-        package: io.flutter.plugins.googlemaps
-        pluginClass: GoogleMapsPlugin
+        default_package: google_maps_flutter_android
       ios:
-        pluginClass: FLTGoogleMapsPlugin
+        default_package: google_maps_flutter_ios
 
 dependencies:
   flutter:
     sdk: flutter
-  flutter_plugin_android_lifecycle: ^2.0.1
+  # Temporary path dependencies to allow moving Android and iOS implementations.
+  google_maps_flutter_android:
+    path: ../google_maps_flutter_android
+  google_maps_flutter_ios:
+    path: ../google_maps_flutter_ios
   google_maps_flutter_platform_interface: ^2.2.1
 
 dev_dependencies:

packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart

@@ -6,7 +6,6 @@ import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
-import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 
 import 'fake_maps_controllers.dart';
 
@@ -588,38 +587,4 @@ void main() {
 
     expect(platformGoogleMap.buildingsEnabled, true);
   });
-
-  testWidgets(
-    'Default Android widget is AndroidView',
-    (WidgetTester tester) async {
-      await tester.pumpWidget(
-        const Directionality(
-          textDirection: TextDirection.ltr,
-          child: GoogleMap(
-            initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
-          ),
-        ),
-      );
-
-      expect(find.byType(AndroidView), findsOneWidget);
-    },
-  );
-
-  testWidgets('Use PlatformViewLink on Android', (WidgetTester tester) async {
-    final MethodChannelGoogleMapsFlutter platform =
-        GoogleMapsFlutterPlatform.instance as MethodChannelGoogleMapsFlutter;
-    platform.useAndroidViewSurface = true;
-
-    await tester.pumpWidget(
-      const Directionality(
-        textDirection: TextDirection.ltr,
-        child: GoogleMap(
-          initialCameraPosition: CameraPosition(target: LatLng(10.0, 15.0)),
-        ),
-      ),
-    );
-
-    expect(find.byType(PlatformViewLink), findsOneWidget);
-    platform.useAndroidViewSurface = false;
-  });
 }