diff --git a/apps.json b/apps.json index 5abbfb1f8..484ea6f7e 100644 --- a/apps.json +++ b/apps.json @@ -2642,12 +2642,12 @@ "id": "widviz", "name": "Widget Visibility Widget", "shortName": "Viz Widget", - "version": "0.02", + "version": "0.03", "description": "Swipe left to hide top bar widgets, swipe right to redisplay.", "icon": "eye.png", "type": "widget", "tags": "widget", - "supports": ["BANGLEJS"], + "supports": ["BANGLEJS","BANGLESJ2"], "storage": [ {"name":"widviz.wid.js","url":"widget.js"} ] @@ -4670,7 +4670,7 @@ "id": "pebble", "name": "Pebble Clock", "shortName": "Pebble", - "version": "0.03", + "version": "0.04", "description": "A pebble style clock to keep the rebellion going", "readme": "README.md", "icon": "pebble.png", diff --git a/apps/pebble/ChangeLog b/apps/pebble/ChangeLog index fc3ff3ba4..76f90de8b 100644 --- a/apps/pebble/ChangeLog +++ b/apps/pebble/ChangeLog @@ -1,3 +1,4 @@ 0.01: first release 0.02: included deployment of pebble.settings.js in apps.json 0.03: Changed time+calendar font to LECO1976Regular, changed to slanting boot +0.04: Fix widget hiding code (fix #1046) diff --git a/apps/pebble/pebble.app.js b/apps/pebble/pebble.app.js index ce9ab3340..106e09b82 100644 --- a/apps/pebble/pebble.app.js +++ b/apps/pebble/pebble.app.js @@ -34,7 +34,7 @@ function draw() { // turn the warning on once we have dipped below 30% if (E.getBattery() < 30) batteryWarning = true; - + // turn the warning off once we have dipped above 40% if (E.getBattery() > 40) batteryWarning = false; @@ -57,7 +57,7 @@ function draw() { g.setFontAlign(0, -1); g.drawString(da[0].toUpperCase(), w/4, ha); // day of week g.drawString(getSteps(), 3*w/4, ha); - + // time // white on red for battery warning g.setColor(!batteryWarning ? g.theme.bg : '#f00'); @@ -71,7 +71,7 @@ function draw() { // contrast bar g.setColor(g.theme.fg); g.fillRect(0, h3, w, h3 + t); - + // the bottom g.setColor(settings.bg); g.fillRect(0, h3 + t, w, h); @@ -111,9 +111,10 @@ g.clear(); Bangle.loadWidgets(); /* * we are not drawing the widgets as we are taking over the whole screen - * so we will blank out the draw() functions of each widget + * so we will blank out the draw() functions of each widget and change the + * area to the top bar doesn't get cleared. */ -for (let wd of WIDGETS) {wd.draw=()=>{};} +for (let wd of WIDGETS) {wd.draw=()=>{};wd.area="";} loadSettings(); setInterval(draw, 15000); // refresh every 15s draw(); diff --git a/apps/widviz/ChangeLog b/apps/widviz/ChangeLog index e1958b429..9785f4d84 100644 --- a/apps/widviz/ChangeLog +++ b/apps/widviz/ChangeLog @@ -1,3 +1,3 @@ - 0.01: New Widget - 0.02: swipe left,right update - +0.01: New Widget +0.02: swipe left,right update +0.03: Fix widget visibility code to the top bar isn't cleared by drawWidgets diff --git a/apps/widviz/widget.js b/apps/widviz/widget.js index 241dabf61..1490cf11a 100644 --- a/apps/widviz/widget.js +++ b/apps/widviz/widget.js @@ -6,16 +6,21 @@ if (!Bangle.isLCDOn() || saved) return; saved = []; for (var wd of WIDGETS) { - saved.push(wd.draw); + saved.push({d:wd.draw,a:wd.area}); wd.draw=()=>{}; + wd.area=""; } g.setColor(0,0,0); - g.fillRect(0,0,239,23); + g.fillRect(0,0,g.getWidth(),23); } function reveal(){ if (!Bangle.isLCDOn() || !saved) return; - for (var wd of WIDGETS) wd.draw = saved.shift(); + for (var wd of WIDGETS) { + var o = saved.shift(); + wd.draw = o.d; + wd.area = o.a; + } Bangle.drawWidgets(); saved=null; }