Skip to content

Commit ccb0350

Browse files
author
Corwin Kerr
committed
Merge remote-tracking branch 'origin/master' into widclkinfo-swipeOn-aware
2 parents f213da4 + be50617 commit ccb0350

File tree

622 files changed

+24975
-7884
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

622 files changed

+24975
-7884
lines changed

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ and which gives information about the app for the Launcher.
230230
"src":"-myappid", // source file
231231
"type":"widget/clock/app/bootloader/...", // optional, default "app"
232232
// see 'type' in 'metadata.json format' below for more options/info
233-
"version":"1.23",
233+
"version":"0.01",
234234
// added by BangleApps loader on upload based on metadata.json
235235
"files:"file1,file2,file3",
236236
// added by BangleApps loader on upload - lists all files
@@ -249,7 +249,7 @@ and which gives information about the app for the Launcher.
249249
{ "id": "appid", // 7 character app id
250250
"name": "Readable name", // readable name
251251
"shortName": "Short name", // short name for launcher
252-
"version": "0v01", // the version of this app
252+
"version": "0.01", // the version of this app
253253
"description": "...", // long description (can contain markdown)
254254
"icon": "icon.png", // icon in apps/
255255
"screenshots" : [ { "url":"screenshot.png" } ], // optional screenshot for app
@@ -270,7 +270,8 @@ and which gives information about the app for the Launcher.
270270
// 'notify' - provides 'notify' library for showing notifications
271271
// 'locale' - provides 'locale' library for language-specific date/distance/etc
272272
// (a version of 'locale' is included in the firmware)
273-
"tags": "", // comma separated tag list for searching
273+
// 'defaultconfig' - a set of apps that will can be installed and will wipe out all previously installed apps
274+
"tags": "", // comma separated tag list for searching (don't include uppercase or spaces)
274275
// common types are:
275276
// 'clock' - it's a clock
276277
// 'widget' - it is (or provides) a widget

android.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
<label class="chip tooltip" filterid="ram" data-tooltip="Apps that don't save anything to flash memory">Online</label>
8686
<label class="chip tooltip" filterid="clkinfo" data-tooltip="Info displayed on clocks, or clocks with info">Clock Info</label>
8787
<label class="chip tooltip" filterid="health" data-tooltip="Apps for your health">Health</label>
88+
<label class="chip tooltip" filterid="fonts" data-tooltip="Extra fonts for non-latin languages">Fonts</label>
8889
<label class="chip tooltip" filterid="favourites" data-tooltip="Apps that you've liked ❤️">Favourites</label>
8990
</div>
9091
<div class="sort-nav hidden">
@@ -159,6 +160,10 @@ <h3>Settings</h3>
159160
<input type="checkbox" id="settings-settime">
160161
<i class="form-icon"></i> Always update time when we connect
161162
</label>
163+
<label class="form-switch">
164+
<input type="checkbox" id="settings-nopacket">
165+
<i class="form-icon"></i> File Upload Compatibility mode (disables binary packet upload)
166+
</label>
162167
<label class="form-switch">
163168
<input type="checkbox" id="settings-usage-stats">
164169
<i class="form-icon"></i> Send app analytics to banglejs.com (apps installed, favourites, firmware version).<br/>

apps/93dub/ChangeLog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
0.05: Display time, even on Thursday
66
0.06: Fix light theme issue, where widgets would end up on a light strip
77
0.07: Minor code improvements
8+
0.08: Support Fast Loading

apps/93dub/app.js

Lines changed: 155 additions & 139 deletions
Large diffs are not rendered by default.

apps/93dub/metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"shortName":"93 Dub",
44
"icon": "93dub.png",
55
"screenshots": [{"url":"screenshot.png"}],
6-
"version": "0.07",
6+
"version": "0.08",
77
"description": "Fan recreation of orviwan's 91 Dub app for the Pebble smartwatch. Uses assets from his 91-Dub-v2.0 repo",
88
"tags": "clock",
99
"type": "clock",

apps/UI4swatch/metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"version": "0.02",
66
"description": "A UI/UX for espruino smartwatches, displays dinamically calc. x,y coordinates.",
77
"icon": "app.png",
8-
"tags": "Color,input,buttons,touch,UI",
8+
"tags": "color,input,buttons,touch,ui",
99
"supports": ["BANGLEJS"],
1010
"readme": "README.md",
1111
"screenshots": [{"url":"UI4swatch_icon.png"},{"url":"UI4swatch_s1.png"}],

apps/Uke/metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"version": "0.04",
55
"description": "Wrist mounted ukulele chords",
66
"icon": "app.png",
7-
"tags": "uke, chords",
8-
"supports" : ["BANGLEJS2"],
7+
"tags": "uke,chords",
8+
"supports" : ["BANGLEJS2"],
99
"readme": "README.md",
1010
"storage": [
1111
{"name":"Uke.app.js","url":"app.js"},

apps/agenda/ChangeLog

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@
1616
0.14: Fixed "Today" and "Yesterday" wrongly displayed for allDay events on some time zones
1717
0.15: Minor code improvements
1818
0.16: Correct date for all day events in negative timezones, improve locale display
19+
0.17: Fixed "Today" and "Tomorrow" labels displaying in non-current weeks
20+
0.18: Correct date in clockinfo for all-day events in negative timezones

apps/agenda/agenda.clkinfo.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,11 @@
6565
agenda.forEach((entry, i) => {
6666

6767
var title = entry.title.slice(0,12);
68-
var date = new Date(entry.timestamp*1000);
68+
// All day events are always in UTC and always start at 00:00:00, so we
69+
// need to "undo" the timezone offsetting to make sure that the day is
70+
// correct.
71+
var offset = entry.allDay ? new Date().getTimezoneOffset() * 60 : 0
72+
var date = new Date((entry.timestamp+offset)*1000);
6973
var dateStr = locale.date(date).replace(/\d\d\d\d/,"");
7074
var shortStr = ((date-now) > 86400000 || entry.allDay) ? dateStr : locale.time(date,1);
7175
var color = "#"+(0x1000000+Number(entry.color)).toString(16).padStart(6,"0");

apps/agenda/agenda.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,12 @@ function formatDay(date) {
4444
return formattedDate;
4545
}
4646
const today = new Date(Date.now());
47-
if (date.getDay() == today.getDay() && date.getMonth() == today.getMonth())
47+
if (date.getDate() == today.getDate())
4848
return /*LANG*/"Today ";
4949
else {
50-
const tomorrow = new Date(Date.now() + 86400 * 1000);
51-
if (date.getDay() == tomorrow.getDay() && date.getMonth() == tomorrow.getMonth()) {
50+
var tomorrow = new Date();
51+
tomorrow.setDate(tomorrow.getDate() + 1);
52+
if (date.getDate() == tomorrow.getDate()) {
5253
return /*LANG*/"Tomorrow ";
5354
}
5455
return formattedDate;

0 commit comments

Comments
 (0)