From 852e25b189ee8e346fe070e5b20a0d91bef0201a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20Arguill=C3=A8re?= <p.arguillere@ubitransport.com>
Date: Thu, 28 Mar 2024 11:27:36 +0100
Subject: [PATCH] set theme to light, add black as an option for foreground
 color

---
 apps/vpw_clock/app.js      |  6 ++++-
 apps/vpw_clock/settings.js | 52 +++++++++++++++++++-------------------
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/apps/vpw_clock/app.js b/apps/vpw_clock/app.js
index fd3824585..a6880001d 100644
--- a/apps/vpw_clock/app.js
+++ b/apps/vpw_clock/app.js
@@ -36,6 +36,10 @@ switch (settings.foregroundColor) {
     foregroundColor = COLOUR_WHITE;
     break;
 
+  case 3:
+    foregroundColor = COLOUR_BLACK;
+    break;
+    
   default:
     foregroundColor = COLOUR_BLACK; // to detect problems
     break;
@@ -144,7 +148,7 @@ function draw() {
 }
 
 // Clear the screen once, at startup
-g.setTheme({ bg: COLOUR_VPW_GREEN, fg: foregroundColor, dark: true }).clear();
+g.setTheme({ bg: COLOUR_VPW_GREEN, fg: foregroundColor, dark: false }).clear();
 // draw immediately at first, queue update
 draw();
 // Stop updates when LCD is off, restart when on
diff --git a/apps/vpw_clock/settings.js b/apps/vpw_clock/settings.js
index 5e267f39c..d8b17d995 100644
--- a/apps/vpw_clock/settings.js
+++ b/apps/vpw_clock/settings.js
@@ -1,28 +1,28 @@
 (function(back) {
-    var FILE = "vpw_clock.settings.json";
-    // Load settings
-    var settings = Object.assign({
-      foregroundColor: 0,
-    }, require('Storage').readJSON(FILE, true) || {});
-  
-    function writeSettings() {
-      require('Storage').writeJSON(FILE, settings);
-    }
-  
-    var foregroundColors = ["Red", "Purple", "White"];
-  
-    // Show the menu
-    E.showMenu({
-      "" : { "title" : "Vaporwave Sunset" },
-      "< Back" : () => back(),
-      'Foreground color': {
-        value: 0|settings.foregroundColor,  // 0| converts undefined to 0
-        min: 0, max: 2,
-        onchange: v => {
-          settings.foregroundColor = v;
-          writeSettings();
-        },
-        format: function (v) {return foregroundColors[v];}
+  var FILE = "vpw_clock.settings.json";
+  // Load settings
+  var settings = Object.assign({
+    foregroundColor: 0,
+  }, require('Storage').readJSON(FILE, true) || {});
+
+  function writeSettings() {
+    require('Storage').writeJSON(FILE, settings);
+  }
+
+  var foregroundColors = ["Red", "Purple", "White", "Black"];
+
+  // Show the menu
+  E.showMenu({
+    "" : { "title" : "Vaporwave Sunset" },
+    "< Back" : () => back(),
+    'Foreground color': {
+      value: 0|settings.foregroundColor,  // 0| converts undefined to 0
+      min: 0, max: 3,
+      onchange: v => {
+        settings.foregroundColor = v;
+        writeSettings();
       },
-    });
-  })
\ No newline at end of file
+      format: function (v) {return foregroundColors[v];}
+    },
+  });
+})
\ No newline at end of file