From 0535229f53adf2c312d96285ad375d77f8ad135d Mon Sep 17 00:00:00 2001
From: Luc Tielen <ltielen@nowsecure.com>
Date: Fri, 9 Jun 2023 20:45:16 +0200
Subject: [PATCH] sunrise 0.04

---
 apps/sunrise/ChangeLog     |  1 +
 apps/sunrise/app.js        | 37 +++++++++++++++++++++++++------------
 apps/sunrise/metadata.json |  2 +-
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/apps/sunrise/ChangeLog b/apps/sunrise/ChangeLog
index b2c5a2ae1..490992812 100644
--- a/apps/sunrise/ChangeLog
+++ b/apps/sunrise/ChangeLog
@@ -1,3 +1,4 @@
 0.01: First release
 0.02: Faster sinus line and fix button to open menu
 0.03: Show day/month, add animations, fix !mylocation and text glitch
+0.04: Always show the widgets, swifter animations and lighter sea line
diff --git a/apps/sunrise/app.js b/apps/sunrise/app.js
index fd6274129..3feb4dfd4 100644
--- a/apps/sunrise/app.js
+++ b/apps/sunrise/app.js
@@ -204,9 +204,9 @@ function drawSinuses () {
   const sl1 = seaLevel(hh1);
   sunRiseX = xfromTime(hh0) + (r / 2);
   sunSetX = xfromTime(hh1) + (r / 2);
-  g.setColor(0, 0, 1);
+  g.setColor(0, 0.5, 1);
   g.drawLine(0, sl0, w, sl1);
-  g.setColor(0, 0, 1);
+  g.setColor(0, 0.5, 1);
   g.drawLine(0, sl0 + 1, w, sl1 + 1);
   /*
   g.setColor(0, 0, 1);
@@ -311,7 +311,11 @@ function drawClock () {
   const mins = ((fmins < 10) ? '0' : '') + (0 | fmins);
   curTime = hours + ':' + mins;
   g.setFont('Vector', 30);
-  g.setColor(1, 1, 1);
+  if (realTime) {
+    g.setColor(1, 1, 1);
+  } else {
+    g.setColor(0, 1, 1);
+  }
   g.drawString(curTime, w / 1.9, ypos);
   // day-month
   if (realTime) {
@@ -324,13 +328,13 @@ function drawClock () {
 }
 
 function renderScreen () {
+  g.setColor(0, 0, 0);
+  g.fillRect(0, 30, w, h);
   realPos = xfromTime((new Date()).getHours());
   g.setFontAlign(-1, -1, 0);
-  g.setBgColor(0, 0, 0);
-  g.clear();
-  if (realTime) {
-    Bangle.drawWidgets();
-  }
+
+  Bangle.drawWidgets();
+
   drawGlow();
   drawSinuses();
   drawTimes();
@@ -360,7 +364,11 @@ renderScreen();
 realPos = xfromTime((new Date()).getHours());
 
 function initialAnimationFrame () {
-  curPos += (realPos - curPos) / 3;
+  let distance = (realPos - curPos) / 4;
+  if (distance > 20) {
+    distance = 20;
+  }
+  curPos += distance;
   pos = curPos;
   renderScreen();
   if (curPos >= realPos) {
@@ -382,7 +390,12 @@ function initialAnimation () {
   initialAnimationFrame();
 }
 
-setInterval(renderScreen, 60 * 1000);
+function main () {
+  g.setBgColor(0, 0, 0);
+  g.clear();
+  setInterval(renderScreen, 60 * 1000);
+  pos = 0;
+  initialAnimation();
+}
 
-pos = 0;
-initialAnimation();
+main();
diff --git a/apps/sunrise/metadata.json b/apps/sunrise/metadata.json
index d9d7533b6..051ff99bd 100644
--- a/apps/sunrise/metadata.json
+++ b/apps/sunrise/metadata.json
@@ -2,7 +2,7 @@
   "id": "sunrise",
   "name": "Sunrise",
   "shortName": "Sunrise",
-  "version": "0.03",
+  "version": "0.04",
   "type": "clock",
   "description": "Show sunrise and sunset times",
   "icon": "app.png",