diff --git a/apps.json b/apps.json index c8e614625..e15ff5b9c 100644 --- a/apps.json +++ b/apps.json @@ -946,7 +946,7 @@ { "id": "svclock", "name": "Simple V-Clock", "icon": "vclock-simple.png", - "version":"0.02", + "version":"0.03", "description": "Modification of Simple Clock 0.04 to use Vectorfont", "tags": "clock", "type":"clock", diff --git a/apps/svclock/ChangeLog b/apps/svclock/ChangeLog index 671de492c..4db60ecd5 100644 --- a/apps/svclock/ChangeLog +++ b/apps/svclock/ChangeLog @@ -1,2 +1,3 @@ 0.01: Modification of SimpleClock 0.04 to use Vectorfont 0.02: Use Bangle.setUI for button/launcher handling +0.03: Scale to BangleJS 2 and add locale \ No newline at end of file diff --git a/apps/svclock/vclock-simple.js b/apps/svclock/vclock-simple.js index 62aad0dc3..637701a3f 100644 --- a/apps/svclock/vclock-simple.js +++ b/apps/svclock/vclock-simple.js @@ -1,17 +1,39 @@ /* jshint esversion: 6 */ const locale = require("locale"); -const timeFontSize = 65; -const dateFontSize = 20; -const gmtFontSize = 10; -const font = "Vector"; +var timeFontSize; +var dateFontSize; +var gmtFontSize; +var font = "Vector"; -const xyCenter = g.getWidth() / 2; -const yposTime = 75; -const yposDate = 130; -const yposYear = 175; -const yposGMT = 220; +var xyCenter = g.getWidth() / 2; +var yposTime; +var yposDate; +var yposYear; +var yposGMT; +switch (process.env.BOARD) { + case "EMSCRIPTEN": + timeFontSize = 65; + dateFontSize = 20; + gmtFontSize = 10; + + yposTime = 75; + yposDate = 130; + yposYear = 175; + yposGMT = 220; + break; + case "EMSCRIPTEN2": + timeFontSize = 48; + dateFontSize = 15; + gmtFontSize = 10; + + yposTime = 55; + yposDate = 95; + yposYear = 128; + yposGMT = 161; + break; +} // Check settings for what type our clock should be var is12Hour = (require("Storage").readJSON("setting.json",1)||{})["12hour"]; @@ -20,8 +42,7 @@ function drawSimpleClock() { Bangle.drawWidgets(); // get date - //var d = new Date(); - var d = new Date(Date.parse('2011-04-11T14:5:30Z')); + var d = new Date(); g.reset(); // default draw styles // drawSting centered