Remove references to v1 embedding for compatibility with Flutter 3.29

Inspired from flutter/packages#6494

Author: mauriziopinotti

.gitignore

@@ -0,0 +1 @@
+.idea/

flutter-hms-map/android/src/main/java/com/huawei/hms/flutter/map/HmsMap.java

@@ -92,7 +92,7 @@ public void onAttachedToActivity(@NonNull ActivityPluginBinding activityPluginBi
         flutterPluginBinding.getPlatformViewRegistry()
             .registerViewFactory(Channel.CHANNEL,
                 new MapFactory(state, flutterPluginBinding.getBinaryMessenger(), activityPluginBinding.getActivity(),
-                    lifecycle, null, activityPluginBinding.getActivity().hashCode()));
+                    lifecycle, activityPluginBinding.getActivity().hashCode()));
     }
 
     @Override

flutter-hms-map/android/src/main/java/com/huawei/hms/flutter/map/map/MapBuilder.java

@@ -98,9 +98,9 @@ class MapBuilder implements MapMethods {
 
     MapController build(final int id, @NonNull final Context context, final Activity mActivity,
         final AtomicInteger state, final BinaryMessenger binaryMessenger, final Application application,
-        final Lifecycle lifecycle, final PluginRegistry.Registrar registrar, final int activityHashCode) {
+        final Lifecycle lifecycle, final int activityHashCode) {
         final MapController controller = new MapController(id, context, mActivity, state, binaryMessenger, application,
-            lifecycle, registrar, activityHashCode, options);
+            lifecycle, activityHashCode, options);
         controller.init();
         controller.setAllGesturesEnabled(allGesturesEnabled);
         controller.setScrollGesturesEnabledDuringRotateOrZoom(scrollGesturesEnabledDuringRotateOrZoom);

flutter-hms-map/android/src/main/java/com/huawei/hms/flutter/map/map/MapController.java

@@ -82,8 +82,6 @@ final class MapController
 
     private final Application mApplication;
 
-    private final PluginRegistry.Registrar registrar;
-
     private final MapView mapView;
 
     private HuaweiMap huaweiMap;
@@ -154,7 +152,7 @@ final class MapController
 
     MapController(final int id, final Context context, final Activity mActivity, final AtomicInteger activityState,
         final BinaryMessenger binaryMessenger, final Application application, final Lifecycle lifecycle,
-        final PluginRegistry.Registrar registrar, final int registrarActivityHashCode, final HuaweiMapOptions options) {
+        final int registrarActivityHashCode, final HuaweiMapOptions options) {
         this.context = context;
         this.activityState = activityState;
         mapView = new MapView(mActivity, options);
@@ -164,7 +162,6 @@ final class MapController
         methodChannel.setMethodCallHandler(this);
         mApplication = application;
         this.lifecycle = lifecycle;
-        this.registrar = registrar;
         activityHashCode = registrarActivityHashCode;
         mapUtils = new MapUtils(methodChannel, compactness, application);
         mapListenerHandler = new MapListenerHandler(id, mapUtils, methodChannel, application);
@@ -952,22 +949,10 @@ private void updateMyLocationSettings() {
     }
 
     private int getActivityHashCode() {
-        if (registrar != null) {
-            Activity activity = registrar.activity();
-            if (activity != null) {
-                return activity.hashCode();
-            }
-        }
         return activityHashCode;
     }
 
     private Application getApplication() {
-        if (registrar != null) {
-            Activity activity = registrar.activity();
-            if (activity != null) {
-                return activity.getApplication();
-            }
-        }
         return mApplication;
     }
 

flutter-hms-map/android/src/main/java/com/huawei/hms/flutter/map/map/MapFactory.java

@@ -51,17 +51,14 @@ public class MapFactory extends PlatformViewFactory {
 
     private final Lifecycle lifecycle;
 
-    private final PluginRegistry.Registrar registrar;
-
     public MapFactory(final AtomicInteger state, final BinaryMessenger binaryMessenger, final Activity mActivity,
-        final Lifecycle lifecycle, final PluginRegistry.Registrar registrar, final int activityHashCode) {
+        final Lifecycle lifecycle, final int activityHashCode) {
         super(StandardMessageCodec.INSTANCE);
         mActivityState = state;
         this.binaryMessenger = binaryMessenger;
         this.application = mActivity.getApplication();
         this.activityHashCode = activityHashCode;
         this.lifecycle = lifecycle;
-        this.registrar = registrar;
         this.mActivity = mActivity;
     }
 
@@ -96,7 +93,6 @@ public PlatformView create(final Context context, final int id, final Object arg
         if (params.containsKey(Param.HEAT_MAPS_TO_INSERT)) {
             builder.setHeatMaps((List<HashMap<String, Object>>) params.get(Param.HEAT_MAPS_TO_INSERT));
         }
-        return builder.build(id, context, mActivity, mActivityState, binaryMessenger, application, lifecycle, registrar,
-            activityHashCode);
+        return builder.build(id, context, mActivity, mActivityState, binaryMessenger, application, lifecycle, activityHashCode);
     }
 }

flutter-hms-map/android/src/main/java/com/huawei/hms/flutter/map/utils/Convert.java

@@ -74,7 +74,7 @@
 
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodChannel;
-import io.flutter.view.FlutterMain;
+import io.flutter.FlutterInjector;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -197,15 +197,15 @@ private static BitmapDescriptor toBitmapDescriptor(final Object o) {
             case Param.FROM_ASSET:
                 if (data.size() == 2) {
                     return BitmapDescriptorFactory.fromAsset(
-                        FlutterMain.getLookupKeyForAsset(Convert.toString(data.get(1))));
+                        FlutterInjector.instance().flutterLoader().getLookupKeyForAsset(Convert.toString(data.get(1))));
                 } else {
                     return BitmapDescriptorFactory.fromAsset(
-                        FlutterMain.getLookupKeyForAsset(Convert.toString(data.get(1)), Convert.toString(data.get(2))));
+                        FlutterInjector.instance().flutterLoader().getLookupKeyForAsset(Convert.toString(data.get(1)), Convert.toString(data.get(2))));
                 }
             case Param.FROM_ASSET_IMAGE:
                 if (data.size() == 3) {
                     return BitmapDescriptorFactory.fromAsset(
-                        FlutterMain.getLookupKeyForAsset(Convert.toString(data.get(1))));
+                        FlutterInjector.instance().flutterLoader().getLookupKeyForAsset(Convert.toString(data.get(1))));
                 } else {
                     throw new IllegalArgumentException(Param.ERROR);
                 }