ANDROID: implemented find command

smallbasic · chrisws · Jun 26, 2025 · Mar 30, 2025 · Apr 5, 2025 · Apr 14, 2025
commit e46505da9b4209056b9ee9ae4fd77d98759390c2
diff --git a/src/platform/android/app/src/main/java/net/sourceforge/smallbasic/EditorBar.java b/src/platform/android/app/src/main/java/net/sourceforge/smallbasic/EditorBar.java
@@ -0,0 +1,79 @@
+package net.sourceforge.smallbasic;
+
+import android.app.Activity;
+import android.content.Context;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+
+class FindBar {
+  private LinearLayout findBar;
+  private EditText findInput;
+  private Button findNext, findPrev, findClose;
+
+  public FindBar(Activity activity) {
+    FrameLayout decor = (FrameLayout) activity.getWindow().getDecorView();
+
+    // Create find bar layout
+    findBar = new LinearLayout(activity);
+    findBar.setOrientation(LinearLayout.HORIZONTAL);
+    findBar.setBackgroundColor(0xFFEEEEEE);
+    findBar.setPadding(8, 8, 8, 8);
+    findBar.setVisibility(View.GONE);
+
+    // Create EditText
+    findInput = new EditText(activity);
+    LinearLayout.LayoutParams lpInput = new LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1);
+    findInput.setLayoutParams(lpInput);
+    findInput.setHint("Find...");
+    findBar.addView(findInput);
+
+    // Create buttons
+    findPrev = new Button(activity);
+    findPrev.setText("↑");
+    findBar.addView(findPrev);
+
+    findNext = new Button(activity);
+    findNext.setText("↓");
+    findBar.addView(findNext);
+
+    findClose = new Button(activity);
+    findClose.setText("✕");
+    findBar.addView(findClose);
+
+    // Add find bar to decor view
+    FrameLayout.LayoutParams lp =
+      new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT,
+                                   FrameLayout.LayoutParams.WRAP_CONTENT,
+                                   Gravity.BOTTOM);
+    decor.addView(findBar, lp);
+
+    // Hook up buttons
+    findNext.setOnClickListener(v -> {
+        String query = findInput.getText().toString();
+        // TODO: call native method or Java function to highlight next
+      });
+
+    findPrev.setOnClickListener(v -> {
+        String query = findInput.getText().toString();
+        // TODO: call native method or Java function to highlight previous
+      });
+
+    findClose.setOnClickListener(v -> {
+        findBar.setVisibility(View.GONE);
+        //hideKeyboard(findInput);
+      });
+  }
+
+  // To show the find bar
+  public void show() {
+    findBar.setVisibility(View.VISIBLE);
+    findInput.requestFocus();
+  }
+}
diff --git a/src/platform/android/jni/Android.mk b/src/platform/android/jni/Android.mk
@@ -39,6 +39,7 @@ LOCAL_SRC_FILES  := main.cpp                   \
                     runtime.cpp                \
                     audio.cpp                  \
                     module.cpp                 \
+                    editor.cpp                 \
                     ../../../ui/screen.cpp     \
                     ../../../ui/ansiwidget.cpp \
                     ../../../ui/window.cpp     \

diff --git a/src/platform/android/jni/editor.cpp b/src/platform/android/jni/editor.cpp
@@ -0,0 +1,236 @@
+// This file is part of SmallBASIC
+//
+// Copyright(C) 2001-2025 Chris Warren-Smith.
+//
+// This program is distributed under the terms of the GPL v2.0 or later
+// Download the GNU Public License (GPL) from www.gnu.org
+//
+
+#include "config.h"
+
+#include "ui/textedit.h"
+#include "platform/android/jni/runtime.h"
+#include "common/device.h"
+
+extern Runtime *runtime;
+
+void showHelpLineInput(TextEditHelpWidget *helpWidget, int width = 35) {
+  helpWidget->showPopup(width, 1);
+}
+
+void System::editSource(strlib::String loadPath, bool restoreOnExit) {
+  logEntered();
+
+  strlib::String fileName;
+  int i = loadPath.lastIndexOf('/', 0);
+  if (i != -1) {
+    fileName = loadPath.substring(i + 1);
+  } else {
+    fileName = loadPath;
+  }
+
+  strlib::String dirtyFile;
+  dirtyFile.append(" * ");
+  dirtyFile.append(fileName);
+  strlib::String cleanFile;
+  cleanFile.append(" - ");
+  cleanFile.append(fileName);
+
+  int w = _output->getWidth();
+  int h = _output->getHeight();
+  int charWidth = _output->getCharWidth();
+  int charHeight = _output->getCharHeight();
+  int prevScreenId = _output->selectScreen(SOURCE_SCREEN);
+  TextEditInput *editWidget;
+  if (_editor != nullptr) {
+    editWidget = _editor;
+    editWidget->_width = w;
+    editWidget->_height = h;
+  } else {
+    editWidget = new TextEditInput(_programSrc, charWidth, charHeight, 0, 0, w, h);
+  }
+  auto *helpWidget = new TextEditHelpWidget(editWidget, charWidth, charHeight, false);
+  auto *widget = editWidget;
+  _modifiedTime = getModifiedTime();
+  editWidget->updateUI(nullptr, nullptr);
+  editWidget->setLineNumbers();
+  editWidget->setFocus(true);
+
+  _output->clearScreen();
+  _output->addInput(editWidget);
+  _output->addInput(helpWidget);
+
+  if (gsb_last_line && isBreak()) {
+    String msg = "Break at line: ";
+    msg.append(gsb_last_line);
+    runtime->alert(msg);
+  } else if (gsb_last_error && !isBack()) {
+    // program stopped with an error
+    editWidget->setCursorRow(gsb_last_line + editWidget->getSelectionRow() - 1);
+    runtime->alert(gsb_last_errmsg);
+  }
+
+  bool showStatus = !editWidget->getScroll();
+  _srcRendered = false;
+  _output->setStatus(showStatus ? cleanFile : "");
+  _output->redraw();
+  _state = kEditState;
+  runtime->showKeypad(true);
+
+  while (_state == kEditState) {
+    MAEvent event = getNextEvent();
+    switch (event.type) {
+    case EVENT_TYPE_POINTER_PRESSED:
+      if (!showStatus && widget == editWidget && event.point.x < editWidget->getMarginWidth()) {
+        _output->setStatus(editWidget->isDirty() ? dirtyFile : cleanFile);
+        _output->redraw();
+        showStatus = true;
+      } else if (widget == helpWidget && helpWidget->searchMode()) {
+        // end searching
+        widget = editWidget;
+        helpWidget->hide();
+        helpWidget->cancelMode();
+      }
+      break;
+    case EVENT_TYPE_POINTER_RELEASED:
+      if (showStatus && event.point.x < editWidget->getMarginWidth() && editWidget->getScroll()) {
+        _output->setStatus("");
+        _output->redraw();
+        showStatus = false;
+      }
+      break;
+    case EVENT_TYPE_OPTIONS_BOX_BUTTON_CLICKED:
+      if (editWidget->isDirty() && !editWidget->getScroll()) {
+        _output->setStatus(dirtyFile);
+        _output->redraw();
+      }
+      break;
+    case EVENT_TYPE_KEY_PRESSED:
+      if (_userScreenId == -1) {
+        dev_clrkb();
+        int sw = _output->getScreenWidth();
+        bool redraw = true;
+        bool dirty = editWidget->isDirty();
+        char *text;
+
+        switch (event.key) {
+        case SB_KEY_F(2):
+        case SB_KEY_F(3):
+        case SB_KEY_F(4):
+        case SB_KEY_F(5):
+        case SB_KEY_F(6):
+        case SB_KEY_F(7):
+        case SB_KEY_F(8):
+        case SB_KEY_F(10):
+        case SB_KEY_F(11):
+        case SB_KEY_F(12):
+        case SB_KEY_MENU:
+        case SB_KEY_ESCAPE:
+        case SB_KEY_BREAK:
+          // unhandled keys
+          redraw = false;
+          break;
+        case SB_KEY_F(1):
+          widget = helpWidget;
+          helpWidget->createKeywordIndex();
+          helpWidget->showPopup(-4, -2);
+          helpWidget->setFocus(true);
+          runtime->showKeypad(false);
+          showStatus = false;
+          break;
+        case SB_KEY_F(9):
+          _state = kRunState;
+          if (editWidget->isDirty()) {
+            saveFile(editWidget, loadPath);
+          }
+          break;
+        case SB_KEY_CTRL('f'):
+          widget = helpWidget;
+          helpWidget->createSearch(false);
+          showHelpLineInput(helpWidget);
+          break;
+        case SB_KEY_CTRL('s'):
+          saveFile(editWidget, loadPath);
+          break;
+        case SB_KEY_CTRL('c'):
+        case SB_KEY_CTRL('x'):
+          text = widget->copy(event.key == (int)SB_KEY_CTRL('x'));
+          if (text) {
+            setClipboardText(text);
+            free(text);
+          }
+          break;
+        case SB_KEY_CTRL('v'):
+          text = getClipboardText();
+          widget->paste(text);
+          free(text);
+          break;
+        case SB_KEY_CTRL('o'):
+          _output->selectScreen(USER_SCREEN1);
+          showCompletion(true);
+          _output->redraw();
+          _state = kActiveState;
+          waitForBack();
+          runtime->showKeypad(true);
+          _output->selectScreen(SOURCE_SCREEN);
+          _state = kEditState;
+          break;
+        default:
+          redraw = widget->edit(event.key, sw, charWidth);
+          break;
+        }
+        if (editWidget->isDirty() != dirty && !editWidget->getScroll()) {
+          _output->setStatus(editWidget->isDirty() ? dirtyFile : cleanFile);
+        }
+        if (redraw) {
+          _output->redraw();
+        }
+      }
+    }
+
+    if (isBack() && widget == helpWidget) {
+      runtime->showKeypad(true);
+      widget = editWidget;
+      helpWidget->hide();
+      editWidget->setFocus(true);
+      _state = kEditState;
+      _output->redraw();
+    }
+
+    if (widget->isDirty()) {
+      int choice = -1;
+      if (isClosing()) {
+        choice = 0;
+      } else if (isBack()) {
+        const char *message = "The current file has not been saved.\n"
+                              "Would you like to save it now?";
+        choice = ask("Save changes?", message, isBack());
+      }
+      if (choice == 0) {
+        widget->save(loadPath);
+      } else if (choice == 2) {
+        // cancel
+        _state = kEditState;
+      }
+    }
+  }
+
+  if (_state == kRunState) {
+    // allow the editor to be restored on return
+    if (!_output->removeInput(editWidget)) {
+      trace("Failed to remove editor input");
+    }
+    runtime->showKeypad(false);
+    _editor = editWidget;
+    _editor->setFocus(false);
+  } else {
+    _editor = nullptr;
+  }
+
+  // deletes editWidget unless it has been removed
+  _output->removeInputs();
+  if (!isClosing() && restoreOnExit) {
+    _output->selectScreen(prevScreenId);
+  }
+  logLeaving();
+}