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

Update app.js

master
xxDUxx 2023-01-22 02:26:50 +01:00 committed by GitHub
parent ff0c54c265
commit 1b4349c449
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/contourclock/app.js
View File

@ -3,6 +3,9 @@
let digits = []; let digits = [];
let drawTimeout; let drawTimeout;
let extrasTimeout; let extrasTimeout;
let onLock;
let onTap;
let onTwist;
let fontName=""; 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) {
@ -25,16 +28,11 @@
} }
require("FontTeletext10x18Ascii").add(Graphics); require("FontTeletext10x18Ascii").add(Graphics);
let queueDraw = function() {
if (drawTimeout) clearTimeout(drawTimeout);
drawTimeout = setTimeout(draw, interval - (Date.now() % interval));
};
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"); g.setFont("Teletext10x18Ascii");
if (settings.weekday) if (settings.weekday)
g.setFontAlign(0,1).drawString(require("locale").dow(date).toUpperCase(),g.getWidth()/2,g.getHeight()-18); g.setFontAlign(0,1).drawString(require("locale").dow(date).toUpperCase(),g.getWidth()/2,g.getHeight()-18);
// Draw Date
if (settings.date) if (settings.date)
g.setFontAlign(0,1).drawString(require('locale').date(date,1),g.getWidth()/2,g.getHeight()); g.setFontAlign(0,1).drawString(require('locale').date(date,1),g.getWidth()/2,g.getHeight());
require("widget_utils").show(); require("widget_utils").show();
@ -44,9 +42,7 @@
require("widget_utils").hide(); require("widget_utils").hide();
}; };
let draw = function() { let draw = function() {
//drawTimeout = undefined;
let date = new Date(); let date = new Date();
print ("drawing time at:" +date.getHours()+":"+date.getMinutes()+":"+date.getSeconds());
g.reset(); g.reset();
if ((!settings.hideWhenLocked) || (!Bangle.isLocked())) drawExtras(); if ((!settings.hideWhenLocked) || (!Bangle.isLocked())) drawExtras();
else require("widget_utils").hide(); else require("widget_utils").hide();
@ -54,7 +50,7 @@
if (drawTimeout) clearTimeout(drawTimeout); if (drawTimeout) clearTimeout(drawTimeout);
drawTimeout = setTimeout(draw, interval - (Date.now() % interval)); drawTimeout = setTimeout(draw, interval - (Date.now() % interval));
}; };
if (settings.hideWhenLocked) {
let onLock = locked => { let onLock = locked => {
if (!locked) { if (!locked) {
require("widget_utils").show(); require("widget_utils").show();
@ -76,7 +72,6 @@
if (extrasTimeout) clearTimeout(extrasTimeout); if (extrasTimeout) clearTimeout(extrasTimeout);
extrasTimeout = setTimeout(hideExtras, 5000); extrasTimeout = setTimeout(hideExtras, 5000);
}; };
if (settings.hideWhenLocked) {
Bangle.on('lock', onLock); Bangle.on('lock', onLock);
if (settings.tapToShow) Bangle.on('tap', onTap); if (settings.tapToShow) Bangle.on('tap', onTap);
if (settings.twistToShow) Bangle.on('twist', onTwist); if (settings.twistToShow) Bangle.on('twist', onTwist);
@ -92,7 +87,9 @@
g.clear(); g.clear();
}}); }});
g.clear(); g.clear();
if (settings.widgets) {
Bangle.loadWidgets(); Bangle.loadWidgets();
Bangle.drawWidgets(); Bangle.drawWidgets();
}
draw(); draw();
} }