testing

voloved · Feb 22, 2025 · 72c18fc · 72c18fc
1 parent ca66344
commit 72c18fc
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 7 deletions.
diff --git a/apps/sched/ChangeLog b/apps/sched/ChangeLog
@@ -31,3 +31,4 @@
 0.28: Added an icon for disabled events
 0.29: Improve clkinfo startup time by 10ms
 0.30: Fix possible bug in toggling an alarm to on, from clkinfo
+0.31: Pressing BTN1 behaves the same as pressing Stop
diff --git a/apps/sched/lib.js b/apps/sched/lib.js
@@ -112,7 +112,8 @@ exports.getSettings = function () {
       buzzCount: 10,
       buzzIntervalMillis: 3000, // 3 seconds
       defaultAlarmPattern: "::",
-      defaultTimerPattern: "::"
+      defaultTimerPattern: "::",
+      btnToStop: true
     },
     require("Storage").readJSON("sched.settings.json", true) || {}
   );

diff --git a/apps/sched/metadata.json b/apps/sched/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "sched",
   "name": "Scheduler",
-  "version": "0.32",
+  "version": "0.34",
   "description": "Scheduling library for alarms and timers",
   "icon": "app.png",
   "type": "scheduler",

diff --git a/apps/sched/sched.js b/apps/sched/sched.js
@@ -70,7 +70,7 @@ function showPromptBtnCancel(msg,options) {
     Bangle.setUI({mode:"custom", remove: options.remove, redraw: draw, back:options.back,
       btn: () => { // Handle physical buttons explicitly
             showPromptBtnCancel();
-            resolve(options.buttons["No"]);
+            resolve(options.buttons.No);
           }, 
       touch:(_,e)=>{
         btnPos.forEach((b,i)=>{
@@ -86,8 +86,8 @@ function showPromptBtnCancel(msg,options) {
   });
 }
 
-function showCustomPrompt(message, options) {
-  if (true) {
+function showCustomPrompt(message, options, btnToStop) {
+  if (btnToStop) {
     return showPromptBtnCancel(message, options);
   } else {
     return E.showPrompt(message, options);
@@ -122,7 +122,7 @@ function showAlarm(alarm) {
   showCustomPrompt(message, {
     title: alarm.timer ? /*LANG*/"TIMER!" : /*LANG*/"ALARM!",
     buttons: { /*LANG*/"Snooze": true, /*LANG*/"Stop": false } // default is sleep so it'll come back in some mins
-  }).then(function (sleep) {
+  }, settings.btnToStop).then(function (sleep) {
     buzzCount = 0;
 
     if (sleep) {

diff --git a/apps/sched/settings.js b/apps/sched/settings.js
@@ -74,6 +74,14 @@
     /*LANG*/"Default Timer Pattern": require("buzz_menu").pattern(settings.defaultTimerPattern, v => {
       settings.defaultTimerPattern = v;
       require("sched").setSettings(settings);
-    })
+    }),
+
+    /*LANG*/"BTN1 to Stop": {
+      value: settings.btnToStop,
+      onchange: v => {
+        settings.btnToStop = v;
+        require("sched").setSettings(settings);
+      }
+    }
   });
 })
diff --git a/typescript/types/sched.d.ts b/typescript/types/sched.d.ts
@@ -93,6 +93,7 @@ declare module Sched {
     buzzIntervalMillis: number,
     defaultAlarmPattern: string,
     defaultTimerPattern: string,
+    btnToStop: boolean,
   };
 
   function getAlarms(): Sched[];