From 2f06eeb9f96f5e6dc99e07b9ca96e2aa45ce3578 Mon Sep 17 00:00:00 2001
From: ps-igel <60899838+ps-igel@users.noreply.github.com>
Date: Thu, 18 Jun 2020 22:56:27 +0200
Subject: [PATCH] Numerals clock: Add date on touch and some improvements

---
 apps.json                          |  2 +-
 apps/numerals/ChangeLog            |  1 +
 apps/numerals/README.md            |  5 +++-
 apps/numerals/numerals.app.js      | 48 +++++++++++++++++++-----------
 apps/numerals/numerals.settings.js |  9 +++++-
 5 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/apps.json b/apps.json
index 94c13ef9e..7ebf3cfd8 100644
--- a/apps.json
+++ b/apps.json
@@ -1332,7 +1332,7 @@
     "name": "Numerals Clock",
     "shortName": "Numerals Clock",
     "icon": "numerals.png",
-    "version":"0.06",
+    "version":"0.07",
     "description": "A simple big numerals clock",
     "tags": "numerals,clock",
 	"type":"clock",
diff --git a/apps/numerals/ChangeLog b/apps/numerals/ChangeLog
index 9e6abb393..b4dbae3e6 100644
--- a/apps/numerals/ChangeLog
+++ b/apps/numerals/ChangeLog
@@ -4,3 +4,4 @@
 0.04: Don't overwrite existing settings on app update
 0.05: Fix settings issue
 0.06: Improve rendering of Numeral 1, fix issue with alarms not showing up
+0.07: Add date on touch and some improvements (see settings and readme)
\ No newline at end of file
diff --git a/apps/numerals/README.md b/apps/numerals/README.md
index 52e84c76d..ebf4c10fe 100644
--- a/apps/numerals/README.md
+++ b/apps/numerals/README.md
@@ -17,4 +17,7 @@ Settings can be accessed through the app/widget settings menu of the Bangle.js
 * frame - only shows outline of numerals
 
 ### Menu button
-* choose button to start launcher menu with
\ No newline at end of file
+* choose button to start launcher menu with
+
+### Date on touch
+* shows the current date as DD MM on touch and reverts back to time after 5 seconds
\ No newline at end of file
diff --git a/apps/numerals/numerals.app.js b/apps/numerals/numerals.app.js
index 37f8219c4..123825853 100644
--- a/apps/numerals/numerals.app.js
+++ b/apps/numerals/numerals.app.js
@@ -42,7 +42,8 @@ if (!settings) {
   settings = {
     color:0,
     drawMode:"fill",
-    menuButton:24
+    menuButton:24,
+    showDate:0
   };
 }
 
@@ -56,35 +57,46 @@ function drawNum(num,col,x,y,func){
   }
 }
 
-function draw(drawMode){
+function draw(date){
   let d = new Date();
-  let h1 = Math.floor((_12hour?d.getHours()%12:d.getHours())/10);
-  let h2 = (_12hour?d.getHours()%12:d.getHours())%10;
-  let m1 = Math.floor(d.getMinutes()/10);
-  let m2 = d.getMinutes()%10;
+  let l1, l2;
+  if (date) {
+    setUpdateInt(0);
+    l1 = ("0"+(new Date()).getDate()).substr(-2);
+    l2 = ("0"+(new Date()).getMonth()).substr(-2);
+    setTimeout(()=>{ draw(); setUpdateInt(1); }, 5000);
+  } else {
+    l1 = ("0"+(_12hour?d.getHours()%12:d.getHours())).substr(-2);
+    l2 = ("0"+d.getMinutes()).substr(-2);
+  }
   g.clearRect(0,24,240,240);
-  drawNum(h1,_hCol[_rCol],0,0,eval(drawMode));
-  drawNum(h2,_hCol[_rCol],1,0,eval(drawMode));
-  drawNum(m1,_mCol[_rCol],0,1,eval(drawMode));
-  drawNum(m2,_mCol[_rCol],1,1,eval(drawMode));
+  drawNum(l1[0],_hCol[_rCol],0,0,eval(settings.drawMode));
+  drawNum(l1[1],_hCol[_rCol],1,0,eval(settings.drawMode));
+  drawNum(l2[0],_mCol[_rCol],0,1,eval(settings.drawMode));
+  drawNum(l2[1],_mCol[_rCol],1,1,eval(settings.drawMode));
+}
+
+function setUpdateInt(set){
+  if (interval) clearInterval(interval);
+  if (set) interval=setInterval(draw, REFRESH_RATE);
 }
 
 Bangle.setLCDMode();
 g.reset().clear();
 setWatch(Bangle.showLauncher, settings.menuButton, {repeat:false,edge:"falling"});
 if (settings.color>0) _rCol=settings.color-1;
-interval=setInterval(draw, REFRESH_RATE, settings.drawMode);
-draw(settings.drawMode);
+setUpdateInt(1);
+draw();
 
+if (settings.showDate) {
+  Bangle.on('touch', () => draw(1));
+}
 Bangle.on('lcdPower', function(on){
   if (on){
     if (settings.color==0) _rCol = Math.floor(Math.random()*_hCol.length);
-    draw(settings.drawMode);
-    interval=setInterval(draw, REFRESH_RATE, settings.drawMode);
-  }else
-  {
-    clearInterval(interval);
-  }
+    draw();
+    setUpdateInt(1);
+  } else setUpdateInt(0);
 });
 
 Bangle.loadWidgets();
diff --git a/apps/numerals/numerals.settings.js b/apps/numerals/numerals.settings.js
index fbd721146..278d7edc7 100644
--- a/apps/numerals/numerals.settings.js
+++ b/apps/numerals/numerals.settings.js
@@ -6,7 +6,8 @@
     numeralsSettings = {
       color:0,
       drawMode:"fill",
-      menuButton:22
+      menuButton:22,
+      showDate:0
     };
     updateSettings();
   }
@@ -36,6 +37,12 @@
       format: v=>btn[v][1],
       onchange: v=> { numeralsSettings.menuButton=btn[v][0]; updateSettings();}
     },
+    "Date on touch": {
+      value: 0|numeralsSettings.showDate,
+      min:0,max:1,
+      format: v=>v?"On":"Off",
+      onchange: v=> { numeralsSettings.showDate=v; updateSettings();}
+    },
     "< back": back
   };
   E.showMenu(menu);