ANDROID: add build setting for library-mode

Author: chrisws

configure.ac

@@ -234,10 +234,14 @@ function buildSDL() {
 }
 
 function buildAndroid() {
-   TARGET="Building for Android."
-
    defaultConditionals
 
+   AC_MSG_CHECKING([if library mode is enabled])
+   AC_ARG_WITH(library,
+   [  --with-library            Build the android as a library default=no],
+       [with_library=$with_library],
+       [with_library=no])
+   AC_MSG_RESULT([$with_library])
    AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
    AC_DEFINE(_ANDROID, 1, [Defined for Android build.])
    AC_DEFINE(IMPL_DEV_READ, 1, [Implement dev_read()])
@@ -248,7 +252,13 @@ function buildAndroid() {
 
    TEST_DIR="src/platform/android"
    AC_SUBST(TEST_DIR)
-   (cd src/platform/android/webui && npm run build)
+   if test $with_library = no; then
+      (cd src/platform/android/webui && npm run build)
+      TARGET="Building for Android."
+   else
+      TARGET="Building for Android library."
+      AC_DEFINE(_ANDROID_LIBRARY, 1, [android library build enabled])
+   fi
 }
 
 function buildConsole() {

src/common/screen.c

@@ -304,6 +304,18 @@ void osd_line(int x1, int y1, int x2, int y2);
 //
 void dev_rect(int x1, int y1, int x2, int y2, int fill) {
   int c1, c2, in1, in2;
+
+  if (x2 < x1) {
+    int x11 = x1;
+    x1 = x2;
+    x2 = x11;
+  }
+  if (y2 < y1) {
+    int y11 = y1;
+    y1 = y2;
+    y2 = y11;
+  }
+
   int px1 = x1;
   int py1 = y1;
   int px2 = x2;
@@ -409,6 +421,9 @@ void dev_window(int x1, int y1, int x2, int y2) {
   }
 }
 
+//
+// set screen width and height
+//
 void dev_resize(int width, int height) {
   if (dev_Vx2 == dev_Vdx && dev_Vx2 == os_graf_mx - 1) {
     // viewport width is full-screen
@@ -432,6 +447,9 @@ void dev_resize(int width, int height) {
   setsysvar_int(SYSVAR_YMAX, height - 1);
 }
 
+//
+// remap x/y to world coordinates
+//
 void dev_map_point(int *x, int *y) {
   *x = W2X(*x);
   *y = W2Y(*y);

src/platform/android/app/src/main/AndroidManifest.xml

@@ -67,6 +67,8 @@
   <!-- Permissions -->
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.ACCESS_COURSE_LOCATION" />
   <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 </manifest>

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

@@ -112,6 +112,7 @@ public class MainActivity extends NativeActivity {
     System.loadLibrary("smallbasic");
   }
 
+  public static native boolean libraryMode();
   public static native void onActivityPaused(boolean paused);
   public static native void onResize(int width, int height);
   public static native void onUnicodeChar(int ch);
@@ -640,10 +641,12 @@ public void speak(final byte[] textBytes) {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    processIntent();
-    processSettings();
     String homeFolder = setupStorageEnvironment();
-    installSamples(homeFolder);
+    if (!libraryMode()) {
+      processIntent();
+      processSettings();
+      installSamples(homeFolder);
+    }
   }
 
   @Override

src/platform/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:7.2.1'
+    classpath 'com.android.tools.build:gradle:7.2.2'
   }
 }
 

src/platform/android/jni/runtime.cpp

@@ -1,6 +1,6 @@
 // This file is part of SmallBASIC
 //
-// Copyright(C) 2001-2016 Chris Warren-Smith.
+// Copyright(C) 2001-2022 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
@@ -132,6 +132,7 @@ int get_sensor_events(int fd, int events, void *data) {
   return 1;
 }
 
+// callbacks from MainActivity.java
 extern "C" JNIEXPORT void JNICALL Java_net_sourceforge_smallbasic_MainActivity_onActivityPaused
   (JNIEnv *env, jclass jclazz, jboolean paused) {
   if (runtime != nullptr && !runtime->isClosing() && runtime->isActive() && os_graphics) {
@@ -140,7 +141,6 @@ extern "C" JNIEXPORT void JNICALL Java_net_sourceforge_smallbasic_MainActivity_o
   }
 }
 
-// callback from MainActivity.java
 extern "C" JNIEXPORT jboolean JNICALL Java_net_sourceforge_smallbasic_MainActivity_optionSelected
   (JNIEnv *env, jclass jclazz, jint index) {
   auto *maEvent = new MAEvent();
@@ -180,6 +180,15 @@ extern "C" JNIEXPORT void JNICALL Java_net_sourceforge_smallbasic_MainActivity_o
   }
 }
 
+extern "C" JNIEXPORT jboolean JNICALL Java_net_sourceforge_smallbasic_MainActivity_libraryMode
+  (JNIEnv *env, jclass jclazz) {
+#if defined(_ANDROID_LIBRARY)
+  return true;
+#else
+  return false;
+#endif
+}
+
 void onContentRectChanged(ANativeActivity *activity, const ARect *rect) {
   logEntered();
   runtime->onResize(rect->right, rect->bottom);

src/ui/system.cpp

@@ -1,6 +1,6 @@
 // This file is part of SmallBASIC
 //
-// Copyright(C) 2001-2019 Chris Warren-Smith.
+// Copyright(C) 2001-2022 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
@@ -1122,9 +1122,11 @@ void System::showMenu() {
         _systemMenu[index++] = MENU_ZOOM_UP;
         _systemMenu[index++] = MENU_ZOOM_DN;
 #endif
+#if !defined(_ANDROID_LIBRARY)
         sprintf(buffer, MENU_STR_EDITOR, opt_ide == IDE_NONE ? MENU_STR_OFF : MENU_STR_ON);
         items->add(new String(buffer));
         _systemMenu[index++] = MENU_EDITMODE;
+#endif
         sprintf(buffer, MENU_STR_THEME, themeName());
         items->add(new String(buffer));
         _systemMenu[index++] = MENU_THEME;