welcome: Save settings in data file

fwelcom

apps.json

@@ -78,7 +78,7 @@
   { "id": "welcome",
     "name": "Welcome",
     "icon": "app.png",
-    "version":"0.07",
+    "version":"0.08",
     "description": "Appears at first boot and explains how to use Bangle.js",
     "tags": "start,welcome",
     "allow_emulator":true,
@@ -86,8 +86,10 @@
       {"name":"welcome.boot.js","url":"boot.js"},
       {"name":"welcome.app.js","url":"app.js"},
       {"name":"welcome.settings.js","url":"settings.js"},
-      {"name":"welcome.settings.json","url":"settings-default.json","evaluate":true},
       {"name":"welcome.img","url":"app-icon.js","evaluate":true}
+    ],
+    "data": [
+      {"name":"welcome.json"}
     ]
   },
   { "id": "gbridge",

apps/welcome/ChangeLog

@@ -7,3 +7,4 @@
 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

apps/welcome/boot.js

@@ -1,11 +1,11 @@
 (function() {
-  let s = require('Storage').readJSON('welcome.settings.json', 1)
+  let s = require('Storage').readJSON('welcome.json', 1)
     || require('Storage').readJSON('setting.json', 1)
     || {welcomed: true} // do NOT run if global settings are also absent
   if (!s.welcomed && require('Storage').read('welcome.app.js')) {
     setTimeout(() => {
       s.welcomed = true
-      require('Storage').write('welcome.settings.json', {welcomed: "yes"})
+      require('Storage').write('welcome.json', {welcomed: "yes"})
       load('welcome.app.js')
     })
   }

apps/welcome/settings-default.json

@@ -1,3 +0,0 @@
-{
-  "welcomed": false
-}

apps/welcome/settings.js

@@ -1,13 +1,13 @@
 // The welcome app is special, and gets to use global settings
 (function(back) {
-  let settings = require('Storage').readJSON('welcome.settings.json', 1)
+  let settings = require('Storage').readJSON('welcome.sjson', 1)
     || require('Storage').readJSON('setting.json', 1) || {}
   E.showMenu({
     '': { 'title': 'Welcome App' },
     'Run on Next Boot': {
       value: !settings.welcomed,
       format: v => v ? 'OK' : 'No',
-      onchange: v => require('Storage').write('welcome.settings.json', {welcomed: !v}),
+      onchange: v => require('Storage').write('welcome.json', {welcomed: !v}),
     },
     'Run Now': () => load('welcome.app.js'),
     '< Back': back,