ANDROID: implemented support for editing with the system keypad

- Fixes for Pixel 9/Android 16

Author: Chris Warren-Smith

src/platform/android/app/src/main/java/net/sourceforge/smallbasic/MainActivity.java

@@ -39,10 +39,15 @@
 import android.window.OnBackInvokedCallback;
 import android.window.OnBackInvokedDispatcher;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.RequiresPermission;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
+import androidx.core.graphics.Insets;
+import androidx.core.view.OnApplyWindowInsetsListener;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -121,7 +126,7 @@ public class MainActivity extends NativeActivity {
   public static native boolean libraryMode();
   public static native void onActivityPaused(boolean paused);
   public static native void onBack();
-  public static native void onResize(int width, int height);
+  public static native void onResize(int width, int height, int imeState);
   public static native void onUnicodeChar(int ch);
   public static native boolean optionSelected(int index);
   public static native void runFile(String fileName);
@@ -429,6 +434,10 @@ public int getWindowHeight() {
     return rect.height();
   }
 
+  public boolean isInsetBasedOnResize() {
+    return Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA;
+  }
+
   public boolean isPredictiveBack() {
     return Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA;
   }
@@ -452,10 +461,11 @@ public boolean loadModules() {
   @Override
   public void onGlobalLayout() {
     super.onGlobalLayout();
-    // find the visible coordinates of our view
-    Rect rect = new Rect();
-    findViewById(android.R.id.content).getWindowVisibleDisplayFrame(rect);
-    onResize(rect.width(), rect.height());
+    if (!isInsetBasedOnResize()) {
+      Rect rect = new Rect();
+      findViewById(android.R.id.content).getWindowVisibleDisplayFrame(rect);
+      onResize(rect.width(), rect.height(), 0);
+    }
   }
 
   @Override
@@ -774,6 +784,7 @@ protected void onCreate(Bundle savedInstanceState) {
     setImmersiveMode();
     setupStorageEnvironment();
     setupPredictiveBack();
+    setupInsetBaseOnResize();
     if (!libraryMode()) {
       processIntent();
       processSettings();
@@ -1063,14 +1074,40 @@ private void setImmersiveMode() {
     }
   }
 
+  /**
+   * onResize() handler for android 16+
+   */
+  private void setupInsetBaseOnResize() {
+    if (isInsetBasedOnResize()) {
+      View view = getWindow().getDecorView();
+      ViewCompat.setOnApplyWindowInsetsListener(view, new OnApplyWindowInsetsListener() {
+        @NonNull
+        @Override
+        public WindowInsetsCompat onApplyWindowInsets(@NonNull View view, @NonNull WindowInsetsCompat insets) {
+          Log.d(TAG, "onApplyWindowInsets");
+          Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
+          Insets navInsets = insets.getInsets(WindowInsetsCompat.Type.navigationBars());
+          Insets ime = insets.getInsets(WindowInsetsCompat.Type.ime());
+          boolean imeVisible = insets.isVisible(WindowInsetsCompat.Type.ime());
+          view.setPadding(0, 0, navInsets.right, navInsets.bottom);
+          int bottomInset = Math.max(systemBars.bottom, ime.bottom);
+          int width = view.getWidth();
+          int height = view.getHeight() - systemBars.top - bottomInset;
+          onResize(width, height, imeVisible ? 1 : -1);
+          return insets;
+        }
+      });
+      view.post(() -> ViewCompat.requestApplyInsets(view));
+    }
+  }
+
   //
   // Hook into Predictive Back (Android 13+)
   //
   private void setupPredictiveBack() {
     if (isPredictiveBack()) {
       getOnBackInvokedDispatcher().registerOnBackInvokedCallback(
-          OnBackInvokedDispatcher.PRIORITY_DEFAULT,
-          new OnBackInvokedCallback() {
+          OnBackInvokedDispatcher.PRIORITY_OVERLAY, new OnBackInvokedCallback() {
             @Override
             public void onBackInvoked() {
               Log.d(TAG, "onBackInvoked");

src/platform/android/jni/editor.cpp

@@ -130,8 +130,7 @@ void Runtime::editSource(strlib::String loadPath, bool restoreOnExit) {
   int h = _output->getHeight();
   int charWidth = _output->getCharWidth();
   int charHeight = _output->getCharHeight();
-  int screenId = opt_ide == IDE_EXTERNAL ? SOURCE_SCREEN : FORM_SCREEN;
-  int prevScreenId = _output->selectScreen(screenId);
+  int prevScreenId = _output->selectScreen(FORM_SCREEN);
   TextEditInput *editWidget;
   if (_editor != nullptr) {
     editWidget = _editor;

src/platform/android/jni/runtime.cpp

@@ -219,9 +219,9 @@ extern "C" JNIEXPORT void JNICALL Java_net_sourceforge_smallbasic_MainActivity_s
 }
 
 extern "C" JNIEXPORT void JNICALL Java_net_sourceforge_smallbasic_MainActivity_onResize
-  (JNIEnv *env, jclass jclazz, jint width, jint height) {
+  (JNIEnv *env, jclass jclazz, jint width, jint height, jint imeState) {
   if (runtime != nullptr && !runtime->isClosing() && runtime->isActive() && os_graphics) {
-    runtime->onResize(width, height);
+    runtime->onResize(width, height, imeState);
   }
 }
 
@@ -258,7 +258,7 @@ extern "C" JNIEXPORT void JNICALL Java_net_sourceforge_smallbasic_MainActivity_c
 
 void onContentRectChanged(ANativeActivity *activity, const ARect *rect) {
   logEntered();
-  runtime->onResize(rect->right, rect->bottom);
+  runtime->onResize(rect->right, rect->bottom, 0);
 }
 
 jbyteArray newByteArray(JNIEnv *env, const char *str) {
@@ -619,7 +619,7 @@ void Runtime::loadConfig() {
   int height = getInteger("getWindowHeight");
   if (height !=  _graphics->getHeight()) {
     // height adjustment for bottom virtual navigation bar
-    onResize(_graphics->getWidth(), height);
+    onResize(_graphics->getWidth(), height, 0);
   }
 
   _output->setTextColor(DEFAULT_FOREGROUND, DEFAULT_BACKGROUND);
@@ -990,14 +990,18 @@ void Runtime::showKeypad(bool show) {
   _app->activity->vm->DetachCurrentThread();
 }
 
-void Runtime::onResize(int width, int height) {
+void Runtime::onResize(int width, int height, int imeState) {
   logEntered();
   if (_graphics != nullptr) {
     int w = _graphics->getWidth();
     int h = _graphics->getHeight();
     if (w != width || h != height) {
-      trace("Resized from %d %d to %d %d", w, h, width, height);
+      trace("Resized from %d %d to %d %d [ime=%d]", w, h, width, height, imeState);
       ALooper_acquire(_app->looper);
+      if (imeState != 0) {
+        // in android 16+ when resize also knows whether the ime (keypad) is active
+        _keypadActive = (imeState > 0);
+      }
       _graphics->setSize(width, height);
       auto *maEvent = new MAEvent();
       maEvent->type = EVENT_TYPE_SCREEN_CHANGED;

src/platform/android/jni/runtime.h

@@ -70,7 +70,7 @@ struct Runtime : public System {
   void showCursor(CursorType cursorType) override {}
   void showKeypad(bool show);
   void onPaused(bool paused) { if (_graphics != nullptr) _graphics->onPaused(paused); }
-  void onResize(int w, int h);
+  void onResize(int w, int h, int imeState);
   void onRunCompleted() override;
   void onUnicodeChar(int ch);
   void loadConfig();

src/ui/textedit.cpp

@@ -2538,8 +2538,10 @@ void TextEditHelpWidget::layout(int x, int y, int w, int h) {
     case kPopup:
       _width = w - (_x + _xmargin);
       _height = h - (_y + _ymargin);
-      _x = _xBase;
-      _y = _yBase;
+#if !defined(_ANDROID)
+     _x = _xBase;
+     _y = _yBase;
+#endif
     }
   }
 }