From 205e95347ee757bbbbf010574742ffb7f1559216 Mon Sep 17 00:00:00 2001
From: Logan B <3870583+thinkpoop@users.noreply.github.com>
Date: Sat, 8 Feb 2025 14:27:01 -0600
Subject: [PATCH] [gbmusic] fix #3737; fix autostart saved state; pass
 playpause to gb instead of play; allow widget clicks

---
 apps/gbmusic/ChangeLog     |  1 +
 apps/gbmusic/app.js        | 16 +++++++++++-----
 apps/gbmusic/boot.js       |  4 ++--
 apps/gbmusic/metadata.json |  2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/apps/gbmusic/ChangeLog b/apps/gbmusic/ChangeLog
index 0275542fb..433c58368 100644
--- a/apps/gbmusic/ChangeLog
+++ b/apps/gbmusic/ChangeLog
@@ -12,3 +12,4 @@
 0.11: Use default Bangle formatter for booleans
 0.12: Issue newline before GB commands (solves issue with console.log and ignored commands)
 0.13: Upgrade to new translation system
+0.14: Fix auto-start saved state; fix clearing track number; allow widget clicks
diff --git a/apps/gbmusic/app.js b/apps/gbmusic/app.js
index 7f5aad8f3..8cf813fb9 100644
--- a/apps/gbmusic/app.js
+++ b/apps/gbmusic/app.js
@@ -91,8 +91,8 @@ function rScroller(l) {
   const w = g.stringWidth(l.label)+40,
     y = l.y+l.h/2;
   l.offset = l.offset%w;
-  g.setClipRect(l.x, l.y, l.x+l.w-1, l.y+l.h-1)
-    .setColor(l.col).setBgColor(l.bgCol) // need to set colors: iScroll calls this function outside Layout
+  //g.setClipRect(l.x, l.y, l.x+l.w-1, l.y+l.h-1)
+  g.setColor(l.col).setBgColor(l.bgCol) // need to set colors: iScroll calls this function outside Layout
     .setFontAlign(-1, 0) // left center
     .clearRect(l.x, l.y, l.x+l.w-1, l.y+l.h-1)
     .drawString(l.label, l.x-l.offset+40, y)
@@ -433,15 +433,21 @@ function sendCommand(command) {
   drawControls();
 }
 
+function handleTouch(btn, pos) {
+  if (pos === undefined || pos.y >= Bangle.appRect.y) {
+    togglePlay();
+  }
+}
+
 function togglePlay() {
-  sendCommand(stat==="play" ? "pause" : "play");
+  sendCommand(stat==="play" ? "pause" : "playpause");
 }
 
 /**
  * Setup touch+swipe for Bangle.js 1
  */
 function touch1() {
-  Bangle.on("touch", togglePlay);
+  Bangle.on("touch", handleTouch);
   Bangle.on("swipe", dir => {
     sendCommand(dir===1 ? "previous" : "next");
   });
@@ -450,7 +456,7 @@ function touch1() {
  * Setup touch+swipe for Bangle.js 2
  */
 function touch2() {
-  Bangle.on("touch", togglePlay);
+  Bangle.on("touch", handleTouch);
   // swiping
   let drag;
   Bangle.on("drag", e => {
diff --git a/apps/gbmusic/boot.js b/apps/gbmusic/boot.js
index 154f85c2b..6cd544a21 100644
--- a/apps/gbmusic/boot.js
+++ b/apps/gbmusic/boot.js
@@ -10,7 +10,7 @@ setTimeout( // make other boot code run first, so we override e.g. android.boot.
      * Only runs while other apps are loaded
      */
     function check() {
-      if (s!=="play" || !i || !a || !Bangle.CLOCK) return; // only launch app if we know which song we are playing, and autoLoad is enabled
+      if ((!s || s.state!=="play") || !i || !a || !Bangle.CLOCK) return; // only launch app if we know which song we are playing, and autoLoad is enabled
       delete (i.t);
       // store info and launch music app
       require("Storage").writeJSON("gbmusic.load.json", {
@@ -27,7 +27,7 @@ setTimeout( // make other boot code run first, so we override e.g. android.boot.
           i = e;
           return APP ? info(e) : check();
         case "musicstate":
-          s = e.state;
+          s = e;
           return APP ? state(e) : check();
         default:
           // pass on other events
diff --git a/apps/gbmusic/metadata.json b/apps/gbmusic/metadata.json
index 0024a1708..a463e6ea0 100644
--- a/apps/gbmusic/metadata.json
+++ b/apps/gbmusic/metadata.json
@@ -2,7 +2,7 @@
   "id": "gbmusic",
   "name": "Gadgetbridge Music Controls",
   "shortName": "Music Controls",
-  "version": "0.13",
+  "version": "0.14",
   "description": "Control the music on your Gadgetbridge-connected phone",
   "icon": "icon.png",
   "screenshots": [{"url":"screenshot_v1_d.png"},{"url":"screenshot_v1_l.png"},