Merge remote-tracking branch 'WhelanB/clkshortcuts' into app-loader

Author: thyttan

README.md

@@ -270,7 +270,8 @@ 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)
-  "tags": "",                 // comma separated tag list for searching
+                              //   'defaultconfig' - a set of apps that will can be installed and will wipe out all previously installed apps
+  "tags": "",                 // comma separated tag list for searching (don't include uppercase or spaces)
                               // common types are:
                               //   'clock' - it's a clock
                               //   'widget' - it is (or provides) a widget

apps/UI4swatch/metadata.json

@@ -5,7 +5,7 @@
   "version": "0.02",
   "description": "A UI/UX for espruino smartwatches, displays dinamically calc. x,y coordinates.",
   "icon": "app.png",
-  "tags": "Color,input,buttons,touch,UI",
+  "tags": "color,input,buttons,touch,ui",
   "supports": ["BANGLEJS"],
   "readme": "README.md",
   "screenshots": [{"url":"UI4swatch_icon.png"},{"url":"UI4swatch_s1.png"}],

apps/Uke/metadata.json

@@ -4,8 +4,8 @@
   "version": "0.04",
   "description": "Wrist mounted ukulele chords",
   "icon": "app.png",
-  "tags": "uke, chords",
-  "supports" : ["BANGLEJS2"],  
+  "tags": "uke,chords",
+  "supports" : ["BANGLEJS2"],
   "readme": "README.md",
   "storage": [
     {"name":"Uke.app.js","url":"app.js"},

apps/bblobface/metadata.json

@@ -6,7 +6,7 @@
   "description": "A fully featured watch face with a playable game on the side.",
   "readme":"README.md",
   "type": "clock",
-  "tags": "clock, game",
+  "tags": "clock,game",
   "supports" : ["BANGLEJS2"],
   "storage": [
     {"name":"bblobface.app.js","url":"app.js"},

apps/beeptest/metadata.json

@@ -5,7 +5,7 @@
   "version": "0.01",
   "description": "Aerobic fitness test created by Léger & Lambert",
   "icon": "beeptest.png",
-  "tags": "Health",
+  "tags": "health",
   "supports": ["BANGLEJS2"],
   "readme": "README.md",
   "storage": [

apps/bordle/metadata.json

@@ -6,7 +6,7 @@
   "description": "Bangle version of a popular word search game",
   "supports" : ["BANGLEJS2"],
   "readme": "README.md",
-  "tags": "game, text",
+  "tags": "game,text",
   "storage": [
     {"name":"bordle.app.js","url":"bordle.app.js"},
     {"name":"wordlencr.txt","url":"wordlencr.txt"},

apps/bwclk/ChangeLog

@@ -32,4 +32,5 @@ clkinfo.addInteractive that would cause ReferenceError.
 0.30: Use widget_utils
 0.31: Use clock_info module as an app
 0.32: Make the border of the clock_info box extend all the way to the right of the screen.
-0.33: Fix issue rendering ClockInfos with for fg+bg color set to the same (#2749)
+0.33: Fix issue rendering ClockInfos with for fg+bg color set to the same (#2749)
+0.34: Support 12-hour time format

apps/bwclk/app.js

@@ -239,11 +239,9 @@ let drawTime = function() {
   var y = y1;
   var date = new Date();
 
-  var hours = String(date.getHours());
-  var minutes = date.getMinutes();
-  minutes = minutes < 10 ? String("0") + minutes : minutes;
-  var colon = settings.hideColon ? "" : ":";
-  var timeStr = hours + colon + minutes;
+  var timeStr = locale.time(date, 1);
+  if (settings.hideColon)
+    timeStr = timeStr.replace(":", "");
 
   // Set y coordinates correctly
   y += parseInt((H - y)/2) + 5;

apps/bwclk/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "bwclk",
   "name": "BW Clock",
-  "version": "0.33",
+  "version": "0.34",
   "description": "A very minimalistic clock.",
   "readme": "README.md",
   "icon": "app.png",

apps/bwclklite/ChangeLog

@@ -35,4 +35,5 @@ clkinfo.addInteractive that would cause ReferenceError.
       Remove invertion of theme as this doesn'twork very well with fastloading.
       Do an quick inital fillRect on theclock info area.
 0.33: Make the border of the clock_info box extend all the way to the right of the screen.
-0.34: Fix issue rendering ClockInfos with for fg+bg color set to the same (#2749)
+0.34: Fix issue rendering ClockInfos with for fg+bg color set to the same (#2749)
+0.35: Support 12-hour time format