From 490a0b9670a3445aead54787c770b8b4a5bdc6d1 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 24 Jun 2021 14:17:16 +0100
Subject: [PATCH] 0.05: setUI, screen size changes

---
 apps.json                   |  4 ++--
 apps/sclock/ChangeLog       |  1 +
 apps/sclock/clock-simple.js | 17 +++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/apps.json b/apps.json
index 6ea646d58..2d556ce06 100644
--- a/apps.json
+++ b/apps.json
@@ -852,9 +852,9 @@
   { "id": "sclock",
     "name": "Simple Clock",
     "icon": "clock-simple.png",
-    "version":"0.04",
+    "version":"0.05",
     "description": "A Simple Digital Clock",
-    "tags": "clock",
+    "tags": "clock,b2",
     "type":"clock",
     "allow_emulator":true,
     "storage": [
diff --git a/apps/sclock/ChangeLog b/apps/sclock/ChangeLog
index afe0c99cb..a6e5b4f8e 100644
--- a/apps/sclock/ChangeLog
+++ b/apps/sclock/ChangeLog
@@ -1,3 +1,4 @@
 0.02: Modified for use with new bootloader and firmware
 0.03: Actually make into 24h clock since there's a 12h variant
 0.04: Make this clock do 12h and 24h
+0.05: setUI, screen size changes
diff --git a/apps/sclock/clock-simple.js b/apps/sclock/clock-simple.js
index dc0eb159c..f61e7d5ad 100644
--- a/apps/sclock/clock-simple.js
+++ b/apps/sclock/clock-simple.js
@@ -1,14 +1,15 @@
 /* jshint esversion: 6 */
-const timeFontSize = 6;
-const dateFontSize = 3;
+const big = g.getWidth()>200;
+const timeFontSize = big?6:5;
+const dateFontSize = big?3:2;
 const gmtFontSize = 2;
 const font = "6x8";
 
 const xyCenter = g.getWidth() / 2;
-const yposTime = 75;
-const yposDate = 130;
-const yposYear = 175;
-const yposGMT = 220;
+const yposTime = xyCenter*0.6;
+const yposDate = xyCenter*1.1;
+const yposYear = xyCenter*1.4;
+const yposGMT = xyCenter*1.9;
 
 // Check settings for what type our clock should be
 var is12Hour = (require("Storage").readJSON("setting.json",1)||{})["12hour"];
@@ -77,5 +78,5 @@ setInterval(drawSimpleClock, 15E3);
 // draw now
 drawSimpleClock();
 
-// Show launcher when middle button pressed
-setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
+// Show launcher when button pressed
+Bangle.setUI("clock");