Release version 2.0.3

Author: mvanbeusekom

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.3
+
+* Android: Migrate to FlutterPlugin Android API (better support for Add-to-App);
+
 ## 2.0.2
 
 * Migrate to AndroidX

README.md

@@ -19,7 +19,7 @@ To use this plugin, add `google_api_availability` as a [dependency in your pubsp
 
 ```yaml
 dependencies:
-  google_api_availability: ^2.0.2
+  google_api_availability: ^2.0.3
 ```
 
 > **NOTE:** There's a known issue with integrating plugins that use Swift into a Flutter project created with the Objective-C template. See issue [Flutter#16049](https://github.com/flutter/flutter/issues/16049) for help on integration.

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

example/android/app/src/main/java/com/baseflow/googleapiavailabilityexample/MainActivity.java

@@ -109,13 +109,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.6.4"
-  pedantic:
-    dependency: transitive
-    description:
-      name: pedantic
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.8.0+1"
   petitparser:
     dependency: transitive
     description:
@@ -176,7 +169,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.11"
+    version: "0.2.15"
   typed_data:
     dependency: transitive
     description:
@@ -200,3 +193,4 @@ packages:
     version: "3.5.0"
 sdks:
   dart: ">=2.4.0 <3.0.0"
+  flutter: ">=1.12.8 <2.0.0"

example/pubspec.lock

@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'google_api_availability'
-  s.version          = '2.0.2'
+  s.version          = '2.0.3'
   s.summary          = 'A Flutter plugin to check the availability of Google Play Services on an Android device.'
   s.description      = <<-DESC
 A Flutter plugin to check the availability of Google Play Services on an Android device.

ios/google_api_availability.podspec

@@ -162,7 +162,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.11"
+    version: "0.2.15"
   typed_data:
     dependency: transitive
     description:
@@ -186,3 +186,4 @@ packages:
     version: "3.5.0"
 sdks:
   dart: ">=2.4.0 <3.0.0"
+  flutter: ">=1.12.8 <2.0.0"

pubspec.lock

@@ -5,6 +5,7 @@ homepage: https://github.com/baseflowit/flutter-google-api-availability
 
 environment:
   sdk: ">=2.0.0 <3.0.0"
+  flutter: ">=1.12.8 <2.0.0"
 
 dependencies:
   flutter:
@@ -18,5 +19,7 @@ dev_dependencies:
 
 flutter:
   plugin:
-    androidPackage: com.baseflow.googleapiavailability
-    pluginClass: GoogleApiAvailabilityPlugin
+    platforms:
+      android:
+        package: com.baseflow.googleapiavailability
+        pluginClass: GoogleApiAvailabilityPlugin