FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Add font support for date and week info

pull/1540/head
Stergios Mekras 2022-03-04 00:52:33 +01:00
parent 9664368caa
commit f89579ad6d
2 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
apps/smclock/app.js
View File

@ -89,8 +89,8 @@ function draw() {
const day = d.getDate(); const day = d.getDate();
const month = d.getMonth() + 1; const month = d.getMonth() + 1;
const week = d02(ISO8601_week_no(d)); const week = d02(ISO8601_week_no(d));
const date1 = d02(day) + "/" + d02(month); const date1 = "";
const date2 = weekday[d.getDay()] + " " + d02(week); const date2 = "";
const h = d.getHours(); const h = d.getHours();
const m = d.getMinutes(); const m = d.getMinutes();
const time = d02(h) + ":" + d02(m); const time = d02(h) + ":" + d02(m);
@ -119,15 +119,40 @@ function draw() {
g.drawString(bat, 46, 22, false); g.drawString(bat, 46, 22, false);
} }
// draw date info
g.setColor(0, 0, 0); g.setColor(0, 0, 0);
if (useVectorFont == true && dateFormat == "Short") { if (useVectorFont == true) {
g.setFont("Vector", 20); g.setFont("Vector", 20);
} else { } else {
g.setFont("6x8", 2); g.setFont("6x8", 2);
} }
g.drawString(date1, 105, 20, false); if (dateFormat == "Short") {
g.setFont("Vector", 16); date1 = d02(day) + "/" + d02(month);
g.drawString(date2, 105, 55, false); g.drawString(date1, 105, 20, false);
} else {
date1 = monthName[month - 1] + d02(day);
g.drawString(date1, 104, 20, false);
}
// draw week info
if (showWeekInfo == true) {
date2 = weekday[d.getDay()] + " " + d02(week)
if (useVectorFont == true) {
g.setFont("Vector", 18);
} else {
g.setFont("6x8", 2);
}
g.drawString(date2, 105, 55, false);
} else {
date2 = d.getFullYear();
if (useVectorFont == true) {
g.setFont("Vector", 22);
g.drawString(date2, 105, 55, false);
} else {
g.setFont("4x6", 3);
g.drawString(date2, 108, 55, false);
}
}
// draw time // draw time
g.setColor(1, 1, 1); g.setColor(1, 1, 1);

12
apps/smclock/settings.js
View File

@ -48,11 +48,7 @@
settings.showAnalogFace !== undefined ? settings.showAnalogFace : false, settings.showAnalogFace !== undefined ? settings.showAnalogFace : false,
format: v => v ? "On" : "Off", format: v => v ? "On" : "Off",
onchange: v => { onchange: v => {
if (v == "On") { settings.showAnalogFace = v;
settings.showAnalogFace = true;
} else {
settings.showAnalogFace = false;
}
writeSettings(); writeSettings();
}, },
}, },
@ -76,11 +72,7 @@
settings.showWeekInfo !== undefined ? settings.showWeekInfo : false, settings.showWeekInfo !== undefined ? settings.showWeekInfo : false,
format: v => v ? "On" : "Off", format: v => v ? "On" : "Off",
onchange: v => { onchange: v => {
if (v == "On") { settings.showWeekInfo = v;
settings.showWeekInfo = true;
} else {
settings.showWeekInfo = false;
}
writeSettings(); writeSettings();
}, },
}, },