bryan
/
BangleApps
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update app.js

master
xxDUxx 2023-01-23 18:51:23 +01:00 committed by GitHub
parent 048dcedfcd
commit e924934146
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 50 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
apps/contourclock/app.js
View File

@ -1,53 +1,64 @@
{ {
let digits = [];
let drawTimeout; let drawTimeout;
let extrasTimeout; let extrasTimeout;
let onLock; let onLock;
let onTap; let onTap;
let onTwist; let onTwist;
let fontName="";
let settings = require('Storage').readJSON("contourclock.json", true) || {}; let settings = require('Storage').readJSON("contourclock.json", true) || {};
if (settings.fontIndex==undefined) { if (settings.fontIndex == undefined) {
settings.fontIndex=0; settings.fontIndex = 0;
settings.widgets=true; settings.widgets = true;
settings.weekday=true; settings.weekday = true;
settings.hideWhenLocked=false; settings.hideWhenLocked = false;
settings.tapToShow=false; settings.tapToShow = false;
settings.twistToShow=false; settings.twistToShow = false;
settings.date=true; settings.date = true;
require('Storage').writeJSON("contourclock.json", settings); require('Storage').writeJSON("contourclock.json", settings);
} }
require("FontTeletext10x18Ascii").add(Graphics);
let extrasShown = (!settings.hidewhenlocked) && (!Bangle.isLocked());
let installedFonts = require('Storage').readJSON("contourclock-install.json") || {}; let installedFonts = require('Storage').readJSON("contourclock-install.json") || {};
if (installedFonts.n>0) { //New install - check for unused font files if (installedFonts.n > 0) { //New install - check for unused font files
settings.fontIndex=E.clip(settings.fontIndex,-installedFonts.n+1,installedFonts.n-1); settings.fontIndex = E.clip(settings.fontIndex, -installedFonts.n + 1, installedFonts.n - 1);
require('Storage').writeJSON("contourclock.json", settings); require('Storage').writeJSON("contourclock.json", settings);
for (let n=installedFonts.n; ;n++) { for (let n = installedFonts.n;; n++) {
if (require("Storage").read("contourclock-"+n+".json")==undefined) break; if (require("Storage").read("contourclock-" + n + ".json") == undefined) break;
require("Storage").erase("contourclock-"+n+".json"); require("Storage").erase("contourclock-" + n + ".json");
} }
require("Storage").erase("contourclock-install.json"); require("Storage").erase("contourclock-install.json");
} }
require("FontTeletext10x18Ascii").add(Graphics); let showExtras = function() { //show extras for a limited time
drawExtras();
if (extrasTimeout) clearTimeout(extrasTimeout);
extrasTimeout = setTimeout(hideExtras, 5000);
};
let drawExtras = function() { //draw date, day of the week and widgets let drawExtras = function() { //draw date, day of the week and widgets
let date = new Date(); let date = new Date();
g.setFont("Teletext10x18Ascii").setFontAlign(0,1); g.setFont("Teletext10x18Ascii").setFontAlign(0, 1);
if (settings.weekday) g.drawString(require("locale").dow(date).toUpperCase(),g.getWidth()/2,g.getHeight()-18); if (settings.weekday) g.drawString(require("locale").dow(date).toUpperCase(), g.getWidth() / 2, g.getHeight() - 18);
if (settings.date) g.drawString(require('locale').date(date,1),g.getWidth()/2,g.getHeight()); if (settings.date) g.drawString(require('locale').date(date, 1), g.getWidth() / 2, g.getHeight());
require("widget_utils").show(); require("widget_utils").show();
extrasShown = true;
}; };
let hideExtras = function() { let hideExtras = function() {
g.clearRect(0,138,g.getWidth()-1,176); if (extrasTimeout) clearTimeout(extrasTimeout);
g.clearRect(0, 138, g.getWidth() - 1, 176);
require("widget_utils").hide(); require("widget_utils").hide();
extrasShown = false;
print(drawTimeout);
}; };
let draw = function() { let draw = function() {
print(process.memory().usage + " - " + drawTimeout);
let date = new Date(); let date = new Date();
g.reset(); g.reset();
if ((!settings.hideWhenLocked) || (!Bangle.isLocked())) drawExtras(); if (extrasShown) drawExtras();
else require("widget_utils").hide(); else hideExtras();
require('contourclock').drawClock(settings.fontIndex); require('contourclock').drawClock(settings.fontIndex);
if (drawTimeout) clearTimeout(drawTimeout); if (drawTimeout) clearTimeout(drawTimeout);
drawTimeout = setTimeout(draw, 60000 - (Date.now() % 60000)); drawTimeout = setTimeout(function() {
drawTimeout = undefined;
draw();
}, 60000 - (Date.now() % 60000));
}; };
if (settings.hideWhenLocked) { if (settings.hideWhenLocked) {
onLock = locked => { onLock = locked => {
@ -59,30 +70,23 @@
hideExtras(); hideExtras();
} }
}; };
onTap = d => {
drawExtras();
if (extrasTimeout) clearTimeout(extrasTimeout);
extrasTimeout = setTimeout(hideExtras, 5000);
};
onTwist = () => {
drawExtras();
if (extrasTimeout) clearTimeout(extrasTimeout);
extrasTimeout = setTimeout(hideExtras, 5000);
};
Bangle.on('lock', onLock); Bangle.on('lock', onLock);
if (settings.tapToShow) Bangle.on('tap', onTap); if (settings.tapToShow) Bangle.on('tap', showExtras);
if (settings.twistToShow) Bangle.on('twist', onTwist); if (settings.twistToShow) Bangle.on('twist', showExtras);
} }
Bangle.setUI({mode:"clock", remove:function() { Bangle.setUI({
Bangle.removeListener('lock',onLock); mode: "clock",
Bangle.removeListener('tap', onTap); remove: function() {
Bangle.removeListener('twist',onTwist); Bangle.removeListener('lock', onLock);
if (drawTimeout) clearTimeout(drawTimeout); Bangle.removeListener('tap', showExtras);
if (extrasTimeout) clearTimeout(extrasTimeout); Bangle.removeListener('twist', showExtras);
if (settings.hideWhenLocked) require("widget_utils").show(); if (drawTimeout) clearTimeout(drawTimeout);
g.reset(); if (extrasTimeout) clearTimeout(extrasTimeout);
g.clear(); if (settings.hideWhenLocked) require("widget_utils").show();
}}); g.reset();
g.clear();
}
});
g.clear(); g.clear();
if (settings.widgets) { if (settings.widgets) {
Bangle.loadWidgets(); Bangle.loadWidgets();