bryan
/
BangleApps_old
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

messages: don't buzz during Quiet Mode

master
Richard de Boer 2021-12-17 21:54:02 +01:00
parent d9d5926416
commit 43f2252bbf
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps.json
View File

@ -77,7 +77,7 @@
{ {
"id": "messages", "id": "messages",
"name": "Messages", "name": "Messages",
"version": "0.14", "version": "0.15",
"description": "App to display notifications from iOS and Gadgetbridge", "description": "App to display notifications from iOS and Gadgetbridge",
"icon": "app.png", "icon": "app.png",
"type": "app", "type": "app",

1
apps/messages/ChangeLog
View File

@ -21,3 +21,4 @@
Add 'Delete All' option to message options Add 'Delete All' option to message options
Now update correctly when 'require("messages").clearAll()' is called Now update correctly when 'require("messages").clearAll()' is called
0.14: Hide widget when all unread notifications are dismissed from phone 0.14: Hide widget when all unread notifications are dismissed from phone
0.15: Don't buzz when Quiet Mode is active

2
apps/messages/app.js
View File

@ -52,7 +52,7 @@ 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.new) { if (msg && msg.new && !((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();
} }

5
apps/messages/lib.js
View File

@ -43,7 +43,8 @@ exports.pushMessage = function(event) {
// otherwise load messages/show widget // otherwise load messages/show widget
var loadMessages = Bangle.CLOCK || event.important; var loadMessages = Bangle.CLOCK || event.important;
// first, buzz // first, buzz
if (loadMessages && global.WIDGETS && WIDGETS.messages) var quiet = (require('Storage').readJSON('setting.json',1)||{}).quiet;
if (!quiet && loadMessages && global.WIDGETS && WIDGETS.messages)
WIDGETS.messages.buzz(); WIDGETS.messages.buzz();
// after a delay load the app, to ensure we have all the messages // after a delay load the app, to ensure we have all the messages
if (exports.messageTimeout) clearTimeout(exports.messageTimeout); if (exports.messageTimeout) clearTimeout(exports.messageTimeout);
@ -51,7 +52,7 @@ exports.pushMessage = function(event) {
exports.messageTimeout = undefined; exports.messageTimeout = undefined;
// if we're in a clock or it's important, go straight to messages app // if we're in a clock or it's important, go straight to messages app
if (loadMessages) return load("messages.app.js"); if (loadMessages) return load("messages.app.js");
if (!global.WIDGETS || !WIDGETS.messages) return Bangle.buzz(); // no widgets - just buzz to let someone know if (!quiet && (!global.WIDGETS || !WIDGETS.messages)) return Bangle.buzz(); // no widgets - just buzz to let someone know
WIDGETS.messages.show(); WIDGETS.messages.show();
}, 500); }, 500);
} }

1
apps/messages/widget.js
View File

@ -26,6 +26,7 @@ WIDGETS["messages"]={area:"tl",width:0,draw:function() {
WIDGETS["messages"].width=0; WIDGETS["messages"].width=0;
Bangle.drawWidgets(); Bangle.drawWidgets();
},buzz:function() { },buzz:function() {
if ((require('Storage').readJSON('setting.json',1)||{}).quiet) return; // never buzz during Quiet Mode
let v = (require('Storage').readJSON("messages.settings.json", true) || {}).vibrate || "."; let v = (require('Storage').readJSON("messages.settings.json", true) || {}).vibrate || ".";
function b() { function b() {
var c = v[0]; var c = v[0];