Merge pull request #211 from chrisws/sb_master

Sb master

Author: chrisws

ChangeLog

@@ -1,10 +1,44 @@
+2024-04-14 (12.27)
+	COMMON: Fix bug #149: Problem with big hex numbers in windows
+	COMMON: Add new function TRANSPOSE()
+
+2024-04-07 (12.27)
+	ANDROID: Implemented "android.request"
+
+2024-02-19 (12.27)
+	COMMON: Fix TSAVE bug #205
+
+2024-01-22 (12.27)
+	COMMON: Fix linking issue on MSYS2
+
+2024-01-14 (12.27)
+	COMMON: Improvements for image.save()
+
+2024-01-13 (12.27)
+	COMMON: Serial port improvements.
+
 2024-01-06 (12.27)
 	COMMON: Allow modules to return objects with methods that take arguments
 
+2023-12-01 (12.27)
+	CONSOLE: Bugfix for image.clip() and image.save()
+
+2023-10-31 (12.27)
+	COMMON: Fix: RTRIM changes input string
+
 2023-08-27 (12.27)
 	COMMON: Fix parameter number error when calling a unit sub/func
 	COMMON: Show a runtime error if a module calls exit()
 
+2023-08-05 (12.27)
+	COMMON: Fix building on Cygwin
+
+2023-07-23 (12.27)
+	COMMON: Fix for RoundPrecisionBug
+
+2023-07-18 (12.27)
+	COMMON: Fix redim regression
+
 2023-06-18 (12.27)
 	COMMON: Fix redim regression
 	PLUGINS: Added mechanism for cleaning up resources when the associated map falls out of scope
@@ -13,6 +47,10 @@
 	CONSOLE: Fix image save
 	ANDROID: Fix download error when there are duplicate scratch.bas files
 
+2023-05-14 (12.27)
+	COMMON: Fix bug: LINEQN tolerance
+	COMMON: Fix floating-point number round-precision bug when converting a floating-point number to string.
+
 2023-03-26 (12.26)
 	ANDROID: Fix setenv error #187
 	ANDROID: update web UI dependencies

src/platform/android/app/build.gradle

@@ -2,16 +2,16 @@ apply plugin: 'com.android.application'
 
 android {
   // app can use the API features included in this API level and lower.
-  compileSdkVersion 33
+  compileSdk 34
 
   // can override some attributes in main/AndroidManifest.xml
   defaultConfig {
     applicationId 'net.sourceforge.smallbasic'
-    minSdkVersion 16
-    targetSdkVersion 33
-    versionCode 59
-    versionName '12.26'
-    resConfigs 'en'
+    minSdkVersion 19
+    targetSdkVersion 34
+    versionCode 60
+    versionName '12.27'
+    resourceConfigurations += ['en']
   }
 
   signingConfigs {
@@ -26,19 +26,13 @@ android {
   }
 
   buildTypes {
-    debug {
-      buildConfigField "boolean", "DEBUG_VIEW", "true"
-      buildConfigField "java.util.Date", "BUILD_TIME", "new java.util.Date(" + System.currentTimeMillis() + "L)"
-    }
     release {
       ndk {
-       debugSymbolLevel = 'FULL'
+        debugSymbolLevel = 'FULL'
       }
-      buildConfigField "boolean", "DEBUG_VIEW", "false"
-      buildConfigField "java.util.Date", "BUILD_TIME", "new java.util.Date(" + System.currentTimeMillis() + "L)"
       shrinkResources true
       minifyEnabled true
-      proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+      proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
       signingConfig signingConfigs.release
     }
   }
@@ -59,6 +53,7 @@ android {
 }
 
 dependencies {
-  implementation 'androidx.core:core:1.10.0'
+  implementation 'androidx.core:core:1.12.0'
+  implementation files('libs/ioio-release.aar')
   testImplementation 'junit:junit:4.13.2'
 }

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

@@ -1,31 +1,9 @@
-# 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 net.sourceforge.smallbasic.** { public *; }
+-keep public class ioio.** { *; }
+-keepclasseswithmembernames class * { native <methods>; }
 -printmapping build/outputs/mapping/release/mapping.txt
 -keepattributes LineNumberTable,SourceFile

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

@@ -152,7 +152,7 @@ sub do_about()
   print "This program is free software; you can use it ";
   print "redistribute it and/or modify it under the terms of the ";
   print "GNU General Public License version 2 as published by ";
-  print "the Free Software Foundation." + chr(10)
+  print "the Free Software Foundation."
   print
   color colText
   server_info()
@@ -162,6 +162,77 @@ end
 
 sub do_setup()
   local frm
+  local fontId = int(env("fontId"))
+  local loadModules = int(env("loadModules"))
+
+  color colText, colBkGnd
+  cls
+  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
+  local w = char_w * 14.5
+  local h = char_h * 4.5
+  local x = char_w / 2
+  local y = char_h / 2
+  rect x, y, w * 2, h + y * 2.5
+  dim frm.inputs(4)
+  frm.inputs(0).type = "label"
+  frm.inputs(0).label = "Select display font:"
+  frm.inputs(0).x = char_w
+  frm.inputs(1).type = "list"
+  frm.inputs(1).value = "Inconsolata|Envy Code R|UbuntuMono"
+  frm.inputs(1).selectedIndex = iff(fontId in [0,1,2], fontId, 0)
+  frm.inputs(1).x = char_w * 1.5
+  frm.inputs(1).y = char_h * 2.2
+  frm.inputs(1).height = char_h * 3 + 4
+  frm.inputs(1).width = char_w * 12
+  frm.inputs(2).type = "button"
+  frm.inputs(2).backgroundColor = colBkGnd
+  frm.inputs(2).color = colText
+  frm.inputs(2).label = "OK"
+  frm.inputs(2).value = "OK"
+  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
+    elseif (frm.value == "cancel") then
+      goto exitFunc
+    endif
+  wend
+  fontId = frm.inputs(1).selectedIndex
+
+  cls
+  at 0, char_h * 1
+  rect x, y, w * 2, h + y * 2.5
+  frm.inputs(0).label = "Extension modules:"
+  frm.inputs(1).value = "Ignore|Load"
+  frm.inputs(1).selectedIndex = iff(loadModules == 1, 1, 0)
+  frm = form(frm)
+  while 1
+    frm.doEvents()
+    if (frm.value == "OK") then
+      exit loop
+    elseif (frm.value == "cancel") then
+      goto exitFunc
+    endif
+  wend
+  loadModules = frm.inputs(1).selectedIndex
 
   color colText, colBkGnd
   cls
@@ -188,45 +259,30 @@ sub do_setup()
     env("serverToken=" + token)
   endif
 
-  color colText, colBkGnd
-  cls
-  print "Web service port number: " + env("serverSocket")
-  print
-  print boldOn + "Select display font."
-  print boldOff
-  print "Envy Code R:"
-  print "  http://damieng.com/envy-code-r"
-  print "Inconsolata:"
-  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|UbuntuMono"
-  frm.inputs(0).selectedIndex=env("fontId")
-  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)
+  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 = int(env("loadModules"))
 
   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
+    print boldOff;
   fi
+
+  print "Extension modules: " + boldOn + iff(loadModules == 2, "Active", iff(loadModules == 1, "Enabled", "Disabled"))
+  print boldOff
 end
 
 func fileCmpFunc0(l, r)
@@ -667,9 +723,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)