Skip to content

Commit 780b691

Browse files
StefanStefan
authored andcommitted
[v0.8]
* Updated menu icon to better match current display * View date, month and week number (with show/hide settings) * "Zoom"-mode to fit width (but trimming bottom part) * Display correct time at startup (not show white boxes first half second)
1 parent 45bb9be commit 780b691

File tree

11 files changed

+235
-133
lines changed

11 files changed

+235
-133
lines changed

Fibonacci_Clock.pbw

1.62 KB
Binary file not shown.

Fibonacci_Clock.png

-348 Bytes
Loading

Fibonacci_Clock1.png

2.27 KB
Loading

Sample.xcf

-7.87 KB
Binary file not shown.

Todo.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ N/A [ ] N/A
44

55
New features:
66
Done Description
7-
[ ] Updated menu icon
8-
[ ] View date, month and week number
97
[ ] Better looking color selection on config page (that show all colors on phone)
10-
[ ] "Zoom" to fit width
118
[ ] Random between valid ways of colouring the boxes.
129
[ ] Rotate the image 90� counter-clockwise, to for text info above/below
1310
(Tried it, but it became too small, I think. Code #ifdef'ed out)

appinfo.json

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"appKeys": {
33
"BackgroundColor": 13,
44
"DotColor": 15,
5+
"FiboDisplay": 20,
56
"GridColor": 14,
67
"HourColor": 8,
78
"HourMinuteColor": 10,
@@ -28,34 +29,34 @@
2829
"resources": {
2930
"media": [
3031
{
31-
"file": "images/cross.png",
32-
"name": "IMAGE_CROSS",
32+
"file": "images/battery.png",
33+
"name": "IMAGE_BATTERY",
3334
"type": "png"
3435
},
3536
{
36-
"file": "images/bluetooth.png",
37-
"name": "IMAGE_BLUETOOTH",
37+
"file": "images/MenuIcon.png",
38+
"menuIcon": true,
39+
"name": "MENU_ICON",
3840
"type": "png"
3941
},
4042
{
41-
"file": "images/plugged.png",
42-
"name": "IMAGE_PLUGGED",
43+
"file": "images/charging.png",
44+
"name": "IMAGE_CHARGING",
4345
"type": "png"
4446
},
4547
{
46-
"file": "images/charging.png",
47-
"name": "IMAGE_CHARGING",
48+
"file": "images/plugged.png",
49+
"name": "IMAGE_PLUGGED",
4850
"type": "png"
4951
},
5052
{
51-
"file": "images/battery.png",
52-
"name": "IMAGE_BATTERY",
53+
"file": "images/cross.png",
54+
"name": "IMAGE_CROSS",
5355
"type": "png"
5456
},
5557
{
56-
"file": "images/MenuIcon.png",
57-
"menuIcon": true,
58-
"name": "MENU_ICON",
58+
"file": "images/bluetooth.png",
59+
"name": "IMAGE_BLUETOOTH",
5960
"type": "png"
6061
}
6162
]
@@ -66,7 +67,7 @@
6667
"basalt"
6768
],
6869
"uuid": "1289bd91-5811-40a5-a270-e8f97c126f18",
69-
"versionLabel": "0.7",
70+
"versionLabel": "0.8",
7071
"watchapp": {
7172
"watchface": true
7273
}

config/config.htm

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
<title>Fibonacci Clock Settings</title>
44
<script>
55
var elementIds = [
6-
"ShowTime", /* "ShowDate", "ShowMonth", "ShowWeekNum", */ "ShowCharge",
6+
"ShowTime", "ShowDate", /* "ShowMonth", */ "ShowWeekNum", "ShowCharge",
77
"ShowBluetooth", "ShowSpiral", "HourColor", "MinuteColor", "HourMinuteColor",
88
"NoneColor", "SpiralColor", "BackgroundColor", "GridColor", "DotColor",
9-
"TimeColor", "OutlineColor", "VibeBluetooth"
9+
"TimeColor", "OutlineColor", "VibeBluetooth", "FiboDisplay"
1010
];
1111

1212
var defValue = [
1313
0, // ShowTime
14-
/*
1514
0, // ShowDate
15+
/*
1616
0, // ShowMonth
17+
*/
1718
0, // ShowWeekNum
18-
*/
1919
1, // ShowCharge
2020
1, // ShowBluetooth
2121
1, // ShowSpiral
@@ -29,7 +29,8 @@
2929
63, // DotColor
3030
64, // TimeColor
3131
21, // OutlineColor
32-
1 // VibeBluetooth
32+
1, // VibeBluetooth
33+
0, // FiboDisplay
3334
];
3435

3536

@@ -141,22 +142,22 @@ <h1>Fibonacci Clock Settings</h1>
141142
<option value="1">Show</option>
142143
<option value="2">Show on tap</option>
143144
</select> time with digits</p>
144-
<!--
145+
145146
<p><select id="ShowDate">
146147
<option value="0">Hide</option>
147148
<option value="1">Show</option>
148149
</select> date</p>
149-
150+
<!--
150151
<p><select id="ShowMonth">
151152
<option value="0">Hide</option>
152153
<option value="1">Show</option>
153154
</select> month</p>
154-
155+
-->
155156
<p><select id="ShowWeekNum">
156157
<option value="0">Hide</option>
157158
<option value="1">Show</option>
158159
</select> week number</p>
159-
-->
160+
160161
<p><select id="ShowCharge">
161162
<option value="0">Hide</option>
162163
<option value="1">Show</option>
@@ -177,6 +178,11 @@ <h1>Fibonacci Clock Settings</h1>
177178
<option value="1">Show</option>
178179
</select> spiral</p>
179180

181+
<p><select id="FiboDisplay">
182+
<option value="0">Fit</option>
183+
<option value="1">Zoom</option>
184+
</select> display</p>
185+
180186
<p><select id="HourColor"></select>
181187
<span id="HourColorPreview" style="border:1px solid">&nbsp;&nbsp;&nbsp;&nbsp;</span> Hour color</p>
182188

resources/images/MenuIcon.png

-15 Bytes
Loading

resources/images/battery.png

47 Bytes
Loading

0 commit comments

Comments
 (0)