Merge pull request espruino#3637 from thyttan/setui-proposal-preview

setuichange: Bangle.js 1 support

Author: gfwilliams

apps/setuichange/ChangeLog

@@ -1,5 +1,4 @@
 0.01: New App!
-0.02: Fix case where we tried to push to Bangle.btnWatches but it wasn't
-	defined.
-0.03: Throw exception if trying to add custom drag handler on mode updown and
-	leftright.
+0.02: Fix case where we tried to push to Bangle.btnWatches but it wasn't defined.
+0.03: Throw exception if trying to add custom drag handler on mode updown and leftright.
+0.04: Bangle.js 1 support. No change to Bangle.js 2.

apps/setuichange/boot-b1.js

@@ -0,0 +1,118 @@
+Bangle.setUI = (function(mode, cb) {
+  var options = {};
+  if ("object"==typeof mode) {
+    options = mode;
+    mode = options.mode;
+    if (!mode) throw new Error("Missing mode in setUI({...})");
+  }
+  var redraw = true;
+  if (global.WIDGETS && WIDGETS.back) {
+    redraw = false;
+    WIDGETS.back.remove(mode && options.back);
+  }
+  if (Bangle.btnWatches) {
+    Bangle.btnWatches.forEach(clearWatch);
+    delete Bangle.btnWatches;
+  }
+  if (Bangle.swipeHandler) {
+    Bangle.removeListener("swipe", Bangle.swipeHandler);
+    delete Bangle.swipeHandler;
+  }
+  if (Bangle.touchHandler) {
+    Bangle.removeListener("touch", Bangle.touchHandler);
+    delete Bangle.touchHandler;
+  }
+  delete Bangle.uiRedraw;
+  delete Bangle.CLOCK;
+  if (Bangle.uiRemove) {
+    let r = Bangle.uiRemove;
+    delete Bangle.uiRemove; // stop recursion if setUI is called inside uiRemove
+    r();
+  }
+  g.reset();// reset graphics state, just in case
+  if (!mode) return;
+  if (mode=="updown") {
+    Bangle.btnWatches = [
+      setWatch(function() { cb(-1); }, BTN1, {repeat:1,edge:"rising"}),
+      setWatch(function() { cb(1); }, BTN3, {repeat:1,edge:"rising"}),
+      setWatch(function() { cb(); }, BTN2, {repeat:1,edge:"rising"})
+    ];
+  } else if (mode=="leftright") {
+    Bangle.btnWatches = [
+      setWatch(function() { cb(-1); }, BTN1, {repeat:1,edge:"rising"}),
+      setWatch(function() { cb(1); }, BTN3, {repeat:1,edge:"rising"}),
+      setWatch(function() { cb(); }, BTN2, {repeat:1,edge:"rising"})
+    ];
+    Bangle.swipeHandler = d => {cb(d);};
+    Bangle.on("swipe", Bangle.swipeHandler);
+    Bangle.touchHandler = d => {cb();};
+    Bangle.on("touch", Bangle.touchHandler);
+  } else if (mode=="clock") {
+    Bangle.CLOCK=1;
+    Bangle.btnWatches = [
+      setWatch(Bangle.showLauncher, BTN2, {repeat:1,edge:"rising"})
+    ];
+  } else if (mode=="clockupdown") {
+    Bangle.CLOCK=1;
+    Bangle.btnWatches = [
+      setWatch(function() { cb(-1); }, BTN1, {repeat:1,edge:"rising"}),
+      setWatch(function() { cb(1); }, BTN3, {repeat:1,edge:"rising"}),
+      setWatch(Bangle.showLauncher, BTN2, {repeat:1,edge:"rising"})
+    ];
+  } else if (mode=="custom") {
+    if (options.clock) {
+      Bangle.btnWatches = [
+        setWatch(Bangle.showLauncher, BTN2, {repeat:1,edge:"rising"})
+      ];
+    }
+  } else
+    throw new Error("Unknown UI mode "+E.toJS(mode));
+  if (options.clock) Bangle.CLOCK=1;
+  if (options.touch) {
+    Bangle.touchHandler = options.touch;
+    Bangle.on("touch", Bangle.touchHandler);
+  }
+  if (options.swipe) {
+    Bangle.swipeHandler = options.swipe;
+    Bangle.on("swipe", Bangle.swipeHandler);
+  }
+  if ((options.btn || options.btnRelease) && !Bangle.btnWatches) Bangle.btnWatches = [];
+  if (options.btn) Bangle.btnWatches.push(
+    setWatch(function() { options.btn(1); }, BTN1, {repeat:1,edge:"rising"}),
+    setWatch(function() { options.btn(2); }, BTN2, {repeat:1,edge:"rising"}),
+    setWatch(function() { options.btn(3); }, BTN3, {repeat:1,edge:"rising"})
+  );
+  if (options.btnRelease) Bangle.btnWatches.push(
+    setWatch(function() { options.btn(1); }, BTN1, {repeat:1,edge:"falling"}),
+    setWatch(function() { options.btn(2); }, BTN2, {repeat:1,edge:"falling"}),
+    setWatch(function() { options.btn(3); }, BTN3, {repeat:1,edge:"falling"})
+  );
+  if (options.remove) // handler for removing the UI (intervals/etc)
+    Bangle.uiRemove = options.remove;
+  if (options.redraw) // handler for redrawing the UI
+    Bangle.uiRedraw = options.redraw;
+  if (options.back) {
+    var touchHandler = (z) => {
+      if (z==1) options.back();
+    };
+    Bangle.on("touch", touchHandler);
+    var btnWatch;
+    if (Bangle.btnWatches===undefined) // only add back button handler if there's no existing watch on BTN1
+      btnWatch = setWatch(function() {
+        btnWatch = undefined;
+        options.back();
+      }, BTN3, {edge:"rising"});
+    WIDGETS = Object.assign({back:{
+      area:"tl", width:24,
+      draw:e=>g.reset().setColor("#f00").drawImage(atob("GBiBAAAYAAH/gAf/4A//8B//+D///D///H/P/n+H/n8P/n4f/vwAP/wAP34f/n8P/n+H/n/P/j///D///B//+A//8Af/4AH/gAAYAA=="),e.x,e.y),
+      remove:(noclear)=>{
+        if (btnWatch) clearWatch(btnWatch);
+        Bangle.removeListener("touch", touchHandler);
+        if (!noclear) g.reset().clearRect({x:WIDGETS.back.x, y:WIDGETS.back.y, w:24,h:24});
+        delete WIDGETS.back;
+        if (!noclear) Bangle.drawWidgets();
+      }
+    }},global.WIDGETS);
+    if (redraw) Bangle.drawWidgets();
+  }
+})

apps/setuichange/boot.js apps/setuichange/boot-b2.jsapps/setuichange/boot.js renamed to apps/setuichange/boot-b2.js

@@ -1,13 +1,14 @@
 { "id": "setuichange",
   "name": "SetUI Proposals preview",
-  "version":"0.03",
+  "version":"0.04",
   "description": "Try out potential future changes to `Bangle.setUI`. Makes hardware button interaction snappier. Makes it possible to set custom event handlers on any type/mode, not just `\"custom\"`. Please provide feedback - see `Read more...` below.",
   "icon": "app.png",
   "tags": "",
   "type": "bootloader",
-  "supports" : ["BANGLEJS2"],
+  "supports" : ["BANGLEJS","BANGLEJS2"],
   "readme": "README.md",
   "storage": [
-    {"name":"setuichange.0.boot.js","url":"boot.js"}
+    {"name":"setuichange.0.boot.js","url":"boot-b1.js", "supports": ["BANGLEJS"]},
+    {"name":"setuichange.0.boot.js","url":"boot-b2.js", "supports": ["BANGLEJS2"]}
   ]
 }