ANDROID: initial ioio integration

Author: chrisws

src/platform/android/app/build.gradle

@@ -7,7 +7,7 @@ android {
   // can override some attributes in main/AndroidManifest.xml
   defaultConfig {
     applicationId 'net.sourceforge.smallbasic'
-    minSdkVersion 16
+    minSdkVersion 19
     targetSdkVersion 34
     versionCode 59
     versionName '12.26'
@@ -26,16 +26,10 @@ android {
   }
 
   buildTypes {
-    debug {
-      buildConfigField "boolean", "DEBUG_VIEW", "true"
-      buildConfigField "java.util.Date", "BUILD_TIME", "new java.util.Date(" + System.currentTimeMillis() + "L)"
-    }
     release {
       ndk {
        debugSymbolLevel = 'FULL'
       }
-      buildConfigField "boolean", "DEBUG_VIEW", "false"
-      buildConfigField "java.util.Date", "BUILD_TIME", "new java.util.Date(" + System.currentTimeMillis() + "L)"
       shrinkResources true
       minifyEnabled true
       proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -60,5 +54,6 @@ android {
 
 dependencies {
   implementation 'androidx.core:core:1.12.0'
+  implementation project(':ioio')
   testImplementation 'junit:junit:4.13.2'
 }

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

@@ -42,6 +42,8 @@
 import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
 
+import net.sourceforge.smallbasic.ioio.IOIOUtility;
+
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.ByteArrayInputStream;
@@ -357,6 +359,20 @@ public int getWindowHeight() {
     return rect.height();
   }
 
+  public boolean loadModules() {
+    Log.i(TAG, "loadModules");
+    boolean result;
+    try {
+      System.loadLibrary("ioio");
+      IOIOUtility.init();
+      result = true;
+    } catch (SecurityException | UnsatisfiedLinkError e) {
+      Log.i(TAG, "loadModules", e);
+      result = false;
+    }
+    return result;
+  }
+
   @Override
   public void onGlobalLayout() {
     super.onGlobalLayout();

src/platform/android/gradle.properties

@@ -9,7 +9,6 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
 android.nonFinalResIds=false
 android.nonTransitiveRClass=false

src/platform/android/ioio/ioio.mk

@@ -0,0 +1,21 @@
+# SmallBASIC
+# Copyright(C) 2024 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
+# 
+
+JNI_PATH := $(call my-dir)
+SB_HOME := $(JNI_PATH)/../../../..
+
+include $(call all-subdir-makefiles)
+LOCAL_PATH := $(JNI_PATH)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE     := ioio
+LOCAL_CFLAGS     := -DHAVE_CONFIG_H=1 -Wno-unknown-pragmas
+LOCAL_C_INCLUDES := $(SB_HOME) $(SB_HOME)/src
+LOCAL_SRC_FILES  := src/main/cpp/ioio.cpp
+LOCAL_LDLIBS     := -llog -landroid
+include $(BUILD_SHARED_LIBRARY)
+

src/platform/android/ioio/src/main/cpp/ioio.cpp

@@ -0,0 +1,10 @@
+#include <jni.h>
+#include <android/log.h>
+
+JNIEnv *g_env;
+
+extern "C" JNIEXPORT void JNICALL
+  Java_net_sourceforge_smallbasic_ioio_IOIOUtility_init(JNIEnv *env, jclass clazz) {
+    __android_log_print(ANDROID_LOG_INFO, "smallbasic", "init entered");
+    g_env = env;
+}

src/platform/android/ioio/src/main/java/net/sourceforge/smallbasic/ioio/IOIOUtility.java

@@ -0,0 +1,10 @@
+package net.sourceforge.smallbasic.ioio;
+
+public class IOIOUtility {
+  private IOIOUtility() {
+    // no access
+  }
+
+  public static native void init();
+
+}

src/platform/android/jni/runtime.cpp

@@ -35,6 +35,7 @@
 #define SERVER_TOKEN_KEY "serverToken"
 #define MUTE_AUDIO_KEY "muteAudio"
 #define THEME_KEY "theme"
+#define LOAD_MODULES_KEY "loadModules"
 #define OPT_IDE_KEY "optIde"
 #define GBOARD_KEY_QUESTION 274
 #define EVENT_TYPE_EXIT 100
@@ -557,7 +558,14 @@ void Runtime::loadConfig() {
     loadEnvConfig(settings, SERVER_SOCKET_KEY);
     loadEnvConfig(settings, SERVER_TOKEN_KEY);
     loadEnvConfig(settings, FONT_ID_KEY);
+
+    s = settings.get(LOAD_MODULES_KEY);
+    if (s && s->toInteger() == 1) {
+      trace("calling loadModules");
+      getBoolean("loadModules");
+    }
   }
+
 }
 
 bool Runtime::loadSettings(Properties<String *> &settings) {

src/platform/android/settings.gradle

@@ -1 +1,2 @@
 include ':app'
+include ':ioio'

src/platform/android/webui/.eslintrc.js renamed to src/platform/android/webui/.eslintrc.cjs

@@ -29,5 +29,10 @@ module.exports = {
   ],
   "rules": {
     "react/prop-types": "off"
+  },
+  "settings": {
+    "react": {
+      "version": "detect"
+    }
   }
 }

src/platform/android/webui/package.json

@@ -1,7 +1,8 @@
 {
   "name": "webui",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "private": true,
+  "type": "module",
   "dependencies": {
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.0",
@@ -22,7 +23,7 @@
   },
   "scripts": {
     "start": "vite --host",
-    "build": "GENERATE_SOURCEMAP=false vite && rm ../app/src/main/assets/webui/static/js/main.* && cp -R build/* ../app/src/main/assets/webui/",
+    "build": "GENERATE_SOURCEMAP=false vite build && rm ../app/src/main/assets/webui/static/js/main.* && cp -R build/* ../app/src/main/assets/webui/",
     "update": "npm update && ncu -u && npm install && npm audit fix"
   },
   "eslintConfig": {