From 346eb8f77b0038c8ee2a23c72a3dcf7d3e0087fb Mon Sep 17 00:00:00 2001 From: Richard de Boer Date: Sat, 2 Oct 2021 14:55:41 +0200 Subject: [PATCH] barclock: coding style (add semicolons) --- apps/barclock/clock-bar.js | 190 ++++++++++++++++++------------------- 1 file changed, 95 insertions(+), 95 deletions(-) diff --git a/apps/barclock/clock-bar.js b/apps/barclock/clock-bar.js index 396c2984a..52affac5d 100644 --- a/apps/barclock/clock-bar.js +++ b/apps/barclock/clock-bar.js @@ -3,159 +3,159 @@ * A simple digital clock showing seconds as a bar **/ // Check settings for what type our clock should be -const is12Hour = (require('Storage').readJSON('setting.json', 1) || {})['12hour'] -let locale = require('locale') +const is12Hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"]; +let locale = require("locale"); { // add some more info to locale - let date = new Date() - date.setFullYear(1111) - date.setMonth(1, 3) // februari: months are zero-indexed - const localized = locale.date(date, true) - locale.dayFirst = /3.*2/.test(localized) + let date = new Date(); + date.setFullYear(1111); + date.setMonth(1, 3); // februari: months are zero-indexed + const localized = locale.date(date, true); + locale.dayFirst = /3.*2/.test(localized); - locale.hasMeridian = false - if(typeof locale.meridian === 'function') { // function does not exists if languages app is not installed - locale.hasMeridian = (locale.meridian(date) !== '') + locale.hasMeridian = false; + if (typeof locale.meridian==="function") { // function does not exists if languages app is not installed + locale.hasMeridian = (locale.meridian(date)!==""); } } const screen = { width: g.getWidth(), height: g.getWidth(), - middle: g.getWidth() / 2, - center: g.getHeight() / 2, -} + middle: g.getWidth()/2, + center: g.getHeight()/2, +}; // hardcoded "settings" const settings = { time: { - font: '6x8', + font: "6x8", size: (is12Hour && locale.hasMeridian) ? 6 : 8, middle: screen.middle, center: screen.center, ampm: { color: -1, - font: '6x8', + font: "6x8", size: 2, }, }, date: { - font: 'Vector', + font: "Vector", size: 20, - middle: screen.height - 20, // at bottom of screen + middle: screen.height-20, // at bottom of screen center: screen.center, }, bar: { top: 155, // just below time thickness: 6, // matches 24h time "pixel" size }, -} +}; -const SECONDS_PER_MINUTE = 60 +const SECONDS_PER_MINUTE = 60; -const timeText = function (date) { +const timeText = function(date) { if (!is12Hour) { - return locale.time(date, true) + return locale.time(date, true); } - const date12 = new Date(date.getTime()) - const hours = date12.getHours() - if (hours === 0) { - date12.setHours(12) - } else if (hours > 12) { - date12.setHours(hours - 12) + const date12 = new Date(date.getTime()); + const hours = date12.getHours(); + if (hours===0) { + date12.setHours(12); + } else if (hours>12) { + date12.setHours(hours-12); } - return locale.time(date12, true) -} -const ampmText = function (date) { - return is12Hour ? locale.meridian(date) : '' -} + return locale.time(date12, true); +}; +const ampmText = function(date) { + return is12Hour ? locale.meridian(date) : ""; +}; -const dateText = function (date) { +const dateText = function(date) { const dayName = locale.dow(date, true), month = locale.month(date, true), - day = date.getDate() - const dayMonth = locale.dayFirst ? `${day} ${month}` : `${month} ${day}` - return `${dayName} ${dayMonth}` -} + day = date.getDate(); + const dayMonth = locale.dayFirst ? `${day} ${month}` : `${month} ${day}`; + return `${dayName} ${dayMonth}`; +}; -const drawDateTime = function (date) { - const t = settings.time - g.setFont(t.font, t.size) - g.setFontAlign(0, 0) // centered - g.drawString(timeText(date), t.center, t.middle, true) +const drawDateTime = function(date) { + const t = settings.time; + g.setFont(t.font, t.size); + g.setFontAlign(0, 0); // centered + g.drawString(timeText(date), t.center, t.middle, true); if (is12Hour && locale.hasMeridian) { - const a = settings.time.ampm - g.setFont(a.font, a.size) - g.setFontAlign(1, -1) // right top + const a = settings.time.ampm; + g.setFont(a.font, a.size); + g.setFontAlign(1, -1); // right top // at right edge of screen, aligned with time bottom - const left = screen.width - a.size * 2, - top = t.middle + t.size - a.size - g.drawString(ampmText(date), left, top, true) + const left = screen.width-a.size*2, + top = t.middle+t.size-a.size; + g.drawString(ampmText(date), left, top, true); } - const d = settings.date - g.setFont(d.font, d.size) - g.setFontAlign(0, 0) // centered - g.drawString(dateText(date), d.center, d.middle, true) -} + const d = settings.date; + g.setFont(d.font, d.size); + g.setFontAlign(0, 0); // centered + g.drawString(dateText(date), d.center, d.middle, true); +}; -const drawBar = function (date) { - const b = settings.bar - const seconds = date.getSeconds() - if (seconds === 0) { +const drawBar = function(date) { + const b = settings.bar; + const seconds = date.getSeconds(); + if (seconds===0) { // zero-size rect stills draws one line of pixels, we don't want that - return + return; } - const fraction = seconds / SECONDS_PER_MINUTE, - width = fraction * screen.width - g.setColor(g.theme.fg2).fillRect(0, b.top, width, b.top + b.thickness) -} + const fraction = seconds/SECONDS_PER_MINUTE, + width = fraction*screen.width; + g.setColor(g.theme.fg2).fillRect(0, b.top, width, b.top+b.thickness); +}; -const clearScreen = function () { - const timeTop = settings.time.middle - (settings.time.size * 4) - g.clearRect(0, timeTop, screen.width, screen.height) -} +const clearScreen = function() { + const timeTop = settings.time.middle-(settings.time.size*4); + g.clearRect(0, timeTop, screen.width, screen.height); +}; -let lastSeconds, tTick -const tick = function () { - g.reset() - const date = new Date() - const seconds = date.getSeconds() - if (lastSeconds > seconds) { +let lastSeconds, tTick; +const tick = function() { + g.reset(); + const date = new Date(); + const seconds = date.getSeconds(); + if (lastSeconds>seconds) { // new minute - clearScreen() - drawDateTime(date) + clearScreen(); + drawDateTime(date); } // the bar only gets larger, so drawing on top of the previous one is fine - drawBar(date) - lastSeconds = seconds + drawBar(date); + lastSeconds = seconds; // schedule next update - const millis = date.getMilliseconds() - tTick = setTimeout(tick, 1000-millis) -} + const millis = date.getMilliseconds(); + tTick = setTimeout(tick, 1000-millis); +}; -const start = function () { - lastSeconds = 99 // force redraw - tick() -} -const stop = function () { +const start = function() { + lastSeconds = 99; // force redraw + tick(); +}; +const stop = function() { if (tTick) { - clearTimeout(tTick) - tTick = undefined + clearTimeout(tTick); + tTick = undefined; } -} +}; // clean app screen -g.clear() -Bangle.loadWidgets() -Bangle.drawWidgets() +g.clear(); +Bangle.loadWidgets(); +Bangle.drawWidgets(); // Show launcher when button pressed Bangle.setUI("clock"); -Bangle.on('lcdPower', function (on) { +Bangle.on("lcdPower", function(on) { if (on) { - start() + start(); } else { - stop() + stop(); } -}) -start() +}); +start();