From 43b0d8897e7a50556b93a58eff19d068d2f43544 Mon Sep 17 00:00:00 2001
From: Richard de Boer <richard@tubul.net>
Date: Fri, 17 Apr 2020 21:25:56 +0200
Subject: [PATCH] widbatpc: Save settings in data file

---
 apps.json                 | 8 +++++---
 apps/widbatpc/ChangeLog   | 1 +
 apps/widbatpc/settings.js | 2 +-
 apps/widbatpc/widget.js   | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps.json b/apps.json
index 0c97b9e57..315120cc7 100644
--- a/apps.json
+++ b/apps.json
@@ -342,14 +342,16 @@
     "name": "Battery Level Widget (with percentage)",
     "shortName": "Battery Widget",
     "icon": "widget.png",
-    "version":"0.09",
+    "version":"0.10",
     "description": "Show the current battery level and charging status in the top right of the clock, with charge percentage",
     "tags": "widget,battery",
     "type":"widget",
     "storage": [
       {"name":"widbatpc.wid.js","url":"widget.js"},
-      {"name":"widbatpc.settings.js","url":"settings.js"},
-      {"name":"widbatpc.settings.json","content": "{}"}
+      {"name":"widbatpc.settings.js","url":"settings.js"}
+    ],
+    "data": [
+      {"name":"widbatpc.json"}
     ]
   },
   { "id": "widbt",
diff --git a/apps/widbatpc/ChangeLog b/apps/widbatpc/ChangeLog
index 129707320..138c1adc8 100644
--- a/apps/widbatpc/ChangeLog
+++ b/apps/widbatpc/ChangeLog
@@ -6,3 +6,4 @@
 0.07: Add settings: percentage/color/charger icon
 0.08: Draw percentage as inverted on monochrome battery
 0.09: Fix regression stopping correct widget updates
+0.10: Don't overwrite existing settings on app update
diff --git a/apps/widbatpc/settings.js b/apps/widbatpc/settings.js
index 5c0bdbcae..88988cf22 100644
--- a/apps/widbatpc/settings.js
+++ b/apps/widbatpc/settings.js
@@ -3,7 +3,7 @@
  * @param {function} back Use back() to return to settings menu
  */
 (function(back) {
-  const SETTINGS_FILE = 'widbatpc.settings.json'
+  const SETTINGS_FILE = 'widbatpc.json'
   const COLORS = ['By Level', 'Green', 'Monochrome']
 
   // initialize with default settings...
diff --git a/apps/widbatpc/widget.js b/apps/widbatpc/widget.js
index aca690ce0..189ca215f 100644
--- a/apps/widbatpc/widget.js
+++ b/apps/widbatpc/widget.js
@@ -11,7 +11,7 @@ const COLORS = {
   'ok': 0xFD20, // "Orange"
   'low':0xF800, // "Red"
 }
-const SETTINGS_FILE = 'widbatpc.settings.json'
+const SETTINGS_FILE = 'widbatpc.json'
 
 let settings
 function loadSettings() {