Skip to content

Commit 342e5a8

Browse files
authored
Fixed bugs in settings.js
Moved list definitions and functions, added direction selector.
1 parent 5c2e29c commit 342e5a8

File tree

1 file changed

+26
-19
lines changed

1 file changed

+26
-19
lines changed

apps/flux/settings.js

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,26 @@
11
(function(back) {
2-
const FILE = "flex.settings.json";
2+
const FILE = "flux.settings.json";
3+
4+
// Color list shared across fields
5+
const COLORS = [
6+
"White", "Black", "Red", "Blue", "Green",
7+
"Yellow", "Orange", "Purple", "Lime",
8+
"Cyan", "Pink", "Light Blue"
9+
];
10+
11+
const directions = [
12+
"Up > Down",
13+
"Down > Up"
14+
];
15+
16+
function colorIndex(name) {
17+
let i = COLORS.indexOf(name);
18+
return i >= 0 ? i : 0;
19+
}
320

421
// Load existing settings with defaults
522
let settings = Object.assign({
6-
"24hour": false,
23+
direction: 0,
724
bg: "Black",
825
fg: "White",
926
bg2: "Lime",
@@ -15,12 +32,14 @@
1532
}
1633

1734
E.showMenu({
18-
"": { title: "Flex Watchface" },
35+
"": { title: "Flux Watchface" },
1936
"< Back": back,
20-
"24 Hour Time": {
21-
value: !!settings["24hour"],
22-
onchange: v => {
23-
settings["24hour"] = v;
37+
"Direction": {
38+
value: settings.direction,
39+
min: 0, max: 1,
40+
format: i => directions[i],
41+
onchange: i => {
42+
settings.direction = i;
2443
writeSettings();
2544
}
2645
},
@@ -61,16 +80,4 @@
6180
}
6281
},
6382
});
64-
65-
// Color list shared across fields
66-
const COLORS = [
67-
"White", "Black", "Red", "Blue", "Green",
68-
"Yellow", "Orange", "Purple", "Lime",
69-
"Cyan", "Pink", "Light Blue"
70-
];
71-
72-
function colorIndex(name) {
73-
let i = COLORS.indexOf(name);
74-
return i >= 0 ? i : 0;
75-
}
7683
});

0 commit comments

Comments
 (0)