From 5977d9b41201b029f781e99460b29bfabd55fd9a Mon Sep 17 00:00:00 2001
From: Martin Pool <github@nullenenenen.nl>
Date: Tue, 3 Sep 2024 23:51:05 +0200
Subject: [PATCH] Fix timelines

---
 apps/dutchclock/app.js        | 11 +++++++----
 apps/dutchclock/metadata.json |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/dutchclock/app.js b/apps/dutchclock/app.js
index 135cfa5ae..e806a74f7 100644
--- a/apps/dutchclock/app.js
+++ b/apps/dutchclock/app.js
@@ -3,8 +3,9 @@ const storage = require("Storage");
 const SCREEN_WIDTH = g.getWidth();
 const SCREEN_HEIGHT = g.getHeight();
 
-const WIDGETS_HEIGHT = 25;
-const DATETIME_SPACING_HEIGHT = 10;
+const TOP_SPACING = 5;
+const WIDGETS_HEIGHT = 20;
+const DATETIME_SPACING_HEIGHT = 5;
 const DATE_HEIGHT = 10;
 const TIME_HEIGHT = 10;
 
@@ -26,6 +27,7 @@ const settings = Object.assign(
 );
 
 const maxFontSize = SCREEN_HEIGHT 
+  - TOP_SPACING
   - (settings.showWidgets ? WIDGETS_HEIGHT : 0)
   - (settings.showDate || settings.showTime ? DATETIME_SPACING_HEIGHT : 0)
   - (settings.showDate ? DATE_HEIGHT : 0)
@@ -33,6 +35,7 @@ const maxFontSize = SCREEN_HEIGHT
 
 const X = SCREEN_WIDTH / 2;
 const Y = SCREEN_HEIGHT / 2
+  + TOP_SPACING / 2
   + (settings.showWidgets ? WIDGETS_HEIGHT / 2 : 0)
   - (settings.showDate || settings.showTime ? DATETIME_SPACING_HEIGHT / 2 : 0)
   - (settings.showDate ? DATE_HEIGHT / 2 : 0)
@@ -121,11 +124,11 @@ function setFont(timeLines) {
 function getBottomLines() {
     const lines = [];
   
-    if (settings.showTimeLine) {
+    if (settings.showTime) {
       lines.push(require("locale").time(date));
     }
   
-    if (settings.showDateLine) {
+    if (settings.showDate) {
       lines.push(`${date.getHours()}:${String(date.getMinutes()).padStart(2, '0')}`);
     }
   
diff --git a/apps/dutchclock/metadata.json b/apps/dutchclock/metadata.json
index d11dbbf41..b5a7ad32d 100644
--- a/apps/dutchclock/metadata.json
+++ b/apps/dutchclock/metadata.json
@@ -3,7 +3,7 @@
   "name": "Dutch Clock",
   "shortName":"Dutch Clock",
   "icon": "app.png",
-  "version":"0.07",
+  "version":"0.08",
   "description": "A clock that displays the time the way a Dutch person would respond when asked what time it is.",
   "type": "clock",
   "tags": "clock,dutch,text",