- sideTap setting converted into number

- sideTap setting menu is radiobutton
pull/1852/head
Rarder44 2022-05-20 01:42:18 +02:00
parent d760fcdf93
commit 3e275a51ae
2 changed files with 19 additions and 34 deletions

View File

@ -37,15 +37,15 @@ function loadLocation() {
}
function loadSettings() {
settings = require("Storage").readJSON(SETTINGS_FILE,1)|| {'bg': '#0f0', 'color': 'Green', 'autoCycle': true,'sideTap':'on'};
settings = {'bg': '#0f0', 'color': 'Green', 'autoCycle': true,'sideTap':0};
//sideTap 0 = on | 1 = sidebar1...
let settings = {'bg': '#0f0', 'color': 'Green', 'autoCycle': true,'sideTap':'on'};
let tmp = require('Storage').readJSON(SETTINGS_FILE, 1) || settings;
for (const key in tmp) {
settings[key] = tmp[key]
}
if(settings.sideTap!='on')
if(settings.sideTap!=0)
sideBar=parseInt(settings.sideTap)-1; //tab to show
is12Hour = (require("Storage").readJSON(GLOBAL_SETTINGS, 1) || {})["12hour"] || false;
}
@ -305,7 +305,7 @@ loadLocation();
if(settings.autoCycle || settings.sideTap=='on')
if(settings.autoCycle || settings.sideTap==0)
{
Bangle.setUI("clockupdown", btn=> {
if (btn<0) prevSidebar();

View File

@ -2,7 +2,8 @@
const SETTINGS_FILE = "rebble.json";
// initialize with default settings...
let localSettings = {'bg': '#0f0', 'color': 'Green', 'autoCycle': true, 'sideTap':'on'};
let localSettings = {'bg': '#0f0', 'color': 'Green', 'autoCycle': true, 'sideTap':0};
//sideTap 0 = on| 1= sideBar1 | 2 = ...
// ...and overwrite them with any saved values
// This way saved values are preserved if a new version adds more settings
@ -49,43 +50,27 @@
if( !localSettings.autoCycle)
{
menu['Tap to Cycle']={
menu['Tap to Cycle']= {
value: localSettings.sideTap,
onchange: () => setTimeout(showTapMenu, 100, changedValue => {
localSettings.sideTap=changedValue;
min: 0,
max: 3,
step: 1,
format: v => NumberToSideTap(v),
onchange: v => {
localSettings.sideTap=v
save();
setTimeout(showMenu, 10);
})
}
};
}
E.showMenu(menu);
}
function showTapMenu(changeCallback)
function NumberToSideTap(Number)
{
var current = localSettings.sideTap;
const menu = {
"": { "title": /*LANG*/"Tap to Cycle" },
"< Back": () => changeCallback(current),
"on": { // No days set: the alarm will fire once
value: current == 'on',
onchange: () => changeCallback('on')
},
"1": {
value: current == '1',
onchange: () => changeCallback('1')
},
"2": {
value: current == '2',
onchange: () => changeCallback('2')
},
"3": {
value: current == '3',
onchange: () => changeCallback('3')
},
};
E.showMenu(menu);
if(Number==0)
return 'on';
return Number+"";
}
showMenu();