Merge branch 'dtlaunch' into app-loader

Author: thyttan

apps/dtlaunch/ChangeLog

@@ -31,3 +31,4 @@ when moving pages. Add caching for faster startups.
 0.24: Add buzz-on-interaction setting
 0.25: Minor code improvements
 0.26: Bangle 2: Postpone loading icons that are not needed initially.
+0.27: Bangle 2: Add setting to remember and present the last open page between instances of dtlaunch.

apps/dtlaunch/app-b2.js

@@ -11,6 +11,7 @@
     swipeExit: false,
     timeOut: "Off",
     interactionBuzz: false,
+    rememberPage: false,
   }, require('Storage').readJSON("dtlaunch.json", true) || {});
 
   let s = require("Storage");
@@ -33,22 +34,31 @@
     s.writeJSON("launch.cache.json", launchCache);
   }
   let apps = launchCache.apps;
-  for (let i = 0; i < 4; i++) { // Initially only load icons for the current page.
+  let page = 0;
+  let initPageAppZeroth = 0;
+  let initPageAppLast = 3;
+  if (settings.rememberPage) {
+    page = (global.dtlaunch&&dtlaunch.handlePagePersist()) ??
+      (parseInt(s.read("dtlaunch.page")) ?? 0);
+    initPageAppZeroth = page*4;
+    initPageAppLast = (page*4+3<apps.length-1)?page*4+3:apps.length-1;//Math.min(page*4+3, apps.length-1); // FIXME:What is fastest?
+  }
+
+  for (let i = initPageAppZeroth; i <= initPageAppLast; i++) { // Initially only load icons for the current page.
     if (apps[i].icon)
       apps[i].icon = s.read(apps[i].icon); // should just be a link to a memory area
   }
 
   let Napps = apps.length;
-  let Npages = Math.ceil(Napps/4);
+  let Npages = parseInt(Napps/4+1); //Math.ceil(Napps/4); // FIXME: What is fastest?
   let maxPage = Npages-1;
   let selected = -1;
   //let oldselected = -1;
-  let page = 0;
   const XOFF = 24;
   const YOFF = 30;
 
   let drawIcon= function(p,n,selected) {
-    let x = (n%2)*72+XOFF; 
+    let x = (n%2)*72+XOFF;
     let y = n>1?72+YOFF:YOFF;
     (selected?g.setColor(g.theme.fgH):g.setColor(g.theme.bg)).fillRect(x+11,y+3,x+60,y+52);
     g.clearRect(x+12,y+4,x+59,y+51);
@@ -99,13 +109,32 @@
 
   Bangle.drawWidgets(); // To immediately update widget field to follow current theme - remove leftovers if previous app set custom theme.
   Bangle.loadWidgets();
-  drawPage(0);
+  drawPage(page);
 
-  for (let i = 4; i < apps.length; i++) { // Load the rest of the app icons that were not initially.
+  for (let i = 0; i < apps.length; i++) { // Load the rest of the app icons that were not initially.
+    if (i >= initPageAppZeroth && i <= initPageAppLast) continue;
     if (apps[i].icon)
       apps[i].icon = s.read(apps[i].icon); // should just be a link to a memory area
   }
 
+  if (!global.dtlaunch) {
+    global.dtlaunch = {};
+    dtlaunch.handlePagePersist = function(page) {
+      // Function for persisting the active page when leaving dtlaunch.
+      if (page===undefined) {return this.page||0;}
+
+      if (!this.killHandler) { // Only register kill listener once.
+        this.killHandler = () => {
+          s.write("dtlaunch.page", this.page.toString());
+        };
+        E.on("kill", this.killHandler); // This is intentionally left around after fastloading into other apps. I.e. not removed in uiRemove.
+      }
+
+      this.page = page;
+    };
+    dtlaunch.handlePagePersist(page);
+  }
+
   let swipeListenerDt = function(dirLeftRight, dirUpDown){
     updateTimeoutToClock();
     selected = -1;
@@ -142,6 +171,7 @@
               drawIcon(page,selected,false);
             } else {
               buzzLong();
+              dtlaunch.handlePagePersist(page);
               load(apps[page*4+i].src);
             }
           }
@@ -162,7 +192,10 @@
     back : Bangle.showClock,
     swipe : swipeListenerDt,
     touch : touchListenerDt,
-    remove : ()=>{if (timeoutToClock) clearTimeout(timeoutToClock);}
+    remove : ()=>{
+      if (timeoutToClock) {clearTimeout(timeoutToClock);}
+      dtlaunch.handlePagePersist(page);
+    }
   });
 
   // taken from Icon Launcher with minor alterations
@@ -171,10 +204,9 @@
     if (settings.timeOut!="Off"){
       let time=parseInt(settings.timeOut);  //the "s" will be trimmed by the parseInt
       if (timeoutToClock) clearTimeout(timeoutToClock);
-      timeoutToClock = setTimeout(Bangle.showClock,time*1000);  
+      timeoutToClock = setTimeout(Bangle.showClock,time*1000);
     }
   };
   updateTimeoutToClock();
 
 } // end of app scope
-

apps/dtlaunch/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "dtlaunch",
   "name": "Desktop Launcher",
-  "version": "0.26",
+  "version": "0.27",
   "description": "Desktop style App Launcher with six (four for Bangle 2) apps per page - fast access if you have lots of apps installed.",
   "screenshots": [{"url":"shot1.png"},{"url":"shot2.png"},{"url":"shot3.png"}],
   "icon": "icon.png",

apps/dtlaunch/settings-b2.js

@@ -8,6 +8,7 @@
     swipeExit: false,
     timeOut: "Off",
     interactionBuzz: false,
+    rememberPage: false,
   }, require('Storage').readJSON(FILE, true) || {});
 
   function writeSettings() {
@@ -64,5 +65,12 @@
         writeSettings();
       }
     },
+    /*LANG*/'Remember Page': {
+      value: settings.rememberPage,
+      onchange: v => {
+        settings.rememberPage = v;
+        writeSettings();
+      }
+    },
   });
 })