Merge branch 'flutter_1.5_upgrade_opt'

android/build.gradle

@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 28
     buildToolsVersion '27.0.3'
     defaultConfig {
         minSdkVersion 16

android/src/main/java/com/idlefish/flutterboost/BoostFlutterView.java

@@ -54,6 +54,7 @@ public class BoostFlutterView extends FrameLayout {
     private BoostFlutterEngine mFlutterEngine;
 
     private XFlutterView mFlutterView;
+    private PlatformPlugin mPlatformPlugin;
 
     private Bundle mArguments;
 
@@ -113,6 +114,7 @@ public class BoostFlutterView extends FrameLayout {
         if (mArguments == null) {
             mArguments = new Bundle();
         }
+        mPlatformPlugin = new PlatformPlugin((Activity) getContext(), mFlutterEngine.getPlatformChannel());
 
         mFlutterView = new XFlutterView(getContext(), getRenderMode(), getTransparencyMode());
         addView(mFlutterView, new FrameLayout.LayoutParams(
@@ -288,6 +290,7 @@ public class BoostFlutterView extends FrameLayout {
         }
     }
 
+
     public void onDestroy() {
         Debuger.log("BoostFlutterView onDestroy");
 

android/src/main/java/com/idlefish/flutterboost/XAndroidKeyProcessor.java

@@ -13,6 +13,7 @@ public class XAndroidKeyProcessor {
     private final KeyEventChannel keyEventChannel;
     @NonNull
     private final XTextInputPlugin textInputPlugin;
+
     private int combiningCharacter;
 
     public XAndroidKeyProcessor(@NonNull KeyEventChannel keyEventChannel, @NonNull XTextInputPlugin textInputPlugin) {
@@ -20,6 +21,7 @@ public class XAndroidKeyProcessor {
         this.textInputPlugin = textInputPlugin;
     }
 
+
     public void onKeyUp(@NonNull KeyEvent keyEvent) {
         Character complexCharacter = applyCombiningCharacterToBaseCharacter(keyEvent.getUnicodeChar());
         keyEventChannel.keyUp(

android/src/main/java/com/idlefish/flutterboost/XFlutterView.java

 package com.idlefish.flutterboost;
 
 import android.annotation.TargetApi;
+import android.app.Activity;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Rect;
@@ -34,6 +35,7 @@ import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.renderer.FlutterRenderer;
 import io.flutter.embedding.engine.renderer.OnFirstFrameRenderedListener;
 import io.flutter.plugin.editing.TextInputPlugin;
+import io.flutter.plugin.platform.PlatformPlugin;
 import io.flutter.view.AccessibilityBridge;
 
 public class XFlutterView extends FrameLayout {
@@ -430,6 +432,7 @@ public class XFlutterView extends FrameLayout {
    * {@link FlutterEngine}.
    */
   public void attachToFlutterEngine(@NonNull FlutterEngine flutterEngine) {
+
     Log.d(TAG, "attachToFlutterEngine()");
     if (isAttachedToFlutterEngine()) {
       if (flutterEngine == this.flutterEngine) {
@@ -450,19 +453,22 @@ public class XFlutterView extends FrameLayout {
 
     // Instruct our FlutterRenderer that we are now its designated RenderSurface.
     this.flutterEngine.getRenderer().attachToRenderSurface(renderSurface);
-
     // Initialize various components that know how to process Android View I/O
     // in a way that Flutter understands.
     if(textInputPlugin==null){
       textInputPlugin = new XTextInputPlugin(
               this,
-              this.flutterEngine.getDartExecutor()
+              flutterEngine.getTextInputChannel()
       );
+
+    }
+    textInputPlugin.setTextInputMethodHandler();
+    textInputPlugin.getInputMethodManager().restartInput(this);
+
     androidKeyProcessor = new XAndroidKeyProcessor(
             this.flutterEngine.getKeyEventChannel(),
             textInputPlugin
     );
-    }
 
 
 
@@ -483,7 +489,6 @@ public class XFlutterView extends FrameLayout {
               accessibilityBridge.isAccessibilityEnabled(),
               accessibilityBridge.isTouchExplorationEnabled()
       );
-      textInputPlugin.getInputMethodManager().restartInput(this);
 
     }
 
@@ -535,8 +540,9 @@ public class XFlutterView extends FrameLayout {
     // now that the engine is detached. The new InputConnection will be null, which
     // signifies that this View does not process input (until a new engine is attached).
     // TODO(mattcarroll): once this is proven to work, move this line ot TextInputPlugin
-    textInputPlugin.getInputMethodManager().restartInput(this);
+//    textInputPlugin.getInputMethodManager().restartInput(this);
     // Instruct our FlutterRenderer that we are no longer interested in being its RenderSurface.
+//    this.textInputPlugin.getInputMethodManager().restartInput(this);
     flutterEngine.getRenderer().detachFromRenderSurface();
     flutterEngine = null;
 

android/src/main/java/com/idlefish/flutterboost/XTextInputPlugin.java

@@ -24,7 +24,6 @@ public class XTextInputPlugin {
     @NonNull
     private final InputMethodManager mImm;
     @NonNull
-    private final TextInputChannel textInputChannel;
     private int mClient = 0;
     @Nullable
     private TextInputChannel.Configuration configuration;
@@ -33,13 +32,17 @@ public class XTextInputPlugin {
     private boolean mRestartInputPending;
     @Nullable
     private InputConnection lastInputConnection;
-
-    public XTextInputPlugin(View view, @NonNull DartExecutor dartExecutor) {
+    private TextInputChannel textInputChannel;
+    public XTextInputPlugin(View view, TextInputChannel mTextInputChannel) {
         mView = view;
         mImm = (InputMethodManager) view.getContext().getSystemService(
                 Context.INPUT_METHOD_SERVICE);
+        textInputChannel=mTextInputChannel;
+
+
+    }
 
-        textInputChannel = new TextInputChannel(dartExecutor);
+    public void setTextInputMethodHandler( ){
         textInputChannel.setTextInputMethodHandler(new TextInputChannel.TextInputMethodHandler() {
             @Override
             public void show() {
@@ -173,6 +176,7 @@ public class XTextInputPlugin {
     }
 
     private void showTextInput(View view) {
+        if(view==null) return;
         view.requestFocus();
         mImm.showSoftInput(view, 0);
     }