From 01dc95520687d657732ad0d841f7b27ad85a75bc Mon Sep 17 00:00:00 2001
From: OmegaRogue <thatomegarogue@gmail.com>
Date: Mon, 21 Sep 2020 23:21:41 +0200
Subject: [PATCH] DANE Watchface v0.10: Added Counter, Added Battery Display

---
 apps.json           |  2 +-
 apps/dane/ChangeLog |  3 ++-
 apps/dane/app.js    | 66 ++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/apps.json b/apps.json
index 3dcb0a8f7..4c9826a0f 100644
--- a/apps.json
+++ b/apps.json
@@ -1421,7 +1421,7 @@
     "name": "Digital Assistant, not EDITH",
     "shortName": "DANE",
     "icon": "app.png",
-    "version": "0.09",
+    "version": "0.10",
     "description": "A Watchface inspired by Tony Stark's EDITH",
     "tags": "clock",
     "type": "clock",
diff --git a/apps/dane/ChangeLog b/apps/dane/ChangeLog
index 421123a1b..0ba1d848b 100644
--- a/apps/dane/ChangeLog
+++ b/apps/dane/ChangeLog
@@ -4,4 +4,5 @@
 0.06: moved and resized icon
 0.07: Added Description
 0.08: Removed Image, Reduced RAM usage
-0.09: Added Unix Time
\ No newline at end of file
+0.09: Added Unix Time
+0.10: Added Counter, Added Battery Display
\ No newline at end of file
diff --git a/apps/dane/app.js b/apps/dane/app.js
index c3d51cd14..81e1bf5fa 100644
--- a/apps/dane/app.js
+++ b/apps/dane/app.js
@@ -6,20 +6,21 @@ const smallFontSize = 2;
 const yOffset       = 23;
 const width = g.getWidth();
 const height = g.getHeight();
-const xyCenter      = width/2;
+const xyCenter      = width/2+4;
 const cornerSize    = 14;
 const cornerOffset  = 3;
 const borderWidth   = 1;
 const yposTime      = 27+yOffset;
 const yposDate      = 65+yOffset+12;
+const yposCounter   = 58+yOffset+35+40;
 
 const mainColor      = "#26dafd";
 const mainColorDark  = "#029dbb";
 // const mainColorLight = "#8bebfe";
 
 const secondaryColor      = "#df9527";
-// const secondaryColorDark  = "#8b5c15";
-const secondaryColorLight = "#ecc180";
+const secondaryColorDark  = "#8b5c15";
+// const secondaryColorLight = "#ecc180";
 
 const success        = "#00ff00";
 // const successDark        = "#000900";
@@ -27,7 +28,9 @@ const success        = "#00ff00";
 
 const alert          = "#ff0000";
 // const alertDark          = "#090000";
-const alertLight          = "#0f0606";
+// const alertLight          = "#0f0606";
+
+let count = 100;
 
 
 // function getImg() {
@@ -97,6 +100,13 @@ function drawTopFrame(x1,y1,x2,y2) {
   g.setColor("#000000");
   g.fillRect(x1+borderWidth,y1+borderWidth,x2-borderWidth,y2-borderWidth);
 }
+
+function drawFrameNoCorners(x1,y1,x2,y2) {
+  g.setColor(mainColorDark);
+  g.drawRect(x1,y1,x2,y2);
+  g.setColor("#000000");
+  g.fillRect(x1+borderWidth,y1+borderWidth,x2-borderWidth,y2-borderWidth);
+}
 // function drawBottomFrame(x1,y1,x2,y2) {
 //   drawTopLeftCorner(x1,y1);
 //   drawTopRightCorner(x2,y1);
@@ -137,6 +147,32 @@ function drawDateText(d) {
   g.drawString(`${d.getDate()}.${d.getMonth()+1}.${d.getFullYear()}`, xyCenter, yposDate, true);
 }
 
+function drawCounterText() {
+  if(count>999) count = 999;
+  if(count<0) count = 0;
+  g.setColor("#000000");
+  g.fillRect(37,58+yOffset+36,203,58+80+yOffset+34);
+  g.setFontAlign(0, 0);
+  g.setColor(alert);
+  g.setFont(font, 8);
+  g.drawString(`${count}`, xyCenter, yposCounter, true);
+
+
+}
+
+function levelColor(l) {
+  // no icon -> brightest green to indicate charging, even when showing percentage
+  if (Bangle.isCharging()) return success;
+  if (l >= 50) return success;
+  if (l >= 15) return secondaryColorDark;
+  return alert;
+}
+
+function drawBattery() {
+  const l = E.getBattery(), c = levelColor(l);
+  const xl = 45+l*(194-46)/100;
+  g.setColor(c).fillRect(46,58+80+yOffset+37,xl, height-5);
+}
 
 
 
@@ -144,9 +180,16 @@ function drawClock() {
   // main frame
   drawFrame(3,10+yOffset,width-3,height-3);
   // time frame
-  drawTopFrame(20,10+yOffset,220,46+12+yOffset);
+  drawTopFrame(20,10+yOffset,220,58+yOffset);
   // date frame
-  drawTopFrame(28,46+12+yOffset,212,46+12+yOffset+35);
+  drawTopFrame(28,58+yOffset,212,58+yOffset+35);
+
+  // counter frame
+  drawTopFrame(36,58+yOffset+35,204,58+80+yOffset+35);
+
+  // battery frame
+  drawFrameNoCorners(44,58+80+yOffset+35,196, height-3);
+
 
   updateClock();
 
@@ -158,6 +201,8 @@ function updateClock() {
   const date = new Date();
   drawTimeText(date);
   drawDateText(date);
+  drawCounterText();
+  drawBattery();
 }
 
 
@@ -178,5 +223,14 @@ drawClock();
 
 setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
 
+setWatch(function() {
+  count+=1;
+  drawCounterText();
+}, BTN1, {repeat:true,edge:"falling"});
+setWatch(function() {
+  count--;
+  drawCounterText();
+}, BTN3, {repeat:true,edge:"falling"});
+
 // refesh every 100 milliseconds
 setInterval(updateClock, 500);