Merge branch 'espruino:master' into master

apps/7x7dotsclock/7x7dotsclock.app.js

@@ -149,11 +149,11 @@ function drawHSeg(x1,y1,x2,y2,Num,Color,Size) {
         if (Color == "fg") {
           g.setColor(g.theme.fg);
         } else {
-        g.setColor(mColor[0],mColor[1],mColor[2]);        
+        g.setColor(mColor[0],mColor[1],mColor[2]);
         }
         g.fillCircle(x1+Dx+(i-1)*(x2-x1)/7,y1+Dy+(j-1)*(y2-y1)/7,Size);
       } else {
-        g.setColor(bColor[0],bColor[1],bColor[2]);        
+        g.setColor(bColor[0],bColor[1],bColor[2]);
         g.fillCircle(x1+Dx+(i-1)*(x2-x1)/7,y1+Dy+(j-1)*(y2-y1)/7,1);
       }
     }
@@ -166,7 +166,7 @@ function drawSSeg(x1,y1,x2,y2,Num,Color,Size) {
     for (let j = 1; j < 8; j++) {
       if (Font[Num][j-1][i-1] == 1) {
         if (Color == "fg") {
-       g.setColor(sColor[0],sColor[1],sColor[2]);        
+       g.setColor(sColor[0],sColor[1],sColor[2]);
         } else {
           g.setColor(g.theme.fg);
           //g.setColor(0.7,0.7,0.7);
@@ -253,8 +253,8 @@ function actions(v){
    if(BTN1.read() === true) {
       print("BTN pressed");
       Bangle.showLauncher();
-   }        
-  
+   }
+
    if(v==-1){
      print("up swipe event");
      if(settings.swupApp != "") load(settings.swupApp);
@@ -269,7 +269,7 @@ function actions(v){
 }
 
 // Get Messages status
-var messages = require("Storage").readJSON("messages.json",1)||[];
+var messages_installed = require("Storage").read("messages") !== undefined;
 
 //var BTconnected = NRF.getSecurityStatus().connected;
 //NRF.on('connect',BTconnected = NRF.getSecurityStatus().connected);
@@ -289,27 +289,27 @@ function drawWidgeds() {
     g.setColor((g.getBPP()>8) ? "#07f" : (g.theme.dark ? "#0ff" : "#00f"));
   else
     g.setColor(g.theme.dark ? "#666" : "#999");
-  g.drawImage(atob("CxQBBgDgFgJgR4jZMawfAcA4D4NYybEYIwTAsBwDAA=="),x1Bt,y1Bt);  
+  g.drawImage(atob("CxQBBgDgFgJgR4jZMawfAcA4D4NYybEYIwTAsBwDAA=="),x1Bt,y1Bt);
+
 
-  
   //Battery
   //print(E.getBattery());
   //print(Bangle.isCharging());
-  
+
   var x1B = 130;
   var y1B = 2;
   var x2B = x1B + 20;
   var y2B = y1B + 15;
-  
+
   g.setColor(g.theme.bg);
   g.clearRect(x1B,y1B,x2B,y2B);
-  
+
   g.setColor(g.theme.fg);
   g.drawRect(x1B,y1B,x2B,y2B);
   g.fillRect(x1B,y1B,x1B+(E.getBattery()*(x2B-x1B)/100),y2B);
   g.fillRect(x2B,y1B+(y2B-y1B)/2-3,x2B+4,y1B+(y2B-y1B)/2+3);
 
-  
+
 
   //Messages
 
@@ -318,25 +318,25 @@ function drawWidgeds() {
   var x2M = x1M + 25;
   var y2M = y2B;
 
-  if (messages.some(m=>m.new)) {
+  if (messages_installed && require("messages").status() == "new") {
     g.setColor(g.theme.fg);
     g.fillRect(x1M,y1M,x2M,y2M);
     g.setColor(g.theme.bg);
     g.drawLine(x1M,y1M,x1M+(x2M-x1M)/2,y1M+(y2M-y1M)/2);
     g.drawLine(x1M+(x2M-x1M)/2,y1M+(y2M-y1M)/2,x2M,y1M);
   }
-  
+
   var strDow = ['Sun','Mon','Tue','Wed','Thu','Fri','Sat'];
   var d = new Date();
   var dow = d.getDay(),day = d.getDate(), month = d.getMonth() + 1, year = d.getFullYear();
 
   print(strDow[dow] + ' ' + day  + '.' + month  + ' ' + year);
-  
+
   g.setColor(g.theme.fg);
   g.setFontAlign(-1, -1,0);
   g.setFont("Vector", 20);
   g.drawString(strDow[dow] + ' ' + day, 0, 0, true);
-  
+
 }
 
 
@@ -354,7 +354,7 @@ function SetFull(on) {
     } else {
       Ys = 30;
       Bangle.setUI("updown",actions);
-      Bangle.on('swipe', function(direction) { 
+      Bangle.on('swipe', function(direction) {
         switch (direction) {
           case 1:
             print("swipe left event");
@@ -362,7 +362,7 @@ function SetFull(on) {
             print(settings.swleftApp);
             break;
           case -1:
-            print("swipe right event");            
+            print("swipe right event");
             if(settings.swrightApp != "")  load(settings.swrightApp);
             print(settings.swrightApp);
             break;
@@ -374,7 +374,7 @@ function SetFull(on) {
 
     SegH = (Ye-Ys)/2;
     Dy = SegH/16;
-  
+
     draw();
 
     if (on != true) {

apps/7x7dotsclock/ChangeLog

@@ -1,2 +1,3 @@
 0.01: Initial version for upload
-0.02: better theme support, configurable colors, small improvements
+0.02: Better theme support, configurable colors, small improvements
+0.03: Use `messages` library to check for new messages

apps/7x7dotsclock/metadata.json

@@ -1,7 +1,7 @@
 { "id": "7x7dotsclock",
   "name": "7x7 Dots Clock",
   "shortName":"7x7 Dots Clock",
-  "version":"0.02",
+  "version":"0.03",
   "description": "A clock with a big 7x7 dots Font",
   "icon": "dotsfontclock.png",
   "tags": "clock",

apps/90sclk/ChangeLog

@@ -1,2 +1,3 @@
 0.01: New App!
-0.02: Fullscreen settings.
+0.02: Fullscreen settings.
+0.03: Tell clock widgets to hide.

apps/90sclk/app.js

@@ -115,6 +115,9 @@ function draw() {
   }
 }
 
+// Show launcher when middle button pressed
+Bangle.setUI("clock");
+
 Bangle.loadWidgets();
 
 // Clear the screen once, at startup
@@ -140,5 +143,3 @@ Bangle.on('lock', function(isLocked) {
 });
 
 
-// Show launcher when middle button pressed
-Bangle.setUI("clock");

apps/90sclk/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "90sclk",
   "name": "90s Clock",
-  "version": "0.02",
+  "version": "0.03",
   "description": "A 90s style watch-face",
   "readme": "README.md",
   "icon": "app.png",

apps/advcasio/ChangeLog

@@ -1,2 +1,3 @@
 0.01: AdvCasio first version
 0.02: Remove un-needed fonts to improve memory usage
+0.03: Tell clock widgets to hide.

apps/advcasio/app.js

@@ -294,9 +294,10 @@ Bangle.on("lock", (locked) => {
 });
 
 
+Bangle.setUI("clock");
+
 // Load widgets, but don't show them
 Bangle.loadWidgets();
-Bangle.setUI("clock");
 
 g.reset();
 g.clear();

apps/advcasio/metadata.json

@@ -1,7 +1,7 @@
 { "id": "advcasio",
   "name": "Advanced Casio Clock",
   "shortName":"advcasio",
-  "version":"0.02",
+  "version":"0.03",
   "description": "An over-engineered clock inspired by Casio watches. It has a 4 days weather, a  timer using swipe and a scratchpad. Can be updated using a dedicated webapp.",
   "icon": "app.png",
   "tags": "clock",

apps/agenda/ChangeLog

@@ -2,3 +2,4 @@
 0.02: Added settings page to force calendar sync
 0.03: Disable past events display from settings
 0.04: Added awareness of allDay field
+0.05: Displaying calendar colour and name

apps/agenda/README.md

@@ -1,3 +1,20 @@
 # Agenda
 
-Basic agenda reading the events synchronised from GadgetBridge
+Basic agenda reading the events synchronised from GadgetBridge.
+
+### Functionalities
+
+* List all events in the next week (or whatever is synchronized)
+* Optionally view past events (until GB removes them)
+* Show start time and location of the events in the list
+* Show the colour of the calendar in the list
+* Display description, location and calendar name after tapping on events
+
+### Report a bug
+
+You can easily open an issue in the espruino repo, but I won't be notified and it might take time.  
+If you want a (hopefully) quicker response, just report [on my fork](https://github.com/glemco/BangleApps).
+
+### Known Problems
+
+Any all-day event lasts just one day: that is a GB limitation that we will likely fix in the future.

apps/agenda/agenda.js

@@ -6,6 +6,8 @@
     title,
     description,
     location,
+    color:int,
+    calName,
     allDay: bool,
   }
 */
@@ -73,6 +75,8 @@ function showEvent(ev) {
     lines = lines.concat(/*LANG*/"Location"+": ", g.wrapString(ev.location, g.getWidth()-10));
   if(ev.description)
     lines = lines.concat("",g.wrapString(ev.description, g.getWidth()-10));
+  if(ev.calName)
+    lines = lines.concat(/*LANG*/"Calendar"+": ", g.wrapString(ev.calName, g.getWidth()-10));
   lines = lines.concat(["",/*LANG*/"< Back"]);
   E.showScroller({
     h : g.getFontHeight(), // height of each menu item in pixels
@@ -116,17 +120,16 @@ function showList() {
       var body = formatDateShort(getDate(ev.timestamp),ev.allDay)+"\n"+(ev.location?ev.location:/*LANG*/"No location");
       if(settings.pastEvents) isPast = ev.timestamp + ev.durationInSeconds < (new Date())/1000;
       if (title) g.setFontAlign(-1,-1).setFont(fontBig)
-        .setColor(isPast ? "#888" : g.theme.fg).drawString(title, x,r.y+2);
+        .setColor(isPast ? "#888" : g.theme.fg).drawString(title, x+4,r.y+2);
       if (body) {
         g.setFontAlign(-1,-1).setFont(fontMedium).setColor(isPast ? "#888" : g.theme.fg);
-        var l = g.wrapString(body, r.w-(x+14));
-        if (l.length>3) {
-          l = l.slice(0,3);
-          l[l.length-1]+="...";
-        }
-        g.drawString(l.join("\n"), x+10,r.y+20);
+        g.drawString(body, x+10,r.y+20);
       }
       g.setColor("#888").fillRect(r.x,r.y+r.h-1,r.x+r.w-1,r.y+r.h-1); // dividing line between items
+      if(ev.color) {
+        g.setColor("#"+(0x1000000+Number(ev.color)).toString(16).padStart(6,"0"));
+        g.fillRect(r.x,r.y+4,r.x+3, r.y+r.h-4);
+      }
     },
     select : idx => showEvent(CALENDAR[idx]),
     back : () => load()

apps/agenda/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "agenda",
   "name": "Agenda",
-  "version": "0.04",
+  "version": "0.05",
   "description": "Simple agenda",
   "icon": "agenda.png",
   "screenshots": [{"url":"screenshot_agenda_overview.png"}, {"url":"screenshot_agenda_event1.png"}, {"url":"screenshot_agenda_event2.png"}],

apps/animclk/ChangeLog

@@ -1,3 +1,5 @@
 0.01: New App!
 0.02: Fix bug if image clock wasn't installed
 0.03: Update to use setUI
+0.04: Tell clock widgets to hide. Move loadWidgets() so it only runs on
+startup and not on every draw.

apps/animclk/app.js

@@ -87,7 +87,6 @@ if (g.drawImages) {
   draw();
   var secondInterval = setInterval(draw,100);
   // load widgets
-  Bangle.loadWidgets();
   Bangle.drawWidgets();
   // Stop when LCD goes off
   Bangle.on('lcdPower',on=>{
@@ -104,3 +103,5 @@ if (g.drawImages) {
 }
 // Show launcher when button pressed
 Bangle.setUI("clock");
+
+Bangle.loadWidgets();

apps/animclk/metadata.json

@@ -2,7 +2,7 @@
   "id": "animclk",
   "name": "Animated Clock",
   "shortName": "Anim Clock",
-  "version": "0.03",
+  "version": "0.04",
   "description": "An animated clock face using Mark Ferrari's amazing 8 bit game art and palette cycling: http://www.markferrari.com/art/8bit-game-art",
   "icon": "app.png",
   "type": "clock",

apps/astral/ChangeLog

@@ -1,3 +1,4 @@
 0.01: Create astral clock app
 0.02: Fixed Whirlpool galaxy RA/DA, larger compass display, fixed moonphase overlapping battery widget
 0.03: Update to use Bangle.setUI instead of setWatch
+0.04: Tell clock widgets to hide.

apps/astral/app.js

@@ -767,6 +767,24 @@ function draw() {
 g.clear();
 current_moonphase = getMoonPhase();
 
+Bangle.setUI("clockupdown", btn => {
+  if (btn==0) {
+    if (!processing) {
+        if (!modeswitch) {
+            modeswitch = true;
+            if (mode == "planetary") mode = "extras";
+            else mode = "planetary";
+        }
+        else
+            modeswitch = false;
+    }
+  } else {
+    if (!processing)
+        ready_to_compute = true;
+  }
+});
+
+
 // Load widgets
 Bangle.loadWidgets();
 Bangle.drawWidgets();
@@ -799,23 +817,6 @@ Bangle.setGPSPower(1);
 // Show launcher when button pressed
 Bangle.setClockMode();
 
-Bangle.setUI("clockupdown", btn => {
-  if (btn==0) {
-    if (!processing) {
-        if (!modeswitch) {
-            modeswitch = true;
-            if (mode == "planetary") mode = "extras";
-            else mode = "planetary";
-        }
-        else
-            modeswitch = false;
-    }
-  } else {
-    if (!processing)
-        ready_to_compute = true;
-  }
-});
-
 setWatch(function () {
     if (!astral_settings.astral_default) {
         colours_switched = true;

apps/astral/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "astral",
   "name": "Astral Clock",
-  "version": "0.03",
+  "version": "0.04",
   "description": "Clock that calculates and displays Alt Az positions of all planets, Sun as well as several other astronomy targets (customizable) and current Moon phase. Coordinates are calculated by GPS & time and onscreen compass assists orienting. See Readme before using.",
   "icon": "app-icon.png",
   "type": "clock",

apps/barcode/ChangeLog

@@ -7,3 +7,4 @@
 0.07: Step count resets at midnight
 0.08: Step count stored in memory to survive reloads. Now shows step count daily and since last reboot.
 0.09: NOW it really should reset daily (instead of every other day...)
+0.10: Tell clock widgets to hide.

apps/barcode/barcode.app.js

@@ -416,13 +416,13 @@ var layout = new Layout( {
 
 // Clear the screen once, at startup
 g.clear();
+Bangle.setUI("clock");
 Bangle.loadWidgets();
 Bangle.drawWidgets();
-Bangle.setUI("clock");
 layout.render();
 
 Bangle.on('lock', function(locked) {
     if(!locked) {
         layout.render();
     }
-});
+});

apps/barcode/metadata.json

@@ -2,7 +2,7 @@
   "name": "Barcode clock",
   "shortName":"Barcode clock",
   "icon": "barcode.icon.png",
-  "version":"0.09",
+  "version":"0.10",
   "description": "EAN-8 compatible barcode clock.",
   "tags": "barcode,ean,ean-8,watchface,clock,clockface",
   "type": "clock",

apps/batclock/ChangeLog

@@ -1,2 +1,3 @@
 0.01: App Created!
 0.02: Update to use Bangle.setUI instead of setWatch
+0.03: Tell clock widgets to hide.

apps/batclock/bat-clock.app.js

@@ -249,6 +249,9 @@ g.clear();
 g.setColor(0, 0.5, 0).drawImage(bg_crack);
 g.setColor(1, 1, 1).drawImage(batman);
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 
@@ -256,5 +259,3 @@ Bangle.drawWidgets();
 timeInterval = setInterval(showTime, 1000);
 showTime();
 
-// Show launcher when button pressed
-Bangle.setUI("clock");

apps/batclock/metadata.json

@@ -2,7 +2,7 @@
   "id": "batclock",
   "name": "Bat Clock",
   "shortName": "Bat Clock",
-  "version": "0.02",
+  "version": "0.03",
   "description": "Morphing Clock, with an awesome \"The Dark Knight\" themed logo.",
   "icon": "bat-clock.png",
   "screenshots": [{"url":"screenshot.png"}],

apps/bclock/ChangeLog

@@ -1,2 +1,3 @@
 0.02: Modified for use with new bootloader and firmware
 0.03: Update to use Bangle.setUI instead of setWatch
+0.04: Tell clock widgets to hide.

apps/bclock/clock-binary.js

@@ -100,10 +100,12 @@ Bangle.on('lcdPower', on => {
   if (on) drawClock();
 });
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 g.clear();
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 setInterval(() => { drawClock(); }, 1000);
 drawClock();
-// Show launcher when button pressed
-Bangle.setUI("clock");
+

apps/bclock/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "bclock",
   "name": "Binary Clock",
-  "version": "0.03",
+  "version": "0.04",
   "description": "A simple binary clock watch face",
   "icon": "clock-binary.png",
   "type": "clock",

apps/bigdclock/ChangeLog

@@ -3,3 +3,4 @@
 0.03: Internationalisation; bug fix - battery icon responds promptly to charging state
 0.04: bug fix
 0.05: proper fix for the race condition in queueDraw()
+0.06: Tell clock widgets to hide.

apps/bigdclock/bigdclock.app.js

@@ -85,7 +85,8 @@ Bangle.on('charging', (charging) => {
     draw();
 });
 
+Bangle.setUI("clock");
+
 Bangle.loadWidgets();
 draw();
 
-Bangle.setUI("clock");

apps/bigdclock/metadata.json

@@ -1,7 +1,7 @@
 { "id": "bigdclock",
   "name": "Big digit clock containing just the essentials",
   "shortName":"Big digit clk",
-  "version":"0.05",
+  "version":"0.06",
   "description": "A clock containing just the essentials, made as easy to read as possible for those of us that need glasses. It contains the time, the day-of-week, the day-of-month, and the current battery state-of-charge.",
   "icon": "bigdclock.png",
   "type": "clock",

apps/binclock/ChangeLog

@@ -1,3 +1,4 @@
 0.01: New App!
 0.02: Fixed bug where screen didn't clear so incorrect time displayed.
 0.03: Update to use Bangle.setUI instead of setWatch
+0.04: Tell clock widgets to hide.

apps/binclock/app.js

@@ -164,9 +164,6 @@ Bangle.on('lcdPower',on=>{
     draw(); // draw immediately
   }
 });
-// Load widgets
-Bangle.loadWidgets();
-Bangle.drawWidgets();
 // Show launcher when button pressed
 Bangle.setUI("clockupdown", btn=>{
   if (btn!=1) return;
@@ -176,3 +173,6 @@ Bangle.setUI("clockupdown", btn=>{
     displayTime = 0;
   }
 });
+// Load widgets
+Bangle.loadWidgets();
+Bangle.drawWidgets();

apps/binclock/metadata.json

@@ -2,7 +2,7 @@
   "id": "binclock",
   "name": "Binary Clock",
   "shortName": "Binary Clock",
-  "version": "0.03",
+  "version": "0.04",
   "description": "A binary clock with hours and minutes. BTN1 toggles a digital clock.",
   "icon": "app.png",
   "type": "clock",

apps/binwatch/ChangeLog

@@ -2,3 +2,5 @@
 0.02: first running version for BangleJs2
 0.03: corrected icon, added screen shot, extended description
 0.04: corrected format of background image (raw binary)
+0.05: move setUI() up before draw() as to not have a false positive 'sanity
+check' when building on github.

apps/binwatch/app.js

@@ -334,6 +334,7 @@ function setRuntimeValues(resolution) {
 var hour = 0, minute = 1, second = 50;
 var batVLevel = 20;
 
+Bangle.setUI("clock");
 
 function draw() {
   var d = new Date();
@@ -371,7 +372,6 @@ function draw() {
 }
 
 // Show launcher when button pressed
-Bangle.setUI("clock");
 setRuntimeValues(g.getWidth());
 g.reset().clear();
 Bangle.loadWidgets();

apps/binwatch/metadata.json

@@ -3,7 +3,7 @@
   "shortName":"BinWatch",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"}],
-  "version":"0.04",
+  "version":"0.05",
   "supports": ["BANGLEJS2"],
   "readme": "README.md",
   "allow_emulator":true,

apps/blobclk/ChangeLog

@@ -5,3 +5,4 @@
 0.04: Modified to account for changes in the behavior of Graphics.fillPoly
 0.05: Slight increase to draw speed after LCD on
 0.06: Update to use Bangle.setUI instead of setWatch, allow themes and different size screens
+0.07: Tell clock widgets to hide.

apps/blobclk/clock-blob.js

@@ -99,6 +99,10 @@ function startTimers() {
   Bangle.drawWidgets();
   intervalRef = setInterval(redraw,1000);
 }
+
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 Bangle.loadWidgets();
 startTimers();
 Bangle.on('lcdPower',function(on) {
@@ -108,5 +112,3 @@ Bangle.on('lcdPower',function(on) {
     clearTimers();
   }
 });
-// Show launcher when button pressed
-Bangle.setUI("clock");

apps/blobclk/metadata.json

@@ -2,7 +2,7 @@
   "id": "blobclk",
   "name": "Large Digit Blob Clock",
   "shortName": "Blob Clock",
-  "version": "0.06",
+  "version": "0.07",
   "description": "A clock with big digits",
   "icon": "clock-blob.png",
   "type": "clock",

apps/boldclk/ChangeLog

@@ -3,3 +3,4 @@
 0.04: Work with themes, smaller screens
 0.05: Adjust hand lengths to be within 'tick' points
 0.06: Removed "wake LCD on face-up"-feature: A watch-face should not set things like "wake LCD on face-up". 
+0.07: Tell clock widgets to hide.

apps/boldclk/bold_clock.js

@@ -130,9 +130,10 @@ Bangle.on('lcdPower', (on) => {
   }
 });
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 g.clear();
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 startTimers();
-// Show launcher when button pressed
-Bangle.setUI("clock");

apps/boldclk/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "boldclk",
   "name": "Bold Clock",
-  "version": "0.06",
+  "version": "0.07",
   "description": "Simple, readable and practical clock",
   "icon": "bold_clock.png",
   "screenshots": [{"url":"screenshot_bold.png"}],

apps/calclock/ChangeLog

@@ -1,2 +1,3 @@
 0.01: Initial version
 0.02: More compact rendering & app icon
+0.03: Tell clock widgets to hide.

apps/calclock/calclock.js

@@ -114,6 +114,6 @@ g.clear();
 fullRedraw();
 var minuteInterval = setInterval(redraw, 60 * 1000);
 
+Bangle.setUI("clock");
 Bangle.loadWidgets();
 Bangle.drawWidgets();
-Bangle.setUI("clock");

apps/calclock/metadata.json

@@ -2,7 +2,7 @@
   "id": "calclock",
   "name": "Calendar Clock",
   "shortName": "CalClock",
-  "version": "0.02",
+  "version": "0.03",
   "description": "Show the current and upcoming events synchronized from Gadgetbridge",
   "icon": "calclock.png",
   "type": "clock",

apps/cassioWatch/ChangeLog

@@ -8,4 +8,5 @@
 0.7: Update Rocket Sequences Scope to not use memory all time
 0.8: Update Some Variable Scopes to not use memory until need
 0.9: Remove ESLint spaces
-0.10: Show daily steps, heartrate and the temperature if weather information is available.
+0.10: Show daily steps, heartrate and the temperature if weather information is available.
+0.11: Tell clock widgets to hide.

apps/cassioWatch/app.js

@@ -165,11 +165,11 @@ Bangle.on("lock", (locked) => {
   }
 });
 
+Bangle.setUI("clock");
 
 // Load widgets, but don't show them
 Bangle.loadWidgets();
-Bangle.setUI("clock");
 
 g.reset();
 g.clear();
-draw();
+draw();

apps/cassioWatch/metadata.json

@@ -4,7 +4,7 @@
   "description": "Animated Clock with Space Cassio Watch Style",
   "screenshots": [{ "url": "screens/screen_night.png" },{ "url": "screens/screen_day.png" }],
   "icon": "app.png",
-  "version": "0.10",
+  "version": "0.11",
   "type": "clock",
   "tags": "clock, weather, cassio, retro",
   "supports": ["BANGLEJS2"],

apps/clockcal/ChangeLog

@@ -3,3 +3,4 @@
 0.03: Configurable drag gestures
 0.04: Use default Bangle formatter for booleans
 0.05: Improved colors (connected vs disconnected)
+0.06: Tell clock widgets to hide.

apps/clockcal/app.js

@@ -1,3 +1,4 @@
+Bangle.setUI("clock");
 Bangle.loadWidgets();
 
 var s = Object.assign({
@@ -307,4 +308,4 @@ NRF.on('disconnect', BTevent);
 
 dimSeconds = Bangle.isLocked();
 drawWatch();
-Bangle.setUI("clock");
+

apps/clockcal/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "clockcal",
   "name": "Clock & Calendar",
-  "version": "0.05",
+  "version": "0.06",
   "description": "Clock with Calendar",
   "readme":"README.md",
   "icon": "app.png",

apps/colorful_clock/ChangeLog

@@ -1,2 +1,3 @@
 ...
 0.03: First update with ChangeLog Added
+0.04: Tell clock widgets to hide.

apps/colorful_clock/app.js

@@ -3,6 +3,8 @@
 
   let outerRadius = Math.min(CenterX,CenterY) * 0.9;
 
+  Bangle.setUI('clock');
+
   Bangle.loadWidgets();
 
 /**** updateClockFaceSize ****/
@@ -241,7 +243,3 @@
       refreshDisplay();
     }
   });
-
-  Bangle.loadWidgets();
-
-  Bangle.setUI('clock');

apps/colorful_clock/metadata.json

@@ -1,7 +1,7 @@
 { "id": "colorful_clock",
   "name": "Colorful Analog Clock",
   "shortName":"Colorful Clock",
-  "version":"0.03",
+  "version":"0.04",
   "description": "a colorful analog clock",
   "icon": "app-icon.png",
   "type": "clock",

apps/configurable_clock/ChangeLog

@@ -1,2 +1,3 @@
 ...
 0.02: First update with ChangeLog Added
+0.03: Tell clock widgets to hide.

apps/configurable_clock/app.js

@@ -5,6 +5,7 @@
   let ScreenWidth  = g.getWidth(),  CenterX;
   let ScreenHeight = g.getHeight(), CenterY, outerRadius;
 
+  Bangle.setUI('clock');
   Bangle.loadWidgets();
 
 /**** updateClockFaceSize ****/
@@ -1377,4 +1378,3 @@
     }
   });
 
-  Bangle.setUI('clock');

apps/configurable_clock/metadata.json

@@ -1,7 +1,7 @@
 { "id": "configurable_clock",
   "name": "Configurable Analog Clock",
   "shortName":"Configurable Clock",
-  "version":"0.02",
+  "version":"0.03",
   "description": "an analog clock with several kinds of faces, hands and colors to choose from",
   "icon": "app-icon.png",
   "type": "clock",

apps/crowclk/ChangeLog

@@ -1,3 +1,4 @@
 0.01: New App!
 0.02: Removed "wake LCD on face-up"-feature: A watch-face should not set things like "wake LCD on face-up". 
 0.03: Fix the clock for dark mode.
+0.04: Tell clock widgets to hide.

apps/crowclk/crow_clock.js

@@ -136,9 +136,9 @@ Bangle.on('lcdPower', (on) => {
 g.clear();
 
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
 
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 startTimers();
-// Show launcher when button pressed
-Bangle.setUI("clock");

apps/crowclk/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "crowclk",
   "name": "Crow Clock",
-  "version": "0.03",
+  "version": "0.04",
   "description": "A simple clock based on Bold Clock that has MST3K's Crow T. Robot for a face",
   "icon": "crow_clock.png",
   "screenshots": [{"url":"screenshot_crow.png"}],

apps/distortclk/ChangeLog

@@ -0,0 +1 @@
+0.01: New face!

apps/distortclk/README.md

@@ -0,0 +1,17 @@
+# Distort Watchface
+Was playing around with custom fonts and made something with it
+Made for Bangle.js 2
+
+![screenshot (3)](https://user-images.githubusercontent.com/44651387/157507228-100452bf-94a6-476f-aec6-d13d5dad86d5.png)
+
+## Features
+
+Has a dark mode
+
+## Requests
+
+If you have any issues or would like to suggest a feature, click here to send a message -> [here](https://github.com/elykittytee/BangleApps/issues/new?title=Poketch%20Clock%20Bug).
+
+## Creator
+
+Eleanor Tayam

apps/distortclk/app-icon.js

@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("j0ewkBiIAxHIQMJiBJEIxAaCAIQfHDgIUFDwwNCHYgVFiAVBHYgIDEghKCCIQGCFYoaDAYgORGIJ2DBwYIBHgQOPgAOIPIYOGAgQOFFgh7DHZQeDBwhoFQgh3JEAgOFFoqkHYRzgOfx4bCJ4gNGSIaJEABA7EAGA"))

apps/distortclk/metadata.json

@@ -0,0 +1,17 @@
+{
+    "id": "distortclk",
+    "name": "Distort Clock",
+    "shortName":"Distort Clock",
+    "version": "0.01",
+    "description": "A clockface",
+    "icon": "app.png",
+    "type": "clock",
+    "tags": "clock",
+    "supports": ["BANGLEJS2"],
+    "allow_emulator": true,
+    "readme":"README.md",
+    "storage": [
+      {"name":"distortclk.app.js","url":"app.js"},
+      {"name":"distortclk.img","url":"app-icon.js","evaluate":true}
+    ]
+}

apps/fclock/ChangeLog

@@ -1,2 +1,3 @@
 0.01: First published version of app
 0.02: Move to Bangle.setUI to launcher support
+0.03: Tell clock widgets to hide.

apps/fclock/fclock.app.js

@@ -173,6 +173,9 @@ const drawHR = function () {
   }
 };
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 // clean app screen
 g.clear();
 Bangle.loadWidgets();
@@ -198,6 +201,3 @@ Bangle.on('HRM', function (d) {
 
 // draw now
 drawClock();
-
-// Show launcher when button pressed
-Bangle.setUI("clock");

apps/fclock/metadata.json

@@ -2,7 +2,7 @@
   "id": "fclock",
   "name": "fclock",
   "shortName": "F Clock",
-  "version": "0.02",
+  "version": "0.03",
   "description": "Simple design of a digital clock",
   "icon": "app.png",
   "type": "clock",

apps/ftclock/ChangeLog

@@ -1,3 +1,4 @@
 0.01: first release
 0.02: RAM efficient version of `fourTwentyTz.js` (as suggested by @gfwilliams).
 0.03: `mkFourTwentyTz.js` now handles new timezonedb.com CSV format
+0.04: Tell clock widgets to hide.

apps/ftclock/app.js

@@ -33,6 +33,8 @@ function draw() {
 
 // Clear the screen once, at startup
 g.clear();
+// Show launcher when middle button pressed
+Bangle.setUI("clock");
 // Load widgets
 Bangle.loadWidgets();
 Bangle.drawWidgets();
@@ -47,5 +49,4 @@ Bangle.on('lcdPower',on=>{
     drawTimeout = undefined;
   }
 });
-// Show launcher when middle button pressed
-Bangle.setUI("clock");
+

apps/ftclock/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "ftclock",
   "name": "Four Twenty Clock",
-  "version": "0.03",
+  "version": "0.04",
   "description": "A clock that tells when and where it's going to be 4:20 next",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"}, {"url":"screenshot1.png"}],

apps/gallifr/ChangeLog

@@ -1,2 +1,3 @@
 0.01: First released version
 0.02: Changed setWatch to Bangle.setUI
+0.03: Tell clock widgets to hide.

apps/gallifr/app.js

@@ -238,10 +238,12 @@ Bangle.on('lcdPower', (on) => {
   }
 });
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 g.clear();
 startTimers();
 Bangle.loadWidgets();
 drawAll();
 
-// Show launcher when button pressed
-Bangle.setUI("clock");
+

apps/gallifr/metadata.json

@@ -2,7 +2,7 @@
   "id": "gallifr",
   "name": "Time Traveller's Chronometer",
   "shortName": "Time Travel Clock",
-  "version": "0.02",
+  "version": "0.03",
   "description": "A clock for time travellers. The light pie segment shows the minutes, the black circle, the hour. The dial itself reads 'time' just in case you forget.",
   "icon": "gallifr.png",
   "screenshots": [{"url":"screenshot_time.png"}],

apps/geissclk/ChangeLog

@@ -1,3 +1,4 @@
 0.01: New App!
 0.02: BTN2->launcher, use smaller text to allow "20:00" to fit on screen
 0.03: Changed setWatch to Bangle.setUI
+0.04: Tell clock widgets to hide.

apps/geissclk/clock.js

@@ -142,11 +142,13 @@ Bangle.on('lcdPower',function(on) {
     animInterval = setInterval(iterate, 50);
   }
 });
-g.clear();
+
+// Show launcher when button pressed
+Bangle.setUI("clock");g.clear();
+
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 iterate();
 animInterval = setInterval(iterate, 50);
 
-// Show launcher when button pressed
-Bangle.setUI("clock");
+

apps/geissclk/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "geissclk",
   "name": "Geiss Clock",
-  "version": "0.03",
+  "version": "0.04",
   "description": "7 segment clock with animated background in the style of Ryan Geiss' music visualisation. NOTE: The first run will take ~1 minute to do some precalculation",
   "icon": "clock.png",
   "type": "clock",

apps/glbasic/ChangeLog

@@ -1,2 +1,3 @@
 0.20: New App!
+0.21: Tell clock widgets to hide.
 

apps/glbasic/glbasic.app.js

@@ -178,6 +178,8 @@ function draw() {
 ////////////////////////////////////////////////////
 // Bangle.setBarometerPower(true);
 
+Bangle.setUI("clock");
+
 Bangle.loadWidgets();
 draw();
 
@@ -197,6 +199,5 @@ Bangle.on('lcdPower', on => {
     }
 });
 
-Bangle.setUI("clock");
 
 Bangle.drawWidgets();

apps/glbasic/metadata.json

@@ -2,7 +2,7 @@
   "id": "glbasic",
   "name": "GLBasic Clock",
   "shortName": "GLBasic",
-  "version": "0.20",
+  "version": "0.21",
   "description": "A clock with large numbers",
   "dependencies": {"widpedom":"app"},
   "icon": "icon48.png",

apps/hcclock/ChangeLog

@@ -1,3 +1,4 @@
 0.01: Base code
 0.02: Saved settings when switching color scheme
-0.03: Added Button 3 opening messages (if app is installed)
+0.03: Added Button 3 opening messages (if app is installed)
+0.04: Use `messages` library to check for new messages

apps/hcclock/hcclock.app.js

@@ -3,7 +3,7 @@
 // Numbers Rect order (left, top, right, bottom)
 // Each number defines a set of rects to draw
 
-const numbers = 
+const numbers =
 [
   [// Zero
     [0, 0, 1, 0.2],
@@ -64,7 +64,7 @@ const numbers =
     [0, 0.8, 1, 1],
     [0, 0, 0.1, 0.6],
     [0.9, 0, 1, 1]
-  ] 
+  ]
 ];
 
 const months = [ "JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC" ];
@@ -103,7 +103,7 @@ function updateTime()
   let mo = now.getMonth();
   let y = now.getFullYear();
   let d = now.getDate();
-  
+
   if(h != hour)
   {
     hour = h;
@@ -127,7 +127,7 @@ function updateTime()
     day = d;
     g.setFont("6x8", 2);
     g.setFontAlign(0, -1, 0);
-    g.drawString(fmtDate(d,mo,y,hour), 120, 120); 
+    g.drawString(fmtDate(d,mo,y,hour), 120, 120);
   }
   drawMessages();
 }
@@ -136,7 +136,7 @@ function drawDigits(x, value)
 {
   if(!Bangle.isLCDOn()) // No need to draw when LCD Off
     return;
-  
+
   drawChar(Math.floor(value/10),  15, x, 115, x+50);
   if(value%10 == 1)
     drawChar(value%10, 55, x, 155, x+50);
@@ -228,27 +228,18 @@ function flipColors()
 //  MESSAGE HANDLING()
 //
 
-let messages_installed = require("Storage").read("messages.app.js") != undefined;
+let messages_installed = require("Storage").read("messages") !== undefined;
 
 function handleMessages()
 {
-  if(messages_installed && hasMessages() > 0)
-  {
-    E.showMessage("Loading Messages...");
-    load("messages.app.js");
-  }
+  if(!hasMessages()) return;
+  E.showMessage("Loading Messages...");
+  load("messages.app.js");
 }
 
 function hasMessages()
 {
-  if(!messages_installed)
-    return false;
-
-  var messages = require("Storage").readJSON("messages.json",1)||[];
-  if (messages.some(m=>m.new))
-    return true;
-  else
-    return false;
+  return messages_installed && require("messages").status() === 'new';
 }
 
 let msg = atob("GBiBAAAAAAAAAAAAAAAAAAAAAB//+DAADDAADDAADDwAPD8A/DOBzDDn/DA//DAHvDAPvjAPvjAPvjAPvh///gf/vAAD+AAB8AAAAA==");
@@ -256,20 +247,21 @@ let had_messages = false;
 
 function drawMessages()
 {
-  if(!had_messages && hasMessages()) {
+  const has_messages = hasMessages();
+  if(has_messages === had_messages) return;
+  if(has_messages) {
       g.setColor(255,255,255);
       g.drawImage(msg, 184, 212);
       g.setFont("6x8", 2);
       g.setFontAlign(0, -1, 0);
       g.drawString(">", 224, 216);
-      had_messages = true;
-  } 
-  else if (had_messages && !hasMessages())
+  }
+  else
   {
       g.setColor(0,0,0);
       g.fillRect(180, 210, 240, 240);
-      had_messages = false;
   }
+  had_messages = has_messages;
 }
 
 //////////////////////////////////////////

apps/hcclock/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "hcclock",
   "name": "Hi-Contrast Clock",
-  "version": "0.03",
+  "version": "0.04",
   "description": "Hi-Contrast Clock : A simple yet very bold clock that aims to be readable in high luninosity environments. Uses big 10x5 pixel digits. Use BTN 1 to switch background and foreground colors.",
   "icon": "hcclock-icon.png",
   "type": "clock",

apps/imgclock/ChangeLog

@@ -8,3 +8,4 @@
 0.07: Don't cut off wide date formats
 0.08: Use Bangle.setUI for button/launcher handling
 0.09: Bangle.js 2 compatibility
+0.10: Tell clock widgets to hide.

apps/imgclock/app.js

@@ -72,6 +72,8 @@ g.drawImage(img, 0,OY,bgoptions);
 // draw clock itself and do it every second
 draw();
 var secondInterval = setInterval(draw,1000);
+// Show launcher when button pressed
+Bangle.setUI("clock");
 // load widgets
 Bangle.loadWidgets();
 Bangle.drawWidgets();
@@ -84,5 +86,4 @@ Bangle.on('lcdPower',on=>{
     draw();
   }
 });
-// Show launcher when button pressed
-Bangle.setUI("clock");
+

apps/imgclock/metadata.json

@@ -2,7 +2,7 @@
   "id": "imgclock",
   "name": "Image background clock",
   "shortName": "Image Clock",
-  "version": "0.09",
+  "version": "0.10",
   "description": "A clock with an image as a background",
   "icon": "app.png",
   "type": "clock",

apps/impwclock/ChangeLog

@@ -3,3 +3,4 @@
 0.03: Move to Bangle.setUI to launcher support
 0.04: Tweaks for compatibility with BangleJS2
 0.05: Time-word now readable on Bangle.js 2
+0.06: Tell clock widgets to hide.

apps/impwclock/clock-impword.js

@@ -154,6 +154,9 @@ Bangle.on('lcdPower', function(on) {
   if (on) drawWordClock();
 });
 
+// Show launcher when button pressed
+Bangle.setUI("clock");
+
 g.clear();
 Bangle.loadWidgets();
 Bangle.drawWidgets();
@@ -172,5 +175,4 @@ Bangle.on('touch',e=>{
   }
 });
 
-// Show launcher when button pressed
-Bangle.setUI("clock");
+

apps/impwclock/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "impwclock",
   "name": "Imprecise Word Clock",
-  "version": "0.05",
+  "version": "0.06",
   "description": "Imprecise word clock for vacations, weekends, and those who never need accurate time.",
   "icon": "clock-impword.png",
   "type": "clock",

apps/isoclock/ChangeLog

@@ -1,2 +1,3 @@
 0.01: Created app based on digiclock with some small tweaks.
 0.02: Swap to Bangle.setUI for launcher/buttons
+0.03: Tell clock widgets to hide.

apps/isoclock/isoclock.js

@@ -89,8 +89,8 @@ Bangle.on('lcdPower',on=>{
   }
 });
 
-Bangle.loadWidgets();
-Bangle.drawWidgets();
-
 // Show launcher when button pressed
 Bangle.setUI("clock");
+
+Bangle.loadWidgets();
+Bangle.drawWidgets();

apps/isoclock/metadata.json

@@ -2,7 +2,7 @@
   "id": "isoclock",
   "name": "ISO Compliant Clock Face",
   "shortName": "ISO Clock",
-  "version": "0.02",
+  "version": "0.03",
   "description": "Tweaked fork of digiclock for ISO date and time",
   "icon": "isoclock.png",
   "type": "clock",

apps/kanawatch/ChangeLog

@@ -2,3 +2,4 @@
 0.02: Improve battery life, sprite resolution, fix launcher issue and unaligned text bug
 0.03: Reduce code size, refresh once a minute and faster refresh
 0.04: Show a random kana every minute to improve learning
+0.05: Tell clock widgets to hide.

apps/kanawatch/app.js

@@ -264,10 +264,10 @@ Bangle.on('touch', function (tap, top) {
 });
 
 g.clear(true);
+// show launcher when button pressed
+Bangle.setUI('clock');
 Bangle.loadWidgets();
 tickWatch();
 setInterval(tickWatch, 1000 * 60);
 
-// show launcher when button pressed
-Bangle.setUI('clock');
 

apps/kanawatch/metadata.json

@@ -2,7 +2,7 @@
   "id": "kanawatch",
   "name": "Kanawatch",
   "shortName": "Kanawatch",
-  "version": "0.04",
+  "version": "0.05",
   "type": "clock",
   "description": "Learn Hiragana and Katakana",
   "icon": "app.png",

apps/limelight/ChangeLog

@@ -1 +1,2 @@
 0.01: first release
+0.02: Tell clock widgets to hide.