Merge pull request #825 from nebbishhacker/weatherlayout

weather: Use Layout library

apps.json

@@ -585,7 +585,7 @@
   { "id": "weather",
     "name": "Weather",
     "icon": "icon.png",
-    "version":"0.09",
+    "version":"0.10",
     "description": "Show Gadgetbridge weather report",
     "readme": "readme.md",
     "tags": "widget,outdoors",

apps/weather/ChangeLog

@@ -5,4 +5,5 @@
 0.06: Use setUI for launcher.
 0.07: Add theme support and unknown icon.
 0.08: Refactor and reduce widget ram usage.
-0.09: Fix crash when weather.json is absent.
+0.09: Fix crash when weather.json is absent.
+0.10: Use new Layout library

apps/weather/app.js

@@ -1,96 +1,106 @@
-(() => {
+const Layout = require('Layout');
-  const weather = require('weather');
+const locale = require('locale');
-  let current = weather.get();
+const weather = require('weather');
+let current = weather.get();
 
-  function formatDuration(millis) {
+Bangle.loadWidgets();
-    let pluralize = (n, w) => n + " " + w + (n == 1 ? "" : "s");
-    if (millis < 60000) return "< 1 minute";
-    if (millis < 3600000) return pluralize(Math.floor(millis/60000), "minute");
-    if (millis < 86400000) return pluralize(Math.floor(millis/3600000), "hour");
-    return pluralize(Math.floor(millis/86400000), "day");
-  }
 
-  function draw() {
+var layout = new Layout({type:"v", bgCol: g.theme.bg, c: [
-    g.reset();
+  {filly: 1},
-    g.clearRect(0, 24, 239, 239);
+  {type: "h", filly: 0, c: [
+    {type: "custom", width: g.getWidth()/2, height: g.getWidth()/2, valign: -1, txt: "unknown", id: "icon",
+      render: l => weather.drawIcon(l.txt, l.x+l.w/2, l.y+l.h/2, l.w/2-5)},
+    {type: "v", fillx: 1, c: [
+      {type: "h", pad: 2, c: [
+        {type: "txt", font: "18%", id: "temp", label: "000"},
+        {type: "txt", font: "12%", valign: -1, id: "tempUnit", label: "°C"},
+      ]},
+      {filly: 1},
+      {type: "txt", font: "6x8", pad: 2, halign: 1, label: "Humidity"},
+      {type: "txt", font: "9%", pad: 2, halign: 1, id: "hum", label: "000%"},
+      {filly: 1},
+      {type: "txt", font: "6x8", pad: 2, halign: -1, label: "Wind"},
+      {type: "h", halign: -1, c: [
+        {type: "txt", font: "9%", pad: 2, id: "wind",  label: "00"},
+        {type: "txt", font: "6x8", pad: 2, valign: -1, id: "windUnit", label: "km/h"},
+      ]},
+    ]},
+  ]},
+  {filly: 1},
+  {type: "txt", font: "9%", wrap: true, height: g.getHeight()*0.18, fillx: 1, id: "cond", label: "Weather condition"},
+  {filly: 1},
+  {type: "h", c: [
+    {type: "txt", font: "6x8", pad: 4, id: "loc", label: "Toronto"},
+    {fillx: 1},
+    {type: "txt", font: "6x8", pad: 4, id: "updateTime", label: "15 minutes ago"},
+  ]},
+  {filly: 1},
+]}, null, {lazy: true});
 
-    weather.drawIcon(current.txt, 65, 90, 55);
+function formatDuration(millis) {
-    const locale = require("locale");
+  let pluralize = (n, w) => n + " " + w + (n == 1 ? "" : "s");
+  if (millis < 60000) return "< 1 minute";
+  if (millis < 3600000) return pluralize(Math.floor(millis/60000), "minute");
+  if (millis < 86400000) return pluralize(Math.floor(millis/3600000), "hour");
+  return pluralize(Math.floor(millis/86400000), "day");
+}
 
-    g.reset();
+function draw() {
+  layout.icon.txt = current.txt;
+  const temp = locale.temp(current.temp-273.15).match(/^(\D*\d*)(.*)$/);
+  layout.temp.label = temp[1];
+  layout.tempUnit.label = temp[2];
+  layout.hum.label = current.hum+"%";
+  const wind = locale.speed(current.wind).match(/^(\D*\d*)(.*)$/);
+  layout.wind.label = wind[1];
+  layout.windUnit.label = wind[2] + " " + current.wrose.toUpperCase();
+  layout.cond.label = current.txt.charAt(0).toUpperCase()+current.txt.slice(1);
+  layout.loc.label = current.loc;
+  layout.updateTime.label = `${formatDuration(Date.now() - current.time)} ago`;
+  layout.update();
+  layout.render();
+}
 
-    const temp = locale.temp(current.temp-273.15).match(/^(\D*\d*)(.*)$/);
+function drawUpdateTime() {
-    let width = g.setFont("Vector", 40).stringWidth(temp[1]);
+  if (!current || !current.time) return;
-    width += g.setFont("Vector", 20).stringWidth(temp[2]);
+  layout.updateTime.label = `${formatDuration(Date.now() - current.time)} ago`;
-    g.setFont("Vector", 40).setFontAlign(-1, -1, 0);
+  layout.update();
-    g.drawString(temp[1], 180-width/2, 70);
+  layout.render();
-    g.setFont("Vector", 20).setFontAlign(1, -1, 0);
+}
-    g.drawString(temp[2], 180+width/2, 70);
 
-    g.setFont("6x8", 1);
+function update() {
-    g.setFontAlign(-1, 0, 0);
+  current = weather.get();
-    g.drawString("Humidity", 135, 130);
+  NRF.removeListener("connect", update);
-    g.setFontAlign(1, 0, 0);
+  if (current) {
-    g.drawString(current.hum+"%", 225, 130);
+    draw();
-    if ('wind' in current) {
+  } else {
-      g.setFontAlign(-1, 0, 0);
+    layout.forgetLazyState();
-      g.drawString("Wind", 135, 142);
+    if (NRF.getSecurityStatus().connected) {
-      g.setFontAlign(1, 0, 0);
+      E.showMessage("Weather\nunknown\n\nIs Gadgetbridge\nweather\nreporting set\nup on your\nphone?");
-      g.drawString(locale.speed(current.wind)+' '+current.wrose.toUpperCase(), 225, 142);
-    }
-
-    g.setFont("6x8", 2).setFontAlign(0, 0, 0);
-    g.drawString(current.loc, 120, 170);
-
-    g.setFont("6x8", 1).setFontAlign(0, 0, 0);
-    g.drawString(current.txt.charAt(0).toUpperCase()+current.txt.slice(1), 120, 190);
-
-    drawUpdateTime();
-
-    g.flip();
-  }
-
-  function drawUpdateTime() {
-    if (!current || !current.time) return;
-    let text = `Last update received ${formatDuration(Date.now() - current.time)} ago`;
-    g.reset();
-    g.clearRect(0, 202, 239, 210);
-    g.setFont("6x8", 1).setFontAlign(0, 0, 0);
-    g.drawString(text, 120, 206);
-  }
-
-  function update() {
-    current = weather.get();
-    NRF.removeListener("connect", update);
-    if (current) {
-      draw();
-    } else if (NRF.getSecurityStatus().connected) {
-      E.showMessage("Weather unknown\n\nIs Gadgetbridge\nweather reporting\nset up on your\nphone?");
     } else {
-      E.showMessage("Weather unknown\n\nGadgetbridge\nnot connected");
+      E.showMessage("Weather\nunknown\n\nGadgetbridge\nnot connected");
       NRF.on("connect", update);
     }
   }
+}
 
-  let interval = setInterval(drawUpdateTime, 60000);
+let interval = setInterval(drawUpdateTime, 60000);
-  Bangle.on('lcdPower', (on) => {
+Bangle.on('lcdPower', (on) => {
-    if (interval) {
+  if (interval) {
-      clearInterval(interval);
+    clearInterval(interval);
-      interval = undefined;
+    interval = undefined;
-    }
+  }
-    if (on) {
+  if (on) {
-      drawUpdateTime();
+    drawUpdateTime();
-      interval = setInterval(drawUpdateTime, 60000);
+    interval = setInterval(drawUpdateTime, 60000);
-    }
+  }
-  });
+});
 
-  weather.on("update", update);
+weather.on("update", update);
 
-  update();
+update();
 
-  // Show launcher when middle button pressed
+// Show launcher when middle button pressed
-  Bangle.setUI("clock");
+Bangle.setUI("clock");
 
-  Bangle.loadWidgets();
+Bangle.drawWidgets();
-  Bangle.drawWidgets();
-})()

modules/Layout.js

@@ -73,6 +73,7 @@ Other functions:
 * `layout.update()` - update positions of everything if contents have changed
 * `layout.debug(obj)` - draw outlines for objects on screen
 * `layout.clear(obj)` - clear the given object (you can also just specify `bgCol` to clear before each render)
+* `layout.forgetLazyState()` - if lazy rendering is enabled, makes the next call to `render()` perform a full re-render
 
 */
 
@@ -258,6 +259,10 @@ Layout.prototype.render = function (l) {
   }
 };
 
+Layout.prototype.forgetLazyState = function () {
+  this.rects = {};
+}
+
 Layout.prototype.layout = function (l) {
   // l = current layout element
   // exw,exh = extra width/height available