Merge branch 'master' into master

pull/1722/head
nxdefiant 2022-04-21 11:56:11 +02:00 committed by GitHub
commit 0e0415fefa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 30 additions and 7 deletions

1
.gitignore vendored
View File

@ -10,3 +10,4 @@ _config.yml
tests/Layout/bin/tmp.* tests/Layout/bin/tmp.*
tests/Layout/testresult.bmp tests/Layout/testresult.bmp
apps.local.json apps.local.json
_site

View File

@ -1,5 +1,5 @@
function drawAlert(){ function drawAlert(){
E.showPrompt("Innactivity detected",{ E.showPrompt("Inactivity detected",{
title:"Activity reminder", title:"Activity reminder",
buttons : {"Ok": true,"Dismiss": false} buttons : {"Ok": true,"Dismiss": false}
}).then(function(v) { }).then(function(v) {

View File

@ -19,4 +19,5 @@
0.18: Cope with >1 identical alarm at once (#1667) 0.18: Cope with >1 identical alarm at once (#1667)
0.19: Ensure rescheduled alarms that already fired have 'last' reset 0.19: Ensure rescheduled alarms that already fired have 'last' reset
0.20: Use the new 'sched' factories to initialize new alarms/timers 0.20: Use the new 'sched' factories to initialize new alarms/timers
0.21: Refactor some methods to scheduling library 0.21: Fix time reset after a day of week change (#1676)
0.22: Refactor some methods to scheduling library

View File

@ -102,7 +102,11 @@ function editAlarm(alarmIndex, alarm) {
}, },
/*LANG*/'Days': { /*LANG*/'Days': {
value: "SMTWTFS".split("").map((d,n)=>a.dow&(1<<n)?d:".").join(""), value: "SMTWTFS".split("").map((d,n)=>a.dow&(1<<n)?d:".").join(""),
onchange: () => editDOW(a.dow, d=>{a.dow=d;editAlarm(alarmIndex,a)}) onchange: () => editDOW(a.dow, d => {
a.dow = d;
a.t = encodeTime(t);
editAlarm(alarmIndex, a);
})
}, },
/*LANG*/'Vibrate': require("buzz_menu").pattern(a.vibrate, v => a.vibrate=v ), /*LANG*/'Vibrate': require("buzz_menu").pattern(a.vibrate, v => a.vibrate=v ),
/*LANG*/'Auto Snooze': { /*LANG*/'Auto Snooze': {

14
apps/launch/README.md Normal file
View File

@ -0,0 +1,14 @@
Launcher
========
This is the default launcher but you can replace it with a customised launcher.
The app is needed to display a menu with all the apps installed on your Bangle. You can launch an app by touching its name/icon.
Settings
--------
- `Font` - The font used (`4x6`, `6x8`, `12x20`, `6x15` or `Vector`). Default `12x20`.
- `Vector Font Size` - The size of the font if `Font` is set to `Vector`. Default `10`.
- `Show Clocks` - If set to `No` then clocks won't appear in the app list. Default `Yes`.
- `Fullscreen` - If set to `Yes` then widgets won't be loaded. Default `No`.

View File

@ -4,6 +4,7 @@
"shortName": "Launcher", "shortName": "Launcher",
"version": "0.13", "version": "0.13",
"description": "This is needed to display a menu allowing you to choose your own applications. You can replace this with a customised launcher.", "description": "This is needed to display a menu allowing you to choose your own applications. You can replace this with a customised launcher.",
"readme": "README.md",
"icon": "app.png", "icon": "app.png",
"type": "launch", "type": "launch",
"tags": "tool,system,launcher", "tags": "tool,system,launcher",

View File

@ -46,3 +46,4 @@
0.31: Option to disable icon flashing 0.31: Option to disable icon flashing
0.32: Added an option to allow quiet mode to override message auto-open 0.32: Added an option to allow quiet mode to override message auto-open
0.33: Timeout from the message list screen if the message being displayed is removed and there is a timer going 0.33: Timeout from the message list screen if the message being displayed is removed and there is a timer going
0.34: Don't buzz for 'map' update messages

View File

@ -52,7 +52,8 @@ var MESSAGES = require("Storage").readJSON("messages.json",1)||[];
if (!Array.isArray(MESSAGES)) MESSAGES=[]; if (!Array.isArray(MESSAGES)) MESSAGES=[];
var onMessagesModified = function(msg) { var onMessagesModified = function(msg) {
// TODO: if new, show this new one // TODO: if new, show this new one
if (msg && msg.id!=="music" && msg.new && !((require('Storage').readJSON('setting.json', 1) || {}).quiet)) { if (msg && msg.id!=="music" && msg.new && active!="map" &&
!((require('Storage').readJSON('setting.json', 1) || {}).quiet)) {
if (WIDGETS["messages"]) WIDGETS["messages"].buzz(); if (WIDGETS["messages"]) WIDGETS["messages"].buzz();
else Bangle.buzz(); else Bangle.buzz();
} }

View File

@ -1,7 +1,7 @@
{ {
"id": "messages", "id": "messages",
"name": "Messages", "name": "Messages",
"version": "0.33", "version": "0.34",
"description": "App to display notifications from iOS and Gadgetbridge/Android", "description": "App to display notifications from iOS and Gadgetbridge/Android",
"icon": "app.png", "icon": "app.png",
"type": "app", "type": "app",

2
core

@ -1 +1 @@
Subproject commit b04f32553935f1479ad226ce1b2cff4f4b2e1a6f Subproject commit 89049a5c7c80d2b56dc235d135fc63b80789db96