Merge pull request #3978 from RKBoss6/schedSnoozeUpdates

[Sched] Add snooze menu

Author: gfwilliams

apps/sched/ChangeLog

@@ -35,3 +35,4 @@
 0.32: clkinfo ensures an alarm won't trigger immediately (copying `alarm`'s behaviour)
 0.33: Ensure default vibration pattern is longer
 0.34: Ensure ClockInfo updates if it's used to start a timer
+0.35: If you use 2v28 (or above) firmware, you can long-press on the snooze button to gain finer control over snooze lengths.

apps/sched/README.md

@@ -1,17 +1,22 @@
-Sched: Scheduling library for alarms and timers
-====================================
+# Sched: Scheduling library for alarms and timers
+
 
 This provides boot code, a library and tools for alarms and timers.
 
 Other apps can use this to provide alarm functionality.
 
-App
----
+## App
+
+
+The `Alarms & Timers` app allows you to add/modify any running alarms and timers.
+
 
-The **Alarms & Timers** app allows you to add/modify any running alarms and timers.
+### Snooze Menu
+
+With sched version 0.35 or later, when an alarm or timer is triggered, and you have the latest cutting-edge firmware (or 2v28 when released), you can long press on the snooze button that pops up to go to a snooze menu, for finer control over snooze amounts. If you do not have the latest firmware, you will not notice any changes.
+
+## Global Settings
 
-Global Settings
----------------
 
 - `Unlock at Buzz` - If `Yes` the alarm/timer will unlock the watch
 - `Delete Expired Timers` - Default for whether expired timers are removed after firing.
@@ -21,8 +26,8 @@ Global Settings
 - `Buzz Interval` - The interval between one buzz and the next
 - `Default Alarm/Timer Pattern` - Default vibration pattern for newly created alarms/timers
 
-Internals / Library
--------------------
+## Internals / Library
+
 
 Alarms are stored in an array in `sched.json`, and take the form:
 

apps/sched/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "sched",
   "name": "Scheduler",
-  "version": "0.34",
+  "version": "0.35",
   "description": "Scheduling library for alarms and timers",
   "icon": "app.png",
   "type": "scheduler",

apps/sched/sched.js

@@ -1,10 +1,60 @@
+
 // Chances are boot0.js got run already and scheduled *another*
 // 'load(sched.js)' - so let's remove it first!
 if (Bangle.SCHED) {
   clearInterval(Bangle.SCHED);
   delete Bangle.SCHED;
 }
 
+function formatMS(ms) {
+  if (ms < 60000) {
+    // less than a minute → show seconds
+    return Math.round(ms / 1000) + "s";
+  } else {
+    // one minute or more → show minutes
+    return Math.round(ms / 60000) + "m";
+  }
+}
+
+function showSnoozeMenu(alarm){
+
+  Bangle.buzz(40);
+
+  function onSnooze(snoozeTime) {
+    if (alarm.ot === undefined) {
+      alarm.ot = alarm.t;
+    }
+    let time = new Date();
+    let currentTime = (time.getHours()*3600000)+(time.getMinutes()*60000)+(time.getSeconds()*1000);
+    alarm.t = currentTime + snoozeTime;
+    alarm.t %= 86400000;
+    Bangle.emit("alarmSnooze", alarm);
+
+    // The updated alarm is still a member of 'alarms'
+    // so writing to array writes changes back directly
+    require("sched").setAlarms(alarms);
+    load();
+  }
+
+  if(alarm.timer){
+    
+    let timerLength=alarm.timer
+    let buttons={ "15s": 15, "30s":30,"1m":60 ,"2m":120,"5m":360};
+    let formattedLength = formatMS(timerLength)+"*";
+    buttons[formattedLength] = Math.round(timerLength/1000);
+    //different button lengths
+    E.showPrompt("Choose snooze length", {
+      title: "Snooze Options",
+      buttons
+    }).then(snoozeTime => onSnooze(snoozeTime * 1000));
+  }else{
+    E.showPrompt("Choose snooze length", {
+      title: "Snooze Options",
+      buttons: { "1m": 1, "2m":2,"5m": 5,"10m":10 } 
+    }).then(snoozeTime => onSnooze(snoozeTime * 60000));
+  }
+}
+  
 function showAlarm(alarm) {
   const alarmIndex = alarms.indexOf(alarm);
   const settings = require("sched").getSettings();
@@ -27,11 +77,16 @@ function showAlarm(alarm) {
 
   E.showPrompt(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
+    buttons: { /*LANG*/"Snooze": 1, /*LANG*/"Stop": 2 }, // default is sleep so it'll come back in some mins
+    buttonsLong:{/*LANG*/"Snooze":3},
   }).then(function (sleep) {
     buzzCount = 0;
-
-    if (sleep) {
+    //long press triggered
+    if(sleep==3){
+      showSnoozeMenu(alarm);
+      return;
+    }
+    if (sleep==1) {
       if (alarm.ot === undefined) {
         alarm.ot = alarm.t;
       }