From b047f14d4ada97c510edc7a773a3e1f08982bc5d Mon Sep 17 00:00:00 2001
From: Richard de Boer <richard@tubul.net>
Date: Fri, 17 Apr 2020 21:35:59 +0200
Subject: [PATCH] setting: Save settings in data file

---
 apps.json                          |  6 ++++--
 apps/setting/ChangeLog             |  1 +
 apps/setting/settings-default.json | 25 -------------------------
 3 files changed, 5 insertions(+), 27 deletions(-)
 delete mode 100644 apps/setting/settings-default.json

diff --git a/apps.json b/apps.json
index a8b29b685..4d5493e49 100644
--- a/apps.json
+++ b/apps.json
@@ -122,15 +122,17 @@
   { "id": "setting",
     "name": "Settings",
     "icon": "settings.png",
-    "version":"0.16",
+    "version":"0.17",
     "description": "A menu for setting up Bangle.js",
     "tags": "tool,system",
     "storage": [
       {"name":"setting.app.js","url":"settings.js"},
       {"name":"setting.boot.js","url":"boot.js"},
-      {"name":"setting.json","url":"settings-default.json","evaluate":true},
       {"name":"setting.img","url":"settings-icon.js","evaluate":true}
     ],
+    "data": [
+      {"name":"setting.json"}
+    ],
     "sortorder" : -2
   },
   { "id": "alarm",
diff --git a/apps/setting/ChangeLog b/apps/setting/ChangeLog
index 3acfb5fb0..773b510f0 100644
--- a/apps/setting/ChangeLog
+++ b/apps/setting/ChangeLog
@@ -18,3 +18,4 @@
 0.14: Reduce memory usage when running app settings page
 0.15: Reduce memory usage when running default clock chooser (#294)
 0.16: Reduce memory usage further when running app settings page
+0.17: Don't overwrite existing settings on app update
diff --git a/apps/setting/settings-default.json b/apps/setting/settings-default.json
deleted file mode 100644
index c61fd6109..000000000
--- a/apps/setting/settings-default.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  ble: true,             // Bluetooth enabled by default
-  blerepl: true,         // Is REPL on Bluetooth - can Espruino IDE be used?
-  log: false,            // Do log messages appear on screen?
-  timeout: 10,           // Default LCD timeout in seconds
-  vibrate: true,         // Vibration enabled by default. App must support
-  beep: "vib",           // Beep enabled by default. App must support
-  timezone: 0,           // Set the timezone for the device
-  HID : false,           // BLE HID mode, off by default
-  clock: null,           // a string for the default clock's name
-  "12hour" : false,      // 12 or 24 hour clock?
-  // welcomed : undefined/true (whether welcome app should show)
-  brightness: 1,       // LCD brightness from 0 to 1
-  options: {
-    wakeOnBTN1: true,
-    wakeOnBTN2: true,
-    wakeOnBTN3: true,
-    wakeOnFaceUp: false,
-    wakeOnTouch: false,
-    wakeOnTwist: true,
-    twistThreshold: 819.2,
-    twistMaxY: -800,
-    twistTimeout: 1000
-  }
-}