Modified more clocks to use 'setUI' instead of a setWatch. All tested on Bangle.js 1

apps.json

@@ -171,7 +171,7 @@
   { "id": "mclock",
     "name": "Morphing Clock",
     "icon": "clock-morphing.png",
-    "version":"0.06",
+    "version":"0.07",
     "description": "7 segment clock that morphs between minutes and hours",
     "tags": "clock",
     "type":"clock",
@@ -258,7 +258,7 @@
   { "id": "slidingtext",
     "name": "Sliding Clock",
     "icon": "slidingtext.png",
-    "version":"0.05",
+    "version":"0.06",
     "description": "Inspired by the Pebble sliding clock, old times are scrolled off the screen and new times on. You are also able to change language on the fly so you can see the time written in other languages using button 1. Currently English, French, Japanese, Spanish and German are supported",
     "tags": "clock",
     "type":"clock",
@@ -296,7 +296,7 @@
     "name": "Image background clock",
     "shortName":"Image Clock",
     "icon": "app.png",
-    "version":"0.07",
+    "version":"0.08",
     "description": "A clock with an image as a background",
     "tags": "clock",
     "type" : "clock",
@@ -865,7 +865,7 @@
   { "id": "sclock",
     "name": "Simple Clock",
     "icon": "clock-simple.png",
-    "version":"0.05",
+    "version":"0.06",
     "description": "A Simple Digital Clock",
     "tags": "clock,b2",
     "type":"clock",
@@ -904,7 +904,7 @@
   { "id": "svclock",
     "name": "Simple V-Clock",
     "icon": "vclock-simple.png",
-    "version":"0.01",
+    "version":"0.02",
     "description": "Modification of Simple Clock 0.04 to use Vectorfont",
     "tags": "clock",
     "type":"clock",
@@ -1030,7 +1030,7 @@
   { "id": "miclock",
     "name": "Mixed Clock",
     "icon": "clock-mixed.png",
-    "version":"0.04",
+    "version":"0.05",
     "description": "A mix of analog and digital Clock",
     "tags": "clock",
     "type":"clock",
@@ -1476,7 +1476,7 @@
   { "id": "minionclk",
     "name": "Minion clock",
     "icon": "minionclk.png",
-    "version": "0.04",
+    "version": "0.05",
     "description": "Minion themed clock.",
     "tags": "clock,minion",
     "type": "clock",
@@ -1917,7 +1917,7 @@
     "id": "largeclock",
     "name": "Large Clock",
     "icon": "largeclock.png",
-    "version": "0.07",
+    "version": "0.08",
     "description": "A readable and informational digital watch, with date, seconds and moon phase",
     "readme": "README.md",
     "tags": "clock",
@@ -2610,7 +2610,7 @@
     "name": "NCR Clock",
     "shortName":"NCR Clock",
     "icon": "app.png",
-    "version":"0.01",
+    "version":"0.02",
     "description": "NodeConf Remote clock",
     "tags": "clock",
     "type": "clock",
@@ -2883,7 +2883,7 @@
   "name": "Morph Clock+",
   "shortName":"Morph Clock+",
   "icon": "mclockplus.png",
-  "version":"1.0",
+  "version":"0.02",
   "description": "Morphing Clock with more readable seconds and date and additional stopwatch",
   "tags": "clock",
   "type": "clock",
@@ -3113,7 +3113,7 @@
 { "id": "simplest",
   "name": "Simplest Clock",
   "icon": "simplest.png",
-  "version":"0.01",
+  "version":"0.02",
   "description": "The simplest working clock, acts as a tutorial piece",
   "tags": "clock",
   "type":"clock",

apps/imgclock/ChangeLog

@@ -5,4 +5,5 @@
       Scaling for background images <240px wide
 0.05: Fix memory/interval leak when LCD turns on
 0.06: Support 12 hour time
-0.07: Don't cut off wide date formats
+0.07: Don't cut off wide date formats
+0.08: Use Bangle.setUI for button/launcher handling

apps/imgclock/app.js

@@ -84,5 +84,5 @@ Bangle.on('lcdPower',on=>{
     draw();
   }
 });
-// Show launcher when middle button pressed
+// Show launcher when button pressed
-setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" });
+Bangle.setUI("clock");

apps/largeclock/ChangeLog

@@ -5,3 +5,4 @@
 0.05: Add support for 12 hour time
 0.06: Allow to disable BTN1 and BTN3 buttons
 0.07: Don't clear all intervals during initialisation
+0.08: Use Bangle.setUI for button/launcher handling

apps/largeclock/largeclock.js

@@ -179,9 +179,9 @@ Bangle.on("lcdPower", function(on) {
 
 Bangle.setLCDMode();
 
-// Show launcher when middle button pressed
+// Show launcher when button pressed
-clearWatch();
+Bangle.setUI("clock");
-setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" });
+
 if (BTN1app) setWatch(
   function() {
     load(BTN1app);

apps/mclock/ChangeLog

@@ -4,3 +4,4 @@
 0.05: Add "ram" keyword to allow 2v06 Espruino builds to cache function that needs to be fast
       Fix issue where first digit could get stuck going from "2x:xx" to " x:xx" (fix #365)
 0.06: Support 12 hour time
+0.07: Use Bangle.setUI for button/launcher handling

apps/mclock/clock-morphing.js

@@ -216,5 +216,5 @@ Bangle.drawWidgets();
 timeInterval = setInterval(showTime, 1000);
 showTime();
 
-// Show launcher when middle button pressed
+// Show launcher when button pressed
-setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
+Bangle.setUI("clock");

apps/mclockplus/ChangeLog

@@ -1 +1,2 @@
-1.0: Created app
+0.01: Created app
+0.02: Use Bangle.setUI for button/launcher handling

apps/mclockplus/mclockplus.app.js

@@ -310,8 +310,8 @@ Bangle.drawWidgets();
 timeInterval = setInterval(showTime, 1000);
 showTime();
 
-// Show launcher when middle button pressed
+// Show launcher when button pressed
-setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
+Bangle.setUI("clock");
 
 // Start stopwatch when BTN3 is pressed
 setWatch(() => {swInterval=setInterval(stopWatch, 1000);stopWatch();}, BTN3, {repeat:false,edge:"falling"});

apps/miclock/ChangeLog

@@ -1,3 +1,4 @@
 0.02: Modified for use with new bootloader and firmware
 0.03: Localization
 0.04: move jshint to the top
+0.05: Use Bangle.setUI for button/launcher handling

apps/miclock/clock-mixed.js

@@ -83,5 +83,5 @@ Bangle.drawWidgets();
 setInterval(drawMixedClock, 5E3);
 drawMixedClock();
 
-// Show launcher when middle button pressed
+// Show launcher when button pressed
-setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
+Bangle.setUI("clock");

apps/minionclk/ChangeLog

@@ -2,3 +2,4 @@
 0.02: Improved date readability, fixed drawing of widgets
 0.03: Fixed rendering for Espruino v2.06
 0.04: Fixed overlapped rendering of dates
+0.05: Use Bangle.setUI for button/launcher handling

apps/minionclk/app.js

@@ -81,4 +81,5 @@ Bangle.on('lcdPower', (on) => {
 Bangle.loadWidgets();
 startDrawing();
 
-setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: 'falling' });
+// Show launcher when button pressed
+Bangle.setUI("clock");

apps/ncrclk/ChangeLog

@@ -1 +1,2 @@
 0.01: A copy of the analogimgclk to work for NodeConf Remote
+0.02: Use Bangle.setUI for button/launcher handling

apps/ncrclk/app.js

@@ -125,5 +125,5 @@ Bangle.loadWidgets();
 Bangle.drawWidgets();
 drawHands(true);
 
-// Show launcher when middle button pressed
+// Show launcher when button pressed
-setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" });
+Bangle.setUI("clock");

apps/sclock/ChangeLog

@@ -2,3 +2,4 @@
 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
+0.06: Use Bangle.setUI for button/launcher handling

apps/sclock/clock-simple.js

@@ -69,6 +69,8 @@ Bangle.on('lcdPower', function(on) {
 
 // clean app screen
 g.clear();
+// Show launcher when button pressed
+Bangle.setUI("clock");
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 
@@ -77,6 +79,3 @@ setInterval(drawSimpleClock, 15E3);
 
 // draw now
 drawSimpleClock();
-
-// Show launcher when button pressed
-Bangle.setUI("clock");

apps/simplest/ChangeLog

@@ -0,0 +1,2 @@
+0.01: Modified for use with new bootloader and firmware
+0.02: Use Bangle.setUI for button/launcher handling

apps/simplest/app.js

@@ -21,4 +21,5 @@ Bangle.loadWidgets();
 Bangle.drawWidgets();
 setInterval(draw, 15000); // refresh every 15s
 draw();
-setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
+// Show launcher when button pressed
+Bangle.setUI("clock");

apps/slidingtext/ChangeLog

@@ -1,5 +1,6 @@
-0.01: Initial Release 
+0.01: Initial Release
-0.02: Color Themes, Smoother scrolling 
+0.02: Color Themes, Smoother scrolling
-0.03: Added Spanish Language 
+0.03: Added Spanish Language
-0.04: Added German Language 
+0.04: Added German Language
 0.05: BUGFIX: pedometer widget interfered with the clock Font Alignment
+0.06: Use Bangle.setUI for button/launcher handling

apps/slidingtext/slidingtext.js

@@ -635,8 +635,8 @@ Bangle.loadWidgets();
 Bangle.drawWidgets();
 
 startTimers();
-// Show launcher when middle button pressed
+// Show launcher when button pressed
-setWatch(Bangle.showLauncher, BTN2,{repeat:false,edge:"falling"});
+Bangle.setUI("clock");
 
 
 // Handle button 1 being pressed

apps/svclock/ChangeLog

@@ -1 +1,2 @@
 0.01: Modification of SimpleClock 0.04 to use Vectorfont
+0.02: Use Bangle.setUI for button/launcher handling

apps/svclock/vclock-simple.js

@@ -80,5 +80,5 @@ setInterval(drawSimpleClock, 15E3);
 // draw now
 drawSimpleClock();
 
-// Show launcher when middle button pressed
+// Show launcher when button pressed
-setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
+Bangle.setUI("clock");