Merge pull request Baseflow#16 from Raphicci/develop

Android embedding V2

Author: mvanbeusekom

android/src/main/java/com/baseflow/googleapiavailability/GoogleApiAvailabilityPlugin.java

@@ -3,13 +3,18 @@
 import android.app.Activity;
 import android.content.Context;
 
+import androidx.annotation.IntDef;
+
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import androidx.annotation.IntDef;
+import io.flutter.embedding.engine.plugins.FlutterPlugin;
+import io.flutter.embedding.engine.plugins.activity.ActivityAware;
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
+import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
@@ -19,7 +24,7 @@
 /**
  * GoogleApiAvailabilityPlugin
  */
-public class GoogleApiAvailabilityPlugin implements MethodCallHandler {
+public class GoogleApiAvailabilityPlugin implements MethodCallHandler, FlutterPlugin, ActivityAware {
   private static final int REQUEST_GOOGLE_PLAY_SERVICES = 1000;
 
   //GOOGLE_PLAY_SERVICES_AVAILABILITY
@@ -46,15 +51,50 @@ public class GoogleApiAvailabilityPlugin implements MethodCallHandler {
   private @interface GooglePlayServicesAvailability {
   }
 
-  public static void registerWith(Registrar registrar) {
-    final MethodChannel channel = new MethodChannel(registrar.messenger(), "flutter.baseflow.com/google_api_availability/methods");
-    channel.setMethodCallHandler(new GoogleApiAvailabilityPlugin(registrar.context()));
+  private Context context;
+  
+
+  public void setContext(Context newContext) {
+    context = newContext;
+  }
+
+  @Override
+  public void onAttachedToActivity(ActivityPluginBinding binding) {
+    setContext(binding.getActivity());
+  }
+
+  @Override
+  public void onDetachedFromActivityForConfigChanges() {
+    setContext(null);
+  }
+
+  @Override
+  public void onReattachedToActivityForConfigChanges(ActivityPluginBinding binding) {
+    setContext(binding.getActivity());
+  }
+
+  @Override
+  public void onDetachedFromActivity() {
+    setContext(null);
+  }
+
+  @Override
+  public void onAttachedToEngine(FlutterPluginBinding binding) {
+    this.registerPlugin(null, binding.getBinaryMessenger());
   }
 
-  private final Context context;
+  @Override
+  public void onDetachedFromEngine(FlutterPluginBinding binding) {}
+
+  private void registerPlugin(Context context, BinaryMessenger messenger) {
+    final MethodChannel channel = new MethodChannel(messenger, "flutter.baseflow.com/google_api_availability/methods");
+    if (context != null) setContext(context);
+    channel.setMethodCallHandler(this);
+  }
 
-  private GoogleApiAvailabilityPlugin(Context context) {
-    this.context = context;
+  public static void registerWith(Registrar registrar) {
+    final GoogleApiAvailabilityPlugin plugin = new GoogleApiAvailabilityPlugin();
+    plugin.registerPlugin(registrar.context(), registrar.messenger());
   }
 
   @Override
@@ -98,4 +138,4 @@ private int toPlayServiceAvailability(int connectionResult) {
         return GOOGLE_PLAY_SERVICES_AVAILABILITY_UNKNOWN;
     }
   }
-}
+}

example/android/app/src/main/AndroidManifest.xml

@@ -8,12 +8,13 @@
         android:label="google_api_availability_example"
         tools:ignore="AllowBackup,GoogleAppIndexingWarning">
         <activity
-            android:name=".MainActivity"
+            android:name="io.flutter.embedding.android.FlutterActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:windowSoftInputMode="adjustResize">
+            <meta-data android:name="flutterEmbedding" android:value="2"/> 
             <!-- This keeps the window background of the activity showing
                  until Flutter renders its first frame. It can be removed if
                  there is no splash screen (such as the default splash screen