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

2022-08-19 08:42:10 +01:00 · 2022-08-19 08:42:10 +01:00 · fb7b69379a
parent 7f8d27b95e 9965f372e7
commit fb7b69379a
17 changed files with 91 additions and 42 deletions
--- a/apps/bwclk/ChangeLog
+++ b/apps/bwclk/ChangeLog
@ -12,4 +12,5 @@
 0.12: Implements a 2D menu.
 0.13: Clicks < 24px are for widgets, if fullscreen mode is disabled.
 0.14: Adds humidity to weather data.
-0.15: Added option for a dynamic mode to show widgets only if unlocked.
+0.15: Added option for a dynamic mode to show widgets only if unlocked.
+0.16: You can now show your agenda if your calendar is synced with Gadgetbridge.
--- a/apps/bwclk/README.md
+++ b/apps/bwclk/README.md
@ -7,6 +7,7 @@ A very minimalistic clock to mainly show date and time.
 The BW clock provides many features and also 3rd party integrations:
 - Bangle data such as steps, heart rate, battery or charging state.
 - A timer can be set directly. *Requirement: Scheduler library*
+- Show agenda entries. *Requirement: Gadgetbridge calendar sync enabled*
 - Weather temperature as well as the wind speed can be shown. *Requirement: Weather app*
 - HomeAssistant triggers can be executed directly. *Requirement: HomeAssistant app*

@ -28,11 +29,11 @@ to e.g. send a trigger via HomeAssistant once you selected it.
 ```
                    +5min
                      |
-  Bangle   -- Timer[Optional] -- Weather[Optional] -- HomeAssistant [Optional]
-    |                 |              |                       |
-   Bpm              -5min         Temperature             Trigger1
-    |                                |                       |
-  Steps                             ...                     ...
+  Bangle   -- Timer[Optional] -- Agenda 1[Optional] -- Weather[Optional] -- HomeAssistant [Optional]
+    |                 |            |                          |                       |
+   Bpm              -5min        Agenda 2                Temperature             Trigger1
+    |                              |                          |                       |
+  Steps                           ...                        ...                     ...
    |
  Battery
 ```
--- a/apps/bwclk/app.js
+++ b/apps/bwclk/app.js
@ -33,17 +33,6 @@ for (const key in saved_settings) {
 * Assets
 */
 // Manrope font
-Graphics.prototype.setXLargeFont = function(scale) {
-  // Actual height 53 (55 - 3)
-  this.setFontCustom(
-    E.toString(require('heatshrink').decompress(atob('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'))),
-    46,
-    atob("FR4uHyopKyksJSssGA=="),
-    70+(scale<<8)+(1<<16)
-  );
-};
-
-
 Graphics.prototype.setLargeFont = function(scale) {
  // Actual height 47 (48 - 2)
  this.setFontCustom(
@ -75,6 +64,19 @@ Graphics.prototype.setSmallFont = function(scale) {
 };


+Graphics.prototype.setMiniFont = function(scale) {
+  // Actual height 18 (17 - 0)
+  this.setFontCustom(
+    atob('AAAAAAAAAAAAAAAAAAf+wf+QAAAAAAAAAcAAcAAAAAcAAAAAAAAAAAAEACEADEADHwD/gP8AfEATHwDfwH+AfEAbEADEADAACAAAAAAAADhwHwwMYY8Yc8YeMIYMMYHHwDHgAAAAAAPAAfgwYhwYjgZnAPuAGcAA5AB3gDswHMwOMwcMwIHgAAAAAACPgP/gZwwY4wYYwYMwYGwMDgAfgAAwAAAAAAcAAcAAAAAAAAAAAAPAD/8PgPcADQAAAAAAAAYABOAHHw+B/4AAAAAAAAAEAAEgAHgAfAAXgAFgAEAAAAAAAAAQAAQAAQAD/AD/AAQAAQAAQAAQAAAAAA0AA4AAAAAAAAAAIAAIAAIAAIAAIAAIAAAAAAAAAwAAwAAAAAAAAAABwAPwD+AfgAYAAAAAAAAH/AP/gYAwYAwYAwYAwYAwP/gH/AAAAAAAMAAYAAf/wf/wAAAAAAAAAGAwOBwYDwYHwYOwYMwc4wPwwDAQAAAQBgYBwZgwbgwfgwewwc/gYPAAAAAAAAOAA+ADyAPCAcCAQCAA/wAfwACAAAAAAAfjAfxgZgwZgwZgwZgwZxgQ/gAOAAAAH/AP/gZhwZgwZAwZgwZgwI/gAfAAAAQAAYAAYAwYDwYfAZ4AfgAcAAAAAAAAGPAP/gZwwYwwYwwZwwf5wPfgAGAAAAHgAPxgYYwYIwYIwYIwYYwP/gH/AAAAAAAAAAAxgAxgAAAAAAAAADA0DA4AAAAAAAAAAAAAcAA+ABnADDgABAAAAAAAAAAAAAAAABIABIABIABIABIABIABIABIABIABIAAAAAAAAAAAAAAAAAAADDgBnAA+AAcAAIAAAAAAAAAAOAAcAAYAAYOwYcAYwAPgAHAAAAAAPAA/wDg4DAYGOMGfEEREEREGfEGfMGBADBAB/AA+AAAAAAQADwAfAD+AfiAcCAfCAHyAA/AAHwAAwAAAf/wf/wQQwQQwQQwYQwY4wf4wHvgAHAA4AH/AODgcBwYAwYAwYAwYAwYAwcBwODgHHAAAAAAAf/wf/wYAwYAwYAwYAwYAwcBwPHgH/AAQAAAAf/wf/wYQwYQwYQwYQwYQwYQwQAQAAAf/wf/wYQAYQAYQAYQAYQAQAAA4AH/AODgcBwYAwYAwYAwYQwYQwMRgOfgAeAAAAAAAf/wf/wAQAAQAAQAAQAAQAAQAA4Af/wAAAAAAf/wf/wAAAABgABwAAwAAwAAwf/wf/gAAAAAAf/wf/wA4AB8ADOAGHAMDgYBwQAwAAAAAAf/wf/wAAwAAwAAwAAwAAwAAQAAAf/wf/wHgAB4AAeAAHgABwAHgAeAB4AHgAf/wf/wAAAAAAf/wf/wOAAHgABwAA8AAOAAHgf/wf/wAAAA4AH/AODgcBwYAwYAwYAwYAwYAwcBwODgH/AA4AAAAf/wf/wYIAYIAYIAYIAYYAc4APwADAAA4AH/AODgcBwYAwYAwYAwYAwYCwcDwODgH/wA4AAAAf/wf/wYIAYIAYIAYMAYeAc/gPxwDAQAAAHDgPhgYgwYwwYwwYQwYYwMZwOPgAHAQAAYAAYAAYAAf/wf/wYAAYAAYAAYAAQAAAAAf+Af/gABwAAwAAwAAwAAwAAwADgf/Af8AAAAYAAfAAH4AA/AAHwABwAHwA+AHwAeAAQAAYAAfAAH8AAfgADwAPwD+AfgAeAAPwAB+AAHwADwA/AP4AeAAQAAQAQYAwODgHHAB8AA4AD8AHHAcDgYAwQAQQAAcAAPAADwAA/wA/wDwAPAAcAAQAAAAAYAwYBwYHwYOwY4wbwwfAwcAwYAwAAAAAAAAAf//f//QAAQAAAAAAAAcAAfgAD+AAPwAAwAAAAAAQAAQAAf//f//AAAAAAAAAAAADAAGAAMAAYAAYAAMAAGAADAAAAAAAAAAEAAEAAEAAEAAEAAEAAEAAEAAEAAEAAEAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABngDuwDMQDMQDIwDIwD/wB/wAAAAAAf/wf/wDAwDAwDAwDAwDAwB/gA/AAAAAAAA/ABzgDAwDAwDAwDAwDhwBhgAAAAAAA/ABzgDAwDAwDAwDAwBhgf/wf/wAAAAAAA/AB/gDIwDIwDIwDIwDIwB5gA5AAAACAACAAP/wf/wSAASAAAAAA/CBzmDAzDAzDAzDAzBhnD/+D/4AAAAAAf/wf/wDAADAADAADAADgAB/wAfwAAAAAAb/wb/wAAAAADAADb//AAAAAAAAAf/wf/wAMAA+ABzADhgDAwCAQAAAf/wf/wAAAAAAD/wD/wDAADAADAADAAB/wB/wDAACAADAADgAB/wAAAAAAD/wD/wDAADAADAADAADgAB/wAfwAAAAAAA/ABzgDAwDAwDAwDAwDAwB/gA/AAAAAAAD//D//DAwDAwDAwDAwDAwB/gA/AAAAAAAA/ABzgDAwDAwDAwDAwBhgD//D//AAAAAAD/wD/wDAADAADAAAAABxgD5wDIwCMwDMwDMwBnwAjgCAACAAf/gf/wCAwCAQCAQAAAD/AD/gAAwAAwAAwAAwABgD/wD/wAAACAADwAA+AAPwABwAHwA+ADwACAACAAD4AA/AAHwAHwA+ADwAD4AAfAADwAHwB+ADwACAACAQDAwBhgA/AAeAAeABzgDhwCAQCAADwAB8AAPHAD+AD4AfAD4ADgAAAQCAwCDwCHQCMQC4QDwQDAQCAQAAAAAAAAAACAP//f//YAAQAAAAAAAAf/wf/wAAAAAAAAAQAAf4ff//ADAAAAAAAAAAAAAAAAAcAAcAAYAAYAAMAAMAAcAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'),
+    32,
+    atob("BAYHEQsQDAQICAgKBQgFBwsHCgoLCgsJCgsFBQsOCwkQCwsNDAoJDQwECAsJDwwNCw0LCwsNCxELCgsHBwcMDAkKCwoLCwYLCwQFCQQPCwsLCwYJBwsJDgkJCggFCAwS"),
+    18+(scale<<8)+(1<<16)
+  );
+  return this;
+};
+
+
+
 function imgLock(){
  return {
    width : 16, height : 16, bpp : 1,
@ -204,6 +206,42 @@ try{
  // If sched is not installed, we hide this menu item
 }

+
+/*
+ * AGENDA MENU
+ */
+var agendaIdx = 0;
+var agenda = storage.readJSON("android.calendar.json");
+if(agenda !== undefined){
+  agenda = agenda.sort((a,b)=>a.timestamp - b.timestamp);
+
+  function nextAgendaEntry(){
+    agendaIdx += 1;
+  }
+
+  function previousAgendaEntry(){
+    agendaIdx -= 1;
+  }
+
+  menu.push([
+    function(){
+      var now = new Date();
+      agenda = agenda.filter(ev=>ev.timestamp + ev.durationInSeconds > now/1000);
+
+      agendaIdx = agendaIdx < 0 ? 0 : agendaIdx;
+      agendaIdx = agendaIdx >= agenda.length ? agendaIdx -1 : agendaIdx;
+      var entry = agenda[agendaIdx];
+      var title = entry.title.slice(0,15);
+      var date = new Date(entry.timestamp*1000);
+      var dateStr = locale.date(date).replace(/\d\d\d\d/,"");
+      dateStr += entry.durationInSeconds < 86400 ? "  |  " + locale.time(date,1) : "";
+
+      return [title + "\n" + dateStr, undefined, () => nextAgendaEntry(), () => previousAgendaEntry(), null]
+    },
+  ]);
+}
+
+
 /*
 * WEATHER MENU
 */
@ -443,11 +481,7 @@ function drawTime(){

  // Show large or small time depending on info entry
  if(menuName == null){
-    if(settings.hideColon){
-      g.setXLargeFont();
-    } else {
-      g.setLargeFont();
-    }
+    g.setLargeFont();
  } else {
    y -= 15;
    g.setMediumFont();
@ -461,7 +495,13 @@ function drawTime(){

  y += 35;
  g.setFontAlign(0,0);
-  g.setSmallFont();
+
+  if(menuName.split('\n').length > 1){
+    g.setMiniFont();
+  } else {
+    g.setSmallFont();
+  }
+
  var imgWidth = 0;
  if(menuImg !== undefined){
    imgWidth = 24.0;
@ -590,6 +630,9 @@ Bangle.on('touch', function(btn, e){
  }

  if(is_right){
+    // A bit hacky but we ensure that always the first agenda entry is shown...
+    agendaIdx = 0;
+
    Bangle.buzz(40, 0.6);
    settings.menuPosX = (settings.menuPosX+1) % menu.length;
    settings.menuPosY = 0;
@ -597,6 +640,9 @@ Bangle.on('touch', function(btn, e){
  }

  if(is_left){
+    // A bit hacky but we ensure that always the first agenda entry is shown...
+    agendaIdx = 0;
+
    Bangle.buzz(40, 0.6);
    settings.menuPosY = 0;
    settings.menuPosX  = settings.menuPosX-1;
@ -606,7 +652,7 @@ Bangle.on('touch', function(btn, e){

  if(is_center){
    var menuEntry = getMenuEntry();
-    if(menuEntry.length > 4){
+    if(menuEntry.length > 4 && menuEntry[4] != null){
      Bangle.buzz(80, 0.6).then(()=>{
        try{
          menuEntry[4]();
--- a/apps/bwclk/metadata.json
+++ b/apps/bwclk/metadata.json
@ -1,7 +1,7 @@
 {
  "id": "bwclk",
  "name": "BW Clock",
-  "version": "0.15",
+  "version": "0.16",
  "description": "A very minimalistic clock to mainly show date and time.",
  "readme": "README.md",
  "icon": "app.png",
--- a/apps/macwatch2/ChangeLog
+++ b/apps/macwatch2/ChangeLog
@ -1,3 +1,4 @@
 0.01: Created first version of the app with numeric date, only works in light mode
 0.02: New icon, shimmied date right a bit
 0.03: Incorporated improvements from Peer David for accuracy, fix dark mode, widgets run in background
+0.04: Changed clock to use 12/24 hour format based on locale
--- a/apps/macwatch2/app.js
+++ b/apps/macwatch2/app.js
@ -30,15 +30,15 @@ function draw() {
  g.setFontAlign(0, -1, 0);
  g.setColor(0,0,0);
  var d = new Date();
-  var da = d.toString().split(" ");
-  hh = da[4].substr(0,2);
-  mi = da[4].substr(3,2);
+  var dt = require("locale").time(d, 1);
+  var hh = dt.split(":")[0];
+  var mm = dt.split(":")[1];
+  g.drawString(hh, 52, 65, true);
+  g.drawString(mm, 132, 65, true);
+  g.drawString(':', 93,65);
  dd = ("0"+(new Date()).getDate()).substr(-2);
  mo = ("0"+((new Date()).getMonth()+1)).substr(-2);
  yy = ("0"+((new Date()).getFullYear())).substr(-2);
-  g.drawString(hh, 52, 65, true);
-  g.drawString(mi, 132, 65, true);
-  g.drawString(':', 93,65);
  g.setFontCustom(font, 48, 8, 521);
  g.drawString(dd + ':' + mo + ':' + yy, 88, 120, true);
  
--- a/apps/macwatch2/metadata.json
+++ b/apps/macwatch2/metadata.json
@ -2,7 +2,7 @@
  "name": "MacWatch2",
  "shortName":"MacWatch2",
  "icon": "app.png",
-  "version":"0.03",
+  "version":"0.04",
  "description": "Classic Mac Finder clock",
  "type": "clock",
  "tags": "clock",
--- a/bin/apploader.js
+++ b/bin/apploader.js
@ -1,4 +1,4 @@
-#!/usr/bin/nodejs
+#!/usr/bin/env nodejs
 /* Simple Command-line app loader for Node.js
 ===============================================

--- a/bin/create_app_supports_field.js
+++ b/bin/create_app_supports_field.js
@ -1,4 +1,4 @@
-#!/usr/bin/nodejs
+#!/usr/bin/env nodejs
 /* Quick hack to add proper 'supports' field to apps.json
 */

--- a/bin/create_apps_json.sh
+++ b/bin/create_apps_json.sh
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # ================================================================
 # apps.json used to contain the metadata for every app. Now the
 # metadata is stored in each apps's directory - app/yourapp/metadata.js
--- a/bin/firmwaremaker.js
+++ b/bin/firmwaremaker.js
@ -1,4 +1,4 @@
-#!/usr/bin/nodejs
+#!/usr/bin/env nodejs
 /*
 Mashes together a bunch of different apps to make
 a single firmware JS file which can be uploaded.
--- a/bin/firmwaremaker_c.js
+++ b/bin/firmwaremaker_c.js
@ -1,4 +1,4 @@
-#!/usr/bin/node
+#!/usr/bin/env node
 /*
 Mashes together a bunch of different apps into a big binary blob.
 We then store this *inside* the Bangle.js firmware and can use it
--- a/bin/pre-publish.sh
+++ b/bin/pre-publish.sh
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 cd `dirname $0`/..
 nodejs bin/sanitycheck.js || exit 1
--- a/bin/sanitycheck.js
+++ b/bin/sanitycheck.js
@ -1,4 +1,4 @@
-#!/usr/bin/node
+#!/usr/bin/env node
 /* Checks for any obvious problems in apps.json
 */

--- a/bin/thumbnailer.js
+++ b/bin/thumbnailer.js
@ -1,4 +1,4 @@
-#!/usr/bin/node
+#!/usr/bin/env node

 /*
 var EMULATOR = "banglejs2";
--- a/tests/Layout/bin/runalltests.sh
+++ b/tests/Layout/bin/runalltests.sh
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 cd `dirname $0`/..
 ls tests/*.js | xargs -I{} bin/runtest.sh {}
--- a/tests/Layout/bin/runtest.sh
+++ b/tests/Layout/bin/runtest.sh
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Requires Linux x64 (for ./espruino)
 # Also imagemagick for display