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

multitimer: drop `var` 

Not strictly necessary, but matches the globals.
master
Rob Pilling 2023-07-17 20:23:13 +01:00
parent ff6158c329
commit c54e33ae7f
1 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
apps/multitimer/app.js
View File

@ -67,7 +67,7 @@ function setHM(alarm, on) {
function drawTimers() { function drawTimers() {
layer = 0; layer = 0;
var timers = require("sched").getAlarms().filter(a => a.timer && a.appid == "multitimer"); const timers = require("sched").getAlarms().filter(a => a.timer && a.appid == "multitimer");
function updateTimers(idx) { function updateTimers(idx) {
if (!timerInt1[idx]) timerInt1[idx] = setTimeout(function() { if (!timerInt1[idx]) timerInt1[idx] = setTimeout(function() {
@ -83,11 +83,10 @@ function drawTimers() {
back : function() {load();}, back : function() {load();},
draw : (idx, r) => { draw : (idx, r) => {
function drawMenuItem(a) { function drawMenuItem(a) {
var msg; let msg = "";
g.setClipRect(R.x,R.y,R.x2,R.y2); g.setClipRect(R.x,R.y,R.x2,R.y2);
if (idx > 0 && timers[idx-1].msg) msg = "\n"+(timers[idx-1].msg.length > 10 ? if (idx > 0 && timers[idx-1].msg) msg = "\n"+(timers[idx-1].msg.length > 10 ?
timers[idx-1].msg.substring(0, 10)+"..." : timers[idx-1].msg); timers[idx-1].msg.substring(0, 10)+"..." : timers[idx-1].msg);
else msg = "";
return g.setColor(g.theme.bg2).fillRect({x:r.x+4,y:r.y+2,w:r.w-8, h:r.h-4, r:5}) return g.setColor(g.theme.bg2).fillRect({x:r.x+4,y:r.y+2,w:r.w-8, h:r.h-4, r:5})
.setColor(g.theme.fg2).setFont("6x8:2").setFontAlign(-1,0).drawString(a+msg,r.x+12,r.y+(r.h/2)); .setColor(g.theme.fg2).setFont("6x8:2").setFontAlign(-1,0).drawString(a+msg,r.x+12,r.y+(r.h/2));
} }
@ -118,15 +117,17 @@ function drawTimers() {
function timerMenu(idx) { function timerMenu(idx) {
layer = -1; layer = -1;
var timers = require("sched").getAlarms(); const timers = require("sched").getAlarms();
var timerIdx = []; const timerIdx = [];
let a;
for (let i = 0; i < timers.length; i++) { for (let i = 0; i < timers.length; i++) {
if (timers[i].timer && timers[i].appid == "multitimer") { if (timers[i].timer && timers[i].appid == "multitimer") {
a = i; a = i;
timerIdx.push(a); timerIdx.push(a);
} }
} }
var a = timers[timerIdx[idx]]; a = timers[timerIdx[idx]];
function updateTimer() { function updateTimer() {
if (timerInt1[0] == undefined) timerInt1[0] = setTimeout(function() { if (timerInt1[0] == undefined) timerInt1[0] = setTimeout(function() {
@ -152,7 +153,7 @@ function timerMenu(idx) {
} }
if (i == 0) { if (i == 0) {
var msg = ""; let msg = "";
if (a.msg) msg = "\n"+(a.msg.length > 10 ? a.msg.substring(0, 10)+"..." : a.msg); if (a.msg) msg = "\n"+(a.msg.length > 10 ? a.msg.substring(0, 10)+"..." : a.msg);
if (a.on == true) { if (a.on == true) {
drawMenuItem(formatTime(a.t-getCurrentTime())+msg); drawMenuItem(formatTime(a.t-getCurrentTime())+msg);
@ -220,9 +221,9 @@ function timerMenu(idx) {
function editTimer(idx, a) { function editTimer(idx, a) {
layer = -1; layer = -1;
var timers = require("sched").getAlarms().filter(a => a.timer && a.appid == "multitimer"); const timers = require("sched").getAlarms().filter(a => a.timer && a.appid == "multitimer");
var alarms = require("sched").getAlarms(); const alarms = require("sched").getAlarms();
var timerIdx = []; const timerIdx = [];
for (let i = 0; i < alarms.length; i++) { for (let i = 0; i < alarms.length; i++) {
if (alarms[i].timer && alarms[i].appid == "multitimer") { if (alarms[i].timer && alarms[i].appid == "multitimer") {
timerIdx.push(i); timerIdx.push(i);
@ -235,10 +236,10 @@ function editTimer(idx, a) {
if (!a.data) { if (!a.data) {
a.data = { hm: false }; a.data = { hm: false };
} }
var t = decodeTime(a.timer); const t = decodeTime(a.timer);
function editMsg(idx, a) { function editMsg(idx, a) {
var msg; let msg;
g.clear(); g.clear();
idx < 0 ? msg = "" : msg = a.msg; idx < 0 ? msg = "" : msg = a.msg;
require("textinput").input({text:msg}).then(result => { require("textinput").input({text:msg}).then(result => {
@ -257,7 +258,7 @@ function editTimer(idx, a) {
setUI(); setUI();
} }
var menu = { const menu = {
"": { "title": "Timer" }, "": { "title": "Timer" },
"< Back": () => { "< Back": () => {
a.t = getCurrentTime() + a.timer; a.t = getCurrentTime() + a.timer;
@ -312,7 +313,7 @@ function editTimer(idx, a) {
value: !a.msg ? "" : a.msg.length > 6 ? a.msg.substring(0, 6)+"..." : a.msg, value: !a.msg ? "" : a.msg.length > 6 ? a.msg.substring(0, 6)+"..." : a.msg,
//menu glitch? setTimeout required here //menu glitch? setTimeout required here
onchange: () => { onchange: () => {
var kbapp = require("Storage").read("textinput"); const kbapp = require("Storage").read("textinput");
if (kbapp != undefined) setTimeout(editMsg, 0, idx, a); if (kbapp != undefined) setTimeout(editMsg, 0, idx, a);
else setTimeout(kbAlert, 0); else setTimeout(kbAlert, 0);
} }
@ -329,7 +330,7 @@ function editTimer(idx, a) {
function drawSw() { function drawSw() {
layer = 1; layer = 1;
var sw = require("Storage").readJSON("multitimer.json", true) || []; const sw = require("Storage").readJSON("multitimer.json", true) || [];
function updateTimers(idx) { function updateTimers(idx) {
if (!timerInt1[idx]) timerInt1[idx] = setTimeout(function() { if (!timerInt1[idx]) timerInt1[idx] = setTimeout(function() {
@ -346,7 +347,7 @@ function drawSw() {
draw : (idx, r) => { draw : (idx, r) => {
function drawMenuItem(a) { function drawMenuItem(a) {
var msg; let msg;
g.setClipRect(R.x,R.y,R.x2,R.y2); g.setClipRect(R.x,R.y,R.x2,R.y2);
if (idx > 0 && sw[idx-1].msg) msg = "\n"+(sw[idx-1].msg.length > 10 ? if (idx > 0 && sw[idx-1].msg) msg = "\n"+(sw[idx-1].msg.length > 10 ?
sw[idx-1].msg.substring(0, 10)+"..." : sw[idx-1].msg); sw[idx-1].msg.substring(0, 10)+"..." : sw[idx-1].msg);
@ -380,7 +381,7 @@ function drawSw() {
function swMenu(idx, a) { function swMenu(idx, a) {
layer = -1; layer = -1;
var sw = require("Storage").readJSON("multitimer.json", true) || []; const sw = require("Storage").readJSON("multitimer.json", true) || [];
if (sw[idx]) a = sw[idx]; if (sw[idx]) a = sw[idx];
else { else {
a = {"t" : 0, "on" : false, "msg" : ""}; a = {"t" : 0, "on" : false, "msg" : ""};
@ -399,7 +400,7 @@ function swMenu(idx, a) {
function editMsg(idx, a) { function editMsg(idx, a) {
g.clear(); g.clear();
var msg = a.msg; const msg = a.msg;
require("textinput").input({text:msg}).then(result => { require("textinput").input({text:msg}).then(result => {
if (result != "") { if (result != "") {
a.msg = result; a.msg = result;
@ -433,7 +434,7 @@ function swMenu(idx, a) {
} }
if (i == 0) { if (i == 0) {
var msg; let msg;
if (a.msg) msg = "\n"+(a.msg.length > 10 ? a.msg.substring(0, 10)+"..." : a.msg); if (a.msg) msg = "\n"+(a.msg.length > 10 ? a.msg.substring(0, 10)+"..." : a.msg);
else msg = ""; else msg = "";
if (a.on == true) { if (a.on == true) {
@ -486,7 +487,7 @@ function swMenu(idx, a) {
//edit message //edit message
if (i == 3) { if (i == 3) {
clearInt(); clearInt();
var kbapp = require("Storage").read("textinput"); const kbapp = require("Storage").read("textinput");
if (kbapp != undefined) editMsg(idx, a); if (kbapp != undefined) editMsg(idx, a);
else kbAlert(); else kbAlert();
} }
@ -503,7 +504,7 @@ function swMenu(idx, a) {
function drawAlarms() { function drawAlarms() {
layer = 2; layer = 2;
var alarms = require("sched").getAlarms().filter(a => !a.timer); const alarms = require("sched").getAlarms().filter(a => !a.timer);
E.showScroller({ E.showScroller({
h : 40, c : alarms.length+2, h : 40, c : alarms.length+2,
@ -512,8 +513,8 @@ function drawAlarms() {
function drawMenuItem(a) { function drawMenuItem(a) {
g.setClipRect(R.x,R.y,R.x2,R.y2); g.setClipRect(R.x,R.y,R.x2,R.y2);
var on = ""; let on = "";
var dow = ""; let dow = "";
if (idx > 0 && alarms[idx-1].on == true) on = " - on"; if (idx > 0 && alarms[idx-1].on == true) on = " - on";
else if (idx > 0 && alarms[idx-1].on == false) on = " - off"; else if (idx > 0 && alarms[idx-1].on == false) on = " - off";
if (idx > 0 && idx < alarms.length+1) dow = "\n"+"SMTWTFS".split("").map((d,n)=>alarms[idx-1].dow&(1<<n)?d:".").join(""); if (idx > 0 && idx < alarms.length+1) dow = "\n"+"SMTWTFS".split("").map((d,n)=>alarms[idx-1].dow&(1<<n)?d:".").join("");
@ -529,7 +530,7 @@ function drawAlarms() {
.setColor(g.theme.fg).setFont("6x8:2").setFontAlign(0,0).drawString("< Swipe >",r.x+(r.w/2),r.y+(r.h/2)); .setColor(g.theme.fg).setFont("6x8:2").setFontAlign(0,0).drawString("< Swipe >",r.x+(r.w/2),r.y+(r.h/2));
} }
else if (idx > 0 && idx < alarms.length+1){ else if (idx > 0 && idx < alarms.length+1){
var str = formatTime(alarms[idx-1].t); const str = formatTime(alarms[idx-1].t);
drawMenuItem(str.slice(0, -3)); drawMenuItem(str.slice(0, -3));
} }
}, },
@ -546,8 +547,8 @@ function editDOW(dow, onchange) {
'': { 'title': 'Days of Week' }, '': { 'title': 'Days of Week' },
'< Back' : () => onchange(dow) '< Back' : () => onchange(dow)
}; };
for (var i = 0; i < 7; i++) (i => { for (let i = 0; i < 7; i++) (i => {
var dayOfWeek = require("locale").dow({ getDay: () => i }); const dayOfWeek = require("locale").dow({ getDay: () => i });
menu[dayOfWeek] = { menu[dayOfWeek] = {
value: !!(dow&(1<<i)), value: !!(dow&(1<<i)),
onchange: v => v ? dow |= 1<<i : dow &= ~(1<<i), onchange: v => v ? dow |= 1<<i : dow &= ~(1<<i),
@ -559,8 +560,8 @@ function editDOW(dow, onchange) {
function editAlarm(idx, a) { function editAlarm(idx, a) {
layer = -1; layer = -1;
var alarms = require("sched").getAlarms(); const alarms = require("sched").getAlarms();
var alarmIdx = []; const alarmIdx = [];
for (let i = 0; i < alarms.length; i++) { for (let i = 0; i < alarms.length; i++) {
if (!alarms[i].timer) { if (!alarms[i].timer) {
alarmIdx.push(i); alarmIdx.push(i);
@ -573,10 +574,10 @@ function editAlarm(idx, a) {
if (!a.data) { if (!a.data) {
a.data = { hm: false }; a.data = { hm: false };
} }
var t = decodeTime(a.t); const t = decodeTime(a.t);
function editMsg(idx, a) { function editMsg(idx, a) {
var msg; let msg;
g.clear(); g.clear();
idx < 0 ? msg = "" : msg = a.msg; idx < 0 ? msg = "" : msg = a.msg;
require("textinput").input({text:msg}).then(result => { require("textinput").input({text:msg}).then(result => {
@ -595,7 +596,7 @@ function editAlarm(idx, a) {
setUI(); setUI();
} }
var menu = { const menu = {
"": { "title": "Alarm" }, "": { "title": "Alarm" },
"< Back": () => { "< Back": () => {
if (idx >= 0) alarms[alarmIdx[idx]] = a; if (idx >= 0) alarms[alarmIdx[idx]] = a;
@ -650,7 +651,7 @@ function editAlarm(idx, a) {
value: !a.msg ? "" : a.msg.length > 6 ? a.msg.substring(0, 6)+"..." : a.msg, value: !a.msg ? "" : a.msg.length > 6 ? a.msg.substring(0, 6)+"..." : a.msg,
//menu glitch? setTimeout required here //menu glitch? setTimeout required here
onchange: () => { onchange: () => {
var kbapp = require("Storage").read("textinput"); const kbapp = require("Storage").read("textinput");
if (kbapp != undefined) setTimeout(editMsg, 0, idx, a); if (kbapp != undefined) setTimeout(editMsg, 0, idx, a);
else setTimeout(kbAlert, 0); else setTimeout(kbAlert, 0);
} }