From 577bcd39b1a25c41d725655943401717080ae04a Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 28 Oct 2021 14:28:30 +0100
Subject: [PATCH] Merge bangle 1 and 2 welcome screens

---
 apps.json                                     |  27 ++++--------------
 apps/welcome/ChangeLog                        |   1 +
 apps/welcome/{app.js => app-bangle1.js}       |   8 ------
 .../app.js => welcome/app-bangle2.js}         |   8 ------
 apps/welcome2/ChangeLog                       |  17 -----------
 apps/welcome2/app-icon.js                     |   1 -
 apps/welcome2/app.png                         | Bin 1939 -> 0 bytes
 apps/welcome2/boot.js                         |   9 ------
 apps/welcome2/settings.js                     |  18 ------------
 bin/sanitycheck.js                            |   4 +--
 10 files changed, 8 insertions(+), 85 deletions(-)
 rename apps/welcome/{app.js => app-bangle1.js} (97%)
 rename apps/{welcome2/app.js => welcome/app-bangle2.js} (97%)
 delete mode 100644 apps/welcome2/ChangeLog
 delete mode 100644 apps/welcome2/app-icon.js
 delete mode 100644 apps/welcome2/app.png
 delete mode 100644 apps/welcome2/boot.js
 delete mode 100644 apps/welcome2/settings.js

diff --git a/apps.json b/apps.json
index 23769e299..2362c2e9d 100644
--- a/apps.json
+++ b/apps.json
@@ -169,17 +169,18 @@
   },
   {
     "id": "welcome",
-    "name": "Welcome (Bangle.js 1)",
+    "name": "Welcome",
     "shortName": "Welcome",
-    "version": "0.12",
+    "version": "0.13",
     "description": "Appears at first boot and explains how to use Bangle.js",
     "icon": "app.png",
     "tags": "start,welcome",
-    "supports": ["BANGLEJS"],
+    "supports": ["BANGLEJS","BANGLEJS2"],
     "allow_emulator": true,
     "storage": [
       {"name":"welcome.boot.js","url":"boot.js"},
-      {"name":"welcome.app.js","url":"app.js"},
+      {"name":"welcome.app.js","url":"app-bangle1.js","supports": ["BANGLEJS"]},
+      {"name":"welcome.app.js","url":"app-bangle2.js","supports": ["BANGLEJS2"]},
       {"name":"welcome.settings.js","url":"settings.js"},
       {"name":"welcome.img","url":"app-icon.js","evaluate":true}
     ],
@@ -203,24 +204,6 @@
     ],
     "data": [{"name":"mywelcome.json"}]
   },
-  {
-    "id": "welcome2",
-    "name": "Welcome (Bangle.js 2)",
-    "shortName": "Welcome",
-    "version": "0.13",
-    "description": "Appears at first boot and explains how to use Bangle.js 2",
-    "icon": "app.png",
-    "tags": "start,welcome",
-    "supports": ["BANGLEJS2"],
-    "allow_emulator": true,
-    "storage": [
-      {"name":"welcome2.boot.js","url":"boot.js"},
-      {"name":"welcome2.app.js","url":"app.js"},
-      {"name":"welcome2.settings.js","url":"settings.js"},
-      {"name":"welcome2.img","url":"app-icon.js","evaluate":true}
-    ],
-    "data": [{"name":"welcome2.json"}]
-  },
   {
     "id": "gbridge",
     "name": "Gadgetbridge",
diff --git a/apps/welcome/ChangeLog b/apps/welcome/ChangeLog
index 519222c52..f72f77a4b 100644
--- a/apps/welcome/ChangeLog
+++ b/apps/welcome/ChangeLog
@@ -14,3 +14,4 @@
 0.10: Tweaks to reduce memory usage
 0.11: Fix initial screen fill colour
 0.12: Fix swipe direction (#800)
+0.13: Mods for Bangle.js 2
diff --git a/apps/welcome/app.js b/apps/welcome/app-bangle1.js
similarity index 97%
rename from apps/welcome/app.js
rename to apps/welcome/app-bangle1.js
index 047b0cdb2..949750b38 100644
--- a/apps/welcome/app.js
+++ b/apps/welcome/app-bangle1.js
@@ -290,14 +290,6 @@ setWatch(()=>{
 }, BTN2, {repeat:true,edge:"falling"});
 setWatch(()=>move(-1), BTN1, {repeat:true});
 
-(function migrateSettings(){
-  let global_settings = require('Storage').readJSON('setting.json', 1)
-  if (global_settings) {
-    delete global_settings.welcomed
-    require('Storage').write('setting.json', global_settings)
-  }
-})()
-
 Bangle.setLCDTimeout(0);
 Bangle.setLCDPower(1);
 move(0);
diff --git a/apps/welcome2/app.js b/apps/welcome/app-bangle2.js
similarity index 97%
rename from apps/welcome2/app.js
rename to apps/welcome/app-bangle2.js
index d9a967d8a..93d1c5657 100644
--- a/apps/welcome2/app.js
+++ b/apps/welcome/app-bangle2.js
@@ -243,14 +243,6 @@ setWatch(()=>{
     move(1);
 }, BTN1, {repeat:true});
 
-(function migrateSettings(){
-  let global_settings = require('Storage').readJSON('setting.json', 1)
-  if (global_settings) {
-    delete global_settings.welcomed
-    require('Storage').write('setting.json', global_settings)
-  }
-})()
-
 Bangle.setLCDTimeout(0);
 Bangle.setLCDPower(1);
 move(0);
diff --git a/apps/welcome2/ChangeLog b/apps/welcome2/ChangeLog
deleted file mode 100644
index f72f77a4b..000000000
--- a/apps/welcome2/ChangeLog
+++ /dev/null
@@ -1,17 +0,0 @@
-0.01: New App!
-0.02: Animate balloon intro
-0.03: BTN3 now won't restart when at the end
-0.04: Fix regression after tweaks to Storage.readJSON
-0.05: Move configuration into App/widget settings
-0.06: Move loader into welcome.boot.js
-0.07: Run again when updated
-      Don't run again when settings app is updated (or absent)
-      Add "Run Now" option to settings
-0.08: Don't overwrite existing settings on app update
-0.09: Allow welcome to run after a fresh install
-      More useful app menu
-      BTN2 now goes to menu on release
-0.10: Tweaks to reduce memory usage
-0.11: Fix initial screen fill colour
-0.12: Fix swipe direction (#800)
-0.13: Mods for Bangle.js 2
diff --git a/apps/welcome2/app-icon.js b/apps/welcome2/app-icon.js
deleted file mode 100644
index 5c1373e17..000000000
--- a/apps/welcome2/app-icon.js
+++ /dev/null
@@ -1 +0,0 @@
-require("heatshrink").decompress(atob("mEwxH+AH4A/AH4AU5gAEFtoxnEwXN53WAAXO5oJB42Wy26AAIueFoPXFggAD4AwEGTQiB6otBFgwAD3QvFGC5dCFxiRGGClhrdbv67BXAIuLMBIwPsIABF4OpLwXOFxjBCF6gtBw2r1mHXoXWFxqQWFwOH62rL4IeB6xeOAAIvHGBYuC6+rR4QvCXpovXw3X1i/DR4QuPR5AvKFQOs6+GF4eod4IvPd5AvLwvWLwQvCv4fBR54vURwOHF4iQCX0yOCF4aQBX0QvHSAoAN3SOSd4WyF4yQPLyhgD1YvDMCJeIFxhgCF47BN4BeHFxpgDSAiRORpAuPMIYAFGBYuaF5aSHFwQvEFqQwOeggSBLa4xNF4X+4wAC/xeCFjIADrYwGBIIvlMQiPDBAOk0gDBz2XF8BlEF4eIxADFF8lcF9n+wIrFF05bHF9AsGF9wupGAYv/F8QupGAov/F/4wOF1gA/AH4Ap"))
diff --git a/apps/welcome2/app.png b/apps/welcome2/app.png
deleted file mode 100644
index ebbf254bd7c3546e8337c97648a7eb56747c81ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1939
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
Z;y>o9o!*JS4-fzV002ovPDHLkV1gG+pke?3

diff --git a/apps/welcome2/boot.js b/apps/welcome2/boot.js
deleted file mode 100644
index 07b7386f1..000000000
--- a/apps/welcome2/boot.js
+++ /dev/null
@@ -1,9 +0,0 @@
-(function() {
-  let s = require('Storage').readJSON('welcome2.json', 1) || {};
-  if (!s.welcomed) {
-    setTimeout(() => {
-      require('Storage').write('welcome2.json', {welcomed: true})
-      load('welcome2.app.js')
-    })
-  }
-})()
diff --git a/apps/welcome2/settings.js b/apps/welcome2/settings.js
deleted file mode 100644
index d87cf4b55..000000000
--- a/apps/welcome2/settings.js
+++ /dev/null
@@ -1,18 +0,0 @@
-(function(back) {
-  let settings = require('Storage').readJSON('welcome2.json', 1)
-    || require('Storage').readJSON('setting.json', 1) || {}
-  E.showMenu({
-    '': { 'title': 'Welcome App' },
-    'Run next boot': {
-      value: !settings.welcomed,
-      format: v => v ? 'Yes' : 'No',
-      onchange: v => require('Storage').write('welcome2.json', {welcomed: !v}),
-    },
-    'Run Now': () => load('welcome2.app.js'),
-    'Turn off & run next': () => {
-      require('Storage').write('welcome2.json', {welcomed: false});
-      Bangle.off();
-    },
-    '< Back': back,
-  })
-})
diff --git a/bin/sanitycheck.js b/bin/sanitycheck.js
index ef795871d..9c5f4c916 100755
--- a/bin/sanitycheck.js
+++ b/bin/sanitycheck.js
@@ -133,9 +133,9 @@ apps.forEach((app,appIdx) => {
     if (isGlob(file.name)) ERROR(`App ${app.id} storage file ${file.name} contains wildcards`);
     let char = file.name.match(FORBIDDEN_FILE_NAME_CHARS)
     if (char) ERROR(`App ${app.id} storage file ${file.name} contains invalid character "${char[0]}"`)
-    if (fileNames.includes(file.name))
+    if (fileNames.includes(file.name) && !file.supports)  // assume that there aren't duplicates if 'supports' is set
       ERROR(`App ${app.id} file ${file.name} is a duplicate`);
-    if (!file.supports) fileNames.push(file.name); // assume that there aren't duplicates if 'supports' is set
+    fileNames.push(file.name);
     allFiles.push({app: app.id, file: file.name});
     if (file.url) if (!fs.existsSync(appDir+file.url)) ERROR(`App ${app.id} file ${file.url} doesn't exist`);
     if (!file.url && !file.content && !app.custom) ERROR(`App ${app.id} file ${file.name} has no contents`);