diff --git a/apps/launch/ChangeLog b/apps/launch/ChangeLog index c511b12b9..dc88c1b3e 100644 --- a/apps/launch/ChangeLog +++ b/apps/launch/ChangeLog @@ -23,6 +23,7 @@ 0.21: Make the "App source not found" warning less buggy 0.22: Add less padding between launcher items, use new font if available in 2v26+ 0.23: Draw a placeholder screen right at the start to speed up apparent boot time -0.24: Fix fullscreen when fastloading the launcher. (TODO:fix back btn flicker) +0.24: Fix Launcher when a custom font from 2v26+ is specified (fix #3787) + Fix fullscreen when fastloading the launcher. (TODO:fix back btn flicker) Fix showClocks setting not taking effect by now clearing cache when - changing those settings. + changing those settings. \ No newline at end of file diff --git a/apps/launch/app.js b/apps/launch/app.js index df3e9a62d..c0450e9ab 100644 --- a/apps/launch/app.js +++ b/apps/launch/app.js @@ -16,7 +16,7 @@ font = "Vector"+(vectorval).toString(); } else{ font = settings.font; - scaleval = (font.split("x")[1])/20; + scaleval = g.setFont(font).stringMetrics("X").height / 20; } } let height = 50*scaleval; @@ -109,4 +109,4 @@ if (!settings.fullscreen) // finally draw widgets Bangle.drawWidgets(); - } +} diff --git a/apps/sched/ChangeLog b/apps/sched/ChangeLog index eab8dd305..efe4d8e15 100644 --- a/apps/sched/ChangeLog +++ b/apps/sched/ChangeLog @@ -31,3 +31,4 @@ 0.28: Added an icon for disabled events 0.29: Improve clkinfo startup time by 10ms 0.30: Fix possible bug in toggling an alarm to on, from clkinfo +0.31: Ensure we reschedule alarms after setTimeZone has been called (fix #3791) \ No newline at end of file diff --git a/apps/sched/boot.js b/apps/sched/boot.js index d736dd0e7..d3441d669 100644 --- a/apps/sched/boot.js +++ b/apps/sched/boot.js @@ -4,6 +4,7 @@ clearTimeout(Bangle.SCHED); delete Bangle.SCHED; } + delete E.setTimeZone; // delete any modified setTimeZone we added below var alarms = require('Storage').readJSON('sched.json',1)||[]; var time = new Date(); var currentTime = (time.getHours()*3600000)+(time.getMinutes()*60000)+(time.getSeconds()*1000); @@ -25,6 +26,9 @@ normally. If active[0].js is defined, just run that code as-is and not alarm.js */ Bangle.SCHED = setTimeout(active[0].js||'load("sched.js")',t); + // Override setTimeZone to ensure we reschedule alarms after it has been called - fix #3791 + var tz = E.setTimeZone; + E.setTimeZone = function(z) { tz(z);eval(require("Storage").read("sched.boot.js")); }; } else { // check for new alarms at midnight (so day of week works) Bangle.SCHED = setTimeout('eval(require("Storage").read("sched.boot.js"))', 86400000 - currentTime); } diff --git a/apps/sched/metadata.json b/apps/sched/metadata.json index 7e3458ae6..8a52068c1 100644 --- a/apps/sched/metadata.json +++ b/apps/sched/metadata.json @@ -1,7 +1,7 @@ { "id": "sched", "name": "Scheduler", - "version": "0.30", + "version": "0.31", "description": "Scheduling library for alarms and timers", "icon": "app.png", "type": "scheduler", diff --git a/core b/core index 43dbadf5b..f83fa462d 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 43dbadf5b9a41ff00aa6bef76d3360b510fb06a5 +Subproject commit f83fa462d831eb0e93fe4ec2b48bfc98a785aa60 diff --git a/loader.js b/loader.js index c1741e696..cb25107df 100644 --- a/loader.js +++ b/loader.js @@ -333,7 +333,7 @@ window.addEventListener('load', (event) => { reloadLanguage(); }); - if (!navigator.bluetooth) { + if ((typeof Android === "undefined") && !navigator.bluetooth) { console.warn("No Web Bluetooth on this platform"); var iOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream; if (iOS) {