ANDROID: add ubuntu mono font

Author: chrisws

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

@@ -187,14 +187,17 @@ sub do_setup()
   print "Envy Code R:"
   print "  http://damieng.com/envy-code-r"
   print "Inconsolata:"
-  print "  Copyright 2006 The Inconsolata Project Authors"
+  print "  Copyright 2006 The Inconsolata Project"
   print "  http://scripts.sil.org/OFL"
+  print "Ubuntu:"
+  print "  https://ubuntu.com/legal/font-licence"
   print
   dim frm.inputs(1)
   frm.inputs(0).type="list"
-  frm.inputs(0).value="Inconsolata|Envy Code R"
+  frm.inputs(0).value="Inconsolata|Envy Code R|UbuntuMono"
   frm.inputs(0).selectedIndex=env("fontId")
-  frm.inputs(0).height=TXTH("Q")*2+4
+  frm.inputs(0).height=TXTH("Q")*3+4
+  frm.inputs(0).width=TXTW("Q")*12
   frm = form(frm)
   frm.doEvents()
   env("fontId=" + frm.inputs(0).selectedIndex)

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

@@ -65,7 +65,6 @@
 import java.net.URLDecoder;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -811,7 +810,7 @@ private Map<String, String> getPostData(DataInputStream inputStream, final Strin
     String nextLine = line;
     while (nextLine != null && nextLine.length() > 0) {
       if (nextLine.toLowerCase(Locale.ENGLISH).startsWith(lengthHeader)) {
-        length = Integer.valueOf(nextLine.substring(lengthHeader.length()));
+        length = Integer.parseInt(nextLine.substring(lengthHeader.length()));
       }
       nextLine = readLine(inputStream);
     }
@@ -919,7 +918,7 @@ private void processSettings() {
     try {
       Properties p = new Properties();
       p.load(getApplication().openFileInput("settings.txt"));
-      int socket = Integer.valueOf(p.getProperty("serverSocket", "-1"));
+      int socket = Integer.parseInt(p.getProperty("serverSocket", "-1"));
       String token = p.getProperty("serverToken", new Date().toString());
       if (socket != -1) {
         startServer(socket, token);

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

@@ -53,8 +53,8 @@ void setSilent(boolean silent) {
    */
   private byte[] generateTone(int freqOfTone, int durationMillis) {
     int numSamples = Math.max(1, durationMillis * AUDIO_SAMPLE_RATE / 1000);
-    double sample[] = new double[numSamples];
-    byte result[] = new byte[2 * numSamples];
+    double[] sample = new double[numSamples];
+    byte[] result = new byte[2 * numSamples];
 
     for (int i = 0; i < numSamples; ++i) {
       // Fill the sample array

src/platform/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.1.1'
+    classpath 'com.android.tools.build:gradle:4.1.3'
     classpath "com.github.ben-manes:gradle-versions-plugin:0.22.0"
   }
 }

src/platform/android/jni/display.cpp

@@ -16,6 +16,8 @@
 #define FONT_FACE_BOLD_0    "Inconsolata-Bold.ttf"
 #define FONT_FACE_REGULAR_1 "Envy Code R.ttf"
 #define FONT_FACE_BOLD_1    "Envy Code R Bold.ttf"
+#define FONT_FACE_REGULAR_2 "UbuntuMono-Regular.ttf"
+#define FONT_FACE_BOLD_2    "UbuntuMono-Bold.ttf"
 
 extern ui::Graphics *graphics;
 
@@ -197,6 +199,10 @@ bool Graphics::loadFonts(int fontId) {
     regularName = FONT_FACE_REGULAR_1;
     boldName = FONT_FACE_BOLD_1;
     break;
+  case 2:
+    regularName = FONT_FACE_REGULAR_2;
+    boldName = FONT_FACE_BOLD_2;
+    break;
   default:
     regularName = FONT_FACE_REGULAR_0;
     boldName = FONT_FACE_BOLD_0;

src/ui/image.cpp

@@ -476,13 +476,16 @@ void screen_dump() {
   if (image != nullptr) {
     const char *path = gsb_bas_dir;
 #if defined(_ANDROID)
-    path = getenv("EXTERNAL_STORAGE");
+    path = getenv("EXTERNAL_DIR");
 #endif
     for (int i = 0; i < 1000; i++) {
       String file;
       if (strstr(path, "://") == nullptr) {
         file.append(path);
       }
+      if (file.lastChar() != '/') {
+        file.append("/");
+      }
       file.append("sbasic_dump_");
       file.append(i);
       file.append(".png");

src/ui/strlib.cpp

@@ -386,6 +386,9 @@ int main() {
   assertEq(1, s3.equals("CATS", true));
   assertEq(0, s3.equals("CATS", false));
   assertEq(1, s3.equals("cats", false));
+  assertEq('x', s1.lastChar());
+  assertEq('\0', s2.lastChar());
+  assertEq('s', s3.lastChar());
   return 0;
 }
 #endif

src/ui/strlib.h

@@ -50,6 +50,7 @@ struct String {
   int    indexOf(char chr, int fromIndex) const;
   int    indexOf(const char *s, int fromIndex) const;
   bool   empty() const { return _buffer == NULL || _buffer[0] == '\0'; };
+  char   lastChar() const { return (_buffer == NULL || !_buffer[0] ? '\0' : _buffer[strlen(_buffer) - 1]); }
   int    lastIndexOf(char chr, int untilIndex) const;
   int    length() const { return (_buffer == NULL ? 0 : strlen(_buffer)); }
   String leftOf(char ch) const;