diff --git a/apps/alarm/app.js b/apps/alarm/app.js index 2167ead36..a68e118ca 100644 --- a/apps/alarm/app.js +++ b/apps/alarm/app.js @@ -1,7 +1,11 @@ Bangle.loadWidgets(); Bangle.drawWidgets(); -const settings = require('Storage').readJSON('alarm.json',1)||{}; +const settings = Object.assign({ + showConfirm : true, + showAutoSnooze : true, + showHidden : true +}, require('Storage').readJSON('alarm.json',1)||{}); // 0 = Sunday (default), 1 = Monday const firstDayOfWeek = (require("Storage").readJSON("setting.json", true) || {}).firstDayOfWeek || 0; const WORKDAYS = 62; @@ -214,9 +218,9 @@ function showEditAlarmMenu(selectedAlarm, alarmIndex, withDate) { if (!keyboard) delete menu[/*LANG*/"Message"]; if (!keyboard || !settings.showGroup) delete menu[/*LANG*/"Group"]; - if (!(settings.showConfirm == null ? true : settings.showConfirm)) delete menu[/*LANG*/"Confirm"]; - if (!(settings.showAutoSnooze == null ? true : settings.showAutoSnooze)) delete menu[/*LANG*/"Auto Snooze"]; - if (!(settings.showHidden == null ? true : settings.showHidden)) delete menu[/*LANG*/"Hidden"]; + if (!settings.showConfirm) delete menu[/*LANG*/"Confirm"]; + if (!settings.showAutoSnooze) delete menu[/*LANG*/"Auto Snooze"]; + if (!settings.showHidden) delete menu[/*LANG*/"Hidden"]; if (!alarm.date) { delete menu[/*LANG*/"Day"]; delete menu[/*LANG*/"Month"]; diff --git a/apps/alarm/metadata.json b/apps/alarm/metadata.json index bd92542db..bcd60a376 100644 --- a/apps/alarm/metadata.json +++ b/apps/alarm/metadata.json @@ -26,5 +26,6 @@ { "url": "screenshot-9.png" }, { "url": "screenshot-10.png" }, { "url": "screenshot-11.png" } - ] + ], + "data":[ {"name":"alarm.settings.json"} ] } diff --git a/apps/alarm/settings.js b/apps/alarm/settings.js index ad5084f23..253bade93 100644 --- a/apps/alarm/settings.js +++ b/apps/alarm/settings.js @@ -1,5 +1,9 @@ (function(back) { - let settings = require('Storage').readJSON('alarm.json',1)||{}; + let settings = Object.assign({ + showConfirm : true, + showAutoSnooze : true, + showHidden : true + }, require('Storage').readJSON('alarm.json',1)||{}); const save = () => require('Storage').write('alarm.json', settings); const DATE_FORMATS = ['default', 'mmdd']; @@ -22,15 +26,15 @@ } }, /*LANG*/'Show Menu Auto Snooze': { - value : settings.showAutoSnooze == null ? true : settings.showAutoSnooze, + value : settings.showAutoSnooze, onchange : v => { settings.showAutoSnooze=v; save();} }, /*LANG*/'Show Menu Confirm': { - value : settings.showConfirm == null ? true : settings.showConfirm, + value : settings.showConfirm, onchange : v => { settings.showConfirm=v; save();} }, /*LANG*/'Show Menu Hidden': { - value : settings.showHidden == null ? true : settings.showHidden, + value : settings.showHidden, onchange : v => { settings.showHidden=v; save();} }, /*LANG*/'Show Menu Group': {