Merge pull request #3386 from bobrippling/fix/chargent-notify-hide

chargent: fix manual/tap hiding of notification
espruino · May 2, 2024 · 37879b5 · 37879b5
2 parents 2d20c81 + dcd5a2d
commit 37879b5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/apps/chargent/ChangeLog b/apps/chargent/ChangeLog
@@ -4,3 +4,4 @@
 0.04: Added notification
 0.05: Fixed boot
 0.06: Allow tap to silence notification/buzzing
+0.07: Fix notification-tap silencing and notification length
diff --git a/apps/chargent/boot.js b/apps/chargent/boot.js
@@ -24,8 +24,8 @@
               lim = sum / cnt;
               require('Storage').writeJSON('chargent.json', {limit: lim});
             }
-            const onHide = () => { id = clearInterval(id) };
-            require('notify').show({id: 'chargent', title: 'Fully charged', onHide });
+            const onHide = () => { if(id) id = clearInterval(id) };
+            require('notify').show({id: 'chargent', title: 'Charged', onHide });
             // TODO ? customizable
             Bangle.buzz(500);
             setTimeout(() => Bangle.buzz(500), 1000);

diff --git a/apps/chargent/metadata.json b/apps/chargent/metadata.json
@@ -1,6 +1,6 @@
 { "id": "chargent",
   "name": "Charge Gently",
-  "version": "0.06",
+  "version": "0.07",
   "description": "When charging, reminds you to disconnect the watch to prolong battery life.",
   "icon": "icon.png",
   "type": "bootloader",

diff --git a/apps/notify/notify_bjs2.js b/apps/notify/notify_bjs2.js
@@ -157,6 +157,7 @@ exports.hide = function(options) {
   hideCallback = undefined;
   id = null;
   Bangle.removeListener("touch", exports.hide);
+  E.stopEventPropagation && E.stopEventPropagation();
   function anim() {
     pos += 4;
     if (pos > 0) {