Merge pull request #18 from authpass/android-embedding-v2

flutter embedding v2 migration

Author: pmundt

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.0
+
+* Finish flutter embedding v2 migration. #17
+
 ## 0.1.0
 
 * null-safety migration (@ValeteTech, PR#16)

android/src/main/java/io/adaptant/labs/flutter_windowmanager/FlutterWindowManagerPlugin.java

@@ -4,25 +4,49 @@
 import android.os.Build;
 import android.view.WindowManager;
 
+import androidx.annotation.NonNull;
+
+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;
 import io.flutter.plugin.common.MethodChannel.Result;
 import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 /** FlutterWindowManagerPlugin */
-public class FlutterWindowManagerPlugin implements MethodCallHandler {
-  private final Activity activity;
+public class FlutterWindowManagerPlugin implements MethodCallHandler, FlutterPlugin, ActivityAware {
+  private Activity activity;
+
+  @SuppressWarnings("unused")
+  public FlutterWindowManagerPlugin() { }
 
-  private FlutterWindowManagerPlugin(Registrar registrar) {
-    this.activity = registrar.activity();
+  private FlutterWindowManagerPlugin(Activity activity) {
+    this.activity = activity;
   }
 
   /** Plugin registration. */
+  @Deprecated
   public static void registerWith(Registrar registrar) {
-    final MethodChannel channel = new MethodChannel(registrar.messenger(), "flutter_windowmanager");
-    FlutterWindowManagerPlugin instance = new FlutterWindowManagerPlugin(registrar);
-    channel.setMethodCallHandler(instance);
+    new FlutterWindowManagerPlugin(registrar.activity()).registerWith(registrar.messenger());
+  }
+
+  private void registerWith(BinaryMessenger binaryMessenger) {
+    final MethodChannel channel = new MethodChannel(binaryMessenger, "flutter_windowmanager");
+    channel.setMethodCallHandler(this);
+  }
+
+
+  @Override
+  public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) {
+    registerWith(flutterPluginBinding.getBinaryMessenger());
+  }
+
+  @Override
+  public void onDetachedFromEngine(@NonNull FlutterPluginBinding flutterPluginBinding) {
+
   }
 
   /**
@@ -119,4 +143,24 @@ public void onMethodCall(MethodCall call, Result result) {
         result.notImplemented();
     }
   }
+
+  @Override
+  public void onAttachedToActivity(@NonNull ActivityPluginBinding activityPluginBinding) {
+    activity = activityPluginBinding.getActivity();
+  }
+
+  @Override
+  public void onDetachedFromActivityForConfigChanges() {
+    activity = null;
+  }
+
+  @Override
+  public void onReattachedToActivityForConfigChanges(@NonNull ActivityPluginBinding activityPluginBinding) {
+    onAttachedToActivity(activityPluginBinding);
+  }
+
+  @Override
+  public void onDetachedFromActivity() {
+    activity = null;
+  }
 }

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

@@ -7,23 +7,20 @@
             android:name="flutterEmbedding"
             android:value="2"/>
         <activity
-            android:name=".MainActivity"
+            android:name="io.flutter.embedding.android.FlutterActivity"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
-            <!-- 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
-                 defined in @style/LaunchTheme). -->
-            <meta-data
-                android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
-                android:value="true" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+            <meta-data
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme"
+                />
         </activity>
     </application>
 </manifest>

example/android/app/src/main/java/io/adaptant/labs/flutter_windowmanager_example/MainActivity.java

@@ -5,4 +5,6 @@
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+    </style>
 </resources>

example/android/app/src/main/res/values/styles.xml

@@ -1,6 +1,6 @@
 name: flutter_windowmanager
 description: A Flutter plugin for manipulating Android WindowManager LayoutParams.
-version: 0.1.0
+version: 0.2.0
 homepage: https://github.com/adaptant-labs/flutter_windowmanager
 repository: https://github.com/adaptant-labs/flutter_windowmanager
 issue_tracker: https://github.com/adaptant-labs/flutter_windowmanager/issues