Merge pull request #3099 from nxdefiant/master

Fixes for alarm, settings & waypoints

apps/alarm/ChangeLog

@@ -47,3 +47,4 @@
 0.42: Fix date not getting saved in event edit menu when tapping Confirm
 0.43: New settings: Show confirm, Show Overflow, Show Type.
 0.44: Add "delete timer after expiration" setting to events.
+0.45: Fix new alarm when selectedAlarm is undefined

apps/alarm/app.js

@@ -106,7 +106,7 @@ function showEditAlarmMenu(selectedAlarm, alarmIndex, withDate) {
   var isNew = alarmIndex === undefined;
 
   var alarm = require("sched").newDefaultAlarm();
-  if (withDate || selectedAlarm.date) {
+  if (withDate || (selectedAlarm && selectedAlarm.date)) {
     alarm.del = require("sched").getSettings().defaultDeleteExpiredTimers;
   }
   alarm.dow = handleFirstDayOfWeek(alarm.dow);

apps/alarm/metadata.json

@@ -2,7 +2,7 @@
   "id": "alarm",
   "name": "Alarms & Timers",
   "shortName": "Alarms",
-  "version": "0.44",
+  "version": "0.45",
   "description": "Set alarms and timers on your Bangle",
   "icon": "app.png",
   "tags": "tool,alarm",

apps/gpsnav/metadata.json

@@ -8,7 +8,7 @@
   "tags": "tool,outdoors,gps",
   "supports": ["BANGLEJS","BANGLEJS2"],
   "readme": "README.md",
-  "dependencies" : { "waypoints":"type" },
+  "dependencies" : { "waypoints":"app" },
   "storage": [
     {"name":"gpsnav.app.js","url":"app.min.js","supports":["BANGLEJS"]},
     {"name":"gpsnav.app.js","url":"app_b2.js","supports":["BANGLEJS2"]},

apps/gpstrek/metadata.json

@@ -8,7 +8,7 @@
   "tags": "tool,outdoors,gps",
   "supports": ["BANGLEJS2"],
   "readme": "README.md",
-  "dependencies" : { "waypoints":"type" },
+  "dependencies" : { "waypoints":"app" },
   "interface" : "interface.html",
   "storage": [
     {"name":"gpstrek.app.js","url":"app.js"},

apps/kitchen/metadata.json

@@ -8,7 +8,7 @@
   "tags": "tool,outdoors,gps",
   "supports": ["BANGLEJS"],
   "readme": "README.md",
-  "dependencies" : { "waypoints":"type" },
+  "dependencies" : { "waypoints":"app" },
   "storage": [
     {"name":"kitchen.app.js","url":"kitchen.app.js"},
     {"name":"stepo2.kit.js","url":"stepo2.kit.js"},

apps/setting/ChangeLog

@@ -76,4 +76,4 @@ of 'Select Clock'
 0.66: Fix LCD calibration bug where it would come on again after the
 	calibration was done.
 0.67: Rename 'Wake on BTN1/Touch' to 'Wake on Button/Tap' on Bangle.js 2
-
+0.68: Fix syntax error

apps/setting/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "setting",
   "name": "Settings",
-  "version": "0.67",
+  "version": "0.68",
   "description": "A menu for setting up Bangle.js",
   "icon": "settings.png",
   "tags": "tool,system",

apps/setting/settings.js

@@ -459,7 +459,6 @@ function showLCDMenu() {
           settings.options.wakeOnBTN1 = !settings.options.wakeOnBTN1;
           updateOptions();
         }
-      }
       },
       /*LANG*/'Wake on Tap': {
         value: settings.options.wakeOnTouch,
@@ -467,6 +466,7 @@ function showLCDMenu() {
           settings.options.wakeOnTouch = !settings.options.wakeOnTouch;
           updateOptions();
         }
+      }
     });
   else
     Object.assign(lcdMenu, {

apps/speedalt/metadata.json

@@ -8,7 +8,7 @@
   "type": "app",
   "tags": "tool,outdoors",
   "supports": ["BANGLEJS","BANGLEJS2"],
-  "dependencies" : { "waypoints":"type" },
+  "dependencies" : { "waypoints":"app" },
   "readme": "README.md",
   "allow_emulator": true,
   "storage": [

apps/speedalt2/metadata.json

@@ -8,7 +8,7 @@
   "type": "app",
   "tags": "tool,outdoors",
   "supports": ["BANGLEJS"],
-  "dependencies" : { "waypoints":"type" },
+  "dependencies" : { "waypoints":"app" },
   "readme": "README.md",
   "allow_emulator": true,
   "storage": [

apps/waypointer/metadata.json

@@ -6,7 +6,7 @@
   "icon": "waypointer.png",
   "tags": "tool,outdoors,gps",
   "supports": ["BANGLEJS", "BANGLEJS2"],
-  "dependencies" : { "waypoints":"type", "magnav" : "app" },
+  "dependencies" : { "waypoints":"app", "magnav" : "app" },
   "readme": "README.md",
   "storage": [
     {"name":"waypointer.app.js","url":"app.js"},

apps/waypoints/ChangeLog

@@ -1,2 +1,4 @@
 0.01: New App!
 0.02: Merge waypoint_editor here, so waypoints can be edited on device, too.
+0.03: Do not register as type waypoint - show in launcher
+      Fixes for Bangle.js 1 & not installed textinput

apps/waypoints/metadata.json

@@ -1,10 +1,9 @@
 { "id": "waypoints",
   "name": "Waypoints",
-  "version":"0.02",
+  "version":"0.03",
   "description": "Provides 'waypoints.json' used by various navigation apps, as well as a way to edit it from the App Loader or from the device",
   "icon": "app.png",
   "tags": "tool,outdoors,gps",
-  "type": "waypoints",
   "supports" : ["BANGLEJS","BANGLEJS2"],
   "readme": "README.md",
   "interface": "interface.html",

apps/waypoints/waypoints.app.js

@@ -1,6 +1,7 @@
 /* Thanks to pinsafe from BangleApps repository */
 
 var Layout = require("Layout");
+const BANGLEJS2 = process.env.HWVERSION == 2; // check for bangle 2
 
 const W = g.getWidth();
 const H = g.getHeight();
@@ -23,20 +24,27 @@ function writeWP() {
 }
 
 function mainMenu() {
+  let textInputInstalled = true;
+  try {
+    require("textinput")
+  } catch(err) {
+    textInputInstalled = false;
+  }
   var menu = {
-    "< Back" : Bangle.load
+    "< Back" : () => load()
   };
-  if (Object.keys(wp).length==0) {
-    //Object.assign(menu, {"NO WPs":""});
-    print("(no waypoints)");
-  } else for (let id in wp) {
+  for (let id in wp) {
     let i = id;
     menu[wp[id]["name"]]=()=>{ show(i); };
   }
+  if (textInputInstalled && BANGLEJS2) {
     menu["Add"]=addCard;
+  }
   menu["Remove"]=removeCard;
   menu["Format"]=setFormat;
+  if (textInputInstalled) {
     menu["Mark GPS"]=markGps;
+  }
   g.clear();
   E.showMenu(menu);
 }
@@ -153,16 +161,14 @@ function lon(x) {
 }
 
 function show(pin) {
-  print(pin);
   var i = wp[pin];
-  var l = i["name"] + "\n" + lat(i["lat"]) + "\n" + lon(i["lon"]);
-  var la = new Layout ({
-    type:"v", c: [
-      {type:"txt", font:"10%", pad:1, fillx:1, filly:1, label: l},
-      {type:"btn", font:"10%", pad:1, fillx:1, filly:1, label:"OK", cb:l=>{mainMenu();}}
-    ], lazy:true});
-  g.clear();
-  la.render();
+  var l = lat(i["lat"]) + "\n" + lon(i["lon"]);
+  E.showPrompt(l,{
+    title:i["name"],
+    buttons : {"Ok":true}
+  }).then(function(v) {
+    mainMenu();
+  });
 }
 
 function showNumpad(text, key_, callback) {
@@ -231,22 +237,17 @@ function removeCard() {
     wp.forEach((val, card) => {
       const name = wp[card].name;
       menu[name]=()=>{
-        E.showMenu();
-        var confirmRemove = new Layout (
-          {type:"v", c: [
-            {type:"txt", font:"15%", pad:1, fillx:1, filly:1, label:"Delete"},
-            {type:"txt", font:"15%", pad:1, fillx:1, filly:1, label:name},
-            {type:"h", c: [
-              {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: "YES", cb:l=>{
+        E.showPrompt(name,{
+          title:"Delete",
+        }).then(function(v) {
+          if (v) {
             wp.splice(card, 1);
             writeWP();
             mainMenu();
-              }},
-              {type:"btn", font:"15%", pad:1, fillx:1, filly:1, label: " NO", cb:l=>{mainMenu();}}
-            ]}
-          ], lazy:true});
-        g.clear();
-        confirmRemove.render();
+          } else {
+            mainMenu();
+          }
+        });
       };
     });
   }
@@ -345,5 +346,4 @@ function addCard() {
 }
 
 g.reset();
-Bangle.setUI();
 mainMenu();

apps/wpmoto/metadata.json

@@ -9,7 +9,7 @@
   "supports": ["BANGLEJS","BANGLEJS2"],
   "screenshots": [{"url":"screenshot.png"},{"url":"screenshot-menu.png"},{"url":"screenshot-delete.png"}],
   "readme": "README.md",
-  "dependencies" : { "waypoints":"type" },
+  "dependencies" : { "waypoints":"app" },
   "storage": [
     {"name":"wpmoto.app.js","url":"app.js"},
     {"name":"wpmoto.img","url":"icon.js","evaluate":true}