ANDROID: updated app icon

Author: chrisws

images/sb-logo.blend

@@ -9,7 +9,7 @@ android {
     applicationId 'net.sourceforge.smallbasic'
     minSdkVersion 21
     targetSdkVersion 34
-    versionCode 71
+    versionCode 72
     versionName '12.28'
     resourceConfigurations += ['en']
   }

images/sb-logo.png

@@ -10,7 +10,7 @@
                android:hardwareAccelerated="true"
                android:usesCleartextTraffic="true"
                android:hasFragileUserData="true"
-               android:icon="@drawable/ic_launcher">
+               android:icon="@mipmap/ic_launcher">
     <!-- Our activity is based on the built-in NativeActivity framework class.
          This will take care of integrating with our NDK code. -->
     <activity android:name="net.sourceforge.smallbasic.MainActivity"

src/platform/android/app/build.gradle

@@ -120,7 +120,7 @@ sub do_about()
   color colText
   print "Version "; sbver
   print
-  print "Copyright (c) 2002-2024 Chris Warren-Smith"
+  print "Copyright (c) 2002-2025 Chris Warren-Smith"
   print "Copyright (c) 1999-2006 Nicholas Christopoulos" + chr(10)
 
   local bn_home

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

@@ -133,7 +133,7 @@ public void addShortcut(final byte[] pathBytes) {
     intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, name);
     intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
                     Intent.ShortcutIconResource.fromContext(getApplicationContext(),
-                                                            R.drawable.ic_launcher));
+                                                            R.mipmap.ic_launcher));
     intent.putExtra("duplicate", false);
     intent.setAction("com.android.launcher.action.INSTALL_SHORTCUT");
     getApplicationContext().sendBroadcast(intent);

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

src/platform/android/app/src/main/res/drawable-hdpi/ic_launcher.png

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>

src/platform/android/app/src/main/res/drawable-mdpi/ic_launcher.png

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

src/platform/android/app/src/main/res/drawable-xhdpi/ic_launcher.png

@@ -21,9 +21,9 @@
 constexpr int32_t AUDIO_SAMPLE_RATE = 44100;
 constexpr float PI2 = 2.0f * M_PI;
 constexpr int SILENCE_BEFORE_STOP = kMillisPerSecond * 5;
-constexpr int MAX_RAMP = 250;
 constexpr int MAX_QUEUE_SIZE = 250;
-constexpr int RAMP_SCALE = 10;
+constexpr int MAX_RAMP = 200;
+constexpr int RAMP_SCALE = 20;
 int instances = 0;
 
 struct Sound {
@@ -87,6 +87,9 @@ float Sound::sample() {
   if (_fadeIn != 0 && _sampled < _fadeIn) {
     // fadeIn from silence
     result *= (float)(_sampled) / (float)_fadeIn;
+  } else if (_fadeOut != 0 && _samples - _sampled < _fadeOut) {
+    // fadeOut to silence
+    result *= (float)(_samples - _sampled) / (float)_fadeOut;
   } else if (_rest != 0) {
     if (_sampled < _rest) {
       // fadeOut the previous sound
@@ -97,9 +100,6 @@ float Sound::sample() {
     } else {
       result = 0;
     }
-  } else if (_fadeOut != 0 && _samples - _sampled < _fadeOut) {
-    // fadeOut to silence
-    result *= (float)(_samples - _sampled) / (float)_fadeOut;
   }
 
   return result;