From 083eac0143bb2b18678603b2739eaea64cb9d0b2 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 24 Jun 2021 14:14:42 +0100
Subject: [PATCH] setUI tweaks

---
 apps.json             |  6 +++---
 apps/pipboy/ChangeLog |  1 +
 apps/pipboy/app.js    | 20 ++++++++++----------
 apps/s7clk/ChangeLog  |  1 +
 apps/s7clk/app.js     |  5 ++---
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/apps.json b/apps.json
index 2e9124c2f..6ea646d58 100644
--- a/apps.json
+++ b/apps.json
@@ -865,7 +865,7 @@
   { "id": "s7clk",
     "name": "Simple 7 segment Clock",
     "icon": "icon.png",
-    "version":"0.02",
+    "version":"0.03",
     "description": "A simple 7 segment Clock with date",
     "tags": "clock,b2",
     "type":"clock",
@@ -1208,9 +1208,9 @@
     "id": "pipboy",
     "name": "Pipboy",
     "icon": "app.png",
-    "version": "0.03",
+    "version": "0.04",
     "description": "Pipboy themed clock",
-    "tags": "clock",
+    "tags": "clock,nob2",
     "type":"clock",
     "allow_emulator":true,
     "storage": [
diff --git a/apps/pipboy/ChangeLog b/apps/pipboy/ChangeLog
index edbadd9b4..1f6d13ad0 100644
--- a/apps/pipboy/ChangeLog
+++ b/apps/pipboy/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New Watch!
 0.02: Changed colors for better readability and added current date
 0.03: Added Info to HP (day in year) and LEVEL (day of week / progress bar show day progress)
+0.04: Using setUI, portable colors
diff --git a/apps/pipboy/app.js b/apps/pipboy/app.js
index 5f885d769..9c2e21cb6 100644
--- a/apps/pipboy/app.js
+++ b/apps/pipboy/app.js
@@ -1,9 +1,9 @@
 const bigFont = 4;
 const smallFont = 2;
 const tinyFont = 1;
-const green = 0x0661;
-const darkGreen = 0x0461;
-const darkerGreen = 0x0261;
+const green = "#0d1";
+const darkGreen = "#091";
+const darkerGreen = "#051";
 const pip = require("heatshrink").decompress(atob("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"));
 
 function isLeapYear(year)
@@ -37,16 +37,16 @@ function bottomLine() {
   var yy = today.getFullYear();
   var day = today.getDay(); //day of week as number
   var h = today.getHours();
-  
+
   var startDate = new Date(yy, 0, 0);
   var oneDay = 1000 * 60 * 60 * 24;
   var daysInYear = 0;
   var diff = today - startDate;
   var currDayInYear = Math.floor(diff / oneDay);
-  
+
   if (isLeapYear(yy)) daysInYear = 366;
   else daysInYear = 365;
-  
+
   g.setFont("6x8", tinyFont);
 
   //first line
@@ -55,7 +55,7 @@ function bottomLine() {
   g.fillRect(105, 175, 160, 185);//STIM
   g.fillRect(166, 175, 239, 185); // RADAWAY
   g.setColor(green);
-  
+
   g.drawString("DATE", 20, 177);
   g.drawString("STIM (3)", 135, 177);
   g.drawString("RADAWAY (8)", 205, 177);
@@ -84,7 +84,7 @@ function drawClock() {
   var mm = t.getMonth()+1; //month is zero-based
   var yy = t.getFullYear();
   var time = ("0" + h).substr(-2) + ":" + ("0" + m).substr(-2);
-  
+
   //create date string
   if (dd.toString().length < 2) dd = '0' + dd;
   if (mm.toString().length < 2) mm = '0' + mm;
@@ -114,9 +114,9 @@ Bangle.on('lcdPower', function(on) {
 });
 
 g.clear();
+// Show launcher when button pressed
+Bangle.setUI("clock");
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 setInterval(drawClock, 1E4);
 drawAll();
-
-setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
diff --git a/apps/s7clk/ChangeLog b/apps/s7clk/ChangeLog
index a08e25f2f..985b2d489 100644
--- a/apps/s7clk/ChangeLog
+++ b/apps/s7clk/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New App!
 0.02: Tweaks for Q3 watch
+0.03: setUI
diff --git a/apps/s7clk/app.js b/apps/s7clk/app.js
index 5bc2bff8f..14f2c69e8 100644
--- a/apps/s7clk/app.js
+++ b/apps/s7clk/app.js
@@ -34,8 +34,7 @@ Bangle.on('lcdPower', function(on) {
 g.clear();
 var secondInterval = setInterval(draw, 1000);
 draw();
+// Show launcher when button pressed
+Bangle.setUI("clock");
 Bangle.loadWidgets();
 Bangle.drawWidgets();
-
-// Show launcher when middle button pressed
-setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});