ANDROID: fix access to external storage

Author: chrisws

ChangeLog

@@ -1,5 +1,7 @@
-2020-06-14 (12.19)
+2020-07-12 (12.19)
 	ANDROID: fix layout issue with samsung mobiles
+	ANDROID: save and restore the selected theme
+	ANDROID: fix access to external storage
 
 2020-06-14 (12.19)
 	UI: Use theme colours in main display #94

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

@@ -7,11 +7,11 @@ const lineSpacing = 2 + char_h
 const wnd = window()
 const theme = wnd.theme
 const colBkGnd = theme.background
-const colText  = theme.text1
+const colText  = theme.text5
 const colFile  = theme.text2
 const colDir   = theme.text3
 const colText2 = theme.text4
-const colNav   = theme.text5
+const colNav   = theme.text1
 const colNav2  = theme.text6
 const menu_gap = -(char_w / 2)
 const is_sdl = instr(sbver, "SDL") != 0

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

@@ -21,6 +21,7 @@
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
@@ -784,6 +785,10 @@ private String getExternalStorage() {
       } else {
         result = path;
       }
+    } else if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+      // https://commonsware.com/blog/2019/06/07/death-external-storage-end-saga.html
+      File[] dirs = getExternalMediaDirs();
+      result = dirs[0].getAbsolutePath();
     } else {
       result = getInternalStorage();
     }

src/platform/android/jni/runtime.cpp

@@ -15,6 +15,7 @@
 #include "platform/android/jni/runtime.h"
 #include "lib/maapi.h"
 #include "ui/utils.h"
+#include "ui/theme.h"
 #include "languages/messages.en.h"
 #include "include/osd.h"
 #include "common/sbapp.h"
@@ -33,6 +34,7 @@
 #define SERVER_SOCKET_KEY "serverSocket"
 #define SERVER_TOKEN_KEY "serverToken"
 #define MUTE_AUDIO_KEY "muteAudio"
+#define THEME_KEY "theme"
 #define OPT_IDE_KEY "optIde"
 #define GBOARD_KEY_QUESTION 274
 #define EVENT_TYPE_EXIT 100
@@ -545,6 +547,13 @@ void Runtime::loadConfig() {
     if (s) {
       opt_ide = s->toInteger();
     }
+    s = settings.get(THEME_KEY);
+    if (s) {
+      int id = s->toInteger();
+      if (id > -1 && id < NUM_THEMES) {
+        g_themeId = id;
+      }
+    }
     loadEnvConfig(settings, SERVER_SOCKET_KEY);
     loadEnvConfig(settings, SERVER_TOKEN_KEY);
     loadEnvConfig(settings, FONT_ID_KEY);
@@ -596,6 +605,7 @@ void Runtime::saveConfig() {
     fprintf(fp, "%s=%d\n", FONT_SCALE_KEY, _fontScale);
     fprintf(fp, "%s=%d\n", MUTE_AUDIO_KEY, opt_mute_audio);
     fprintf(fp, "%s=%d\n", OPT_IDE_KEY, opt_ide);
+    fprintf(fp, "%s=%d\n", THEME_KEY, g_themeId);
     for (int i = 0; environ[i] != nullptr; i++) {
       char *env = environ[i];
       if (strstr(env, SERVER_SOCKET_KEY) != nullptr ||

src/ui/inputs.cpp

@@ -239,7 +239,7 @@ void FormInput::drawLink(const char *caption, int dx, int dy, int sw, int chw) {
 
 void FormInput::drawText(const char *caption, int dx, int dy, int sw, int chw) {
   if (caption != nullptr) {
-    unsigned strWidth = chw * strlen(caption);
+    int strWidth = chw * strlen(caption);
     int width = sw - dx;
     if (width > _width) {
       width = _width;