From b1585366c5945ba74912b84da917fac6da43b753 Mon Sep 17 00:00:00 2001 From: Pascal Gollnick <33615872+unnamed1337@users.noreply.github.com> Date: Tue, 31 Mar 2020 20:13:35 +0200 Subject: [PATCH 1/4] Update app.js --- apps/cliock/app.js | 47 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/apps/cliock/app.js b/apps/cliock/app.js index 607993f63..48cc24f22 100644 --- a/apps/cliock/app.js +++ b/apps/cliock/app.js @@ -1,4 +1,3 @@ -var line; var fontsize = 3; var locale = require("locale"); var marginTop = 40; @@ -10,39 +9,39 @@ function drawAll(){ Bangle.loadWidgets(); Bangle.drawWidgets(); updateTime(); + updateRest(new Date(),true); +} + +function updateRest(now,force){ + Bangle.loadWidgets(); + Bangle.drawWidgets(); + if (now.getMinutes() != 0 && force) return; + let date = locale.date(now,false); + writeLine(WeekDays[now.getDay()],1); + writeLine(date,2); } function updateTime(){ if (!Bangle.isLCDOn()) return; - line = 0; - var now = new Date(); - var date = locale.date(now,false); - var h = now.getHours(); - var m = now.getMinutes(); + let now = new Date(); + let h = now.getHours(); + let m = now.getMinutes(); h = h>=10?h:"0"+h; m = m>=10?m:"0"+m; + writeLine(h+":"+m,0); + writeLine(flag?" ":"_",3); + flag = !flag; + updateRest(now,false); +} +function writeLineStart(line){ + g.drawString(">",4,marginTop+line*30); +} +function writeLine(str,line){ g.setFont("6x8",fontsize); g.setColor(0,1,0); g.setFontAlign(-1,-1); - writeLine(h+":"+m); - writeLine(WeekDays[now.getDay()]); - writeLine(date); - if(flag){ - writeLine(" "); - flag = false; - } - else{ - writeLine("_"); - flag = true; - } -} -function writeLineStart(){ - g.drawString(">",4,marginTop+line*30); -} -function writeLine(str){ g.clearRect(0,marginTop+line*30,((str.length+1)*20),marginTop+25+line*30); - writeLineStart(); + writeLineStart(line); g.drawString(str,25,marginTop+line*30); - line++; } drawAll(); From ad33990965e71417626fba5ff4a0bb4125a1cc47 Mon Sep 17 00:00:00 2001 From: Pascal Gollnick <33615872+unnamed1337@users.noreply.github.com> Date: Tue, 31 Mar 2020 20:15:39 +0200 Subject: [PATCH 2/4] Update apps.json --- apps.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps.json b/apps.json index 692979fdd..c8c9aaad2 100644 --- a/apps.json +++ b/apps.json @@ -841,10 +841,10 @@ "name": "Commandline-Clock", "shortName":"CLI-Clock", "icon": "app.png", - "version":"0.04", + "version":"0.05", "description": "Simple CLI-Styled Clock", - "tags": "cli,command,bash,shell", - "type": "clock", + "tags": "clock,cli,command,bash,shell", + "type":"clock" "allow_emulator":true, "storage": [ {"name":"cliock.app.js","url":"app.js"}, From 61c8d255e71003502539a7e4d2cddcf75852e2d0 Mon Sep 17 00:00:00 2001 From: Pascal Gollnick <33615872+unnamed1337@users.noreply.github.com> Date: Tue, 31 Mar 2020 20:17:26 +0200 Subject: [PATCH 3/4] Update apps.json --- apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps.json b/apps.json index c8c9aaad2..8e3f7ec15 100644 --- a/apps.json +++ b/apps.json @@ -844,7 +844,7 @@ "version":"0.05", "description": "Simple CLI-Styled Clock", "tags": "clock,cli,command,bash,shell", - "type":"clock" + "type":"clock", "allow_emulator":true, "storage": [ {"name":"cliock.app.js","url":"app.js"}, From 7d78869647f1e0ba6893e68c60d73d5dc076f53a Mon Sep 17 00:00:00 2001 From: Pascal Gollnick <33615872+unnamed1337@users.noreply.github.com> Date: Tue, 31 Mar 2020 20:21:09 +0200 Subject: [PATCH 4/4] Update app.js --- apps/cliock/app.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/cliock/app.js b/apps/cliock/app.js index 48cc24f22..f73815a69 100644 --- a/apps/cliock/app.js +++ b/apps/cliock/app.js @@ -13,8 +13,6 @@ function drawAll(){ } function updateRest(now,force){ - Bangle.loadWidgets(); - Bangle.drawWidgets(); if (now.getMinutes() != 0 && force) return; let date = locale.date(now,false); writeLine(WeekDays[now.getDay()],1);