Merge pull request #1544 from foostuff/master

ClockCal: Initial release

apps/clockcal/ChangeLog

@@ -0,0 +1 @@
+0.01: Initial upload

apps/clockcal/README.md

@@ -0,0 +1,21 @@
+# Clock & Calendar by Michael
+
+This is my "Hello World". I first made this watchface almost 10 years ago for my original Pebble and Pebble Time and I missed this so much, that I had to write it for the BangleJS2.
+I know that it seems redundant because there already **is** a *time&cal*-app, but it didn't fit my style.
+
+- locked screen with only one minimal update/minute
+- ![locked screen](https://foostuff.github.io/BangleApps/apps/clockcal/screenshot.png)
+- unlocked screen (twist?) with seconds
+- ![unlocked screen](https://foostuff.github.io/BangleApps/apps/clockcal/screenshot2.png)
+
+## Configurable Features
+- Number of calendar rows (weeks)
+- Buzz on connect/disconnect (I know, this should be an extra widget, but for now, it is included)
+- Clock Mode (24h/12h). Doesn't have an am/pm indicator. It's only there because it was easy.
+- First day of the week
+- Red Saturday
+- Red Sunday
+
+## Feedback
+The clock works for me in a 24h/MondayFirst/WeekendFree environment but is not well-tested with other settings.
+So if something isn't working, please tell me: https://github.com/foostuff/BangleApps/issues

apps/clockcal/app-icon.js

@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwkECqMCkQACiEDkIXQuUnkUBkESiYXPgN/u8jgEx/8vC6E3k9xiH//8/C6BHCPQMSL6EDO4cgaf4A/ACEC+YFDl4FEAAM/+ISHbIIECh4FB+QWEA4PwCQsfC4gVBkYGDgP/mQ4CCQk/iAXEAQTiCgMiDQQSFiATDBgQXCgILBEQkQBwYrEC4sPLQRpCBwoXECgUCC4oSBAggXHNQRfDV4X/JgQXJBIIXFgYuDC5QKBiE/C4f/bwgXJmanGJgoSDiTQBmQMBE4JYBfwJ5BBYMiYQISEB4IAB+KdCAgfwAwTrCn4SDiczAAMwGwMTmR0CmECBgRSBCQwA/AGsBgEQAgYABAwcHu93s4GBqAXEmLrCiYICmICBj4XEgvABIMMqECiIXCgQXCegLYBC4NwF4VcAQNV4EPkEhF4REBgYXCiQvCu4UCAQMFJYRfKgxGBuxfGLgkjFgMCkMBmEjgEigZaBI4XFMYcRC4kBmRhBkMQgI5DF4MFgAXCLARfCFoIvDkZmBhnF4sA5gvDYghfEHIQJDAAhQBIAPwVQMTgQvCNIMhAwJfBR4MMU4JRB+RJBiUQgUDVwMgYwMBgcwX4amBqBQBiTqBgUQh8RmJhCL4IvC4HMR4ZaEAgIBBL4LBDL5EBmI5BkQvBXwIGBmMPMwMvkEFR4VcR4UgU4MSC4UQmIJBn7dBiQNBqoXBPYNQh8Q+MB+MvgEvG4JyBj8A+RkBhlQd4ZHBiBYCL4bBELxEAA=="))

apps/clockcal/app.js

@@ -0,0 +1,119 @@
+Bangle.loadWidgets();
+
+var s = Object.assign({
+    CAL_ROWS: 4, //number of calendar rows.(weeks) Shouldn't exceed 5 when using widgets.
+    BUZZ_ON_BT: true, //2x slow buzz on disconnect, 2x fast buzz on connect. Will be extra widget eventually
+    MODE24: true, //24h mode vs 12h mode
+    FIRSTDAYOFFSET: 6, //First day of the week: 0-6: Sun, Sat, Fri, Thu, Wed, Tue, Mon
+    REDSUN: true, // Use red color for sunday?
+    REDSAT: true, // Use red color for saturday?
+}, require('Storage').readJSON("clockcal.json", true) || {});
+
+const h = g.getHeight();
+const w = g.getWidth();
+const CELL_W = w / 7;
+const CELL_H = 15;
+const CAL_Y = h - s.CAL_ROWS * CELL_H;
+const DEBUG = false;
+
+function drawMinutes() {
+    if (DEBUG) console.log("|-->minutes");
+    var d = new Date();
+    var hours = s.MODE24 ? d.getHours().toString().padStart(2, ' ') : ((d.getHours() + 24) % 12 || 12).toString().padStart(2, ' ');
+    var minutes = d.getMinutes().toString().padStart(2, '0');
+    var textColor = NRF.getSecurityStatus().connected ? '#fff' : '#f00';
+    var size = 50;
+    var clock_x = (w - 20) / 2;
+    if (dimSeconds) {
+        size = 65;
+        clock_x = 4 + (w / 2);
+    }
+    g.setBgColor(0);
+    g.setColor(textColor);
+    g.setFont("Vector", size);
+    g.setFontAlign(0, 1);
+    g.drawString(hours + ":" + minutes, clock_x, CAL_Y - 10, 1);
+    var nextminute = (61 - d.getSeconds());
+    if (typeof minuteInterval !== "undefined") clearTimeout(minuteInterval);
+    minuteInterval = setTimeout(drawMinutes, nextminute * 1000);
+}
+
+function drawSeconds() {
+    if (DEBUG) console.log("|--->seconds");
+    var d = new Date();
+    g.setColor();
+    g.fillRect(w - 31, CAL_Y - 36, w - 3, CAL_Y - 19);
+    g.setBgColor(0);
+    g.setColor('#fff');
+    g.setFont("Vector", 24);
+    g.setFontAlign(1, 1);
+    g.drawString(" " + d.getSeconds().toString().padStart(2, '0'), w, CAL_Y - 13);
+    if (typeof secondInterval !== "undefined") clearTimeout(secondInterval);
+    if (!dimSeconds) secondInterval = setTimeout(drawSeconds, 1000);
+}
+
+function drawCalendar() {
+    if (DEBUG) console.log("CALENDAR");
+    var d = new Date();
+    g.reset();
+    g.setBgColor(0);
+    g.clear();
+    drawMinutes();
+    if (!dimSeconds) drawSeconds();
+    const dow = (s.FIRSTDAYOFFSET + d.getDay()) % 7; //MO=0, SU=6
+    const today = d.getDate();
+    var rD = new Date(d.getTime());
+    rD.setDate(rD.getDate() - dow);
+    var rDate = rD.getDate();
+    g.setFontAlign(1, 1);
+    for (var y = 1; y <= s.CAL_ROWS; y++) {
+        for (var x = 1; x <= 7; x++) {
+            bottomrightX = x * CELL_W - 2;
+            bottomrightY = y * CELL_H + CAL_Y;
+            g.setFont("Vector", 16);
+            var fg = ((s.REDSUN && rD.getDay() == 0) || (s.REDSAT && rD.getDay() == 6)) ? '#f00' : '#fff';
+            if (y == 1 && today == rDate) {
+                g.setColor('#0f0');
+                g.fillRect(bottomrightX - CELL_W + 1, bottomrightY - CELL_H - 1, bottomrightX, bottomrightY - 2);
+                g.setColor('#000');
+                g.drawString(rDate, bottomrightX, bottomrightY);
+            }
+            else {
+                g.setColor(fg);
+                g.drawString(rDate, bottomrightX, bottomrightY);
+            }
+            rD.setDate(rDate + 1);
+            rDate = rD.getDate();
+        }
+    }
+    Bangle.drawWidgets();
+
+    var nextday = (3600 * 24) - (d.getHours() * 3600 + d.getMinutes() * 60 + d.getSeconds() + 1);
+    if (DEBUG) console.log("Next Day:" + (nextday / 3600));
+    if (typeof dayInterval !== "undefined") clearTimeout(dayInterval);
+    dayInterval = setTimeout(drawCalendar, nextday * 1000);
+}
+
+function BTevent() {
+    drawMinutes();
+    if (s.BUZZ_ON_BT) {
+        var interval = (NRF.getSecurityStatus().connected) ? 100 : 500;
+        Bangle.buzz(interval);
+        setTimeout(function () { Bangle.buzz(interval); }, interval * 3);
+    }
+}
+
+//register events
+Bangle.on('lock', locked => {
+    if (typeof secondInterval !== "undefined") clearTimeout(secondInterval);
+    dimSeconds = locked; //dim seconds if lock=on
+    drawCalendar();
+});
+NRF.on('connect', BTevent);
+NRF.on('disconnect', BTevent);
+
+
+dimSeconds = Bangle.isLocked();
+drawCalendar();
+
+Bangle.setUI("clock");

apps/clockcal/metadata.json

@@ -0,0 +1,19 @@
+{
+  "id": "clockcal",
+  "name": "Clock & Calendar",
+  "version": "0.01",
+  "description": "Clock with Calendar",
+  "readme":"README.md",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot.png"},{"url":"screenshot2.png"}],
+  "type": "clock",
+  "tags": "clock",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "allow_emulator": true,
+  "storage": [
+    {"name":"clockcal.app.js","url":"app.js"},
+    {"name":"clockcal.settings.js","url":"settings.js"},
+    {"name":"clockcal.img","url":"app-icon.js","evaluate":true}
+  ],
+  "data": [{"name":"clockcal.json"}]
+}

apps/clockcal/settings.js

@@ -0,0 +1,92 @@
+(function (back) {
+    var FILE = "clockcal.json";
+
+    settings = Object.assign({
+        CAL_ROWS: 4, //number of calendar rows.(weeks) Shouldn't exceed 5 when using widgets.
+        BUZZ_ON_BT: true, //2x slow buzz on disconnect, 2x fast buzz on connect. Will be extra widget eventually
+        MODE24: true, //24h mode vs 12h mode
+        FIRSTDAY: 6, //First day of the week: mo, tu, we, th, fr, sa, su
+        REDSUN: true, // Use red color for sunday?
+        REDSAT: true, // Use red color for saturday?
+    }, require('Storage').readJSON(FILE, true) || {});
+
+
+    function writeSettings() {
+        require('Storage').writeJSON(FILE, settings);
+    }
+
+    menu = {
+        "": { "title": "Clock & Calendar" },
+        "< Back": () => back(),
+        'Buzz(dis)conn.?': {
+            value: settings.BUZZ_ON_BT,
+            format: v => v ? "On" : "Off",
+            onchange: v => {
+                settings.BUZZ_ON_BT = v;
+                writeSettings();
+            }
+        },
+        '#Calendar Rows': {
+            value: settings.CAL_ROWS,
+            min: 0, max: 6,
+            onchange: v => {
+                settings.CAL_ROWS = v;
+                writeSettings();
+            }
+        },
+        'Clock mode': {
+            value: settings.MODE24,
+            format: v => v ? "24h" : "12h",
+            onchange: v => {
+                settings.MODE24 = v;
+                writeSettings();
+            }
+        },
+        'First Day': {
+            value: settings.FIRSTDAY,
+            min: 0, max: 6,
+            format: v => ["Sun", "Sat", "Fri", "Thu", "Wed", "Tue", "Mon"][v],
+            onchange: v => {
+                settings.FIRSTDAY = v;
+                writeSettings();
+            }
+        },
+        'Red Saturday?': {
+            value: settings.REDSAT,
+            format: v => v ? "On" : "Off",
+            onchange: v => {
+                settings.REDSAT = v;
+                writeSettings();
+            }
+        },
+        'Red Sunday?': {
+            value: settings.REDSUN,
+            format: v => v ? "On" : "Off",
+            onchange: v => {
+                settings.REDSUN = v;
+                writeSettings();
+            }
+        },
+        'Load deafauls?': {
+            value: 0,
+            min: 0, max: 1,
+            format: v => ["No", "Yes"][v],
+            onchange: v => {
+                if (v == 1) {
+                    settings = {
+                        CAL_ROWS: 4, //number of calendar rows.(weeks) Shouldn't exceed 5 when using widgets.
+                        BUZZ_ON_BT: true, //2x slow buzz on disconnect, 2x fast buzz on connect. 
+                        MODE24: true, //24h mode vs 12h mode
+                        FIRSTDAY: 6, //First day of the week: mo, tu, we, th, fr, sa, su
+                        REDSUN: true, // Use red color for sunday?
+                        REDSAT: true, // Use red color for saturday?
+                    };
+                    writeSettings();
+                    load()
+                }
+            }
+        },
+    }
+    // Show the menu
+    E.showMenu(menu);
+})