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

Merge pull request #610 from hoekma/master 

Update world clock for larger secondary timezone display
master
Gordon Williams 2020-12-14 08:44:26 +00:00 committed by GitHub
parent 31f715d495 ad9c170f78
commit ee92512a07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 102 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps.json
View File

@ -2307,7 +2307,7 @@
"name": "World Clock - 4 time zones",
"shortName":"World Clock",
"icon": "app.png",
"version":"0.02",
"version":"0.03",
"description": "Current time zone plus up to four others",
"tags": "clock",
"type" : "clock",

142
apps/worldclock/app.js
View File

@ -1,31 +1,75 @@
/* jshint esversion: 6 */
const timeFontSize = 6;
const dateFontSize = 3;
const gmtFontSize = 2;
// Font for primary time and date
const primaryTimeFontSize = 6;
const primaryDateFontSize = 3;
// Font for single secondary time
const secondaryTimeFontSize = 4;
const secondaryTimeZoneFontSize = 2;
// Font / columns for multiple secondary times
const secondaryRowColFontSize = 2;
const xcol1 = 10;
const xcol2 = g.getWidth() - xcol1;
const font = "6x8";
const xyCenter = g.getWidth() / 2;
const xcol1=10;
const xcol2=g.getWidth()-xcol1;
const yposTime = 75;
const yposDate = 130;
//const yposYear = 175;
//const yposGMT = 220;
const yposWorld=170;
const yposWorld = 170;
const OFFSET_TIME_ZONE = 0;
const OFFSET_HOURS = 1;
var offsets = require("Storage").readJSON("worldclock.settings.json");
var offsets = require("Storage").readJSON("worldclock.settings.json") || [];
// TESTING CODE
// Used to test offset array values during development.
// Uncomment to override secondary offsets value
// const mockOffsets = {
// zeroOffsets: [],
// oneOffset: [["UTC", 0]],
// twoOffsets: [
// ["Tokyo", 9],
// ["UTC", 0],
// ],
// fourOffsets: [
// ["Tokyo", 9],
// ["UTC", 0],
// ["Denver", -7],
// ["Miami", -5],
// ],
// fiveOffsets: [
// ["Tokyo", 9],
// ["UTC", 0],
// ["Denver", -7],
// ["Chicago", -6],
// ["Miami", -5],
// ],
// };
// Uncomment one at a time to test various offsets array scenarios
// offsets = mockOffsets.zeroOffsets; // should render nothing below primary time
// offsets = mockOffsets.oneOffset; // should render larger in two rows
// offsets = mockOffsets.twoOffsets; // should render two in columns
// offsets = mockOffsets.fourOffsets; // should render in columns
// offsets = mockOffsets.fiveOffsets; // should render first four in columns
// END TESTING CODE
// Check settings for what type our clock should be
//var is12Hour = (require("Storage").readJSON("setting.json",1)||{})["12hour"];
var secondInterval = undefined;
var secondInterval;
function doublenum(x) {
return x<10? "0"+x : ""+x;
return x < 10 ? "0" + x : "" + x;
}
function offset(dt,offset) {
return new Date(dt.getTime() + (offset*60*60*1000));
function getCurrentTimeFromOffset(dt, offset) {
return new Date(dt.getTime() + offset * 60 * 60 * 1000);
}
function drawSimpleClock() {
@ -33,43 +77,60 @@ function drawSimpleClock() {
var d = new Date();
var da = d.toString().split(" ");
g.reset(); // default draw styles
// default draw styles
g.reset();
// drawSting centered
g.setFontAlign(0, 0);
// draw time
var time = da[4].substr(0, 5).split(":");
var hours = time[0], minutes = time[1];
var hours = time[0],
minutes = time[1];
g.setFont(font, timeFontSize);
g.setFont(font, primaryTimeFontSize);
g.drawString(`${hours}:${minutes}`, xyCenter, yposTime, true);
// draw Day, name of month, Date
var date = [da[0], da[1], da[2]].join(" ");
g.setFont(font, dateFontSize);
g.setFont(font, primaryDateFontSize);
g.drawString(date, xyCenter, yposDate, true);
// draw year
//g.setFont(font, dateFontSize);
//g.drawString(d.getFullYear(), xyCenter, yposYear, true);
// set gmt to UTC+0
var gmt = new Date(d.getTime() + d.getTimezoneOffset() * 60 * 1000);
// draw gmt
//console.log(d.getTimezoneOffset());//offset to GMT in minutes
var gmt = new Date(d.getTime()+(d.getTimezoneOffset()*60*1000));
//gmt is now UTC+0
for (var i=0; i<offsets.length; i++) {
g.setFont(font, gmtFontSize);
dx=offset(gmt,offsets[i][1]);
hours=doublenum(dx.getHours());
minutes=doublenum(dx.getMinutes());
g.setFontAlign(-1, 0);
g.drawString(offsets[i][0],xcol1,yposWorld+i*15, true);
g.setFontAlign(1, 0);
g.drawString(`${hours}:${minutes}`, xcol2, yposWorld+i*15, true);
//g.drawString(gmt, xyCenter, yposWorld, true);
}
// Loop through offset(s) and render
offsets.forEach((offset, index) => {
dx = getCurrentTimeFromOffset(gmt, offset[OFFSET_HOURS]);
hours = doublenum(dx.getHours());
minutes = doublenum(dx.getMinutes());
if (offsets.length === 1) {
// For a single secondary timezone, draw it bigger and drop time zone to second line
const xOffset = 30;
g.setFont(font, secondaryTimeFontSize);
g.drawString(`${hours}:${minutes}`, xyCenter, yposTime + 100, true);
g.setFont(font, secondaryTimeZoneFontSize);
g.drawString(offset[OFFSET_TIME_ZONE], xyCenter, yposTime + 130, true);
// draw Day, name of month, Date
g.setFont(font, secondaryTimeZoneFontSize);
g.drawString(date, xyCenter, yposDate, true);
} else if (index < 4) {
// For > 1 extra timezones, render as columns / rows
g.setFont(font, secondaryRowColFontSize);
g.setFontAlign(-1, 0);
g.drawString(
offset[OFFSET_TIME_ZONE],
xcol1,
yposWorld + index * 15,
true
);
g.setFontAlign(1, 0);
g.drawString(`${hours}:${minutes}`, xcol2, yposWorld + index * 15, true);
}
});
}
// clean app screen
@ -78,11 +139,11 @@ Bangle.loadWidgets();
Bangle.drawWidgets();
// refesh every 15 sec when screen is on
Bangle.on('lcdPower',on=>{
Bangle.on("lcdPower", (on) => {
if (secondInterval) clearInterval(secondInterval);
secondInterval = undefined;
if (on) {
secondInterval = setInterval(drawSimpleClock, 15E3);
secondInterval = setInterval(drawSimpleClock, 15e3);
drawSimpleClock(); // draw immediately
}
});
@ -90,9 +151,8 @@ Bangle.on('lcdPower',on=>{
// draw now and every 15 sec until display goes off
drawSimpleClock();
if (Bangle.isLCDOn()) {
secondInterval = setInterval(drawSimpleClock, 15E3);
secondInterval = setInterval(drawSimpleClock, 15e3);
}
// Show launcher when middle button pressed
setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" });