Code cleanup

apps/activityreminder/app.js

@@ -4,7 +4,7 @@ function drawAlert(){
     buttons : {"Ok": true,"Dismiss": false}
     }).then(function(v) {
       console.log(stepsArray); // todo remove
-      if(v == true){  
+      if(v == true){
         stepsArray = stepsArray.slice(0, activityreminder.maxInnactivityMin - 3);
         require("activityreminder").saveStepsArray(stepsArray);
       }
@@ -15,28 +15,25 @@ function drawAlert(){
     load();
   });
 
-  Bangle.buzz();
+  Bangle.buzz(400);
   setTimeout(load, 10000);
 
 }
 
-function run()
-{
-  if(stepsArray.length == activityreminder.maxInnactivityMin){
-    if (stepsArray[0] - stepsArray[stepsArray.length-1] < activityreminder.minSteps)
-    {
-       drawAlert();
+function run(){
+    if(stepsArray.length == activityreminder.maxInnactivityMin){
+        if (stepsArray[0] - stepsArray[stepsArray.length-1] < activityreminder.minSteps){
+            drawAlert();
+        }
+    }else{
+        eval(require("Storage").read("activityreminder.settings.js"))(()=>load());
     }
-  }else{
-    // todo find something else to do when there is no alert to show, showing the setting is a placeholder for now
-    eval(require("Storage").read("activityreminder.settings.js"))(()=>load());
-  }
 }
 
 
 g.clear();
 Bangle.loadWidgets();
 Bangle.drawWidgets();
-global.activityreminder = require("activityreminder").loadSettings();
+activityreminder = require("activityreminder").loadSettings();
 stepsArray = require("activityreminder").loadStepsArray();
 run()

apps/activityreminder/boot.js

@@ -1,39 +1,30 @@
-global.activityreminder = require("activityreminder").loadSettings();
-
-if (global.activityreminder) {
-
-  activityreminder =
-    Object.assign(activityreminder,
-    {
-      run: function(){
-        var now = new Date();
-        var h = now.getHours();
-        console.log(global.stepsArray);
-        if(h >= activityreminder.startHour && h < activityreminder.endHour)
-        {
-          var health = Bangle.getHealthStatus("day");
-          stepsArray.unshift(health.steps);
-          stepsArray = stepsArray.slice(0, activityreminder.maxInnactivityMin);
-          require("activityreminder").saveStepsArray(stepsArray);
+function run(){
+    var now = new Date();
+    var h = now.getHours();
+    console.log(stepsArray); // todo remove
+    if(h >= activityreminder.startHour && h < activityreminder.endHour){
+        var health = Bangle.getHealthStatus("day");
+        stepsArray.unshift(health.steps);
+        stepsArray = stepsArray.slice(0, activityreminder.maxInnactivityMin);
+        require("activityreminder").saveStepsArray(stepsArray);
+    }
+    else{
+        if(stepsArray != []){
+            stepsArray = [];
+            require("activityreminder").saveStepsArray(stepsArray);
         }
-        else{
-          if(stepsArray != [])
-          {
-             stepsArray = [];
-             require("activityreminder").saveStepsArray(stepsArray);
-          }
-          
+    }
+    if(stepsArray.length >= activityreminder.maxInnactivityMin){
+        if (stepsArray[0] - stepsArray[stepsArray.length-1] < activityreminder.minSteps){
+            load('activityreminder.app.js');
         }
-        if(stepsArray.length == activityreminder.maxInnactivityMin){
-          if (stepsArray[0] - stepsArray[stepsArray.length-1] < activityreminder.minSteps)
-          {
-              load('activityreminder.app.js');
-          }
-        }
-      }
-   });
-
-  stepsArray = require("activityreminder").loadStepsArray(); // todo load from storage and save in storage on activityreminder.data. Create lib.js to read and write in it
-  setInterval(global.activityreminder.run, 60000); // todo change back to 60000
+    }
+}
+
+
+activityreminder = require("activityreminder").loadSettings();
+if(activityreminder.enabled) {
+    stepsArray = require("activityreminder").loadStepsArray();
+    setInterval(global.activityreminder.run, 60000);
 }
 

apps/activityreminder/settings.js

@@ -6,7 +6,7 @@
     startHour: 9,
     endHour: 20,
     maxInnactivityMin: 30,
-    delayondismiss: 15,
+    dismissDelayMin: 15,
     minsteps: 50,
   }, require('Storage').readJSON(FILE, true) || {});
 
@@ -60,7 +60,7 @@
      },
      'Min steps': {
         value: 50|settings.minSteps,
-        min: 5, max: 60,
+        min: 10, max: 500,
         onchange: v => {
           settings.minSteps = v;
           writeSettings();