Merge branch 'twenties' into app-loader

Author: thyttan

apps/twenties/boot.js

@@ -1,3 +1,4 @@
+var isTwentiesInstalled = true; // Used to clear the alarms set by `twenties` if it is uninstalled. See `twenties.setup.js`.
 {
   let alarms = require("sched").getAlarms();
   if (!alarms.find(a => a.appid == "twenties")) { // Only set up alarms if they aren't already.

apps/twenties/setup.js

@@ -1,6 +1,16 @@
 { // this code is called from `twenties.boot.js` in a scope where the `alarms` variable is defined.
 
   const NUMBER_OF_ALARMS_TO_SCHEDULE = (17 - 8) * 3; // start at 8 o'clock, end at 17 o'clock. Fire every 1/3 of an hour.
+  const J́S_BUZZ_OR_DELETE_ALARMS = `{
+  if (!isTwentiesInstalled) {
+    let alarms = require("sched").getAlarms();
+    alarms = alarms.filter((alarm) => {alarm.appid === "twenties"});
+    alarms.forEach(alarm => {
+      require("sched").setAlarm(alarm.id, undefined);
+    });
+    require("sched").reload();
+  } else {Bangle.buzz()}
+}`
   for (let i = 0; i < NUMBER_OF_ALARMS_TO_SCHEDULE + 1; i++) {
     for (let j = 0; j < 2; j++) {
       alarms.push({
@@ -10,10 +20,7 @@
         t: 8 * 3600000 + i * 20 * 60000 + j * 20 * 1000,
         dow: 0b0111110,
         hidden: true,
-        js: "Bangle.buzz()" // OPTIONAL - a JS command to execute when the alarm activates (*instead* of loading 'sched.js')
-        // when this code is run, you're responsible for setting alarm.on=false (or removing the alarm)
-        // hack that let's us repeat without writing out the day strings in the menu scroller - which was heavy on the watch with so many alarms. Testing to evaluate effectiveness.
-        // TODO: Does this still make it so alarms are only fired on weekdays?
+        js: J́S_BUZZ_OR_DELETE_ALARMS
       });
     }
   }