From 1f247a74e2b379111ebb6b006c53ee4ec54364e1 Mon Sep 17 00:00:00 2001
From: Daniel Smith <rdnlsmith@gmail.com>
Date: Sat, 18 May 2019 18:51:50 -0400
Subject: Refactor HR/steps digit drawing into loops

---
 app/index.js | 75 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/app/index.js b/app/index.js
index ef5a7cf..8fab4d0 100644
--- a/app/index.js
+++ b/app/index.js
@@ -151,59 +151,58 @@ function setDay(val) {
 }
 
 function setHeartRate(val) {
-  drawDigit(val % 10, hr3);
-  val = Math.floor(val / 10);
+  let digits = [hr1, hr2, hr3];
+  let lastNonZeroIndex = 3;
 
-  drawDigit(val % 10, hr2);
-  val = Math.floor(val / 10);
+  for (let i = 2; i >= 0; i--) {
+    let digit = val % 10;
+    val = Math.floor(val / 10);
 
-  drawDigit(val % 10, hr1);
+    if (digit != 0) {
+      lastNonZeroIndex = i;
+    }
+
+    drawDigit(digit, digits[i]);
+    digits[i].style.opacity = 1;
+  }
+
+  // Darken leading zeroes
+  for (let i = 0; i < lastNonZeroIndex; i++)
+  {
+    digits[i].style.opacity = 0.2;
+  }
 }
 
 function setActivity(activity, val) {
+  // Can't rely on $+ syntax because text is right-aligned.
+  // Move container closer to edge for each 1; all other digits are the same width.
   let position = 140;
   actIcon.image = `icons/stat_${activity}_solid_24px.png`;
 
-  let digit = val % 10;
-  if (digit == 1) {
-    position += 7; // adjust for narrower 1
-  }
-  val = Math.floor(val / 10);
-  drawDigit(digit, act6);
+  let digits = [act1, act2, act3, act4, act5, act6];
+  let lastNonZeroIndex = 6;
 
-  digit = val % 10;
-  if (digit == 1) {
-    position += 7; // adjust for narrower 1
-  }
-  val = Math.floor(val / 10);
-  drawDigit(digit, act5);
+  for (let i = 5; i >= 0; i--) {
+    let digit = val % 10;
+    val = Math.floor(val / 10);
 
-  digit = val % 10;
-  if (digit == 1) {
-    position += 7; // adjust for narrower 1
-  }
-  val = Math.floor(val / 10);
-  drawDigit(digit, act4);
+    if (digit != 0) {
+      lastNonZeroIndex = i;
+    }
 
-  digit = val % 10;
-  if (digit == 1) {
-    position += 7; // adjust for narrower 1
-  }
-  val = Math.floor(val / 10);
-  drawDigit(digit, act3);
+    if (digit == 1) {
+      position += 7;
+    }
 
-  digit = val % 10;
-  if (digit == 1) {
-    position += 7; // adjust for narrower 1
+    drawDigit(digit, digits[i]);
+    digits[i].style.opacity = 1;
   }
-  val = Math.floor(val / 10);
-  drawDigit(digit, act2);
 
-  digit = val % 10;
-  if (digit == 1) {
-    position += 7; // adjust for narrower 1
+  // Darken leading zeroes
+  for (let i = 0; i < lastNonZeroIndex; i++)
+  {
+    digits[i].style.opacity = 0.2;
   }
-  drawDigit(digit, act1);
 
   actContainer.x = position;
 }
-- 
cgit v1.2.3