From 9bca4822004a319540bf3e2307053f0f046cc75c Mon Sep 17 00:00:00 2001
From: Logan B <3870583+thinkpoop@users.noreply.github.com>
Date: Sun, 3 Mar 2024 11:34:28 -0600
Subject: [PATCH] a_dndtoggle: remove default.json

---
 apps/a_dndtoggle/a_dndtoggle.app.js | 6 ++----
 apps/a_dndtoggle/default.json       | 1 -
 apps/a_dndtoggle/metadata.json      | 1 -
 apps/a_dndtoggle/settings.js        | 8 +++-----
 4 files changed, 5 insertions(+), 11 deletions(-)
 delete mode 100644 apps/a_dndtoggle/default.json

diff --git a/apps/a_dndtoggle/a_dndtoggle.app.js b/apps/a_dndtoggle/a_dndtoggle.app.js
index 7ee02d231..207034209 100644
--- a/apps/a_dndtoggle/a_dndtoggle.app.js
+++ b/apps/a_dndtoggle/a_dndtoggle.app.js
@@ -6,10 +6,8 @@ let current = 0|bSettings.quiet;
 //1 alarms
 //2 silent
 
-const dndSettings = Object.assign(
-		require('Storage').readJSON("a_dndtoggle.default.json", true) || {},
-		require('Storage').readJSON("a_dndtoggle.settings.json", true) || {}
-  );
+const dndSettings = 
+	require('Storage').readJSON("a_dndtoggle.settings.json", true) || {};
 
 console.log("old: " + current);
 
diff --git a/apps/a_dndtoggle/default.json b/apps/a_dndtoggle/default.json
deleted file mode 100644
index 96bf417c5..000000000
--- a/apps/a_dndtoggle/default.json
+++ /dev/null
@@ -1 +0,0 @@
-{"mode":2}
\ No newline at end of file
diff --git a/apps/a_dndtoggle/metadata.json b/apps/a_dndtoggle/metadata.json
index e7f47d69e..62f0edae9 100644
--- a/apps/a_dndtoggle/metadata.json
+++ b/apps/a_dndtoggle/metadata.json
@@ -13,7 +13,6 @@
   ],
   "storage": [
     {"name":"a_dndtoggle.app.js","url":"a_dndtoggle.app.js"},
-    {"name":"a_dndtoggle.default.json","url":"default.json"},
     {"name":"a_dndtoggle.settings.js","url":"settings.js"},
 	{"name":"a_dndtoggle.img","url":"app-icon.js","evaluate":true}
   ],  
diff --git a/apps/a_dndtoggle/settings.js b/apps/a_dndtoggle/settings.js
index da643667f..aea8d9b60 100644
--- a/apps/a_dndtoggle/settings.js
+++ b/apps/a_dndtoggle/settings.js
@@ -1,9 +1,7 @@
 (function(back) {
 
-    const settings = Object.assign(
-        require('Storage').readJSON("a_dndtoggle.default.json", true) || {},
-        require('Storage').readJSON("a_dndtoggle.settings.json", true) || {}
-      );
+    const settings = 
+        require('Storage').readJSON("a_dndtoggle.settings.json", true) || {};
   
     function updateSettings() {
       require('Storage').writeJSON("a_dndtoggle.settings.json", settings);
@@ -15,7 +13,7 @@
         '': { 'title': 'A_DND Toggle' },
         '< Back': back,
         /*LANG*/"Quiet Mode": {
-          value: settings.mode,
+          value: settings.mode || 2,
           min: 1, max: modes.length - 1,
           format: v => modes[v],
           onchange: v => {