Merge branch 'master' into messagegui

Author: thyttan

apps/93dub/ChangeLog

@@ -5,3 +5,4 @@
 0.05: Display time, even on Thursday
 0.06: Fix light theme issue, where widgets would end up on a light strip
 0.07: Minor code improvements
+0.08: Support Fast Loading

apps/93dub/app.js

@@ -3,7 +3,7 @@
  "shortName":"93 Dub",
  "icon": "93dub.png",
  "screenshots": [{"url":"screenshot.png"}],
- "version": "0.07",
+ "version": "0.08",
  "description": "Fan recreation of orviwan's 91 Dub app for the Pebble smartwatch. Uses assets from his 91-Dub-v2.0 repo",
  "tags": "clock",
  "type": "clock",

apps/93dub/metadata.json

@@ -16,3 +16,4 @@
 0.14: Fixed "Today" and "Yesterday" wrongly displayed for allDay events on some time zones
 0.15: Minor code improvements
 0.16: Correct date for all day events in negative timezones, improve locale display
+0.17: Fixed "Today" and "Tomorrow" labels displaying in non-current weeks

apps/agenda/ChangeLog

@@ -44,11 +44,12 @@ function formatDay(date) {
     return formattedDate;
   }
   const today = new Date(Date.now());
-  if (date.getDay() == today.getDay() && date.getMonth() == today.getMonth())
+  if (date.getDate() == today.getDate())
      return /*LANG*/"Today ";
   else {
-    const tomorrow = new Date(Date.now() + 86400 * 1000);
-    if (date.getDay() == tomorrow.getDay() && date.getMonth() == tomorrow.getMonth()) {
+    var tomorrow = new Date();
+    tomorrow.setDate(tomorrow.getDate() + 1);
+    if (date.getDate() == tomorrow.getDate()) {
        return /*LANG*/"Tomorrow ";
     }
     return formattedDate;

apps/agenda/agenda.js

@@ -1,7 +1,7 @@
 {
   "id": "agenda",
   "name": "Agenda",
-  "version": "0.16",
+  "version": "0.17",
   "description": "Simple agenda",
   "icon": "agenda.png",
   "screenshots": [{"url":"screenshot_agenda_overview.png"}, {"url":"screenshot_agenda_event1.png"}, {"url":"screenshot_agenda_event2.png"}],

apps/agenda/metadata.json

@@ -39,4 +39,10 @@
       Allow `calendar-` to take an array of items to remove
 0.37: Support Gadgetbridge canned responses
 0.38: Don't rewrite settings file on every boot!
-0.39: Move GB message handling into a library to reduce boot time from 40ms->13ms
+0.39: Move GB message handling into a library to reduce boot time from 40ms->13ms
+0.40: Ensure we send health 'activity' message to gadgetbridge (added 2v26)
+0.41: When using `actfetch`, fetch historical activity type too
+0.42: Add handling for android STREAM_MUSIC volume level info, emitting on
+      arrival. (Needs Gadgetbridge nightly (either flavor) for now, or stable
+      version 85 when it's out)
+

apps/android/ChangeLog

@@ -32,7 +32,7 @@
   setInterval(sendBattery, 10*60*1000);
   // Health tracking - if 'realtime' data is sent with 'rt:1', but let's still send our activity log every 10 mins
   Bangle.on('health', h=>{
-    require("android").gbSend({ t: "act", stp: h.steps, hrm: h.bpm, mov: h.movement });
+    require("android").gbSend({ t: "act", stp: h.steps, hrm: h.bpm, mov: h.movement, act: h.activity }); // h.activity added in 2v26
   });
   // Music control
   Bangle.musicControl = cmd => {

apps/android/boot.js

@@ -44,6 +44,10 @@ exports.gbHandler = (event) => {
     "musicinfo" : function() {
       require("messages").pushMessage(Object.assign(event, {t:"modify",id:"music",title:"Music"}));
     },
+    // {t:"audio", v:(percentage of max volume for android STREAM_MUSIC)}
+    "audio" : function() {
+      Bangle.emit("musicVolume", event.v);
+    },
     // {"t":"call","cmd":"incoming/end/start/outgoing","name":"Bob","number":"12421312"})
     "call" : function() {
       Object.assign(event, {
@@ -213,7 +217,8 @@ exports.gbHandler = (event) => {
             ts: sampleTs,
             stp: r.steps,
             hrm: r.bpm,
-            mov: r.movement
+            mov: r.movement,
+            act: r.activity
           });
           actCount++;
         }
@@ -385,4 +390,4 @@ exports.overwriteGPS = () => { // if the overwrite option is set, call this on i
   setTimeout(()=>{
     if (!Bangle.isGPSOn()) require("android").gbSend({ t: "gps_power", status: false });
   },3000);
-};
+};

apps/android/lib.js

@@ -2,7 +2,7 @@
   "id": "android",
   "name": "Android Integration",
   "shortName": "Android",
-  "version": "0.39",
+  "version": "0.42",
   "description": "Display notifications/music/etc sent from the Gadgetbridge app on Android. This replaces the old 'Gadgetbridge' Bangle.js widget.",
   "icon": "app.png",
   "tags": "tool,system,messages,notifications,gadgetbridge",