Merge branch 'master' of https://github.com/espruino/BangleApps

apps.json

@@ -93,7 +93,7 @@
   { "id": "gbridge",
     "name": "Gadgetbridge",
     "icon": "app.png",
-    "version":"0.09",
+    "version":"0.10",
     "description": "The default notification handler for Gadgetbridge notifications from Android",
     "tags": "tool,system,android,widget",
     "type":"widget",
@@ -120,7 +120,7 @@
   { "id": "setting",
     "name": "Settings",
     "icon": "settings.png",
-    "version":"0.15",
+    "version":"0.16",
     "description": "A menu for setting up Bangle.js",
     "tags": "tool,system",
     "storage": [
@@ -1271,5 +1271,27 @@
       {"name":"calculator.app.js","url":"app.js"},
       {"name":"calculator.img","url":"calculator-icon.js","evaluate":true}
     ]
+  },
+  {
+    "id": "dane",
+    "name": "Digital Assistant, not EDITH",
+    "shortName": "DANE",
+    "icon": "app.png",
+    "version": "0.07",
+    "description": "A Watchface inspired by Tony Stark's EDITH",
+    "tags": "clock",
+    "type": "clock",
+    "allow_emulator": true,
+    "storage": [
+      {
+        "name": "dane.app.js",
+        "url": "app.js"
+      },
+      {
+        "name": "dane.img",
+        "url": "app-icon.js",
+        "evaluate": true
+      }
+    ]
   }
 ]

apps/dane/ChangeLog

@@ -0,0 +1,5 @@
+0.01: New App!
+0.04: Added Icon to watchface
+0.05: bugfix
+0.06: moved and resized icon
+0.07: Added Description

apps/dane/app-icon.js

@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("l8wxH+AH4A/AH4A/AFUvl8Cu4AEgUCBQIrfFQMRAAe/Aw4xbDYIlBiUS7AjCAAY5BBYMSiJkBGC4sCicTiRQJHoUSCAIwBF6sv30SikUiRMMMIISD7AvTl/YiYtPF40TF6R4BicVFqAWDF4MViaPRIwQWTF4O/IwiKRCoMRUiZHEDJ5cXJAxeOOQuQhQuShWQJIe/JJkviIuC74tTFwORRqKLD+3cmVLpsLFZtNAANKhXeDYKNOu4uEmdlDwVNBoNlsoDDmoKBhYQChcyFycVFwOTFwJcBpomBhYjCmouBAwYMCmZdBa4d3FyonBKoIoCAwIECLooucEIIjCRIYuFms1Lqq7CFwS7DLQQsDhYrBHIZdHXZkCdQpQDXoIQDFwIDBeoQQCpYuSl8RFwMT70KCRYAIhUSFwMTiMvFxm/CQUSFyp5Did3Fxi8DOBwuLDSEv7ETfoRCNDI13DIMT34ZPIYSgOaxJ3SIgZeTC7COBdgMCC58vOoakWiQvQFoQTBFqgvEiURF5gRDOKIdIDwMRiO/axMCBoMRLQItXF4Z9B7F3BxF37BZBAAQnRIYobDMAKqIl5aDAA5zJFwaCBAA6PBFxQQEAAYKBFxjSCU4IECA4YuJCAoAEFx0UikTAAIEBAwQuKCIoADFxsCI5RdiUAoAEVgIVJABRDHAH4A/AH4A/ADAA="))

apps/dane/app.js

@@ -0,0 +1,163 @@
+const font          = "6x8";
+const timeFontSize  = 4;
+const dateFontSize  = 3;
+const smallFontSize = 2;
+const yOffset       = 23;
+const xyCenter      = g.getWidth()/2;
+const cornerSize    = 14;
+const cornerOffset  = 3;
+const borderWidth   = 1;
+const yposTime      = 27+yOffset;
+const yposDate      = 65+yOffset;
+
+const mainColor      = "#26dafd";
+const mainColorDark  = "#029dbb";
+const mainColorLight = "#8bebfe";
+
+const secondaryColor      = "#df9527";
+const secondaryColorDark  = "#8b5c15";
+const secondaryColorLight = "#ecc180";
+
+const success        = "#00ff00";
+const successDark        = "#000900";
+const successLight        = "#060f06";
+
+const alert          = "#ff0000";
+const alertDark          = "#090000";
+const alertLight          = "#0f0606";
+
+var img = {
+  width : 120, height : 120, bpp : 8,
+  transparent : 254,
+  buffer : require("heatshrink").decompress(atob("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"))
+}
+
+
+function drawTopLeftCorner(x,y) {
+  g.setColor(mainColor);
+  var x1 = x-cornerOffset;
+  var y1 = y-cornerOffset;
+  g.fillRect(x1,y1,x1+cornerSize,y1+cornerSize);
+  g.setColor("#000000");
+  g.fillRect(x,y,x+cornerSize-cornerOffset,y+cornerSize-cornerOffset);
+}
+function drawTopRightCorner(x,y) {
+  g.setColor(mainColor);
+  var x1 = x+cornerOffset;
+  var y1 = y-cornerOffset;
+  g.fillRect(x1,y1,x1-cornerSize,y1+cornerSize);
+  g.setColor("#000000");
+  g.fillRect(x,y,x-cornerSize-cornerOffset,y+cornerSize-cornerOffset);
+}
+function drawBottomLeftCorner(x,y) {
+  g.setColor(mainColor);
+  var x1 = x-cornerOffset;
+  var y1 = y+cornerOffset;
+  g.fillRect(x1,y1,x1+cornerSize,y1-cornerSize);
+  g.setColor("#000000");
+  g.fillRect(x,y,x+cornerSize-cornerOffset,y-cornerSize+cornerOffset);
+}
+function drawBottomRightCorner(x,y) {
+  g.setColor(mainColor);
+  var x1 = x+cornerOffset;
+  var y1 = y+cornerOffset;
+  g.fillRect(x1,y1,x1-cornerSize,y1-cornerSize);
+  g.setColor("#000000");
+  g.fillRect(x,y,x-cornerSize+cornerOffset,y-cornerSize+cornerOffset);
+}
+
+function drawFrame(x1,y1,x2,y2) {
+  drawTopLeftCorner(x1,y1);
+  drawTopRightCorner(x2,y1);
+  drawBottomLeftCorner(x1,y2);
+  drawBottomRightCorner(x2,y2);
+  g.setColor(mainColorDark);
+  g.drawRect(x1,y1,x2,y2);
+  g.setColor("#000000");
+  g.fillRect(x1+borderWidth,y1+borderWidth,x2-borderWidth,y2-borderWidth);
+}
+function drawTopFrame(x1,y1,x2,y2) {
+
+  drawBottomLeftCorner(x1,y2);
+  drawBottomRightCorner(x2,y2);
+  g.setColor(mainColorDark);
+  g.drawRect(x1,y1,x2,y2);
+  g.setColor("#000000");
+  g.fillRect(x1+borderWidth,y1+borderWidth,x2-borderWidth,y2-borderWidth);
+}
+function drawBottomFrame(x1,y1,x2,y2) {
+  drawTopLeftCorner(x1,y1);
+  drawTopRightCorner(x2,y1);
+  g.setColor(mainColorDark);
+  g.drawRect(x1,y1,x2,y2);
+  g.setColor("#000000");
+  g.fillRect(x1+borderWidth,y1+borderWidth,x2-borderWidth,y2-borderWidth);
+}
+
+function getUTCTime(d) {
+  return d.toUTCString().split(' ')[4].split(':').map(function(d){return Number(d);});
+}
+
+
+
+
+
+function drawTimeText() {
+  g.setFontAlign(0, 0);
+  var d = new Date();
+  var da = d.toString().split(" ");
+  var dutc = getUTCTime(d);
+
+  var time = da[4].split(":");
+  var hours = time[0],
+      minutes = time[1],
+      seconds = time[2];
+  g.setColor(mainColor);
+  g.setFont(font, timeFontSize);
+  g.drawString(`${hours}:${minutes}:${seconds}`, xyCenter, yposTime, true);
+  g.setFont(font, smallFontSize);
+}
+function drawDateText() {
+  g.setFontAlign(0, 0);
+  var d = new Date();
+  g.setFont(font, dateFontSize);
+  g.drawString(`${d.getDate()}.${d.getMonth()+1}.${d.getFullYear()}`, xyCenter, yposDate, true);
+}
+
+
+
+function drawClock() {
+  // main frame
+  drawFrame(3,10+yOffset,g.getWidth()-3,g.getHeight()-3);
+  // time frame
+  drawTopFrame(20,10+yOffset,220,46+yOffset);
+  // date frame
+  drawTopFrame(28,46+yOffset,212,46+yOffset+35);
+
+  // texts
+  drawTimeText();
+  drawDateText();
+  g.drawImage(img,g.getWidth()/2-(img.width/2),g.getHeight()/2);
+}
+function updateClock() {
+  drawTimeText();
+  drawDateText();
+}
+
+
+Bangle.on('lcdPower', function(on) {
+  if (on) drawClock();
+});
+g.clear();
+
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+
+
+drawClock();
+
+
+setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
+
+// refesh every 100 milliseconds
+setInterval(updateClock, 100);

apps/gbridge/ChangeLog

@@ -8,3 +8,4 @@
 0.07: Move configuration to settings menu
 0.08: Don't turn on LCD at start of every song
 0.09: Update Bluetooth connection state automatically
+0.10: Make widget play well with other Gadgetbridge widgets/apps

apps/gbridge/widget.js

@@ -145,6 +145,7 @@
     }
   }
 
+  var _GB = global.GB;
   global.GB = (event) => {
     switch (event.t) {
       case "notify":
@@ -160,6 +161,7 @@
         handleCallEvent(event);
         break;
     }
+    if(_GB)setTimeout(_GB,0,event);
   };
 
   // Touch control

apps/setting/ChangeLog

@@ -17,3 +17,4 @@
       Move LCD Brightness menu into more general LCD menu
 0.14: Reduce memory usage when running app settings page
 0.15: Reduce memory usage when running default clock chooser (#294)
+0.16: Reduce memory usage further when running app settings page

apps/setting/settings.js

@@ -417,7 +417,7 @@ function showAppSettingsMenu() {
     '< Back': ()=>showMainMenu(),
   }
   const apps = storage.list(/\.info$/)
-    .map(app => {var a=storage.readJSON(app, 1);return (a&&a.settings)?a:undefined})
+    .map(app => {var a=storage.readJSON(app, 1);return (a&&a.settings)?{sortorder:a.sortorder,name:a.name,settings:a.settings}:undefined})
     .filter(app => app) // filter out any undefined apps
     .sort((a, b) => a.sortorder - b.sortorder)
   if (apps.length === 0) {