Merge branch 'ateatimer' into app-loader

Author: thyttan

apps/ateatimer/app.js

@@ -1,5 +1,12 @@
 // Tea Timer Application for Bangle.js 2 using sched library
 
+let appRect = Bangle.appRect;
+let middleY = appRect.y+appRect.w/2;
+let middleRect = {x:appRect.x, y:middleY-20, w:appRect.w, h:40}
+let GREEN = g.theme.dark?0x03E0:0x07E0;
+
+let intervalID;
+
 let timerDuration = (() => {
   let file = require("Storage").open("ateatimer.data", "r");
   let data = file.read(4); // Assuming 4 bytes for storage
@@ -14,7 +21,7 @@ function saveDefaultDuration() {
 }
 
 function drawTime() {
-  g.clear();
+  g.clearRect(middleRect);
   g.setFont("Vector", 40);
   g.setFontAlign(0, 0); // Center align
 
@@ -25,6 +32,10 @@ function drawTime() {
 
   g.drawString(timeStr, g.getWidth() / 2, g.getHeight() / 2);
 
+  g.flip();
+}
+
+function drawButtons() {
   // Draw Increase button (triangle pointing up)
   g.fillPoly([
     g.getWidth() / 2, g.getHeight() / 2 - 80, // Top vertex
@@ -42,6 +53,12 @@ function drawTime() {
   g.flip();
 }
 
+function drawInit() {
+  g.clear(true);
+  drawButtons();
+  drawTime();
+}
+
 function startTimer() {
   if (timerRunning) return;
   if (timeRemaining == 0) return;
@@ -52,8 +69,13 @@ function startTimer() {
   saveDefaultDuration();
   scheduleTimer();
 
+  // Flash the time in green to indicate the timer started
+  g.setColor(GREEN)
+  drawTime();
+  g.reset();
+
   // Start the secondary timer to update the display
-  setInterval(updateDisplay, 1000);
+  intervalID = setInterval(updateDisplay, 1000);
 }
 
 function scheduleTimer() {
@@ -125,7 +147,8 @@ function updateDisplay() {
     drawTime();
     if (timeRemaining <= 0) {
       timeRemaining = 0;
-      clearInterval(updateDisplay);
+      clearInterval(intervalID);
+      intervalID = undefined;
       timerRunning = false;
     }
   }
@@ -146,11 +169,10 @@ Bangle.on("touch", (zone, xy) => {
 });
 
 let isRunning = require("sched").getAlarm("ateatimer");
+// Draw the initial timer display
+drawInit();
 if (isRunning) {
   timerRunning = true;
   // Start the timer to update the display
-  setInterval(updateDisplay, 1000);
-} else {
-  // Draw the initial timer display
-  drawTime();
-}
+  intervalID = setInterval(updateDisplay, 1000);
+}