From 03f40ffca15b085287f2292cc6c1ff33a611c14d Mon Sep 17 00:00:00 2001
From: Erik Andresen <erik@vontaene.de>
Date: Mon, 28 Nov 2022 19:33:50 +0100
Subject: [PATCH] taglaunch: Backport PR 2316 for launch

---
 apps/taglaunch/ChangeLog     |  1 +
 apps/taglaunch/app.js        | 19 +++++++------------
 apps/taglaunch/metadata.json |  2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/apps/taglaunch/ChangeLog b/apps/taglaunch/ChangeLog
index 5560f00bc..981f50386 100644
--- a/apps/taglaunch/ChangeLog
+++ b/apps/taglaunch/ChangeLog
@@ -1 +1,2 @@
 0.01: New App!
+0.02: Use Bangle.showClock for changing to clock (Backport from launch)
diff --git a/apps/taglaunch/app.js b/apps/taglaunch/app.js
index 07a7021db..c940284c2 100644
--- a/apps/taglaunch/app.js
+++ b/apps/taglaunch/app.js
@@ -69,16 +69,6 @@ let tagKeys = Object.keys(tags).filter(tag => tag !== "clock" || settings.showCl
 if (!settings.fullscreen)
   Bangle.loadWidgets();
 
-let returnToClock = function() {
-  // unload everything manually
-  // ... or we could just call `load();` but it will be slower
-  Bangle.setUI(); // remove scroller's handling
-  if (lockTimeout) clearTimeout(lockTimeout);
-  Bangle.removeListener("lock", lockHandler);
-  // now load the default clock - just call .bootcde as this has the code already
-  setTimeout(eval,0,s.read(".bootcde"));
-};
-
 let showTagMenu = (tag) => {
   E.showScroller({
     h : 64*scaleval, c : appsByTag[tag].length,
@@ -121,7 +111,12 @@ let showMainMenu = () => {
       let tag = tagKeys[i];
       showTagMenu(tag);
     },
-    back : returnToClock // button press or tap in top left calls returnToClock now
+    back : Bangle.showClock, // button press or tap in top left shows clock now
+    remove : () => {
+      // cleanup the timeout to not leave anything behind after being removed from ram
+      if (lockTimeout) clearTimeout(lockTimeout);
+      Bangle.removeListener("lock", lockHandler);
+  }
   });
 };
 showMainMenu();
@@ -134,7 +129,7 @@ let lockHandler = function(locked) {
   if (lockTimeout) clearTimeout(lockTimeout);
   lockTimeout = undefined;
   if (locked) {
-    lockTimeout = setTimeout(returnToClock, 10000);
+    lockTimeout = setTimeout(Bangle.showClock, 10000);
   }
 };
 Bangle.on("lock", lockHandler);
diff --git a/apps/taglaunch/metadata.json b/apps/taglaunch/metadata.json
index aded51314..d7f1954b1 100644
--- a/apps/taglaunch/metadata.json
+++ b/apps/taglaunch/metadata.json
@@ -2,7 +2,7 @@
   "id": "taglaunch",
   "name": "Tag Launcher",
   "shortName": "Taglauncher",
-  "version": "0.01",
+  "version": "0.02",
   "description": "Launcher that puts all applications into submenus based on their tag. With many applications installed this can result in a faster application selection than the linear access of the default launcher.",
   "readme": "README.md",
   "icon": "app.png",