Let the plugin support v2 embeddding

android/src/main/java/com/lilplugins/xf_speech_plugin/XfSpeechPlugin.java

@@ -1,35 +1,94 @@
 package com.lilplugins.xf_speech_plugin;
 
+import android.util.Log;
+import android.app.Activity;
+
+import androidx.annotation.NonNull;
+
 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;
-import android.util.Log;
+
 import io.flutter.plugin.common.PluginRegistry;
+import io.flutter.plugin.common.PluginRegistry.Registrar;;
 
-public class XfSpeechPlugin implements MethodCallHandler{
+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;
+
+
+public class XfSpeechPlugin implements FlutterPlugin, MethodCallHandler, ActivityAware{
 
   private static String TAG = XfSpeechPlugin.class.getSimpleName();
   private static final String CHANNEL = "lilplugins.com/xf_speech_plugin";
+
   PluginRegistry.Registrar registrar;
   XfSpeechDelegate delegate;
 
+  private MethodChannel channel;
+  private Activity mActivity;
+
+  /*  
+  XfSpeechPlugin() {
+  }
+
   XfSpeechPlugin(final PluginRegistry.Registrar registrar, final XfSpeechDelegate delegate) {
     this.registrar = registrar;
     this.delegate = delegate;
   }
-
+  */
+
   public static void registerWith(Registrar registrar) {
-    if (registrar.activity() == null) {
-      return;
-    }
+    final XfSpeechPlugin instance = new XfSpeechPlugin();
     final MethodChannel channel = new MethodChannel(registrar.messenger(), CHANNEL);
     final XfSpeechDelegate delegate = new XfSpeechDelegate(registrar.activity(),channel);
     registrar.addRequestPermissionsResultListener(delegate);
-    final XfSpeechPlugin instance = new XfSpeechPlugin(registrar, delegate);
+
+    instance.registrar = registrar;
+    instance.delegate = delegate;
     channel.setMethodCallHandler(instance);
   }
+
+  @Override
+  public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) {
+    channel = new MethodChannel(flutterPluginBinding.getBinaryMessenger(), CHANNEL);
+    channel.setMethodCallHandler(this);
+  }
+
+  @Override
+  public void onAttachedToActivity(ActivityPluginBinding binding) {
+      onAttachedToActivity(binding.getActivity());
+      binding.addRequestPermissionsResultListener(this.delegate);
+  }
+
+  private void onAttachedToActivity(Activity activity) {
+      this.mActivity = activity;
+      this.delegate = new XfSpeechDelegate(activity, this.channel);
+  }
+
+  @Override
+  public void onDetachedFromActivityForConfigChanges() {
+
+  }
+
+  @Override
+  public void onReattachedToActivityForConfigChanges(@NonNull ActivityPluginBinding binding) {
+      onAttachedToActivity(binding);
+      binding.addRequestPermissionsResultListener(this.delegate);
+  }
+
+  @Override
+  public void onDetachedFromActivity() {
+      this.mActivity = null;
+  }
+
+  @Override
+  public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
+    channel.setMethodCallHandler(null);
+  }
+
 
   static final String METHOD_CALL_INITWITHAPPID = "initWithAppId";
   static final String METHOD_CALL_SETPARAMETER = "setParameter";

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

@@ -7,27 +7,34 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
+        android:name=".MainActivity"
         android:label="xf_speech_plugin_example"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|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). -->
+            <!-- Specifies an Android theme to apply to this Activity as soon as
+                 the Android process has started. This theme is visible to the user
+                 while the Flutter UI initializes. After that, this theme continues
+                 to determine the Window background behind the Flutter UI. -->
             <meta-data
-                android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
-                android:value="true" />
+              android:name="io.flutter.embedding.android.NormalTheme"
+              android:resource="@style/NormalTheme"
+              />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <!-- Don't delete the meta-data below.
+             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
     </application>
 </manifest>

example/android/app/src/main/java/com/lilplugins/xf_speech_plugin_example/EmbeddingV1Activity.java

@@ -0,0 +1,18 @@
+package com.lilplugins.xf_speech_plugin_example;
+
+import android.os.Bundle;
+
+import io.flutter.app.FlutterActivity;
+import io.flutter.plugins.GeneratedPluginRegistrant;
+
+/**
+ * EmbeddingV1 兼容测试类
+ */
+public class EmbeddingV1Activity extends FlutterActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+}
+

example/android/app/src/main/java/com/lilplugins/xf_speech_plugin_example/MainActivity.java

@@ -1,13 +1,14 @@
 package com.lilplugins.xf_speech_plugin_example;
 
 import android.os.Bundle;
-import io.flutter.app.FlutterActivity;
+
 import io.flutter.plugins.GeneratedPluginRegistrant;
 
+/*
+ * v1
+ *import io.flutter.app.FlutterActivity;
+ */
+import io.flutter.embedding.android.FlutterActivity;
+
 public class MainActivity extends FlutterActivity {
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    GeneratedPluginRegistrant.registerWith(this);
-  }
 }

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             Flutter draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>

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

@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
 </resources>