ANDROID: ioio library module now built from smallbasic.plugins repo

Author: chrisws

src/platform/android/app/build.gradle

@@ -28,11 +28,11 @@ android {
   buildTypes {
     release {
       ndk {
-       debugSymbolLevel = 'FULL'
+        debugSymbolLevel = 'FULL'
       }
       shrinkResources true
       minifyEnabled true
-      proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+      proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
       signingConfig signingConfigs.release
     }
   }
@@ -54,6 +54,6 @@ android {
 
 dependencies {
   implementation 'androidx.core:core:1.12.0'
-  implementation project(':ioio')
+  //implementation files('libs/ioio-release.aar')
   testImplementation 'junit:junit:4.13.2'
 }

src/platform/android/app/proguard-rules.pro

@@ -1,31 +1,8 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
 #
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
+# For more details, see https://developer.android.com/build/shrink-code
 #
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
--keep public class * {
-    public *;
-}
-
--keepclasseswithmembernames class * {
-    native <methods>;
-}
 
+-keep public class * { public *; }
+-keepclasseswithmembernames class * { native <methods>; }
 -printmapping build/outputs/mapping/release/mapping.txt
 -keepattributes LineNumberTable,SourceFile

src/platform/android/app/src/main/assets/main.bas

@@ -165,12 +165,12 @@ sub do_setup()
 
   color colText, colBkGnd
   cls
-  at 0, char_h * 6.5
-  print "Envy Code R:"
-  print "  http://damieng.com/envy-code-r"
+  at 0, char_h * 6
   print "Inconsolata:"
   print "  Copyright 2006 The Inconsolata Project"
   print "  http://scripts.sil.org/OFL"
+  print "Envy Code R:"
+  print "  http://damieng.com/envy-code-r"
   print "Ubuntu:"
   print "  https://ubuntu.com/legal/font-licence"
   at 0, char_h * 1
@@ -179,7 +179,7 @@ sub do_setup()
   local x = char_w / 2
   local y = char_h / 2
   rect x, y, w * 2, h + y * 2.5
-  dim frm.inputs(3)
+  dim frm.inputs(4)
   frm.inputs(0).type = "label"
   frm.inputs(0).label = "Select display font:"
   frm.inputs(0).x = char_w
@@ -195,14 +195,25 @@ sub do_setup()
   frm.inputs(2).color = colText
   frm.inputs(2).label = "OK"
   frm.inputs(2).value = "OK"
-  frm.inputs(2).x = -(char_w * 8)
-  frm.inputs(2).y = -(char_h)
+  frm.inputs(2).x = -(char_w * 2.5)
+  frm.inputs(2).y = -char_h
+  frm.inputs(3).type = "button"
+  frm.inputs(3).backgroundColor = colBkGnd
+  frm.inputs(3).color = colText
+  frm.inputs(3).label = "Cancel"
+  frm.inputs(3).value = "cancel"
+  frm.inputs(3).x = -(char_w * .75)
+
   frm = form(frm)
   while 1
     frm.doEvents()
-    if (frm.value == "OK") then exit loop
+    if (frm.value == "OK") then
+      exit loop
+    elseif (frm.value == "cancel") then
+      goto exitFunc
+    endif
   wend
-  env("fontId=" + frm.inputs(1).selectedIndex)
+  local fontId = frm.inputs(1).selectedIndex
 
   cls
   at 0, char_h * 1
@@ -213,9 +224,13 @@ sub do_setup()
   frm = form(frm)
   while 1
     frm.doEvents()
-    if (frm.value == "OK") then exit loop
+    if (frm.value == "OK") then
+      exit loop
+    elseif (frm.value == "cancel") then
+      goto exitFunc
+    endif
   wend
-  env("loadModules=" + frm.inputs(1).selectedIndex)
+  local loadModules = frm.inputs(1).selectedIndex
 
   color colText, colBkGnd
   cls
@@ -242,26 +257,35 @@ sub do_setup()
     env("serverToken=" + token)
   endif
 
+  env("fontId=" + fontId)
+  env("loadModules=" + loadModules)
+
   local msg = "You must restart SmallBASIC for this change to take effect."
   wnd.alert(msg, "Restart required")
+
+  label exitFunc
   clear_screen()
 end
 
 sub server_info()
   local serverSocket = env("serverSocket")
   local ipAddr = env("IP_ADDR")
   local loadModules = env("loadModules")
+  local hasText = false
 
   if (len(serverSocket) > 0 && int(serverSocket) > 1023 && int(serverSocket) < 65536 && len(ipAddr)) then
     serverSocket = ipAddr + ":" + serverSocket
     print boldOff + "Web Service: " + boldOn + serverSocket
     print boldOff + "Access token: " + boldOn + env("serverToken")
     print boldOff;
+    hasText = true
   fi
   if (int(loadModules) == 1) then
     print "Extension modules: " + boldOn + "Enabled"
     print boldOff;
+    hasText = true
   endif
+  if (hasText) then print
 end
 
 func fileCmpFunc0(l, r)
@@ -702,9 +726,9 @@ sub main
     frm.inputs << bn_files
     frm.inputs << bn_online
     frm.inputs << bn_scratch
-    if (!is_sdl) then
+'    if (!is_sdl) then
       frm.inputs << bn_setup
-    endif
+'    endif
     frm.inputs << bn_about
     listFiles frm, path, sortDir, basList
     frm = form(frm)

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

@@ -363,6 +363,7 @@ public boolean loadModules() {
     try {
       System.loadLibrary("ioio");
       Class.forName("net.sourceforge.smallbasic.ioio.IOIOLoader").newInstance();
+      Log.i(TAG, "loadModules - success");
       result = true;
     } catch (Exception | UnsatisfiedLinkError e) {
       Log.i(TAG, "loadModules", e);

src/platform/android/ioio/ioio.mk

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