From 6ffa4b28b3ef399607fcef767c02fefb2806d8f9 Mon Sep 17 00:00:00 2001
From: Salim Blume <sblume@gmail.com>
Date: Sat, 5 Mar 2022 14:05:48 -0600
Subject: [PATCH] Menu fixes and tweaking vibe options

---
 apps/run/settings.js |  9 +++++----
 modules/exstats.js   | 41 ++++++++++++++++++++++++++---------------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/apps/run/settings.js b/apps/run/settings.js
index e386106e0..405cb03b8 100644
--- a/apps/run/settings.js
+++ b/apps/run/settings.js
@@ -70,14 +70,15 @@
       }
     };
   ExStats.appendMenuItems(menu, settings, saveSettings);
+  ExStats.appendNotifyMenuItems(menu, settings, saveSettings);
   var vibPatterns = [/*LANG*/"Off", ".", "-", "--", "-.-", "---"];
   var vibTimes = [
     [],
     [[100, 1]],
-    [[500, 1]],
-    [[500, 1], [200, 0], [500, 1]],
-    [[500, 1],[200, 0], [100, 1], [200, 0], [500, 1]],
-    [[500, 1],[200, 0],[500, 1],[200, 0],[500, 1]],
+    [[300, 1]],
+    [[300, 1], [200, 0], [300, 1]],
+    [[300, 1],[200, 0], [100, 1], [200, 0], [300, 1]],
+    [[300, 1],[200, 0],[300, 1],[200, 0],[300, 1]],
   ];
   menu[/*LANG*/"Dist Notifctn"] = {
     value: Math.max(0,vibPatterns.indexOf(settings.notify.dist.notification)),
diff --git a/modules/exstats.js b/modules/exstats.js
index 8b097a198..b106622d0 100644
--- a/modules/exstats.js
+++ b/modules/exstats.js
@@ -48,6 +48,15 @@ var menu = { ... };
 ExStats.appendMenuItems(menu, settings, saveSettingsFunction);
 E.showMenu(menu);
 
+// Additionally, if your app makes use of the stat notifications, you can display additional menu
+// settings for configuring when to notify (note the added line in the example below)W
+
+var menu = { ... };
+ExStats.appendMenuItems(menu, settings, saveSettingsFunction);
+ExStats.appendNotifyMenuItems(menu, settings, saveSettingsFunction);
+E.showMenu(menu);
+
+
 */
 var state = {
   active : false, // are we working or not?
@@ -315,17 +324,19 @@ exports.getStats = function(statIDs, options) {
 };
 
 exports.appendMenuItems = function(menu, settings, saveSettings) {
-  var paceNames = ["1000m","1 mile","1/2 Mthn", "Marathon",];
-  var paceAmts = [1000,1609,21098,42195];
+  var paceNames = ["1000m", "1 mile", "1/2 Mthn", "Marathon",];
+  var paceAmts = [1000, 1609, 21098, 42195];
   menu['Pace'] = {
-    min: 0, max: paceNames.length-1,
-    value: Math.max(paceAmts.indexOf(settings.paceLength),0),
+    min: 0, max: paceNames.length - 1,
+    value: Math.max(paceAmts.indexOf(settings.paceLength), 0),
     format: v => paceNames[v],
     onchange: v => {
       settings.paceLength = paceAmts[v];
       saveSettings();
     },
   };
+}
+exports.appendNotifyMenuItems = function(menu, settings, saveSettings) {
   var distNames = ['Off', "1000m","1 mile","1/2 Mthn", "Marathon",];
   var distAmts = [0, 1000,1609,21098,42195];
   menu['Ntfy Dist'] = {
@@ -337,17 +348,6 @@ exports.appendMenuItems = function(menu, settings, saveSettings) {
       saveSettings();
     },
   };
-  var timeNames = ['Off', '30s', '1min', '2min', '5min', '10min', '30min', '1hr'];
-  var timeAmts = [0, 30000, 60000, 120000, 300000, 600000, 1800000, 3600000];
-  menu['Ntfy Time'] = {
-    min: 0, max: timeNames.length-1,
-    value: Math.max(timeAmts.indexOf(settings.notify.time.increment),0),
-    format: v => timeNames[v],
-    onchange: v => {
-      settings.notify.time.increment = timeAmts[v];
-      saveSettings();
-    },
-  };
   var stepNames = ['Off', '100', '500', '1000', '5000', '10000'];
   var stepAmts = [0, 100, 500, 1000, 5000, 10000];
   menu['Ntfy Steps'] = {
@@ -359,4 +359,15 @@ exports.appendMenuItems = function(menu, settings, saveSettings) {
       saveSettings();
     },
   };
+  var timeNames = ['Off', '30s', '1min', '2min', '5min', '10min', '30min', '1hr'];
+  var timeAmts = [0, 30000, 60000, 120000, 300000, 600000, 1800000, 3600000];
+  menu['Ntfy Time'] = {
+    min: 0, max: timeNames.length-1,
+    value: Math.max(timeAmts.indexOf(settings.notify.time.increment),0),
+    format: v => timeNames[v],
+    onchange: v => {
+      settings.notify.time.increment = timeAmts[v];
+      saveSettings();
+    },
+  };
 };