Merge remote-tracking branch 'upstream/master'

apps/messages/ChangeLog

@@ -31,6 +31,6 @@
 0.19: Use a larger font for message text if it'll fit
 0.20: Allow tapping on the body to show a scrollable view of the message and title in a bigger font (fix #1405, #1031)
 0.21: Improve list readability on dark theme
+0.22: Add Home Assistant icon
 0.22: Allow repeat to be switched Off, so there is no buzzing repetition.
-      Also gave the widget a pixel more room to the right
-
+      Also gave the widget a pixel more room to the right

apps/messages/app.js

@@ -83,6 +83,7 @@ function getMessageImage(msg) {
   if (s=="calendar") return atob("GBiBAAAAAAAAAAAAAA//8B//+BgAGBgAGBgAGB//+B//+B//+B9m2B//+B//+Btm2B//+B//+Btm+B//+B//+A//8AAAAAAAAAAAAA==");
   if (s=="facebook") return getFBIcon();
   if (s=="hangouts") return atob("FBaBAAH4AH/gD/8B//g//8P//H5n58Y+fGPnxj5+d+fmfj//4//8H//B//gH/4A/8AA+AAHAABgAAAA=");
+  if (s=="home assistant") return atob("FhaBAAAAAADAAAeAAD8AAf4AD/3AfP8D7fwft/D/P8ec572zbzbNsOEhw+AfD8D8P4fw/z/D/P8P8/w/z/AAAAA=");
   if (s=="instagram") return atob("GBiBAAAAAAAAAAAAAAAAAAP/wAYAYAwAMAgAkAh+EAjDEAiBEAiBEAiBEAiBEAjDEAh+EAgAEAwAMAYAYAP/wAAAAAAAAAAAAAAAAA==");
   if (s=="gmail") return getNotificationImage();
   if (s=="google home") return atob("GBiCAAAAAAAAAAAAAAAAAAAAAoAAAAAACqAAAAAAKqwAAAAAqroAAAACquqAAAAKq+qgAAAqr/qoAACqv/6qAAKq//+qgA6r///qsAqr///6sAqv///6sAqv///6sAqv///6sA6v///6sA6v///qsA6qqqqqsA6qqqqqsA6qqqqqsAP7///vwAAAAAAAAAAAAAAAAA==");
@@ -114,6 +115,7 @@ function getMessageImageCol(msg,def) {
     "facebook": "#4267b2",
     "gmail": "#ea4335",
     "google home": "#fbbc05",
+    "home assistant": "#fff", // ha-blue is #41bdf5, but that's the background
     "hangouts": "#1ba261",
     "instagram": "#dd2a7b",
     "messenger": "#0078ff",

apps/messages/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "messages",
   "name": "Messages",
-  "version": "0.43",
+  "version": "0.22",
   "description": "App to display notifications from iOS and Gadgetbridge/Android",
   "icon": "app.png",
   "type": "app",

apps/neonx/ChangeLog

@@ -1,3 +1,4 @@
 0.01: Initial release
 0.02: Optional fullscreen mode
-0.03: Optional show lock status via color
+0.03: Optional show lock status via color
+0.04: Ensure that widgets are always hidden in fullscreen mode

apps/neonx/metadata.json

@@ -2,7 +2,7 @@
   "id": "neonx",
   "name": "Neon X & IO X Clock",
   "shortName": "Neon X Clock",
-  "version": "0.03",
+  "version": "0.04",
   "description": "Pebble Neon X & Neon IO X for Bangle.js",
   "icon": "neonx.png",
   "type": "clock",

apps/neonx/neonx.app.js

@@ -74,6 +74,12 @@ function drawLine(poly, thickness){
 function drawClock(num){
   let tx, ty;
 
+  if(settings.fullscreen){
+    g.clearRect(0,0,screenWidth,screenHeight);
+  } else {
+    g.clearRect(0,24,240,240);
+  }
+
   for (let x = 0; x <= 1; x++) {
     for (let y = 0; y <= 1; y++) {
       const current = ((y + 1) * 2 + x - 1);
@@ -106,6 +112,14 @@ function drawClock(num){
 function draw(date){
   queueDraw();
 
+  // Depending on the settings, we clear all widgets or draw those.
+  if(settings.fullscreen){
+    for (let wd of WIDGETS) {wd.draw=()=>{};wd.area="";}
+  } else {
+    Bangle.drawWidgets();
+  }
+
+  // Now lets draw the time/date
   let d = new Date();
   let l1, l2;
 
@@ -126,12 +140,6 @@ function draw(date){
     l2 = ('0' + d.getMinutes()).substr(-2);
   }
 
-  if(settings.fullscreen){
-    g.clearRect(0,0,screenWidth,screenHeight);
-  } else {
-    g.clearRect(0,24,240,240);
-  }
-
   drawClock([l1, l2]);
 }
 
@@ -175,12 +183,6 @@ Bangle.on('lock', function(isLocked) {
  */
 g.clear(1);
 Bangle.setUI("clock");
-draw();
-
 Bangle.loadWidgets();
 
-if(settings.fullscreen){
-  for (let wd of WIDGETS) {wd.draw=()=>{};wd.area="";}
-} else {
-  Bangle.drawWidgets();
-}
+draw();