From 3f1ded53ede093c29023a96541eb0738d3f04f25 Mon Sep 17 00:00:00 2001
From: Erik Andresen <erik@vontaene.de>
Date: Tue, 2 May 2023 19:33:29 +0200
Subject: [PATCH 01/14] calendar: Read day names from locale

---
 apps/calendar/calendar.js | 65 ++++-----------------------------------
 1 file changed, 6 insertions(+), 59 deletions(-)

diff --git a/apps/calendar/calendar.js b/apps/calendar/calendar.js
index 6aab1aecd..ffe3084e6 100644
--- a/apps/calendar/calendar.js
+++ b/apps/calendar/calendar.js
@@ -55,65 +55,12 @@ if (settings.ndColors === true) {
 }
 
 function getDowLbls(locale) {
-  let dowLbls;
-  //TODO: Find some clever way to generate this programmatically from locale lib
-  switch (locale) {
-    case "de_AT":
-    case "de_CH":
-    case "de_DE":
-      if (startOnSun) {
-        dowLbls = ["So", "Mo", "Di", "Mi", "Do", "Fr", "Sa"];
-      } else {
-        dowLbls = ["Mo", "Di", "Mi", "Do", "Fr", "Sa", "So"];
-      }
-      break;
-    case "nl_NL":
-      if (startOnSun) {
-        dowLbls = ["zo", "ma", "di", "wo", "do", "vr", "za"];
-      } else {
-        dowLbls = ["ma", "di", "wo", "do", "vr", "za", "zo"];
-      }
-      break;
-    case "fr_BE":
-    case "fr_CH":
-    case "fr_FR":
-      if (startOnSun) {
-        dowLbls = ["Di", "Lu", "Ma", "Me", "Je", "Ve", "Sa"];
-      } else {
-        dowLbls = ["Lu", "Ma", "Me", "Je", "Ve", "Sa", "Di"];
-      }
-      break;
-    case "sv_SE":
-      if (startOnSun) {
-        dowLbls = ["Di", "Lu", "Ma", "Me", "Je", "Ve", "Sa"];
-      } else {
-        dowLbls = ["Lu", "Ma", "Me", "Je", "Ve", "Sa", "Di"];
-      }
-      break;
-    case "it_CH":
-    case "it_IT":
-      if (startOnSun) {
-        dowLbls = ["Do", "Lu", "Ma", "Me", "Gi", "Ve", "Sa"];
-      } else {
-        dowLbls = ["Lu", "Ma", "Me", "Gi", "Ve", "Sa", "Do"];
-      }
-      break;
-    case "oc_FR":
-      if (startOnSun) {
-        dowLbls = ["dg", "dl", "dm", "dc", "dj", "dv", "ds"];
-      } else {
-        dowLbls = ["dl", "dm", "dc", "dj", "dv", "ds", "dg"];
-      }
-      break;
-    default:
-      if (startOnSun) {
-        dowLbls = ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"];
-      } else {
-        dowLbls = ["Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"];
-      }
-      break;
-  }
-  return dowLbls;
+  let days = startOnSun ? [0, 1, 2, 3, 4, 5, 6] : [1, 2, 3, 4, 5, 6, 0];
+  const d = new Date();
+  return days.map(i => {
+    d.setDate(d.getDate() + (i + 7 - d.getDay()) % 7);
+    return require("locale").dow(d, 1);
+  });
 }
 
 function sameDay(d1, d2) {

From aa6d7cdbe197f8c8dde64699372f8c445aa7583f Mon Sep 17 00:00:00 2001
From: Erik Andresen <erik@vontaene.de>
Date: Tue, 2 May 2023 20:03:58 +0200
Subject: [PATCH 02/14] calendar: Display holidays

---
 apps/calendar/ChangeLog     |  1 +
 apps/calendar/calendar.js   | 47 ++++++++++++++++++++++---------------
 apps/calendar/metadata.json |  2 +-
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/apps/calendar/ChangeLog b/apps/calendar/ChangeLog
index 27e1e2517..c7902e263 100644
--- a/apps/calendar/ChangeLog
+++ b/apps/calendar/ChangeLog
@@ -13,3 +13,4 @@
 0.12: Mark dated events on a day
 0.13: Switch to swipe left/right for month and up/down for year selection
       Display events for current month on touch
+0.14: Add support for holidays
diff --git a/apps/calendar/calendar.js b/apps/calendar/calendar.js
index ffe3084e6..92e3428ba 100644
--- a/apps/calendar/calendar.js
+++ b/apps/calendar/calendar.js
@@ -36,7 +36,12 @@ const events = (require("Storage").readJSON("sched.json",1) || []).filter(a => a
   date.setHours(time.h);
   date.setMinutes(time.m);
   date.setSeconds(time.s);
-  return {date: date, msg: a.msg};
+  return {date: date, msg: a.msg, type: "e"};
+});
+// add holidays
+(require("Storage").readJSON("calendar.holiday.json",1) || []).forEach(h => {
+  const date = new Date(h.date);
+  events.push({date: date, msg: h.name, type: "h"});
 });
 events.sort((a,b) => a.date - b.date);
 
@@ -167,6 +172,27 @@ function drawCalendar(date) {
       const y1 = y * rowH + headerH + rowH;
       const x2 = x * colW + colW;
       const y2 = y * rowH + headerH + rowH + rowH;
+
+      if (eventsThisMonth.length > 0) {
+        // Display events for this day
+        eventsThisMonth.forEach((ev, idx) => {
+          if (sameDay(ev.date, curDay)) {
+            if (ev.type === "e") { // alarm/event
+              const hour = ev.date.getHours() + ev.date.getMinutes()/60.0;
+              const slice = hour/24*(eventsPerDay-1); // slice 0 for 0:00 up to eventsPerDay for 23:59
+              const height = (y2-2) - (y1+2); // height of a cell
+              const sliceHeight = height/eventsPerDay;
+              const ystart = (y1+2) + slice*sliceHeight;
+              g.setColor(bgEvent).fillRect(x1+1, ystart, x2-2, ystart+sliceHeight);
+            } else if (ev.type === "h") { // holiday
+              g.setColor(bgColorWeekend).fillRect(x1+1, y1+1, x2-1, y2-1);
+            }
+
+            eventsThisMonth.splice(idx, 1); // this event is no longer needed
+          }
+        });
+      }
+
       if (isToday) {
         g.setColor(red);
         g.drawRect(x1, y1, x2, y2);
@@ -178,23 +204,6 @@ function drawCalendar(date) {
         );
       }
 
-      if (eventsThisMonth.length > 0) {
-        // Display events for this day
-        g.setColor(bgEvent);
-        eventsThisMonth.forEach((ev, idx) => {
-          if (sameDay(ev.date, curDay)) {
-            const hour = ev.date.getHours() + ev.date.getMinutes()/60.0;
-            const slice = hour/24*(eventsPerDay-1); // slice 0 for 0:00 up to eventsPerDay for 23:59
-            const height = (y2-2) - (y1+2); // height of a cell
-            const sliceHeight = height/eventsPerDay;
-            const ystart = (y1+2) + slice*sliceHeight;
-            g.fillRect(x1+1, ystart, x2-2, ystart+sliceHeight);
-
-            eventsThisMonth.splice(idx, 1); // this event is no longer needed
-          }
-        });
-      }
-
       require("Font8x12").add(Graphics);
       g.setFont("8x12", fontSize);
       g.setColor(day < 50 ? fgOtherMonth : fgSameMonth);
@@ -236,7 +245,7 @@ function setUI() {
       const menu = events.filter(ev => ev.date.getFullYear() === date.getFullYear() && ev.date.getMonth() === date.getMonth()).map(e => {
         const dateStr = require("locale").date(e.date, 1);
         const timeStr = require("locale").time(e.date, 1);
-        return { title: `${dateStr} ${timeStr}` + (e.msg ? " " + e.msg : "") };
+        return { title: `${dateStr} ${e.type === "e" ? timeStr : ""}` + (e.msg ? " " + e.msg : "") };
       });
       if (menu.length === 0) {
         menu.push({title: /*LANG*/"No events"});
diff --git a/apps/calendar/metadata.json b/apps/calendar/metadata.json
index 87599e3f4..bf5c67b09 100644
--- a/apps/calendar/metadata.json
+++ b/apps/calendar/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "calendar",
   "name": "Calendar",
-  "version": "0.13",
+  "version": "0.14",
   "description": "Simple calendar",
   "icon": "calendar.png",
   "screenshots": [{"url":"screenshot_calendar.png"}],

From 8650595ca42879087f496b40f81dcd7ddebcdcc9 Mon Sep 17 00:00:00 2001
From: Erik Andresen <erik@vontaene.de>
Date: Tue, 2 May 2023 22:30:47 +0200
Subject: [PATCH 03/14] calendar: Add interface.html for holidays

---
 apps/calendar/interface.html | 186 +++++++++++++++++++++++++++++++++++
 apps/calendar/metadata.json  |   3 +-
 2 files changed, 188 insertions(+), 1 deletion(-)
 create mode 100644 apps/calendar/interface.html

diff --git a/apps/calendar/interface.html b/apps/calendar/interface.html
new file mode 100644
index 000000000..b70b26f9c
--- /dev/null
+++ b/apps/calendar/interface.html
@@ -0,0 +1,186 @@
+<html>
+  <head>
+    <link rel="stylesheet" href="../../css/spectre.min.css">
+    <link rel="stylesheet" href="../../css/spectre-icons.min.css">
+    <script src="../../core/lib/interface.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/ical.js/1.5.0/ical.min.js"></script>
+    <script>
+let dataElement = document.getElementById("data");
+let holidays;
+
+function sameDay(d1, d2) {
+  return d1.getFullYear() === d2.getFullYear() &&
+    d1.getMonth() === d2.getMonth() &&
+    d1.getDate() === d2.getDate();
+}
+
+function render() {
+  holidays.sort((a,b) => new Date(a.date) - new Date(b.date));
+  document.getElementById('events').innerHTML = "";
+  holidays.forEach(holiday => {
+    renderHoliday(holiday);
+  });
+}
+
+function readFile(input) {
+  document.getElementById('upload').disabled = true;
+
+  for(let i=0; i<input.files.length; i++) {
+    const reader = new FileReader();
+    reader.addEventListener("load", () => {
+      const jCalData = ICAL.parse(reader.result);
+      const comp = new ICAL.Component(jCalData);
+      // Fetch the VEVENT part
+      comp.getAllSubcomponents('vevent').forEach(vevent => {
+        event = new ICAL.Event(vevent);
+        holidays = holidays.filter(holiday => !sameDay(new Date(holiday.date), event.startDate.toJSDate())); // remove if already exists
+
+        const holiday = eventToHoliday(event);
+
+        holidays.push(holiday);
+      });
+
+      render();
+    }, false);
+
+    reader.readAsText(input.files[i], "UTF-8");
+  }
+}
+
+function eventToHoliday(event) {
+  const date = event.startDate.toJSDate();
+
+  const holiday = {
+    date: formatDate(date),
+    name: event.summary,
+  };
+  return holiday;
+}
+
+function formatDate(d) {
+  return d.getFullYear() + "-" + (d.getMonth() + 1).toString().padStart(2, '0') + "-" + d.getDate().toString().padStart(2, '0');
+}
+
+function upload() {
+  Util.showModal("Saving...");
+  Util.writeStorage("calendar.holiday.json", JSON.stringify(holidays), () => {
+    location.reload(); // reload so we see current data
+  });
+}
+
+function renderHoliday(holiday) {
+  const localDate = new Date(holiday.date);
+
+  const tr = document.createElement('tr');
+  tr.classList.add('event-row');
+  const tdTime = document.createElement('td');
+  tr.appendChild(tdTime);
+  const inputTime = document.createElement('input');
+  inputTime.type = "date";
+  inputTime.classList.add('event-date');
+  inputTime.classList.add('form-input');
+  inputTime.value = formatDate(localDate)
+  inputTime.onchange = (e => {
+    const date = new Date(inputTime.value);
+    holiday.date = formatDate(date.toISOString())
+  });
+  tdTime.appendChild(inputTime);
+
+  const tdSummary = document.createElement('td');
+  tr.appendChild(tdSummary);
+  const inputSummary = document.createElement('input');
+  inputSummary.type = "text";
+  inputSummary.classList.add('event-summary');
+  inputSummary.classList.add('form-input');
+  inputSummary.maxLength=40;
+  const summary = (holiday.name?.substring(0, inputSummary.maxLength) || "");
+  inputSummary.value = summary;
+  inputSummary.onchange = (e => {
+    holiday.name = inputSummary.value;
+  });
+  tdSummary.appendChild(inputSummary);
+  inputSummary.onchange();
+
+  const tdInfo = document.createElement('td');
+  tr.appendChild(tdInfo);
+
+  const buttonDelete = document.createElement('button');
+  buttonDelete.classList.add('btn');
+  buttonDelete.classList.add('btn-action');
+  tdInfo.prepend(buttonDelete);
+  const iconDelete = document.createElement('i');
+  iconDelete.classList.add('icon');
+  iconDelete.classList.add('icon-delete');
+  buttonDelete.appendChild(iconDelete);
+  buttonDelete.onclick = (e => {
+    holidays = holidays.filter(a => a !== holiday);
+    document.getElementById('events').removeChild(tr);
+  });
+
+  document.getElementById('events').appendChild(tr);
+  document.getElementById('upload').disabled = false;
+}
+
+function addHoliday() {
+  const holiday = {date: formatDate(new Date())};
+  renderHoliday(holiday);
+  holidays.push(holiday);
+  render();
+}
+
+function getData() {
+  Util.showModal("Loading...");
+  Util.readStorage('calendar.holiday.json',data=>{
+    holidays = JSON.parse(data || "[]") || [];
+
+    Util.hideModal();
+    holidays.forEach(holiday => {
+      renderHoliday(holiday);
+    });
+  });
+}
+
+// Called when app starts
+function onInit() {
+  getData();
+}
+    </script>
+  </head>
+  <body>
+    <h4>Holidays</h4>
+
+    <div class="float-right">
+      <button class="btn" onclick="addHoliday();">
+        <i class="icon icon-plus"></i>
+      </button>
+    </div>
+
+    <table class="table">
+      <thead>
+        <tr>
+          <th>Date</th>
+          <th>Holiday</th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody id="events">
+      </tbody>
+    </table>
+
+    <div class="divider"></div>
+    <div class="form-horizontal">
+      <div class="form-group">
+        <div class="col-5 col-xs-12">
+          <label class="form-label" for="fileinput">Add from iCalendar file</label>
+        </div>
+        <div class="col-7 col-xs-12">
+          <input id="fileinput" class="form-input" type="file" onchange="readFile(this)" accept=".ics,.ifb,.ical,.ifbf" multiple/>
+        </div>
+      </div>
+    </div>
+    <div class="divider"></div>
+
+    <button id="upload" class="btn btn-primary" onClick="upload()" disabled>Upload</button>
+    <button id="reload" class="btn" onClick="location.reload()">Reload</button>
+  </body>
+</html>
diff --git a/apps/calendar/metadata.json b/apps/calendar/metadata.json
index bf5c67b09..b7e40a1fd 100644
--- a/apps/calendar/metadata.json
+++ b/apps/calendar/metadata.json
@@ -9,10 +9,11 @@
   "supports": ["BANGLEJS","BANGLEJS2"],
   "readme": "README.md",
   "allow_emulator": true,
+  "interface": "interface.html",
   "storage": [
     {"name":"calendar.app.js","url":"calendar.js"},
     {"name":"calendar.settings.js","url":"settings.js"},
     {"name":"calendar.img","url":"calendar-icon.js","evaluate":true}
   ],
-  "data": [{"name":"calendar.json"}]
+  "data": [{"name":"calendar.json"}, {"name":"calendar.holiday.json"}]
 }

From 2d752832b734aa85052c63211f7e9ea8be53a7b6 Mon Sep 17 00:00:00 2001
From: Erik Andresen <erik@vontaene.de>
Date: Tue, 2 May 2023 22:31:21 +0200
Subject: [PATCH 04/14] sched/interface: fix date format

---
 apps/sched/interface.html | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/sched/interface.html b/apps/sched/interface.html
index 366e597a2..f1ace7d0c 100644
--- a/apps/sched/interface.html
+++ b/apps/sched/interface.html
@@ -3,7 +3,7 @@
     <link rel="stylesheet" href="../../css/spectre.min.css">
     <link rel="stylesheet" href="../../css/spectre-icons.min.css">
     <script src="../../core/lib/interface.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/ical.js/0.0.3/ical.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/ical.js/1.5.0/ical.min.js"></script>
     <script>
 let dataElement = document.getElementById("data");
 let alarms;
@@ -17,7 +17,7 @@ function readFile(input) {
     const reader = new FileReader();
     reader.addEventListener("load", () => {
       const jCalData = ICAL.parse(reader.result);
-      const comp = new ICAL.Component(jCalData[1]);
+      const comp = new ICAL.Component(jCalData);
       // Fetch the VEVENT part
       comp.getAllSubcomponents('vevent').forEach(vevent => {
         event = new ICAL.Event(vevent);
@@ -50,13 +50,17 @@ function dateFromAlarm(alarm) {
   return new Date(date.getTime() + alarm.t);
 }
 
+function formatDate(d) {
+  return d.getFullYear() + "-" + (d.getMonth() + 1).toString().padStart(2, '0') + "-" + d.getDate().toString().padStart(2, '0');
+}
+
 function getAlarmDefaults() {
   const date = new Date();
   return {
     on: true,
     t: dateToMsSinceMidnight(date),
     dow: 127,
-    date: date.toISOString().substring(0,10),
+    date: formatDate(date),
     last: 0,
     rp: "defaultRepeat" in schedSettings ? schedSettings.defaultRepeat : false,
     vibrate: "defaultAlarmPattern" in schedSettings ? schedSettings.defaultAlarmPattern : "::",
@@ -72,7 +76,7 @@ function eventToAlarm(event, offsetMs) {
     id: event.uid,
     msg: event.summary,
     t: dateToMsSinceMidnight(date),
-    date: date.toISOString().substring(0,10),
+    date: formatDate(date),
     data: {end: event.endDate.toJSDate().toISOString()}
   }};
   if (offsetMs) { // Alarm time is not real event time, so do a backup
@@ -105,7 +109,7 @@ function renderAlarm(alarm, exists) {
   inputTime.onchange = (e => {
     const date = new Date(inputTime.value);
     alarm.t = dateToMsSinceMidnight(date);
-    alarm.date = date.toISOString().substring(0,10);
+    alarm.date = formatDate(date);
   });
   tdTime.appendChild(inputTime);
 

From 5da64a5f8397385c40a3c774322257d0d09a3767 Mon Sep 17 00:00:00 2001
From: Erik Andresen <erik@vontaene.de>
Date: Tue, 2 May 2023 22:55:58 +0200
Subject: [PATCH 05/14] calendar/interface: Add check for existing file

---
 apps/calendar/README.md      |  1 +
 apps/calendar/interface.html | 23 ++++++++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/apps/calendar/README.md b/apps/calendar/README.md
index ec1c0c55a..6cf369563 100644
--- a/apps/calendar/README.md
+++ b/apps/calendar/README.md
@@ -10,6 +10,7 @@ Basic calendar
 - Swipe down (Bangle.js 2 only) to go to the next year
 - Touch to display events for current month
 - Press the button (button 3 on Bangle.js 1) to exit
+- Holidays have same color as weekends and can be edited with the 'Download'-interface
 
 ## Settings
 
diff --git a/apps/calendar/interface.html b/apps/calendar/interface.html
index b70b26f9c..068c71514 100644
--- a/apps/calendar/interface.html
+++ b/apps/calendar/interface.html
@@ -129,14 +129,23 @@ function addHoliday() {
 }
 
 function getData() {
-  Util.showModal("Loading...");
-  Util.readStorage('calendar.holiday.json',data=>{
-    holidays = JSON.parse(data || "[]") || [];
+  Puck.write(`\x10(function() {
+    Bluetooth.print(JSON.stringify(require("Storage").list("calendar.holiday.json").sort()));
+    })()\n`, contents => {
+      const fileNames = JSON.parse(contents);
+      if (fileNames.length > 0) {
+        Util.showModal("Loading...");
+        Util.readStorage('calendar.holiday.json',data=>{
+          holidays = JSON.parse(data || "[]") || [];
 
-    Util.hideModal();
-    holidays.forEach(holiday => {
-      renderHoliday(holiday);
-    });
+          Util.hideModal();
+          holidays.forEach(holiday => {
+            renderHoliday(holiday);
+          });
+        });
+      } else {
+        holidays = [];
+      }
   });
 }
 

From 044fc173c5d9cbf71bc9a6e972372e61c955b556 Mon Sep 17 00:00:00 2001
From: Erik Andresen <erik@vontaene.de>
Date: Wed, 3 May 2023 22:09:14 +0200
Subject: [PATCH 06/14] calendar: Add type other+repeat

---
 apps/calendar/README.md      |  2 +-
 apps/calendar/calendar.js    | 44 +++++++++++++++---------
 apps/calendar/interface.html | 65 ++++++++++++++++++++++++++++--------
 apps/calendar/metadata.json  |  2 +-
 4 files changed, 83 insertions(+), 30 deletions(-)

diff --git a/apps/calendar/README.md b/apps/calendar/README.md
index 6cf369563..5f90d0d52 100644
--- a/apps/calendar/README.md
+++ b/apps/calendar/README.md
@@ -10,7 +10,7 @@ Basic calendar
 - Swipe down (Bangle.js 2 only) to go to the next year
 - Touch to display events for current month
 - Press the button (button 3 on Bangle.js 1) to exit
-- Holidays have same color as weekends and can be edited with the 'Download'-interface
+- Holidays have same color as weekends and can be edited with the 'Download'-interface, e.g. by uploading an iCalendar file.
 
 ## Settings
 
diff --git a/apps/calendar/calendar.js b/apps/calendar/calendar.js
index 92e3428ba..7977b0196 100644
--- a/apps/calendar/calendar.js
+++ b/apps/calendar/calendar.js
@@ -38,12 +38,15 @@ const events = (require("Storage").readJSON("sched.json",1) || []).filter(a => a
   date.setSeconds(time.s);
   return {date: date, msg: a.msg, type: "e"};
 });
-// add holidays
-(require("Storage").readJSON("calendar.holiday.json",1) || []).forEach(h => {
-  const date = new Date(h.date);
-  events.push({date: date, msg: h.name, type: "h"});
+// add holidays & other events
+(require("Storage").readJSON("calendar.days.json",1) || []).forEach(d => {
+  const date = new Date(d.date);
+  const o = {date: date, msg: d.name, type: d.type};
+  if (d.repeat) {
+    o.repeat = d.repeat;
+  }
+  events.push(o);
 });
-events.sort((a,b) => a.date - b.date);
 
 if (settings.ndColors === undefined) {
   settings.ndColors = !g.theme.dark;
@@ -158,8 +161,12 @@ function drawCalendar(date) {
   weekBeforeMonth.setDate(weekBeforeMonth.getDate() - 7);
   const week2AfterMonth = new Date(date.getFullYear(), date.getMonth()+1, 0);
   week2AfterMonth.setDate(week2AfterMonth.getDate() + 14);
+  events.forEach(ev => {
+    if (ev.repeat === "y") {
+      ev.date.setFullYear(date.getFullYear());
+    }
+  });
   const eventsThisMonth = events.filter(ev => ev.date > weekBeforeMonth && ev.date < week2AfterMonth);
-
   let i = 0;
   for (y = 0; y < rowN - 1; y++) {
     for (x = 0; x < colN; x++) {
@@ -177,15 +184,21 @@ function drawCalendar(date) {
         // Display events for this day
         eventsThisMonth.forEach((ev, idx) => {
           if (sameDay(ev.date, curDay)) {
-            if (ev.type === "e") { // alarm/event
-              const hour = ev.date.getHours() + ev.date.getMinutes()/60.0;
-              const slice = hour/24*(eventsPerDay-1); // slice 0 for 0:00 up to eventsPerDay for 23:59
-              const height = (y2-2) - (y1+2); // height of a cell
-              const sliceHeight = height/eventsPerDay;
-              const ystart = (y1+2) + slice*sliceHeight;
-              g.setColor(bgEvent).fillRect(x1+1, ystart, x2-2, ystart+sliceHeight);
-            } else if (ev.type === "h") { // holiday
-              g.setColor(bgColorWeekend).fillRect(x1+1, y1+1, x2-1, y2-1);
+            switch(ev.type) {
+              case "e": // alarm/event
+                const hour = ev.date.getHours() + ev.date.getMinutes()/60.0;
+                const slice = hour/24*(eventsPerDay-1); // slice 0 for 0:00 up to eventsPerDay for 23:59
+                const height = (y2-2) - (y1+2); // height of a cell
+                const sliceHeight = height/eventsPerDay;
+                const ystart = (y1+2) + slice*sliceHeight;
+                g.setColor(bgEvent).fillRect(x1+1, ystart, x2-2, ystart+sliceHeight);
+                break;
+              case "h": // holiday
+                g.setColor(bgColorWeekend).fillRect(x1+1, y1+1, x2-1, y2-1);
+                break;
+              case "o": // other
+                g.setColor("#88ff00").fillRect(x1+1, y1+1, x2-1, y2-1);
+                break;
             }
 
             eventsThisMonth.splice(idx, 1); // this event is no longer needed
@@ -242,6 +255,7 @@ function setUI() {
     },
     btn: (n) => n === (process.env.HWVERSION === 2 ? 1 : 3) && load(),
     touch: (n,e) => {
+      events.sort((a,b) => a.date - b.date);
       const menu = events.filter(ev => ev.date.getFullYear() === date.getFullYear() && ev.date.getMonth() === date.getMonth()).map(e => {
         const dateStr = require("locale").date(e.date, 1);
         const timeStr = require("locale").time(e.date, 1);
diff --git a/apps/calendar/interface.html b/apps/calendar/interface.html
index 068c71514..509a6bebd 100644
--- a/apps/calendar/interface.html
+++ b/apps/calendar/interface.html
@@ -53,6 +53,7 @@ function eventToHoliday(event) {
   const holiday = {
     date: formatDate(date),
     name: event.summary,
+    type: 'h',
   };
   return holiday;
 }
@@ -63,7 +64,7 @@ function formatDate(d) {
 
 function upload() {
   Util.showModal("Saving...");
-  Util.writeStorage("calendar.holiday.json", JSON.stringify(holidays), () => {
+  Util.writeStorage("calendar.days.json", JSON.stringify(holidays), () => {
     location.reload(); // reload so we see current data
   });
 }
@@ -82,7 +83,7 @@ function renderHoliday(holiday) {
   inputTime.value = formatDate(localDate)
   inputTime.onchange = (e => {
     const date = new Date(inputTime.value);
-    holiday.date = formatDate(date.toISOString())
+    holiday.date = formatDate(date);
   });
   tdTime.appendChild(inputTime);
 
@@ -101,13 +102,50 @@ function renderHoliday(holiday) {
   tdSummary.appendChild(inputSummary);
   inputSummary.onchange();
 
-  const tdInfo = document.createElement('td');
-  tr.appendChild(tdInfo);
+  const tdType = document.createElement('td');
+  tr.appendChild(tdType);
+  const selectType = document.createElement("select");
+  selectType.classList.add('form-select');
+  tdType.prepend(selectType);
+  const optionHoliday = document.createElement("option");
+  optionHoliday.text = "Holiday";
+  optionHoliday.value = "h";
+  optionHoliday.selected = holiday.type === "h";
+  selectType.add(optionHoliday);
+  const optionOther = document.createElement("option");
+  optionOther.text = "Other";
+  optionOther.value = "o";
+  optionOther.selected = holiday.type === "o";
+  selectType.add(optionOther);
+  selectType.onchange = (e => {
+    holiday.type = e.target.value;
+  });
+
+  const tdRepeat = document.createElement('td');
+  tr.appendChild(tdRepeat);
+  const selectRepeat = document.createElement("select");
+  selectRepeat.classList.add('form-select');
+  tdRepeat.prepend(selectRepeat);
+  const optionNever = document.createElement("option");
+  optionNever.text = "Never";
+  optionNever.selected = !holiday.repeat;
+  selectRepeat.add(optionNever);
+  const optionYearly = document.createElement("option");
+  optionYearly.text = "Yearly";
+  optionYearly.value = "y";
+  optionYearly.selected = holiday.repeat === "y";
+  selectRepeat.add(optionYearly);
+  selectRepeat.onchange = (e => {
+    holiday.repeat = e.target.value;
+  });
+
+  const tdAction = document.createElement('td');
+  tr.appendChild(tdAction);
 
   const buttonDelete = document.createElement('button');
   buttonDelete.classList.add('btn');
   buttonDelete.classList.add('btn-action');
-  tdInfo.prepend(buttonDelete);
+  tdAction.prepend(buttonDelete);
   const iconDelete = document.createElement('i');
   iconDelete.classList.add('icon');
   iconDelete.classList.add('icon-delete');
@@ -129,22 +167,21 @@ function addHoliday() {
 }
 
 function getData() {
+  Util.showModal("Loading...");
   Puck.write(`\x10(function() {
-    Bluetooth.print(JSON.stringify(require("Storage").list("calendar.holiday.json").sort()));
+    Bluetooth.print(JSON.stringify(require("Storage").list("calendar.days.json").sort()));
     })()\n`, contents => {
       const fileNames = JSON.parse(contents);
       if (fileNames.length > 0) {
-        Util.showModal("Loading...");
-        Util.readStorage('calendar.holiday.json',data=>{
+        Util.readStorage('calendar.days.json',data=>{
           holidays = JSON.parse(data || "[]") || [];
 
           Util.hideModal();
-          holidays.forEach(holiday => {
-            renderHoliday(holiday);
-          });
+          render();
         });
       } else {
         holidays = [];
+        Util.hideModal();
       }
   });
 }
@@ -156,7 +193,7 @@ function onInit() {
     </script>
   </head>
   <body>
-    <h4>Holidays</h4>
+    <h4 class="float-left">Holidays</h4>
 
     <div class="float-right">
       <button class="btn" onclick="addHoliday();">
@@ -164,11 +201,13 @@ function onInit() {
       </button>
     </div>
 
-    <table class="table">
+    <table class="table table-scroll" style="clear:both;">
       <thead>
         <tr>
           <th>Date</th>
           <th>Holiday</th>
+          <th>Type</th>
+          <th>Repeat</th>
           <th></th>
         </tr>
       </thead>
diff --git a/apps/calendar/metadata.json b/apps/calendar/metadata.json
index b7e40a1fd..44a68d879 100644
--- a/apps/calendar/metadata.json
+++ b/apps/calendar/metadata.json
@@ -15,5 +15,5 @@
     {"name":"calendar.settings.js","url":"settings.js"},
     {"name":"calendar.img","url":"calendar-icon.js","evaluate":true}
   ],
-  "data": [{"name":"calendar.json"}, {"name":"calendar.holiday.json"}]
+  "data": [{"name":"calendar.json"}, {"name":"calendar.days.json"}]
 }

From d4116f80d56b8ff1a9f8651d274cac0a06c7fd01 Mon Sep 17 00:00:00 2001
From: Erik Andresen <erik@vontaene.de>
Date: Thu, 4 May 2023 21:27:20 +0200
Subject: [PATCH 07/14] calendar: Change color for holidays

---
 apps/calendar/calendar.js    | 8 ++++++--
 apps/calendar/interface.html | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/calendar/calendar.js b/apps/calendar/calendar.js
index 7977b0196..d7c43eb1f 100644
--- a/apps/calendar/calendar.js
+++ b/apps/calendar/calendar.js
@@ -16,6 +16,7 @@ const white = "#ffffff";
 const red = "#d41706";
 const blue = "#0000ff";
 const yellow = "#ffff00";
+const cyan = "#00ffff";
 let bgColor = color4;
 let bgColorMonth = color1;
 let bgColorDow = color2;
@@ -23,6 +24,7 @@ let bgColorWeekend = color3;
 let fgOtherMonth = gray1;
 let fgSameMonth = white;
 let bgEvent = blue;
+let bgOtherEvent = "#ff8800";
 const eventsPerDay=6; // how much different events per day we can display
 const date = new Date();
 
@@ -60,6 +62,7 @@ if (settings.ndColors === true) {
   fgOtherMonth = blue;
   fgSameMonth = black;
   bgEvent = color2;
+  bgOtherEvent = cyan;
 }
 
 function getDowLbls(locale) {
@@ -163,10 +166,11 @@ function drawCalendar(date) {
   week2AfterMonth.setDate(week2AfterMonth.getDate() + 14);
   events.forEach(ev => {
     if (ev.repeat === "y") {
-      ev.date.setFullYear(date.getFullYear());
+      ev.date.setFullYear(ev.date.getMonth() < 6 ? week2AfterMonth.getFullYear() : weekBeforeMonth.getFullYear());
     }
   });
   const eventsThisMonth = events.filter(ev => ev.date > weekBeforeMonth && ev.date < week2AfterMonth);
+  eventsThisMonth.sort((a,b) => a.date - b.date);
   let i = 0;
   for (y = 0; y < rowN - 1; y++) {
     for (x = 0; x < colN; x++) {
@@ -197,7 +201,7 @@ function drawCalendar(date) {
                 g.setColor(bgColorWeekend).fillRect(x1+1, y1+1, x2-1, y2-1);
                 break;
               case "o": // other
-                g.setColor("#88ff00").fillRect(x1+1, y1+1, x2-1, y2-1);
+                g.setColor(bgOtherEvent).fillRect(x1+1, y1+1, x2-1, y2-1);
                 break;
             }
 
diff --git a/apps/calendar/interface.html b/apps/calendar/interface.html
index 509a6bebd..280a96c0b 100644
--- a/apps/calendar/interface.html
+++ b/apps/calendar/interface.html
@@ -160,7 +160,7 @@ function renderHoliday(holiday) {
 }
 
 function addHoliday() {
-  const holiday = {date: formatDate(new Date())};
+  const holiday = {date: formatDate(new Date()), type: 'h'};
   renderHoliday(holiday);
   holidays.push(holiday);
   render();

From fc91e7db89d78d5aa3816590f10e6fb593f2a25a Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Sat, 6 May 2023 11:23:01 +0100
Subject: [PATCH 08/14] stlap: add state and lap data files

---
 apps/stlap/metadata.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/stlap/metadata.json b/apps/stlap/metadata.json
index 1ecdc5b6e..2a814eb0b 100644
--- a/apps/stlap/metadata.json
+++ b/apps/stlap/metadata.json
@@ -20,5 +20,9 @@
       "url": "icon.js",
       "evaluate": true
     }
+  ],
+  "data": [
+    {"name":"stlap.state.json"},
+    {"wildcard":"stlap-*.json"}
   ]
 }
\ No newline at end of file

From 8702b3504569a7a0bfd9fd24ba1d5568f30bd41c Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Sat, 6 May 2023 11:23:16 +0100
Subject: [PATCH 09/14] stlap: no exceptions when STATE_PATH doesn't exist

---
 apps/stlap/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/stlap/app.js b/apps/stlap/app.js
index 0bd18311f..0c0bb33ca 100644
--- a/apps/stlap/app.js
+++ b/apps/stlap/app.js
@@ -8,7 +8,7 @@ const BUTTON_ICONS = {
   reset: heatshrink.decompress(atob("jEYwMA/4BB/+BAQPDAQPnAQIAKv///0///8j///EP//wAQQICBwQUCEhgyCHAQ+CIgI="))
 };
 
-let state = storage.readJSON(STATE_PATH);
+let state = storage.readJSON(STATE_PATH, 1);
 const STATE_DEFAULT = {
   wasRunning: false,              //If the stopwatch was ever running since being reset
   sessionStart: 0,                //When the stopwatch was first started

From 16d4dc758875bdef5fc12eef0f906903dcb64c1d Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Sat, 6 May 2023 11:37:55 +0100
Subject: [PATCH 10/14] stlap: slow down javascript when the user's not
 watching

---
 apps/stlap/app.js | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/apps/stlap/app.js b/apps/stlap/app.js
index 0c0bb33ca..ad5463180 100644
--- a/apps/stlap/app.js
+++ b/apps/stlap/app.js
@@ -157,7 +157,7 @@ function firstTimeStart(now, time) {
     elapsedTime: 0,
   };
   lapFile = 'stlap-' + state.sessionStart + '.json';
-  setupTimerInterval();
+  setupTimerIntervalFast();
   Bangle.buzz(200);
   drawButtons();
 }
@@ -201,13 +201,15 @@ function start(now, time) {
   state.elapsedTime += (state.pausedTime - state.startTime);
   state.startTime = now;
   state.running = true;
-  setupTimerInterval();
+  setupTimerIntervalFast();
   Bangle.buzz(200);
   drawTime();
   drawButtons();
 }
 
 Bangle.on("touch", (button, xy) => {
+  setupTimerIntervalFast();
+
   //In gesture mode, just turn on the light and then return
   if (gestureMode) {
     Bangle.setLCDPower(true);
@@ -242,6 +244,8 @@ Bangle.on("touch", (button, xy) => {
 });
 
 Bangle.on('swipe', direction => {
+  setupTimerIntervalFast();
+
   let now = (new Date()).getTime();
   let time = getTime();
 
@@ -272,12 +276,23 @@ setWatch(() => {
 }, BTN1, { repeat: true });
 
 let timerInterval;
+let userWatching = false;
+
+function setupTimerIntervalFast() {
+  userWatching = true;
+  setupTimerInterval();
+
+  setTimeout(() => {
+    userWatching = false;
+    setupTimerInterval();
+  }, 5000);
+}
 
 function setupTimerInterval() {
   if (timerInterval !== undefined) {
     clearInterval(timerInterval);
   }
-  timerInterval = setInterval(drawTime, 10);
+  timerInterval = setInterval(drawTime, userWatching ? 10 : 1000);
 }
 
 function stopTimerInterval() {
@@ -289,7 +304,7 @@ function stopTimerInterval() {
 
 drawTime();
 if (state.running) {
-  setupTimerInterval();
+  setupTimerIntervalFast();
 }
 
 //Save our state when the app is closed
@@ -300,5 +315,8 @@ E.on('kill', () => {
   }
 });
 
+// change interval depending of whether the user's looking
+Bangle.on("twist", setupTimerIntervalFast);
+
 Bangle.loadWidgets();
 Bangle.drawWidgets();
\ No newline at end of file

From 7dca61a0d5dbe74debe6608aae030ecbf3dcb852 Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Sat, 6 May 2023 12:27:21 +0100
Subject: [PATCH 11/14] Fix d888b80ea - correctly bump ratchet launcher's
 version

---
 apps/powermanager/ChangeLog       | 2 +-
 apps/ratchet_launch/ChangeLog     | 1 +
 apps/ratchet_launch/metadata.json | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/powermanager/ChangeLog b/apps/powermanager/ChangeLog
index d1c288f97..de3fd021c 100644
--- a/apps/powermanager/ChangeLog
+++ b/apps/powermanager/ChangeLog
@@ -9,4 +9,4 @@
 0.07: Convert Yes/No On/Off in settings to checkboxes
 0.08: Fix the wrapping of intervals/timeouts with parameters
       Fix the widget drawing if widgets are hidden and Bangle.setLCDBrightness is called
-0.09: Cache the app-launch info
\ No newline at end of file
+0.09: Accidental version bump
\ No newline at end of file
diff --git a/apps/ratchet_launch/ChangeLog b/apps/ratchet_launch/ChangeLog
index af7f83942..e60ca42d2 100644
--- a/apps/ratchet_launch/ChangeLog
+++ b/apps/ratchet_launch/ChangeLog
@@ -1 +1,2 @@
 0.01: Initial release
+0.02: Cache the app-launch info
diff --git a/apps/ratchet_launch/metadata.json b/apps/ratchet_launch/metadata.json
index 45057b0b9..7ebe0c4cd 100644
--- a/apps/ratchet_launch/metadata.json
+++ b/apps/ratchet_launch/metadata.json
@@ -2,7 +2,7 @@
   "id": "ratchet_launch",
   "name": "Ratchet Launcher",
   "shortName": "Ratchet",
-  "version": "0.01",
+  "version": "0.02",
   "description": "Launcher with discrete scrolling for quicker app selection",
   "icon": "app.png",
   "type": "launch",

From 2c896c8567479bbe42ed4a3f0f290ec71f1fc07a Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Sat, 6 May 2023 17:58:36 +0100
Subject: [PATCH 12/14] stlap: bump version

---
 apps/stlap/ChangeLog     | 3 ++-
 apps/stlap/metadata.json | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/stlap/ChangeLog b/apps/stlap/ChangeLog
index 35ba8b130..0c21e6efd 100644
--- a/apps/stlap/ChangeLog
+++ b/apps/stlap/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New app!
 0.02: Bug fixes
-0.03: Submitted to the app loader
\ No newline at end of file
+0.03: Submitted to the app loader
+0.04: Reduce battery consumption when the user's not looking
\ No newline at end of file
diff --git a/apps/stlap/metadata.json b/apps/stlap/metadata.json
index 2a814eb0b..ac846dfd7 100644
--- a/apps/stlap/metadata.json
+++ b/apps/stlap/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "stlap",
   "name": "Stopwatch",
-  "version": "0.03",
+  "version": "0.04",
   "description": "A stopwatch that remembers its state, with a lap timer and a gesture mode (enable by swiping)",
   "icon": "icon.png",
   "type": "app",

From b8b8bc41f3f2fa094616bccb234b9690380c002d Mon Sep 17 00:00:00 2001
From: gellnerm <47713613+gellnerm@users.noreply.github.com>
Date: Mon, 8 May 2023 11:20:39 +0200
Subject: [PATCH 13/14] Update ChangeLog

---
 apps/widtemp/ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/widtemp/ChangeLog b/apps/widtemp/ChangeLog
index af7f83942..8fd2f7ca1 100644
--- a/apps/widtemp/ChangeLog
+++ b/apps/widtemp/ChangeLog
@@ -1 +1,2 @@
 0.01: Initial release
+0.02: Disallow emulator

From 52fd577a939d1063bbedea538a68c56ba072fd89 Mon Sep 17 00:00:00 2001
From: gellnerm <47713613+gellnerm@users.noreply.github.com>
Date: Mon, 8 May 2023 11:21:00 +0200
Subject: [PATCH 14/14] Update metadata.json

Disallow emulator
---
 apps/widtemp/metadata.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/widtemp/metadata.json b/apps/widtemp/metadata.json
index 7b28acd38..5ec0f2f0e 100644
--- a/apps/widtemp/metadata.json
+++ b/apps/widtemp/metadata.json
@@ -1,7 +1,7 @@
 {
     "id": "widtemp",
     "name": "Temperature widget",
-    "version": "0.01",
+    "version": "0.02",
     "description": "A temperature widget, showing the current internal temperature",
     "readme": "README.md",
     "icon": "widtemp.png",
@@ -10,7 +10,7 @@
     "tags": "widget,health",
     "supports": ["BANGLEJS","BANGLEJS2"],
     "dependencies" : {},
-    "allow_emulator":true,
+    "allow_emulator":false,
     "storage": [
       {"name":"widtemp.wid.js","url":"widtemp.wid.js"}
     ]