From 54e313bf3bae3802e5c2ac6d5feca37cd7525e21 Mon Sep 17 00:00:00 2001
From: Vingelar <Vingelar@mantisse.de>
Date: Thu, 18 Nov 2021 21:54:27 +0100
Subject: [PATCH] several updates on main app: - changed positions of battery,
 BT, mask - removed all setColor calls - updated background image 176 -
 changed bt icon - added month names as gfx

---
 apps/TheBinWatch/Background176_center.png | Bin 4158 -> 4463 bytes
 apps/TheBinWatch/app.js                   | 158 ++++++++++++----------
 apps/TheBinWatch/bt-icon.png              | Bin 628 -> 708 bytes
 3 files changed, 83 insertions(+), 75 deletions(-)

diff --git a/apps/TheBinWatch/Background176_center.png b/apps/TheBinWatch/Background176_center.png
index 9c8ecee53dae7bcf0f81fa2e42d8e3344317bc31..c8c1c01489841b23c195421c1dc52112f5df424b 100644
GIT binary patch
literal 4463
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

literal 4158
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

diff --git a/apps/TheBinWatch/app.js b/apps/TheBinWatch/app.js
index 8cb8669f6..4a8e692a1 100644
--- a/apps/TheBinWatch/app.js
+++ b/apps/TheBinWatch/app.js
@@ -9,33 +9,56 @@
 ****************************************************/
 
 /* reuqirements */
-var locale = require("locale");
-require("Font5x9Numeric7Seg").add(Graphics);
+require("Font7x11Numeric7Seg").add(Graphics);
+require("Font5x7Numeric7Seg").add(Graphics);
 
 
 /* constants and definitions */
 
 /* Bangle 2: 176 x 176 */
 
+/* month images */
+
+var month = [
+  /* JAN */ {width : 53, height : 24, bpp : 1, buffer : require("heatshrink").decompress(atob("AAMf/0D8AFBkM/9EvwMAgcM/3B30YgE4uEOh354EB4eAuFz90Ah0cgeDx9wgFw8Ecjk7wEDw8A8AIBgEcnEHg4IBgFh4EYnEDHYMF/8AwBID/BODgN/4EgAoI0BgODwExGgkDzg0FAII0D88A8PAnAIBAIMOgPBBAPAiBpCgPAQIOAmFwg0P/B5BwcAiE/JYYAHA"))},
+  /* FEB */ {width : 51, height : 24, bpp : 1, buffer : require("heatshrink").decompress(atob("v/8n/+g/+if/hP/wM/8c/4Of8Ez/FwgE4gEHgFOAYUA8Ed4ADBgEcge4AYMAgeAu4DCgFwhwQBEIMOgPcAYMAgPAjN/4G/8EX/kf/EP/kB/+F/8C/+Ar/xGQkBGTE7wADBMIMHMotMgEGv+A7/hEYOf/EH/hvBh6FBIIKYFA"))},
+  /* MAR */ {width : 52, height : 23, bpp : 1, buffer : require("heatshrink").decompress(atob("v/4j/+gf/hP/gV/6FP/HP8kz/cGv8OgHDwFwuEE8McnEHg8A905BgcO8ecBiM4BgMwuEGoeEi/8gX/wE4gH/4Ef/AMFx0QDIcA8BADnEOgIzCufABgk+Bglx+AMEh+OBgdwvnghk4gcGgfsgFDgEQoEeSgvg"))},
+  /* APR */ {width : 52, height : 23, bpp : 1, buffer : require("heatshrink").decompress(atob("v/4j/4gf/hP/oV/4FP/HP9kz/EGv8OgPDwEguEE8EcnEHg8A9wMCuFwhwMTgAMBmFwg1f+EX/kC/+D/8A//AJIIMFxwZCgFwgAmCgEHnBNDgFz4AMEnwMEuPwBgkPxwMDuF88EMBgMGgfsgFDRgNAjyUF8A="))},
+  /* MAY */ {width : 52, height : 24, bpp : 1, buffer : require("heatshrink").decompress(atob("v/4j/+AoMJ/8Cv/QAwPP8kz/cEgEugHDwFwsEG8McnEHg8A905BgVwh3jzgMRnAMBmAMBoeEi/8BgNgnEA//Ah/4BgcB/+OiAZCBgPgIARTB90BGYUAhwMahk4gYMBpkAocAiEP+CSDIAOAAwYMB"))},
+  /* JUN */ {width : 53, height : 24, bpp : 1, buffer : require("heatshrink").decompress(atob("AAcD8ADBkMAhEvwIJBhkA4O+jEAnFwh0O/PAgPDwFwufugEOjkDwePuEAuHgjkcneAgeHgHgBAMAjk4g8HBAMAsPAjE4gY7BggCBwBPLkACBGgMBweAmI0EgecGgoBBGgfngHh4E4BAIBBh0B4IIB4EQmEEBAPA/0An5qBg0P/ED/xNBiAKBh6PCAAw="))},
+  /* JUL */ {width : 53, height : 24, bpp : 1, buffer : require("heatshrink").decompress(atob("AA8hgEImAFBgcMgHB4AGBnFwh0OAoMB4eAuFwAwMOjkDweAAwNw8EcjggCw8A8HgAwMcnEHg40CsPAjE4AwUEAQIgCABMgGgcBGgMBGgo/BGggKBGgYBB8PAnA0BBQMOgJpC4EQmEENIX+gE/wFn/EP/ED/0Cv/gBQMP8EP/5QGA"))},
+  /* AUG */ {width : 52, height : 24, bpp : 1, buffer : require("heatshrink").decompress(atob("n/8AocE/+gAgMP/1n+0QgGA//HgHhwEYl/wuEOjkDw8Ag4MB4E4uEABilhBgcv/EcgOCgEB/+AwBBB/AMBAgMCj/ngFgAwNw/wmCgImBBgIzDhwzFBikGhkBgUAs0AkEf4EH+A3Bgf+gBLBAwIMD"))},
+  /* SEP */ {width : 51, height : 23, bpp : 1, buffer : require("heatshrink").decompress(atob("h/4j//g/+gf/wn/4M/8ABB5/wmf4mEAjkAg8Ap0AgeAgHgjvAgFwBwMD3EAhwOCu8AgIOCh3ggE4BwMB7gjCBwMYv/Ar/wi/8j/8IYMB/+BIYIODDwIyCLIMHGQYGB8JBDB4IyCAoMDw5BDB4JBDgEEMoZ6Cn/A8A6B8FP/kYgEf/EH/4eCA"))},
+  /* OCT */ {width : 50, height : 23, bpp : 1, buffer : require("heatshrink").decompress(atob("h/gg/+j//w/8gf/h//+H+gF/wP//OAkHADAXgjlwAoU4g8cAgMYh0B44pCgeAuIYBgfADAnwnEDDAUcghCDgRMIsACBkAYFGKZKDngYFgJjBwAYCPgX4DAMHPgQYBgB8C8EGgAA="))},
+  /* NOV */ {width : 51, height : 24, bpp : 1, buffer : require("heatshrink").decompress(atob("vkAgf4AoMX4GA/+ABIN8mEP8EggP350MgMGgF+vvDwFw8Ef4+4uEOjgiBu8OgIOBv8A8PAnFwEQMcnEHBwP8gOHgFh4EdHYNAgEQgJLFggFEhPAjFwg0cg4jDGQPnGQk8GQkPI4IyB8PDKwYOB+BWBMoMHnkOgHAn+A98BwEIh/4jnAHgX+gaGBAAcggAA=="))},
+  /* DEC */ {width : 49, height : 23, bpp : 1, buffer : require("heatshrink").decompress(atob("v/gj//gP/5/4iYFC2f4hn/CAOcgMHgEBwEOgPDwEB4AJB8PAgHggeAuHggFwBoM4uEAnANBjgDBjgNBgwDBh0AiEAgowBAAQ6BwEAggFBv/BwAwBsIwWhwwDnEHAYIiBjhhDgEN/0Dn/Aj/hO4M/+Ef/JABv/8g/+A=="))},
+  /* MAI */ {width : 44, height : 23, bpp : 1, buffer : require("heatshrink").decompress(atob("v/4j/+gEJ/8Cv/QgnP8kz/cA50A4eAuEc8McnEHgPOnIKD8ecBR04BQMwhlDwkX/kAoE4gH/4EABQlOiAVD8A2EgIrDBS0MnEDgHMGQMAiEEPwo="))},
+  /* OKT */ {width : 51, height : 24, bpp : 1, buffer : require("heatshrink").decompress(atob("g/wAQMP//B/8DgPh//8j/AuF8n//jECh0fDAUA8PH4AGB8EcnIhBsEcgeHvkAj0DwFw98AgYjBh0dDAN4h0A4eAEgQDBl/4gFAE4MD/5OE3/ggIyBhk4gcAuAyCBIIyDIIIyDAgOAGQMBGQNwh8B4E4BwMB8BlCBIM8gF/AgMYg+Aj/wmA3B+EB/hBChiYGA"))},
+  /* DEZ */ {width : 51, height : 23, bpp : 1, buffer : require("heatshrink").decompress(atob("n/wh//w//xP/gV/8F//Of4Fn/EH/04gUODAUHgHh4AFBnHgjk4BYUcgeHAoMB8eAuHgAwN4uEOjgFBh4jB4eAgED4ADBl/4gFwB4MD/4DBgQCB3/gC4PghgyBgPAGQl4gYyDjwgBGQQrBh0BGQVwDQM4F4MMLIJlEg3/gOfPAPgn/gk/+j/+h/8IoPh//gA="))}
+];
+
+var imgSquid = {width : 88, height : 26, bpp : 1, buffer : require("heatshrink").decompress(atob("gE/AYUYgEH////0B//gBQM8BQgDB/AKHh/A/gKBvwKBAgMOj8AnwKHBAIMBgH/BQgmCAoPnBQl4AoOAgPnwAKDuEAgYKB4YKIgfD4AKDMAMB4EDwIKIg+B8AKIgAKIh8A+AKHh0AuAKHj0AvBMG4EcgE4K458Bnh4HnEAjiOHBwMeBQpKBEgMOXQ/wBwIKDaAZQBg4KDcwT0BAAOHfgoKHgE/wDaBAAL8DA="))};
+
 const V2_X_STEP = 26;
 const V2_Y_STEP = 34;
 
-const V2_TIME_Y_OFFSET = 30;
-const V2_HX = 35;
+const V2_TIME_Y_OFFSET = 8;
+const V2_HX = 36;
 const V2_HY = 0 + V2_TIME_Y_OFFSET;
 const V2_MX = 10;
-const V2_MY = 40 + V2_TIME_Y_OFFSET;
+const V2_MY = 51 + V2_TIME_Y_OFFSET;
 const V2_SX = 10;
-const V2_SY = 80 + V2_TIME_Y_OFFSET;
-const V2_BT_X = 30;
-const V2_BT_Y = 10;
-const V2_DX = 160;
-const V2_DY = 148;
+const V2_SY = 95 + V2_TIME_Y_OFFSET;
+const V2_BT_X = 135;
+const V2_BT_Y = 20;
+const V2_DX = 100;
+const V2_DY = 141;
+
+const V2_BAT_POS_X = 21;
+const V2_BAT_POS_Y = 40;
+const V2_BAT_SIZE_X = 13;
+const V2_BAT_SIZE_Y = 2;
 
-const V2_BAT_POS_X = 127;
-const V2_BAT_POS_Y = 15;
-const V2_BAT_SIZE_X = 2;
-const V2_BAT_SIZE_Y = 3;
 const V2_SCREEN_SIZE_X = 176;
 const V2_SCREEN_SIZE_Y = 176;
 const V2_BACKGROUND_IMAGE = "Background176_center.png";
@@ -112,7 +135,7 @@ var cgimg;
  * @param numOfBits: number of bits to draw
 */
 function drawSquare(gfx, x, y, data, numOfBits) {
-  
+
   for(i = numOfBits; i > 0 ; i--) {
     if( (data & 1) != 0) {
       gfx.fillRect(x + (i - 1) * x_step, y, 
@@ -132,11 +155,8 @@ function drawSquare(gfx, x, y, data, numOfBits) {
  * @param s: seconds
 */
 function drawBinary(gfx, hour, minute, second) {
-  gfx.clear(1);
-  gfx.setColor(bg_color);
-  gfx.fillRect(0, 0, screen_size_x, screen_size_y);
-  gfx.setColor(fg_color);
-  
+  gfx.clear(0);
+
   if(hour > 12) {
     hour -= 12;          /* we use for bit for hours so we only display 12 hours*/
   }
@@ -159,10 +179,8 @@ function drawTime(gfx, h, m, s) {
   var time = (" "+h).substr(-2) + ":" + ("0"+m).substr(-2)+ ":" + ("0"+s).substr(-2);
 
   gfx.setFontAlign(0,-1); // align right bottom
-  gfx.setFont("5x9Numeric7Seg", 2);
-  gfx.setColor(fg_color);
-
-  gfx.drawString(time, gfx.getWidth() / 2, dy, false /*clear background*/);
+  gfx.setFont("7x11Numeric7Seg", 2);
+  gfx.drawString(time, gfx.getWidth() / 2, dy + 1, false /*clear background*/);
 }
 
 /**
@@ -173,18 +191,20 @@ function drawTime(gfx, h, m, s) {
  * @param gfx: graphic object to use
  * @param d: date object
 */
-
+var vMonth = 0;
 function drawDate(gfx, d) {
   var dateString = ""
-    + ("0" + d.getDate()).substr(-2) + " " 
-    + ("0" + d.getMonth()).substr(-2) + " "
-    + ("0" + d.getFullYear()).substr(-4);
+    + ("0" + d.getDate()).substr(-2) 
+//    + " " 
+//    + ("0" + d.getMonth()).substr(-2) 
+//    + " "
+//    + ("0" + d.getFullYear()).substr(-2)
+  ;
 
-  gfx.setFontAlign(0,-1); // align right bottom
-  gfx.setFont("5x9Numeric7Seg",2); /* draw the current time font */
-  gfx.setColor(fg_color);
-
-  gfx.drawString(dateString, gfx.getWidth() / 2, dy, false /* don't clear background*/);
+  gfx.setFontAlign(-1,-1); // align right bottom
+  gfx.setFont("7x11Numeric7Seg",2); /* draw the current time font */
+  gfx.drawString(dateString, dx, dy + 1, false /* don't clear background*/);
+  gfx.drawImage(month[d.getMonth()], 40, dy);
 }
 
 function toggleDateTime() {
@@ -192,10 +212,13 @@ function toggleDateTime() {
   if(showDateTime > 2){
     showDateTime = 0;
   }
-  draw();
 }
 
 function updateVTime() {
+  vMonth++;
+  if(vMonth >= 12 + 3) {
+    vMonth = 0;
+  }
   second++;
   if(second > 59) {
     second = 0;
@@ -219,23 +242,13 @@ function updateVTime() {
  * @param level: current battery level
 */
 function drawBattery(gfx, level) {
-  var pos_x = bat_pos_x + 5 * (bat_size_x + 2);
+  var pos_y = bat_pos_y - 1;
   var stepLevel = Math.round((level + 10) / 20);
-/*  
-  if(stepLevel < 2) {
-    gfx.setColor(2);
-  } else if(stepLevel < 4) {
-    gfx.setColor(3);
-  } else {
-    gfx.setColor(4);
-  }
-*/ 
-  gfx.setColor(fg_color);
 
   for(i = 0; i < stepLevel; i++) {
-    pos_x -= bat_size_x + 2;
-    gfx.fillRect(pos_x, bat_pos_y, 
-                 pos_x + bat_size_x, bat_pos_y + bat_size_y);
+    pos_y -= bat_size_y + 2;
+    gfx.fillRect(bat_pos_x, pos_y, 
+                 bat_pos_x + bat_size_x, pos_y + bat_size_y);
   }
 }
 
@@ -247,7 +260,10 @@ function drawBattery(gfx, level) {
  * @param gfx: graphic object
  * @param level: current battery level
 */
-function drawBT(status) {
+function drawBT(gfx, status) {
+  if(!status) {
+    gfx.drawImage(require("Storage").read("bt-icon.png"), bt_x, bt_y);
+  }
 }
 function setRuntimeValues(resolution) {
   if(240 == resolution) {
@@ -269,14 +285,14 @@ function setRuntimeValues(resolution) {
     screen_size_x = V1_SCREEN_SIZE_X;
     screen_size_y = V1_SCREEN_SIZE_Y;
     backgroundImage = V1_BACKGROUND_IMAGE;
-    bg_color = V1_BG_COLOR;
-    fg_color = V1_FG_COLOR;
-    
+
     bat_pos_x = V1_BAT_POS_X;
     bat_pos_y = V1_BAT_POS_Y;
     bat_size_x = V1_BAT_SIZE_X;
     bat_size_y = V1_BAT_SIZE_Y;
-    
+
+	setWatch(toggleDateTime, BTN1, { repeat : true, edge: "falling"});
+
   } else {
     x_step = V2_X_STEP;
     y_step = V2_Y_STEP;
@@ -299,17 +315,17 @@ function setRuntimeValues(resolution) {
     screen_size_x = V2_SCREEN_SIZE_X;
     screen_size_y = V2_SCREEN_SIZE_Y;
     backgroundImage = V2_BACKGROUND_IMAGE;
-    bg_color = V2_BG_COLOR;
-    fg_color = V2_FG_COLOR;
 
     bat_pos_x = V2_BAT_POS_X;
     bat_pos_y = V2_BAT_POS_Y;
     bat_size_x = V2_BAT_SIZE_X;
     bat_size_y = V2_BAT_SIZE_Y;
+
+    Bangle.on('swipe', function(direction) { toggleDateTime(direction);});
 }
   cg = Graphics.createArrayBuffer(
     screen_size_x,screen_size_y, 1, {msb:true});
-  
+
   cgimg = {width:screen_size_x, height:screen_size_y, bpp:1,
              transparent:0, buffer:cg.buffer};
 
@@ -319,13 +335,12 @@ var batVLevel = 20;
 
 
 function draw() {
-  if (!Bangle.isLCDOn()) {return;} // no drawing, also no new update scheduled 
   var d = new Date();
   var h = d.getHours(), m = d.getMinutes(), s = d.getSeconds();
-  
+  g.reset();
+
   drawBinary(cg, h, m, s);
-  cg.setColor(fg_color);
- 
+
   switch(showDateTime) {
     case 1:
       drawTime(cg, h, m, s);
@@ -334,12 +349,10 @@ function draw() {
       drawDate(cg, d);
       break;
     default:
-      /* do nothing */
+      cg.drawImage(imgSquid, cg.getWidth() / 2 - 44, dy);
   }
-  cg.setColor(fg_color);
-  drawBattery(cg, batVLevel /*E.getBattery()*/);
-  drawBT(1);
-  
+  drawBattery(cg, /*batVLevel*/  E.getBattery());
+
   batVLevel += 2;
   if(batVLevel > 100) {
     batVLevel = 0;
@@ -347,25 +360,20 @@ function draw() {
   updateVTime();
   g.clear();
   g.drawImages([{image:cgimg},
-             {image:require("Storage").read(backgroundImage)},
-             { x:bt_x, y:bt_y, rotate: 0, image:require("Storage").read("bt-icon.png")},
+            {image:require("Storage").read(backgroundImage)},
+//             { x:bt_x, y:bt_y, rotate: 0, image:require("Storage").read("bt-icon.png")},
             ]);
+  drawBT(g, NRF.getSecurityStatus().connected);
+//  Bangle.drawWidgets();
   const millis = d.getMilliseconds();
   setTimeout(draw, 1000-millis);
+ // Bangle.loadWidgets();
 }
 
 // Show launcher when button pressed
 Bangle.setUI("clock");
 setRuntimeValues(g.getWidth());
-Bangle.on("lcdPower", function(on) {
-  if (on) {
-    draw();
-  }
-});
 g.reset().clear();
 Bangle.loadWidgets();
 Bangle.drawWidgets();
-//setInterval(draw, 1000);
-//var x_size = g.getWidth();
-setWatch(toggleDateTime, BTN1, { repeat : true, edge: "falling"});
 draw();
diff --git a/apps/TheBinWatch/bt-icon.png b/apps/TheBinWatch/bt-icon.png
index c07800ea34b2935ba689265237bf2ccbc4fced55..cba9b59736664317879b89469e7b0479793d0cfb 100644
GIT binary patch
delta 607
zcmV-l0-*i$1jGf9I|~*i000&x0ZCFM@R3G2e*!N_L_t(IPmPq#Zqq;%Mn6Y!(<UVf
z&BBRYOQ@8B)K+B!Z@`blmKWefSh3(ucnFZ#BSnD)swzuVv}r<B#kG~tBt?n2-#Ako
z*N!-nZOwRmd}r>=H6j5iPJ2M*>4SMIo9ng*s}2l)1Jjv|UjtT5;Fi#L|B32lPd%d}
zfAvrp4}tzwJm$lD4~OkbynB0Bwbv^NVLy<@emqc%G)W<$lu$hJ|DZWKK@iLk4uC@Z
zDqogFi}-`;Gz5YXN*gA+#U`G=?BJX9E1{m|GMPq6heI6p4zMvi!}NTBRjZ6i-GSQ>
zArnCUM@FL75PtI!?5m&Xnl>K0E%oi^f3G`mn<C81Ca0BNJIcD&o{H?kwD83JBGYx|
zZ-F1DGK2o+c9a!eT1Nakn@YyW(lWv%-6SQAPC)0E++@wVm3z67CCL>MN?*JVZ>?FL
zj4Ty$YkX|S*@R`mK3Og!xkAd0&v#X1ux+5#0ve6XwM~*Kq)hKKu9=cK&cepdf8{ca
zB4!#pas=h7-VdVwy2JArotbuIZ*_P&6?%+Dw|UV)SHYJPq)A7Xl}#O;jy6fLC^uT4
zy_u;$q$5j5G@iuI(q49Sq`+EcgdxUKHBehyy3a~0ab%P0d554j^LG!mYTPzPWByrO
zwE}ulHA-^O(<etyb9FykRw)A}NvA8QddPJw7;y)g?Jiay3X^N53v4nn%}s%g@6sV+
t7RsYzVEa{e;plwwu;ogHmdF+X{sIDuS1CWD-*x~1002ovPDHLkV1iC08QlN?

delta 526
zcmV+p0`dLC1@r`vI|~aC000XR0j(pwb&*Cne*xb~L_t(IPkmI&N<=XX&4A+z@r@%R
zdUf=w3@V7=#)W_2#-*R2|D?F|6I=@}9ha^YoChd^AoxH{Owz{b)Q$(vy=|JDo13(S
zBo=WNR`39FI)fZ<hylw&tnvE<mT(`cGz~xn9uLDhjq$wKM@Pu<h<VGwUrt2i+E81L
zf1mOp_BouYG)^I-QROc6cooJfPO!tViG++{_Tj~6Y7WdH6$+$+^O$)xhKk{LC}cE*
zV-b5AnqebQqgbZdg}XYJY0rttZ$=^^4Zri37itV<JOO$rmZ)5*OBt@Yo|~=#TC;XQ
zOoNVDEX+*B)DN%tJqg;)paDihI8J6}e=#|JFt_=4d25(4U<&EX0!m|G{)XEhEqDs<
zTm1MhvyfS>#@$UU1g!3KcC)LPF=_Oatznr_sYKLjCH*?c4UyyYXCd5YR4x<M>#hcj
zl)qAID353%%uH$~nVFCwj#2&!%GvbB_ykDJ4CZ67xg)+g!JH~Qxff%cnKi%=c#k_M
zVpSUQzl`Up%*@&F{^8zzYk`navlH+wGrsV6`QJVZ5!xN`wJj#ds9y|n1vR_uGeg(R
zwy5aUJgPXZ3&tET^lbVdL5GMnK-e98ohum?8qtGpK_(<0(m8Ip2E+jP0a4;T6fSHP
Q;{X5v07*qoM6N<$f*~sN;Q#;t