Added clkinfosunrise to allow clocks to display sunrise and sunset if they use clock_info

README.md

@@ -255,8 +255,11 @@ and which gives information about the app for the Launcher.
                               //   'app' - an application
                               //   'clock' - a clock - required for clocks to automatically start
                               //   'widget' - a widget
+                              //   'module' - this provides a module that can be used with 'require'.
+                              //              'provides_modules' should be used if type:module is specified
                               //   'bootloader' - an app that at startup (app.boot.js) but doesn't have a launcher entry for 'app.js'
                               //   'settings' - apps that appear in Settings->Apps (with appname.settings.js) but that have no 'app.js'
+                              //   'clkinfo' - Provides a 'myapp.clkinfo.js' file that can be used to display info in clocks - see modules/clock_info.js
                               //   'RAM' - code that runs and doesn't upload anything to storage
                               //   'launch' - replacement 'Launcher'
                               //   'textinput' - provides a 'textinput' library that allows text to be input on the Bangle
@@ -265,9 +268,16 @@ and which gives information about the app for the Launcher.
                               //   'notify' - provides 'notify' library for showing notifications
                               //   'locale' - provides 'locale' library for language-specific date/distance/etc
                               //              (a version of 'locale' is included in the firmware)
-                              //   'module' - this provides a module that can be used with 'require'.
-                              //              'provides_modules' should be used if type:module is specified
   "tags": "",                 // comma separated tag list for searching
+                              // common types are:
+                              //   'clock' - it's a clock
+                              //   'widget' - it is (or provides) a widget
+                              //   'outdoors' - useful for outdoor activities
+                              //   'tool' - a useful utility (timer, calculator, etc)
+                              //   'game' - a game
+                              //   'bluetooth' - uses Bluetooth LE
+                              //   'system' - used by the system
+                              //   'clkinfo' - provides or uses clock_info module for data on your clock face (see modules/clock_info.js)
   "supports": ["BANGLEJS2"],  // List of device IDs supported, either BANGLEJS or BANGLEJS2
   "dependencies" : { "notify":"type" } // optional, app 'types' we depend on (see "type" above)
   "dependencies" : { "messages":"app" } // optional, depend on a specific app ID

apps/agenda/metadata.json

@@ -5,7 +5,7 @@
   "description": "Simple agenda",
   "icon": "agenda.png",
   "screenshots": [{"url":"screenshot_agenda_overview.png"}, {"url":"screenshot_agenda_event1.png"}, {"url":"screenshot_agenda_event2.png"}],
-  "tags": "agenda",
+  "tags": "agenda,clkinfo",
   "supports": ["BANGLEJS","BANGLEJS2"],
   "readme": "README.md",
   "allow_emulator": true,

apps/aptsciclk/metadata.json

@@ -5,6 +5,7 @@
     "version": "0.08",
     "description": "A clock based on the portal series",
     "icon": "app.png",
+    "screenshots": [{"url":"screenshot.png"}],
     "type": "clock",
     "tags": "clock",
     "supports": ["BANGLEJS2"],

apps/bwclk/metadata.json

@@ -7,7 +7,7 @@
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"}, {"url":"screenshot_2.png"}, {"url":"screenshot_3.png"}, {"url":"screenshot_4.png"}],
   "type": "clock",
-  "tags": "clock",
+  "tags": "clock,clkinfo",
   "supports": ["BANGLEJS2"],
   "allow_emulator": true,
   "storage": [

apps/clkinfosunrise/ChangeLog

@@ -0,0 +1 @@
+0.01: New App!

apps/clkinfosunrise/clkinfo.js

@@ -0,0 +1,33 @@
+(function() {
+  // get today's sunlight times for lat/lon
+  var sunrise, sunset;
+
+  function calculate() {
+    var SunCalc = require("https://raw.githubusercontent.com/mourner/suncalc/master/suncalc.js");
+    const locale = require("locale");
+    var location = require("Storage").readJSON("mylocation.json",1)||{};
+    location.lat = location.lat||51.5072;
+    location.lon = location.lon||0.1276;
+    location.location = location.location||"London";
+    var times = SunCalc.getTimes(new Date(), location.lat, location.lon);
+    sunrise = locale.time(times.sunrise,1);
+    sunset = locale.time(times.sunset,1);
+    /* do we want to re-calculate this every day? Or we just assume
+    that 'show' will get called once a day? */
+  }
+
+  return {
+    name: "Bangle",
+    items: [
+      { name : "Sunrise",
+        get : () => ({ text : sunrise,
+                       img : atob("GBiBAAAAAAAAAAAAAAAYAAA8AAB+AAD/AAAAAAAAAAAAAAAYAAAYAAQYIA4AcAYAYAA8AAB+AAD/AAH/gD///D///AAAAAAAAAAAAA==") }),
+        show : calculate, hide : () => {}
+      }, { name : "Sunset",
+        get : () => ({ text : sunset,
+                       img : atob("GBiBAAAAAAAAAAAAAAB+AAA8AAAYAAAYAAAAAAAAAAAAAAAYAAAYAAQYIA4AcAYAYAA8AAB+AAD/AAH/gD///D///AAAAAAAAAAAAA==") }),
+        show : calculate, hide : () => {}
+      }
+    ]
+  };
+})

apps/clkinfosunrise/metadata.json

@@ -0,0 +1,12 @@
+{ "id": "clkinfosunrise",
+  "name": "Sunrise Clockinfo",
+  "version":"0.01",
+  "description": "For clocks that display 'clockinfo' (messages that can be cycled through using the clock_info module) this displays sunrise and sunset based on the location from the 'My Location' app",
+  "icon": "app.png",
+  "type": "clkinfo",
+  "tags": "clkinfo,sunrise",
+  "supports" : ["BANGLEJS2"],
+  "storage": [
+    {"name":"sunrise.clkinfo.js","url":"clkinfo.js"}
+  ]
+}

apps/ha/metadata.json

@@ -5,7 +5,7 @@
   "description": "Integrates your BangleJS into HomeAssistant.",
   "icon": "ha.png",
   "type": "app",
-  "tags": "tool",
+  "tags": "tool,clkinfo",
   "readme": "README.md",
   "supports": ["BANGLEJS2"],
   "custom": "custom.html",

apps/smpltmr/metadata.json

@@ -5,7 +5,7 @@
   "version": "0.04",
   "description": "A very simple app to start a timer.",
   "icon": "app.png",
-  "tags": "tool,alarm,timer",
+  "tags": "tool,alarm,timer,clkinfo",
   "dependencies": {"scheduler":"type"},
   "supports": ["BANGLEJS2"],
   "screenshots": [{"url":"screenshot_1.png"}, {"url": "screenshot_2.png"}, {"url": "screenshot_3.png"}, {"url": "screenshot_4.png"}],

apps/weather/metadata.json

@@ -5,7 +5,7 @@
   "description": "Show Gadgetbridge weather report",
   "icon": "icon.png",
   "screenshots": [{"url":"screenshot.png"}],
-  "tags": "widget,outdoors",
+  "tags": "widget,outdoors,clkinfo",
   "supports": ["BANGLEJS","BANGLEJS2"],
   "readme": "readme.md",
   "storage": [

bin/sanitycheck.js

@@ -81,7 +81,7 @@ const APP_KEYS = [
 const STORAGE_KEYS = ['name', 'url', 'content', 'evaluate', 'noOverwite', 'supports', 'noOverwrite'];
 const DATA_KEYS = ['name', 'wildcard', 'storageFile', 'url', 'content', 'evaluate'];
 const SUPPORTS_DEVICES = ["BANGLEJS","BANGLEJS2"]; // device IDs allowed for 'supports'
-const METADATA_TYPES = ["app","clock","widget","bootloader","RAM","launch","scheduler","notify","locale","settings","waypoints","textinput","module"]; // values allowed for "type" field
+const METADATA_TYPES = ["app","clock","widget","bootloader","RAM","launch","scheduler","notify","locale","settings","waypoints","textinput","module","clkinfo"]; // values allowed for "type" field
 const FORBIDDEN_FILE_NAME_CHARS = /[,;]/; // used as separators in appid.info
 const VALID_DUPLICATES = [ '.tfmodel', '.tfnames' ];
 const GRANDFATHERED_ICONS = ["s7clk",  "snek", "astral", "alpinenav", "slomoclock", "arrow", "pebble", "rebble"];

modules/clock_info.js

@@ -129,13 +129,16 @@ Simply supply the menu data (from .load) and a function to draw the clock info.
 
 For example:
 
-var clockInfoMenu = require("clock_info").addInteractive(require("clock_info").load(), (itm, info) => {
+let clockInfoMenu = require("clock_info").addInteractive(require("clock_info").load(), (itm, info) => {
-  var y = 0;
+  var x = 20, y = 20, w=80, h=48;
-  g.reset().setFont("6x8:2").setFontAlign(-1,0);
+  g.reset().clearRect(x,y,x+w-1,y+h-1);
-  g.clearRect(0,y,g.getWidth(),y+23);
+  g.drawRect(x,y,x+w-1,y+h-1); // debug - just to show where we are
-  g.drawImage(info.img, 0,y);
+  g.drawImage(info.img, x+w/2-12,y+4);
-  g.drawString(info.text, 48,y+12);
+  g.setFont("6x8:2").setFontAlign(0,0).drawString(info.text, x+w/2,y+36);
 });
+// then when clock 'unloads':
+clockInfoMenu.remove();
+delete clockInfoMenu;
 
 Then if you need to unload the clock info so it no longer
 uses memory or responds to swipes, you can call clockInfoMenu.remove()