Bram
/
BangleApps
forked from FOSS/BangleApps
1
0
Fork 0
Code Pull Requests Activity

ClockFace: support Fast Loading, by adding a remove() function to clocks

master
Richard de Boer 2022-12-01 00:54:38 +01:00
parent dda81fe199
commit 1d4fb1301a
No known key found for this signature in database
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
modules/ClockFace.js
View File

@ -9,7 +9,7 @@ function ClockFace(options) {
if (![
"precision",
"init", "draw", "update",
"pause", "resume",
"pause", "resume", "remove",
"up", "down", "upDown",
"settingsFile",
].includes(k)) throw `Invalid ClockFace option: ${k}`;
@ -27,6 +27,7 @@ function ClockFace(options) {
if (options.init) this.init = options.init;
if (options.pause) this._pause = options.pause;
if (options.resume) this._resume = options.resume;
if (options.remove) this._remove = options.remove;
if ((options.up || options.down) && options.upDown) throw "ClockFace up/down and upDown cannot be used together";
if (options.up || options.down) this._upDown = (dir) => {
if (dir<0 && options.up) options.up.apply(this);
@ -44,8 +45,15 @@ function ClockFace(options) {
["showDate", "loadWidgets"].forEach(k => {
if (this[k]===undefined) this[k] = true;
});
let s = require("Storage").readJSON("setting.json",1)||{};
if ((global.__FILE__===undefined || global.__FILE__===s.clock)
&& s.clockHasWidgets!==this.loadWidgets) {
// save whether we can Fast Load
s.clockHasWidgets = this.loadWidgets;
require("Storage").writeJSON("setting.json", s);
}
// use global 24/12-hour setting if not set by clock-settings
if (!('is12Hour' in this)) this.is12Hour = !!(require("Storage").readJSON("setting.json", true) || {})["12hour"];
if (!('is12Hour' in this)) this.is12Hour = !!(s["12hour"]);
}
ClockFace.prototype.tick = function() {
@ -85,16 +93,27 @@ ClockFace.prototype.start = function() {
Bangle.CLOCK = 1;
if (this.loadWidgets) Bangle.loadWidgets();
if (this.init) this.init.apply(this);
if (this._upDown) Bangle.setUI("clockupdown", d=>this._upDown.apply(this,[d]));
else Bangle.setUI("clock");
const uiRemove = this._remove ? () => this.remove() : undefined;
if (this._upDown) {
Bangle.setUI({
mode: "clockupdown",
remove: uiRemove,
}, d => this._upDown.apply(this, [d]));
} else {
Bangle.setUI({
mode: "clock",
remove: uiRemove,
});
}
delete this._last;
this.paused = false;
this.tick();
Bangle.on("lcdPower", on => {
this._onLcd = on => {
if (on) this.resume();
else this.pause();
});
};
Bangle.on("lcdPower", this._onLcd);
};
ClockFace.prototype.pause = function() {
@ -111,6 +130,11 @@ ClockFace.prototype.resume = function() {
if (this._resume) this._resume.apply(this);
this.tick();
};
ClockFace.prototype.remove = function() {
if (this._timeout) clearTimeout(this._timeout);
Bangle.removeListener("lcdPower", this._onLcd);
if (this._remove) this._remove.apply(this);
};
/**
* Force a complete redraw

5
modules/ClockFace.md
View File

@ -77,6 +77,11 @@ var clock = new ClockFace({
resume: function() { // optional, called when the screen turns on
// for example: turn GPS/compass back on
},
remove: function() { // optional, used for Fast Loading
// for example: remove listeners
// Fast Loading will not be used unless this function is present,
// if there is nothing to clean up, you can just leave it empty.
},
up: function() { // optional, up handler
},
down: function() { // optional, down handler