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

Merge pull request #3698 from dormio/master 

[clockcal] Added an option to show weeks prior to the current week on clock calendar
pull/3701/head
Rob Pilling 2024-12-20 21:08:39 +00:00 committed by GitHub
parent 0ac4c515ed 794e40f12d
commit f43971ef1f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/clockcal/ChangeLog
View File

@ -8,3 +8,4 @@
0.08: Fixed typo in settings.js for DRAGDOWN to make option work 0.08: Fixed typo in settings.js for DRAGDOWN to make option work
0.09: You can now back out of the calendar using the button 0.09: You can now back out of the calendar using the button
0.10: Fix linter warnings 0.10: Fix linter warnings
0.11: Added option to show prior weeks on clock calendar

7
apps/clockcal/app.js
View File

@ -2,7 +2,8 @@ Bangle.setUI("clock");
Bangle.loadWidgets(); Bangle.loadWidgets();
var s = Object.assign({ var s = Object.assign({
CAL_ROWS: 4, //number of calendar rows.(weeks) Shouldn't exceed 5 when using widgets. CAL_ROWS: 4, //total number of calendar rows.(weeks) Shouldn't exceed 5 when using widgets.
CAL_ROWS_PRIOR: 0, //number of calendar rows.(weeks) that show above the current week
BUZZ_ON_BT: true, //2x slow buzz on disconnect, 2x fast buzz on connect. Will be extra widget eventually BUZZ_ON_BT: true, //2x slow buzz on disconnect, 2x fast buzz on connect. Will be extra widget eventually
MODE24: true, //24h mode vs 12h mode MODE24: true, //24h mode vs 12h mode
FIRSTDAY: 6, //First day of the week: mo, tu, we, th, fr, sa, su FIRSTDAY: 6, //First day of the week: mo, tu, we, th, fr, sa, su
@ -178,7 +179,7 @@ function drawWatch() {
const dow = (s.FIRSTDAY + d.getDay()) % 7; //MO=0, SU=6 const dow = (s.FIRSTDAY + d.getDay()) % 7; //MO=0, SU=6
const today = d.getDate(); const today = d.getDate();
var rD = new Date(d.getTime()); var rD = new Date(d.getTime());
rD.setDate(rD.getDate() - dow); rD.setDate(rD.getDate() - dow - s.CAL_ROWS_PRIOR * 7);
var rDate = rD.getDate(); var rDate = rD.getDate();
g.setFontAlign(1, 1); g.setFontAlign(1, 1);
for (var y = 1; y <= s.CAL_ROWS; y++) { for (var y = 1; y <= s.CAL_ROWS; y++) {
@ -187,7 +188,7 @@ function drawWatch() {
bottomrightY = y * CELL_H + CAL_Y; bottomrightY = y * CELL_H + CAL_Y;
g.setFont("Vector", 16); g.setFont("Vector", 16);
var fg = ((s.REDSUN && rD.getDay() == 0) || (s.REDSAT && rD.getDay() == 6)) ? '#f00' : '#fff'; var fg = ((s.REDSUN && rD.getDay() == 0) || (s.REDSAT && rD.getDay() == 6)) ? '#f00' : '#fff';
if (y == 1 && today == rDate) { if (y == s.CAL_ROWS_PRIOR + 1 && today == rDate) {
g.setColor('#0f0'); g.setColor('#0f0');
g.fillRect(bottomrightX - CELL_W + 1, bottomrightY - CELL_H - 1, bottomrightX, bottomrightY - 2); g.fillRect(bottomrightX - CELL_W + 1, bottomrightY - CELL_H - 1, bottomrightX, bottomrightY - 2);
g.setColor('#000'); g.setColor('#000');

2
apps/clockcal/metadata.json
View File

@ -1,7 +1,7 @@
{ {
"id": "clockcal", "id": "clockcal",
"name": "Clock & Calendar", "name": "Clock & Calendar",
"version": "0.10", "version": "0.11",
"description": "Clock with Calendar", "description": "Clock with Calendar",
"readme":"README.md", "readme":"README.md",
"icon": "app.png", "icon": "app.png",

11
apps/clockcal/settings.js
View File

@ -1,7 +1,8 @@
(function (back) { (function (back) {
var FILE = "clockcal.json"; var FILE = "clockcal.json";
const defaults={ const defaults={
CAL_ROWS: 4, //number of calendar rows.(weeks) Shouldn't exceed 5 when using widgets. CAL_ROWS: 4, //total number of calendar rows.(weeks) Shouldn't exceed 5 when using widgets.
CAL_ROWS_PRIOR: 0, //number of calendar rows.(weeks) that show above the current week
BUZZ_ON_BT: true, //2x slow buzz on disconnect, 2x fast buzz on connect. Will be extra widget eventually BUZZ_ON_BT: true, //2x slow buzz on disconnect, 2x fast buzz on connect. Will be extra widget eventually
MODE24: true, //24h mode vs 12h mode MODE24: true, //24h mode vs 12h mode
FIRSTDAY: 6, //First day of the week: mo, tu, we, th, fr, sa, su FIRSTDAY: 6, //First day of the week: mo, tu, we, th, fr, sa, su
@ -39,6 +40,14 @@
writeSettings(); writeSettings();
} }
}, },
'#Cal Rows Prior': {
value: settings.CAL_ROWS_PRIOR,
min: 0, max: 4,
onchange: v => {
settings.CAL_ROWS_PRIOR = v;
writeSettings();
}
},
'Clock mode': { 'Clock mode': {
value: settings.MODE24, value: settings.MODE24,
format: v => v ? "24h" : "12h", format: v => v ? "24h" : "12h",