[alarm] default settings at the top; upd metadata

master
lauzonhomeschool 2023-09-18 17:38:17 -04:00 committed by GitHub
parent b9e4306f8f
commit 279ee5d292
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 9 deletions

View File

@ -1,7 +1,11 @@
Bangle.loadWidgets(); Bangle.loadWidgets();
Bangle.drawWidgets(); 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 // 0 = Sunday (default), 1 = Monday
const firstDayOfWeek = (require("Storage").readJSON("setting.json", true) || {}).firstDayOfWeek || 0; const firstDayOfWeek = (require("Storage").readJSON("setting.json", true) || {}).firstDayOfWeek || 0;
const WORKDAYS = 62; const WORKDAYS = 62;
@ -214,9 +218,9 @@ function showEditAlarmMenu(selectedAlarm, alarmIndex, withDate) {
if (!keyboard) delete menu[/*LANG*/"Message"]; if (!keyboard) delete menu[/*LANG*/"Message"];
if (!keyboard || !settings.showGroup) delete menu[/*LANG*/"Group"]; if (!keyboard || !settings.showGroup) delete menu[/*LANG*/"Group"];
if (!(settings.showConfirm == null ? true : settings.showConfirm)) delete menu[/*LANG*/"Confirm"]; if (!settings.showConfirm) delete menu[/*LANG*/"Confirm"];
if (!(settings.showAutoSnooze == null ? true : settings.showAutoSnooze)) delete menu[/*LANG*/"Auto Snooze"]; if (!settings.showAutoSnooze) delete menu[/*LANG*/"Auto Snooze"];
if (!(settings.showHidden == null ? true : settings.showHidden)) delete menu[/*LANG*/"Hidden"]; if (!settings.showHidden) delete menu[/*LANG*/"Hidden"];
if (!alarm.date) { if (!alarm.date) {
delete menu[/*LANG*/"Day"]; delete menu[/*LANG*/"Day"];
delete menu[/*LANG*/"Month"]; delete menu[/*LANG*/"Month"];

View File

@ -26,5 +26,6 @@
{ "url": "screenshot-9.png" }, { "url": "screenshot-9.png" },
{ "url": "screenshot-10.png" }, { "url": "screenshot-10.png" },
{ "url": "screenshot-11.png" } { "url": "screenshot-11.png" }
] ],
"data":[ {"name":"alarm.settings.json"} ]
} }

View File

@ -1,5 +1,9 @@
(function(back) { (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 save = () => require('Storage').write('alarm.json', settings);
const DATE_FORMATS = ['default', 'mmdd']; const DATE_FORMATS = ['default', 'mmdd'];
@ -22,15 +26,15 @@
} }
}, },
/*LANG*/'Show Menu Auto Snooze': { /*LANG*/'Show Menu Auto Snooze': {
value : settings.showAutoSnooze == null ? true : settings.showAutoSnooze, value : settings.showAutoSnooze,
onchange : v => { settings.showAutoSnooze=v; save();} onchange : v => { settings.showAutoSnooze=v; save();}
}, },
/*LANG*/'Show Menu Confirm': { /*LANG*/'Show Menu Confirm': {
value : settings.showConfirm == null ? true : settings.showConfirm, value : settings.showConfirm,
onchange : v => { settings.showConfirm=v; save();} onchange : v => { settings.showConfirm=v; save();}
}, },
/*LANG*/'Show Menu Hidden': { /*LANG*/'Show Menu Hidden': {
value : settings.showHidden == null ? true : settings.showHidden, value : settings.showHidden,
onchange : v => { settings.showHidden=v; save();} onchange : v => { settings.showHidden=v; save();}
}, },
/*LANG*/'Show Menu Group': { /*LANG*/'Show Menu Group': {