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

CHANGELOG.md

@@ -6,5 +6,6 @@ Changed for individual apps are listed in `apps/appname/ChangeLog`
 * `Remove All Apps` now doesn't perform a reset before erase - fixes inability to update firmware if settings are wrong
 * Added optional `README.md` file for apps
 * Remove 2v04 version warning, add links in About to official/developer versions
-* Fix issue removing an app that was just installed (Fix #253)
+* Fix issue removing an app that was just installed (fix #253)
 * Add `Favourite` functionality
+* Version number now clickable even when you're at the latest version (fix #291)

apps.json

@@ -119,7 +119,7 @@
   { "id": "setting",
     "name": "Settings",
     "icon": "settings.png",
-    "version":"0.13",
+    "version":"0.14",
     "description": "A menu for setting up Bangle.js",
     "tags": "tool,system",
     "storage": [
@@ -1191,7 +1191,7 @@
     "name": "Numerals Clock",
     "shortName": "Numerals Clock",
     "icon": "numerals.png",
-    "version":"0.01",
+    "version":"0.02",
     "description": "A simple big numerals clock",
     "tags": "numerals,clock",
 	"type":"clock",

apps/numerals/ChangeLog

@@ -1 +1,2 @@
 0.01: New App!
+0.02: Use BTN2 for settings menu like other clocks

apps/numerals/numerals.app.js

@@ -70,7 +70,7 @@ function draw(drawMode){
 Bangle.setLCDMode();
 
 clearWatch();
-setWatch(Bangle.showLauncher, BTN1, {repeat:false,edge:"falling"});
+setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
 
 g.clear();
 clearInterval();

apps/setting/ChangeLog

@@ -15,3 +15,4 @@
 0.13: Fix memory leak for App settings
       Make capitalization more consistent
       Move LCD Brightness menu into more general LCD menu
+0.14: Reduce memory usage when running app settings page

apps/setting/settings.js

@@ -325,8 +325,6 @@ function showClockMenu() {
   return E.showMenu(clockMenu);
 }
 
-
-
 function showSetTimeMenu() {
   d = new Date();
   const timemenu = {
@@ -419,8 +417,8 @@ function showAppSettingsMenu() {
     '< Back': ()=>showMainMenu(),
   }
   const apps = storage.list(/\.info$/)
-    .map(app => storage.readJSON(app, 1))
-    .filter(app => app && app.settings)
+    .map(app => {var a=storage.readJSON(app, 1);return (a&&a.settings)?a:undefined})
+    .filter(app => app) // filter out any undefined apps
     .sort((a, b) => a.sortorder - b.sortorder)
   if (apps.length === 0) {
     appmenu['No app has settings'] = () => { };

js/comms.js

@@ -40,7 +40,7 @@ uploadApp : (app,skipReset) => { // expects an apps.json structure (i.e. with `s
         currentBytes += f.content.length;
         // Chould check CRC here if needed instead of returning 'OK'...
         // E.CRC32(require("Storage").read(${JSON.stringify(app.name)}))
-        Puck.write(`\x10${f.cmd};Bluetooth.println("OK")\n`,(result) => {
+        Puck.write(`${f.cmd};Bluetooth.println("OK")\n`,(result) => {
           if (!result || result.trim()!="OK") {
             Progress.hide({sticky:true});
             return reject("Unexpected response "+(result||""));

js/utils.js

@@ -56,7 +56,7 @@ function getVersionInfo(appListing, appInstalled) {
     if (appListing.version)
       versionText = clicky("v"+appListing.version);
   } else {
-    versionText = (appInstalled.version ? ("v"+appInstalled.version) : "Unknown version");
+    versionText = (appInstalled.version ? (clicky("v"+appInstalled.version)) : "Unknown version");
     if (appListing.version != appInstalled.version) {
       if (appListing.version) versionText += ", latest "+clicky("v"+appListing.version);
       canUpdate = true;