Merge branch 'app-history-from-fastload-utils' into app-loader

Author: thyttan

apps/apphist/metadata.json

@@ -8,7 +8,7 @@
   "supports": ["BANGLEJS2"],
   "readme": "README.md",
   "storage": [
-    {"name":"apphist.5.boot.js","url":"boot.js"},
+    {"name":"apphist.6.boot.js","url":"boot.js"},
     {"name":"apphist.settings.js","url":"settings.js"}
   ],
   "data": [{"name":"apphist.json"}]

apps/fastload/ChangeLog

@@ -4,3 +4,4 @@
 0.04: (WIP) Allow use of app history when going back (`load()` or `Bangle.load()` calls without specified app).
 0.05: Check for changes in setting.js and force real reload if needed
 0.06: Fix caching whether an app is fastloadable
+0.07: Break out app history to a separate app: App History, `apphist`.

apps/fastload/README.md

@@ -18,17 +18,10 @@ Bangle will just end up with a memory leak or undefined behaviour**
 
 ## Settings
 
-* Activate app history and navigate back through recent apps instead of immediately loading the clock face
-* If Quick Launch is installed it can be excluded from app history
 * Allows to redirect all loads usually loading the clock to the launcher instead
 * The "Fastloading..." screen can be switched off
 * Enable checking `setting.json` and force a complete load on changes
 
-## App history
-
-* Long press of hardware button clears the app history and loads the clock face
-* Installing the 'Fast Reset' app allows doing fastloads directly to the clock face by pressing the hardware button just a little longer than a click. Useful if there are many apps in the history and the user want to access the clock quickly.
-
 ## Technical Notes
 
 Fastload uses the same mechanism as `.bootcde` does to check the app to be loaded for widget use and stores the result of that and a hash of the js in a cache.

apps/fastload/boot.js

@@ -60,29 +60,8 @@ let fastload = function(n){
 };
 global.load = fastload;
 
-let appHistory, resetHistory, recordHistory;
-if (SETTINGS.useAppHistory){
-  appHistory  = s.readJSON("fastload.history.json",true)||[];
-  resetHistory = ()=>{appHistory=[];s.writeJSON("fastload.history.json",appHistory);};
-  recordHistory = ()=>{s.writeJSON("fastload.history.json",appHistory);};
-}
-
 Bangle.load = (o => (name) => {
   if (Bangle.uiRemove && !SETTINGS.hideLoading) loadingScreen();
-  if (SETTINGS.useAppHistory){
-    if (name && name!=".bootcde" && !(name=="quicklaunch.app.js" && SETTINGS.disregardQuicklaunch)) {
-      // store the name of the app to launch
-      appHistory.push(name);
-    } else if (name==".bootcde") { // when Bangle.showClock is called
-      resetHistory();
-    } else if (name=="quicklaunch.app.js" && SETTINGS.disregardQuicklaunch) {
-      // do nothing with history
-    } else {
-      // go back in history
-      appHistory.pop();
-      name = appHistory[appHistory.length-1];
-    }
-  }
   if (SETTINGS.autoloadLauncher && !name){
     let orig = Bangle.load;
     Bangle.load = (n)=>{
@@ -94,6 +73,4 @@ Bangle.load = (o => (name) => {
   } else
     o(name);
 })(Bangle.load);
-
-if (SETTINGS.useAppHistory) E.on('kill', ()=>{if (!BTN.read()) recordHistory(); else resetHistory();}); // Usually record history, but reset it if long press of HW button was used.
 }

apps/fastload/metadata.json

@@ -1,7 +1,7 @@
 { "id": "fastload",
   "name": "Fastload Utils",
   "shortName" : "Fastload Utils",
-  "version": "0.06",
+  "version": "0.07",
   "icon": "icon.png",
   "description": "Enable experimental fastloading for more apps. ⚠️ Use with extreme caution - many apps are not compatible with fastload and will cause memory leaks and instability.",
   "type":"bootloader",

apps/fastload/settings.js

@@ -1,7 +1,6 @@
 (function(back) {
   var FILE="fastload.json";
   var settings;
-  var isQuicklaunchPresent = !!require('Storage').read("quicklaunch.app.js", 0, 1);
 
   function writeSettings(key, value) {
     var s = require('Storage').readJSON(FILE, true) || {};
@@ -21,34 +20,10 @@
 
     mainmenu[''] = { 'title': 'Fastload', back: back };
 
-    mainmenu['Activate app history'] = {
-        value: !!settings.useAppHistory,
-        onchange: v => {
-          writeSettings("useAppHistory",v);
-          if (v && settings.autoloadLauncher) {
-            writeSettings("autoloadLauncher",!v);  // Don't use app history and load to launcher together.
-            setTimeout(()=>E.showMenu(buildMainMenu()), 0); // Update the menu so it can be seen if a value was automatically set to false (app history vs load launcher).
-          }
-        }
-      };
-
-    if (isQuicklaunchPresent) {
-      mainmenu['Exclude Quick Launch from history'] = {
-        value: !!settings.disregardQuicklaunch,
-        onchange: v => {
-          writeSettings("disregardQuicklaunch",v);
-        }
-      };
-    }
-
     mainmenu['Force load to launcher'] = {
         value: !!settings.autoloadLauncher,
         onchange: v => {
           writeSettings("autoloadLauncher",v);
-          if (v && settings.useAppHistory) {
-            writeSettings("useAppHistory",!v);
-            setTimeout(()=>E.showMenu(buildMainMenu()), 0); // Update the menu so it can be seen if a value was automatically set to false (app history vs load launcher).
-          } // Don't use app history and load to launcher together.
         }
       };