From 94bd895bafeb37250b64373692c9cceb3e9ece97 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Wed, 24 Nov 2021 12:56:56 +0000
Subject: [PATCH] welcome 0.14: Turn off and run later to use softOff to time
 is set right plus other minor tweaks

---
 apps.json                | 3 ++-
 apps/welcome/ChangeLog   | 1 +
 apps/welcome/settings.js | 3 ++-
 loader.js                | 6 ++++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/apps.json b/apps.json
index 43def8d2c..8b4c87d6b 100644
--- a/apps.json
+++ b/apps.json
@@ -51,6 +51,7 @@
   {
     "id": "android",
     "name": "Android Integration",
+    "shortName": "Android",
     "version": "0.03",
     "description": "(BETA) App to display notifications from Gadgetbridge on Android. This will eventually replace the Gadgetbridge widget.",
     "icon": "app.png",
@@ -213,7 +214,7 @@
     "id": "welcome",
     "name": "Welcome",
     "shortName": "Welcome",
-    "version": "0.13",
+    "version": "0.14",
     "description": "Appears at first boot and explains how to use Bangle.js",
     "icon": "app.png",
     "screenshots": [{"url":"screenshot_welcome.png"}],
diff --git a/apps/welcome/ChangeLog b/apps/welcome/ChangeLog
index f72f77a4b..8e2f99b9a 100644
--- a/apps/welcome/ChangeLog
+++ b/apps/welcome/ChangeLog
@@ -15,3 +15,4 @@
 0.11: Fix initial screen fill colour
 0.12: Fix swipe direction (#800)
 0.13: Mods for Bangle.js 2
+0.14: Turn off and run later to use softOff to time is set right
diff --git a/apps/welcome/settings.js b/apps/welcome/settings.js
index f269f238e..27a322c7f 100644
--- a/apps/welcome/settings.js
+++ b/apps/welcome/settings.js
@@ -11,7 +11,8 @@
     'Run Now': () => load('welcome.app.js'),
     'Turn off & run next': () => {
       require('Storage').write('welcome.json', {welcomed: false});
-      Bangle.off();
+      Bangle.setLocked(true); // fix for pre-2v11 firmware that can accidentally leave touchscreen on
+      if (Bangle.softOff()) Bangle.softOff(); else Bangle.off();
     },
     '< Back': back,
   })
diff --git a/loader.js b/loader.js
index a28f7fe78..680cd0f94 100644
--- a/loader.js
+++ b/loader.js
@@ -171,7 +171,9 @@ function onAppJSONLoaded() {
   if (deviceId !== undefined)
     filterAppsForDevice(deviceId);
 
-  return new Promise(resolve => {
+  /* Disable external screenshot loading - seems we probably have enough
+  screenshots added manually in apps.json */
+  /*return new Promise(resolve => {
     httpGet("screenshots.json").then(screenshotJSON=>{
       var screenshots = [];
       try {
@@ -189,5 +191,5 @@ function onAppJSONLoaded() {
       console.log("No screenshots.json found");
       resolve();
     });
-  });
+  });*/
 }