PArtially working

Author: GaryQian

lib/web_ui/lib/src/engine/text_editing/text_editing.dart

@@ -876,6 +876,10 @@ abstract class DefaultTextEditingStrategy implements TextEditingStrategy {
     _lastEditingState!.applyToDomElement(domElement);
   }
 
+  void setKeyboardInset(int bottomInset) {
+    print('DART:UI SETTING KEYBOARD INSET IN DEFAULTTEXTEDITINGSTRATEGY');
+  }
+
   void placeElement() {
     domElement.focus();
   }
@@ -1321,6 +1325,10 @@ class TextEditingChannel {
         cleanForms();
         break;
 
+      case 'TextInput.setKeyboardInset':
+        implementation.setKeyboardInset(call.arguments);
+        break;
+
       default:
         throw StateError(
             'Unsupported method call on the flutter/textinput channel: ${call.method}');
@@ -1510,6 +1518,11 @@ class HybridTextEditing {
     }
   }
 
+  /// Responds to the 'TextInput.setKeyboardInset' message.
+  void setKeyboardInset(int bottomInset) {
+    editingElement!.setKeyboardInset(bottomInset);
+  }
+
   /// A CSS class name used to identify all elements used for text editing.
   @visibleForTesting
   static const String textEditingClass = 'flt-text-editing';

shell/platform/android/io/flutter/embedding/android/FlutterView.java

@@ -532,6 +532,7 @@ public final WindowInsets onApplyWindowInsets(@NonNull WindowInsets insets) {
       viewportMetrics.viewInsetRight = 0;
       viewportMetrics.viewInsetBottom = finalInsets.bottom;
       viewportMetrics.viewInsetLeft = 0;
+      Log.e("flutter", "JAVA INSETS: " + finalInsets.bottom);
     } else {
       // We zero the left and/or right sides to prevent the padding the
       // navigation bar would have caused.

shell/platform/android/io/flutter/embedding/engine/systemchannels/TextInputChannel.java

@@ -136,11 +136,10 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result
               break;
 
             case "TextInput.setKeyboardInset":
-              textInputMethodHandler.setKeyboardInset();
                try {
                 final JSONObject arguments = (JSONObject) args;
                 final int bottomInset = arguments.getInt("bottomInset");
-                textInputMethodHandler.sendAppPrivateCommand(bottomInset);
+                textInputMethodHandler.setKeyboardInset(bottomInset);
                 result.success(null);
               } catch (JSONException exception) {
                 result.error("error", exception.getMessage(), null);

shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java

@@ -77,13 +77,13 @@ public TextInputPlugin(
         new TextInputChannel.TextInputMethodHandler() {
           @Override
           public void show() {
-            controlTextInputWindowInsetsAnimation(150);
+            // controlTextInputWindowInsetsAnimation(150);
             showTextInput(mView);
           }
 
           @Override
           public void hide() {
-            controlTextInputWindowInsetsAnimation(100);
+            // controlTextInputWindowInsetsAnimation(100);
             hideTextInput(mView);
           }
 
@@ -149,37 +149,51 @@ public void setKeyboardInset(int bottomInset) {
   }
 
   private class CustomWindowInsetsAnimationControlListener implements WindowInsetsAnimationControlListener {
-    private Insets targetInsets;
+    private int offset;
+    int baseInset;
 
     CustomWindowInsetsAnimationControlListener() {
-      targetInsets = Insets.of(0, 0, 0, 0);
+      // targetInsets = Insets.of(0, 0, 0, 0);
     }
 
-    CustomWindowInsetsAnimationControlListener(Insets insets) {
-      targetInsets = insets;
+    void setOffset(int offset) {
+      this.offset = offset;
     }
 
-    void setInsets(Insets insets) {
-      targetInsets = insets;
+    void setBaseInset(int baseInset) {
+      this.baseInset = baseInset;
+    }
+
+    void computeBaseInset(View view) {
+      int mask = android.view.WindowInsets.Type.ime();
+      Insets finalInsets = view.getRootWindowInsets().getInsets(mask);
+      if (baseInset < finalInsets.bottom) setBaseInset(finalInsets.bottom);
     }
 
     public void onCancelled(WindowInsetsAnimationController controller) {}
 
     public void onFinished(WindowInsetsAnimationController controller) {}
 
     public void onReady(WindowInsetsAnimationController controller, int types) {
-      controller.setInsetsAndAlpha(targetInsets, 1f, 1f);
+      if (controller.isReady() && (controller.getTypes() & types) > 0) {
+        controller.setInsetsAndAlpha(Insets.of(0, 0, 0, baseInset + offset), 1f, 1f);
+      }
+      // controller.finish(true);
     }
   }
 
-  private void controlTextInputWindowInsetsAnimation(int bottomInset) {
-    Log.e("flutter", "IN THE WINDOW WindowInsetsAnimationController !!!!!!!!!: " + bottomInset);
-    Insets targetInsets = Insets.of(0, 0, 0, bottomInset);
-    if (mInsetsListener == null) {
-      mInsetsListener = new CustomWindowInsetsAnimationControlListener(targetInsets);
-    } else {
-      mInsetsListener.setInsets(targetInsets);
-    }
+  private void controlTextInputWindowInsetsAnimation(int offset) {
+    Log.e("flutter", "IN THE WINDOW WindowInsetsAnimationController !!!!!!!!!: " + offset + " " + mInsetsListener.baseInset);
+    // if (mInsetsListener == null) {
+    //   mInsetsListener = new CustomWindowInsetsAnimationControlListener();
+    //   mInsetsListener.setBaseInset(0);
+    //   mInsetsListener.setOffset(offset);
+    // } else {
+    //   mInsetsListener.setOffset(offset);
+    // }
+    setupInsetsListener();
+    mInsetsListener.setOffset(offset);
+    mInsetsListener.computeBaseInset(mView);
     mView.getWindowInsetsController().controlWindowInsetsAnimation(
       android.view.WindowInsets.Type.ime(),
       -1,   // duration.
@@ -189,6 +203,12 @@ private void controlTextInputWindowInsetsAnimation(int bottomInset) {
     );
   }
 
+  private void setupInsetsListener() {
+    if (mInsetsListener == null) {
+      mInsetsListener = new CustomWindowInsetsAnimationControlListener();
+    }
+  }
+
   @NonNull
   public InputMethodManager getInputMethodManager() {
     return mImm;
@@ -371,6 +391,8 @@ public void sendTextInputAppPrivateCommand(String action, Bundle data) {
   private void showTextInput(View view) {
     view.requestFocus();
     mImm.showSoftInput(view, 0);
+    setupInsetsListener();
+    mInsetsListener.computeBaseInset(mView);
   }
 
   private void hideTextInput(View view) {
@@ -382,6 +404,8 @@ private void hideTextInput(View view) {
     // field(by text field here I mean anything that keeps the keyboard open).
     // See: https://github.com/flutter/flutter/issues/34169
     mImm.hideSoftInputFromWindow(view.getApplicationWindowToken(), 0);
+    setupInsetsListener();
+    mInsetsListener.computeBaseInset(mView);
   }
 
   private void notifyViewEntered() {