ANDROID: use system based font size

Author: chrisws

ide/android/AndroidManifest.xml

@@ -7,6 +7,10 @@
   <!-- This is the platform API where NativeActivity was introduced. -->
   <uses-sdk android:minSdkVersion="9" />
 
+  <!-- support large + xlarge screens to avoid compatibility mode -->
+  <supports-screens android:largeScreens="true" />
+  <supports-screens android:xlargeScreens="true" />
+
   <!-- This .apk has Java code, so set hasCode to true. -->
   <application android:label="@string/app_name"
                android:hasCode="true"

src/platform/android/jni/runtime.cpp

@@ -24,11 +24,10 @@
 #include "common/fs_socket_client.h"
 
 #define WAIT_INTERVAL 10
-#define DEFAULT_FONT_SIZE 30
 #define MAIN_BAS "__main_bas__"
 #define CONFIG_FILE "/settings.txt"
 #define PATH_KEY "path"
-#define FONT_SCALE_KEY "fontScale"
+#define FONT_SCALE_KEY "fontScale2"
 #define SERVER_SOCKET_KEY "serverSocket"
 #define SERVER_TOKEN_KEY "serverToken"
 
@@ -223,6 +222,17 @@ String Runtime::getString(const char *methodName) {
   return result;
 }
 
+int Runtime::getInteger(const char *methodName) {
+  JNIEnv *env;
+  _app->activity->vm->AttachCurrentThread(&env, NULL);
+  jclass clazz = env->GetObjectClass(_app->activity->clazz);
+  jmethodID methodId = env->GetMethodID(clazz, methodName, "()I");
+  jint result = env->CallIntMethod(_app->activity->clazz, methodId);
+  env->DeleteLocalRef(clazz);
+  _app->activity->vm->DetachCurrentThread();
+  return result;
+}
+
 int Runtime::getUnicodeChar(int keyCode, int metaState) {
   JNIEnv *env;
   _app->activity->vm->AttachCurrentThread(&env, NULL);
@@ -309,8 +319,11 @@ void Runtime::loadConfig() {
   String path;
   Properties profile;
 
+  int fontSize = getInteger("getStartupFontSize");
+  trace("fontSize = %d", fontSize);
+
   _output->setTextColor(DEFAULT_FOREGROUND, DEFAULT_BACKGROUND);
-  _output->setFontSize(DEFAULT_FONT_SIZE);
+  _output->setFontSize(fontSize);
   _initialFontSize = _output->getFontSize();
 
   path.append(_app->activity->internalDataPath);

src/platform/android/jni/runtime.h

@@ -25,7 +25,8 @@ struct Runtime : public System {
   void clearSoundQueue();
   void construct();
   bool getUntrusted();
-  String getString(const char *method);
+  String getString(const char *methodName);
+  int getInteger(const char *methodName);
   int getUnicodeChar(int keyCode, int metaState);
   void redraw() { _graphics->redraw(); }
   void handleKeyEvent(MAEvent &event);

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

@@ -38,12 +38,15 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Base64;
+import android.util.DisplayMetrics;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.InputDevice;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
@@ -59,6 +62,7 @@ public class MainActivity extends NativeActivity {
   private static final String WEB_BAS = "web.bas";
   private static final String SCHEME_BAS = "qrcode.bas";
   private static final String SCHEME = "smallbasic://x/";
+  private static final int BASE_FONT_SIZE = 20;
   private String _startupBas = null;
   private boolean _untrusted = false;
   private ExecutorService _audioExecutor = Executors.newSingleThreadExecutor();
@@ -108,6 +112,11 @@ public String getStartupBas() {
     return this._startupBas == null ? "" : this._startupBas;
   }
 
+  public int getStartupFontSize() {
+    DisplayMetrics metrics = Resources.getSystem().getDisplayMetrics();
+    return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, BASE_FONT_SIZE, metrics);
+  }
+
   public int getUnicodeChar(int keyCode, int metaState) {
     int result = 0;
     InputDevice device = InputDevice.getDevice(InputDevice.getDeviceIds()[0]);

src/platform/common/ansiwidget.cpp

@@ -48,7 +48,7 @@
 
 #define BUTTON_PADDING 10
 #define OVER_SCROLL 100
-
+#define H_SCROLL_SIZE 5
 #define SWIPE_MAX_TIMER 3000
 #define SWIPE_DELAY_STEP 200
 #define SWIPE_MAX_DURATION 300
@@ -783,8 +783,9 @@ bool AnsiWidget::pointerMoveEvent(MAEvent &event) {
     if (vscroll < 0) {
       vscroll = 0;
     }
-    if ((hscroll != _front->_scrollX && maxHScroll > 0 &&
-         hscroll <= maxHScroll) ||
+    if ((abs(hscroll - _front->_scrollX) > H_SCROLL_SIZE
+         && maxHScroll > 0
+         && hscroll <= maxHScroll) ||
         (vscroll != _front->_scrollY && maxVScroll > 0 &&
          vscroll < maxVScroll + OVER_SCROLL)) {
       _front->drawInto();