v0.2.8: allow background play + more

added background play
added some help test
update travis tools version
added animated gif ...
fdroid fix: use 28.0.2 instead of 28.0.3

Author: tube42

.travis.yml

@@ -1,8 +1,8 @@
 language: android
 android:
   components:
-    - build-tools-26.0.2
-    - android-26
+    - build-tools-28.0.3
+    - android-28
     - tools
     - platform-tools
   licenses:

README.rst

@@ -7,13 +7,12 @@ DRUM ON
 This is a FOSS drum app for Android.
 
 .. raw:: html
-   
+
    <a href="https://f-droid.org/app/se.tube42.drum.android"><img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="100"></a>
 
-Screenshot
-----------
 
-.. image:: extra/screenshot/img00.png
+.. image:: extra/screenshot/demo.gif
+
 
 Building
 --------
@@ -53,4 +52,3 @@ To build the assets, you should do
 .. code:: shell
 
     make
-

android/build.gradle

@@ -1,6 +1,6 @@
 android {
-    buildToolsVersion "26.0.2"
-    compileSdkVersion 26
+    buildToolsVersion "28.0.2"
+    compileSdkVersion 28
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
@@ -20,11 +20,11 @@ android {
     defaultConfig {
         applicationId "se.tube42.drum.android"
         minSdkVersion 17
-        targetSdkVersion 26
+        targetSdkVersion 28
 
 		// app version
-        versionCode 27
-        versionName "0.2.7"
+        versionCode 28
+        versionName "0.2.8"
 
     }
 }

build.gradle

@@ -16,7 +16,7 @@ allprojects {
 
     ext {
         appName = "Drum On"
-        gdxVersion = '1.9.6'
+        gdxVersion = '1.9.7'
         roboVMVersion = '2.3.1'
         box2DLightsVersion = '1.4'
         ashleyVersion = '1.7.0'
@@ -76,7 +76,7 @@ project(":core") {
 
 		compile "se.tube42.tweeny:tweeny:0.3.1"
         compile "se.tube42.ks:ks:0.3.1"
-        compile "se.tube42.base42:base42:0.3.4"
+        compile "se.tube42.base42:base42:0.3.5"
     }
 }
 

core/src/se/tube42/drum/DrumApp.java

@@ -129,9 +129,11 @@ private void load_assets()
 
     @Override public void pause()
     {
-        ServiceProvider.autoSave();
-        World.mgr.onPause();
-        World.mixer.stop();
+		ServiceProvider.autoSave();
+		if(!Settings.bg_play) {
+        	World.mgr.onPause();
+			World.mixer.stop();
+		}
         super.pause();
     }
 
@@ -146,7 +148,12 @@ private void load_assets()
 
     public void dispose()
     {
-        System.out.println("Disposing...\n");
+		System.out.println("Disposing...\n");
+
+		// assuming we allowed bg-play, we might need to update stop music now
+		World.mgr.onPause();
+		World.mixer.stop();
+
         World.mixer.dispose();
         super.dispose();
     }

core/src/se/tube42/drum/audio/EffectChain.java

@@ -66,12 +66,12 @@ public boolean isEnabled(int n)
         return (enabled  & (1 << n)) != 0;
     }
 
-    public void toggle(int n)
+    public boolean toggle(int n)
     {
-        enabled ^= 1 << n;
+		enabled ^= 1 << n;
+		return isEnabled(n);
     }
 
-
     public void process(float [] data, int offset, int size)
     {
         for(int i = 0; i < effects.length; i++) {

core/src/se/tube42/drum/data/Constants.java

@@ -157,7 +157,8 @@ public final class Constants
           TOOL_FX_LOFI = 8,
           TOOL_FX_FILTER = 9,
           TOOL_FX_DELAY = 10,
-          TOOL_FX_COMP = 11,
+		  TOOL_FX_COMP = 11,
+		  TOOL_MISC_BACKGROUND = 12,
           TOOL_MISC_PAUSE = 14,
           TOOL_MISC_SAVE = 15
           ;
@@ -173,7 +174,7 @@ public final class Constants
         ICON_LOFI, ICON_FILTER, ICON_DELAY, ICON_COMPRESS,
 
         // settings
-       -1, -1, ICON_PAUSE, ICON_SAVE
+		ICON_BG_STOP, -1, ICON_PAUSE, ICON_SAVE
     };
 
     // ---------------------------------------

core/src/se/tube42/drum/data/Settings.java

@@ -0,0 +1,11 @@
+
+package se.tube42.drum.data;
+
+/**
+ * App overall settings
+ */
+public class Settings
+{
+	public static boolean bg_play = false;
+
+}

core/src/se/tube42/drum/logic/ServiceProvider.java

@@ -23,7 +23,8 @@ public class ServiceProvider
 
     public static void init()
     {
-        StorageService.init("drum.0");
+		StorageService.init("drum.0");
+		SettingsService.load();
     }
 
 
@@ -33,14 +34,16 @@ public static void init()
 
     public static void autoLoad()
     {
+		SettingsService.load();
         if(World.prog != null)
             SaveService.load(-1);
     }
 
     public static void autoSave()
     {
         if(World.prog != null)
-            SaveService.save(-1);
+			SaveService.save(-1);
+		SettingsService.save();
     }
 
 

core/src/se/tube42/drum/logic/SettingsService.java

@@ -0,0 +1,92 @@
+
+package se.tube42.drum.logic;
+
+import java.io.*;
+import java.util.Set;
+
+import se.tube42.lib.service.*;
+
+import se.tube42.drum.audio.*;
+import se.tube42.drum.data.*;
+
+import static se.tube42.drum.data.Constants.*;
+
+
+public final class SettingsService
+{
+    private final static String
+          HEADER = "drumon-settings",
+          SETTINGS_NAME = "DrumonSettings"
+          ;
+
+    private final static int
+		  VERSION = 1
+		  ;
+
+    // -----------------------------------------------------------
+    // load / save
+    // -----------------------------------------------------------
+
+    public static void save()
+    {
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		DataOutputStream dos = new DataOutputStream(baos);
+		try {
+			// format
+			dos.writeByte(VERSION);
+
+			// format flags
+			int fileflags = 0;
+			dos.writeInt(fileflags);
+
+			dos.writeBoolean(Settings.bg_play);
+
+			// reserved for future
+			dos.writeBoolean(false);
+			dos.writeBoolean(false);
+			dos.writeInt(0);
+			dos.writeInt(0);
+			dos.writeUTF("");
+			dos.writeUTF("");
+
+			final String str = HEADER + EncodingService.encode64( baos.toByteArray());
+			StorageService.save(SETTINGS_NAME, str);
+			StorageService.flush();
+		} catch(IOException e) {
+			System.err.println("ERROR: could not save settings: " + e);
+		}
+    }
+
+    // load from a save
+    public static boolean load()
+    {
+		String str = StorageService.load(SETTINGS_NAME, null);
+		if(str == null)
+			return false;
+
+		// check header
+		if(!str.startsWith(HEADER))
+            return false;
+        str = str.substring(HEADER.length());
+
+		byte [] bytes = EncodingService.decode64(str);
+		if(bytes == null)  {
+			System.err.println("ERROR: could not decode settings string: " + str);
+			return false;
+		}
+
+		try {
+			ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
+			DataInputStream dis = new DataInputStream(bais);
+
+            final byte version = dis.readByte();
+			final int fileflags = dis.readInt();
+			Settings.bg_play = dis.readBoolean();
+
+		} catch(IOException e) {
+			System.err.println("Could not load settings: " + e);
+			return false;
+		}
+		return true;
+    }
+}