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

Merge pull request #502 from nebbishhacker/largeclock 

Largeclock changes
master
Gordon Williams 2020-06-14 16:25:44 +01:00 committed by GitHub
parent 02a4d5c28a 86bb7da352
commit f17ddbc652
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps.json
View File

@ -1605,7 +1605,7 @@
"id": "largeclock", "id": "largeclock",
"name": "Large Clock", "name": "Large Clock",
"icon": "largeclock.png", "icon": "largeclock.png",
"version": "0.03", "version": "0.05",
"description": "A readable and informational digital watch, with date, seconds and moon phase", "description": "A readable and informational digital watch, with date, seconds and moon phase",
"readme": "README.md", "readme": "README.md",
"tags": "clock", "tags": "clock",

2
apps/largeclock/ChangeLog
View File

@ -1,3 +1,5 @@
0.01: Init 0.01: Init
0.02: fix 3/4 moon orientation 0.02: fix 3/4 moon orientation
0.03: Change `largeclock.json` to 'data' file to allow settings to be preserved 0.03: Change `largeclock.json` to 'data' file to allow settings to be preserved
0.04: Adjust layout to account for new vector font
0.05: Add support for 12 hour time

30
apps/largeclock/largeclock.js
View File

@ -4,11 +4,13 @@ let interval;
let lastMoonPhase; let lastMoonPhase;
let lastMinutes; let lastMinutes;
const is12Hour = (require("Storage").readJSON("setting.json",1)||{})["12hour"];
const moonR = 12; const moonR = 12;
const moonX = 215; const moonX = 215;
const moonY = 50; const moonY = is12Hour ? 90 : 50;
const settings = require("Storage").readJSON("largeclock.json", 1); const settings = require("Storage").readJSON("largeclock.json", 1)||{};
const BTN1app = settings.BTN1 || ""; const BTN1app = settings.BTN1 || "";
const BTN3app = settings.BTN3 || ""; const BTN3app = settings.BTN3 || "";
@ -118,33 +120,41 @@ function drawMoon(d) {
function drawTime(d) { function drawTime(d) {
const da = d.toString().split(" "); const da = d.toString().split(" ");
const time = da[4].substr(0, 5).split(":"); const time = da[4].split(":");
const dow = da[0]; const dow = da[0];
const month = da[1]; const month = da[1];
const day = da[2]; const day = da[2];
const year = da[3]; const year = da[3];
const hours = time[0]; const hours = is12Hour ? ("0" + (((d.getHours() + 11) % 12) + 1)).substr(-2) : time[0];
const meridian = d.getHours() < 12 ? "AM" : "PM";
const minutes = time[1]; const minutes = time[1];
const seconds = d.getSeconds(); const seconds = time[2];
if (minutes != lastMinutes) { if (minutes != lastMinutes) {
if (is12Hour) {
g.setFont("Vector", 18);
g.setColor(1, 1, 1);
g.setFontAlign(0, -1);
g.clearRect(195, 34, 240, 44);
g.drawString(meridian, 217, 34);
}
g.clearRect(0, 24, moonX - moonR - 10, 239); g.clearRect(0, 24, moonX - moonR - 10, 239);
g.setColor(1, 1, 1); g.setColor(1, 1, 1);
g.setFontAlign(-1, -1); g.setFontAlign(-1, -1);
g.setFont("Vector", 100); g.setFont("Vector", 100);
g.drawString(hours, 50, 24, true); g.drawString(hours, 40, 24, true);
g.setColor(1, 50, 1); g.setColor(1, 50, 1);
g.drawString(minutes, 50, 135, true); g.drawString(minutes, 40, 135, true);
g.setFont("Vector", 20); g.setFont("Vector", 20);
g.setRotation(3); g.setRotation(3);
g.drawString(`${dow} ${day} ${month}`, 50, 15, true); g.drawString(`${dow} ${day} ${month}`, 50, 10, true);
g.drawString(year, 75, 205, true); g.drawString(year, is12Hour ? 46 : 75, 205, true);
lastMinutes = minutes; lastMinutes = minutes;
} }
g.setRotation(0); g.setRotation(0);
g.setFont("Vector", 20); g.setFont("Vector", 20);
g.setColor(1, 1, 1); g.setColor(1, 1, 1);
g.setFontAlign(0, -1); g.setFontAlign(0, -1);
g.clearRect(200, 210, 240, 240); g.clearRect(195, 210, 240, 240);
g.drawString(seconds, 215, 215); g.drawString(seconds, 215, 215);
} }