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

Clean up code format

master
Fredrik Lautrup 2020-04-23 19:43:48 +02:00
parent 5c3e5ff2ee
commit 43ae16f1c0
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
apps/rclock/rclock.app.js
View File

@ -5,7 +5,7 @@
var date; var date;
var first = true; var first = true;
var locale = require('locale'); var locale = require('locale');
var _12hour = (require("Storage").readJSON("setting.json",1)||{})["12hour"]||false; var _12hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"] || false;
const screen = { const screen = {
width: g.getWidth(), width: g.getWidth(),
@ -43,7 +43,7 @@
}; };
const dateStr = function (date) { const dateStr = function (date) {
return locale.date(new Date(),1); return locale.date(new Date(), 1);
}; };
const getArcXY = function (centerX, centerY, radius, angle) { const getArcXY = function (centerX, centerY, radius, angle) {
@ -64,7 +64,7 @@
//g.setPixel(r[0],r[1]); //g.setPixel(r[0],r[1]);
g.drawLine(r1[0], r1[1], r2[0], r2[1]); g.drawLine(r1[0], r1[1], r2[0], r2[1]);
g.setColor('#333333'); g.setColor('#333333');
g.drawCircle(settings.circle.middle, settings.circle.center, rad - settings.circle.width-4) g.drawCircle(settings.circle.middle, settings.circle.center, rad - settings.circle.width - 4)
}; };
const drawSecArc = function (sections, color) { const drawSecArc = function (sections, color) {
@ -76,7 +76,7 @@
//g.setPixel(r[0],r[1]); //g.setPixel(r[0],r[1]);
g.drawLine(r1[0], r1[1], r2[0], r2[1]); g.drawLine(r1[0], r1[1], r2[0], r2[1]);
g.setColor('#333333'); g.setColor('#333333');
g.drawCircle(settings.circle.middle, settings.circle.center, rad - settings.circle.width-4) g.drawCircle(settings.circle.middle, settings.circle.center, rad - settings.circle.width - 4)
}; };
const drawClock = function () { const drawClock = function () {
@ -125,24 +125,24 @@
//Write the time as configured in the settings //Write the time as configured in the settings
hours = currentTime.getHours(); hours = currentTime.getHours();
if(_12hour && hours>13) { if (_12hour && hours > 13) {
hours=hours-12; hours = hours - 12;
} }
var meridian; var meridian;
if (typeof locale.meridian === "function") { if (typeof locale.meridian === "function") {
meridian=locale.meridian(new Date()); meridian = locale.meridian(new Date());
} else { } else {
meridian=""; meridian = "";
} }
var timestr; var timestr;
if(meridian.length>0 && _12hour) { if (meridian.length > 0 && _12hour) {
timestr=hours+" "+meridian; timestr = hours + " " + meridian;
} else { } else {
timestr=hours; timestr = hours;
} }
g.setColor(settings.time.color); g.setColor(settings.time.color);
@ -161,7 +161,7 @@
// clean app screen // clean app screen
g.clear(); g.clear();
g.setFontAlign( 0, 0, 0); g.setFontAlign(0, 0, 0);
Bangle.loadWidgets(); Bangle.loadWidgets();
Bangle.drawWidgets(); Bangle.drawWidgets();