From a4c97850dd1f7a5c83e9a2be95e89d8199cacced Mon Sep 17 00:00:00 2001
From: Jeroen Peters <jeroenpeters1986@gmail.com>
Date: Fri, 18 Feb 2022 19:53:11 +0100
Subject: [PATCH] #1132: Messages: Allow disabling repetition of buzzer

---
 apps/messages/ChangeLog     |  1 +
 apps/messages/app.js        |  2 +-
 apps/messages/metadata.json |  2 +-
 apps/messages/settings.js   |  4 ++--
 apps/messages/widget.js     | 10 ++++++----
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/apps/messages/ChangeLog b/apps/messages/ChangeLog
index 4811cd19b..e2c671fa1 100644
--- a/apps/messages/ChangeLog
+++ b/apps/messages/ChangeLog
@@ -31,3 +31,4 @@
 0.19: Use a larger font for message text if it'll fit
 0.20: Allow tapping on the body to show a scrollable view of the message and title in a bigger font (fix #1405, #1031)
 0.21: Improve list readability on dark theme
+0.22: Allow repeat to be switched Off, so there is no buzzing repetition
diff --git a/apps/messages/app.js b/apps/messages/app.js
index 4aaf97369..5f70f6748 100644
--- a/apps/messages/app.js
+++ b/apps/messages/app.js
@@ -123,7 +123,7 @@ function getMessageImageCol(msg,def) {
     "telegram": "#0088cc",
     "twitter": "#1da1f2",
     "whatsapp": "#4fce5d",
-    "wordfeud": "#dcc8bd",
+    "wordfeud": "#e7d3c7",
   }[(msg.src||"").toLowerCase()]||(def !== undefined?def:g.theme.fg);
 }
 
diff --git a/apps/messages/metadata.json b/apps/messages/metadata.json
index 6834693ae..e84d9f0d9 100644
--- a/apps/messages/metadata.json
+++ b/apps/messages/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "messages",
   "name": "Messages",
-  "version": "0.21",
+  "version": "0.22",
   "description": "App to display notifications from iOS and Gadgetbridge",
   "icon": "app.png",
   "type": "app",
diff --git a/apps/messages/settings.js b/apps/messages/settings.js
index c865a37fb..ae9b4aab5 100644
--- a/apps/messages/settings.js
+++ b/apps/messages/settings.js
@@ -27,8 +27,8 @@
     },
     /*LANG*/'Repeat': {
       value: settings().repeat,
-      min: 2, max: 10,
-      format: v => v+"s",
+      min: 0, max: 10,
+      format: v => v?v+"s":/*LANG*/"Off",
       onchange: v => updateSetting("repeat", v)
     },
     /*LANG*/'Unread timer': {
diff --git a/apps/messages/widget.js b/apps/messages/widget.js
index 1239ef262..614b6194a 100644
--- a/apps/messages/widget.js
+++ b/apps/messages/widget.js
@@ -1,4 +1,4 @@
-WIDGETS["messages"]={area:"tl", width:0, iconwidth:23,
+WIDGETS["messages"]={area:"tl", width:0, iconwidth:24,
 draw:function() {
   Bangle.removeListener('touch', this.touch);
   if (!this.width) return;
@@ -8,9 +8,11 @@ draw:function() {
   //if (c<60) Bangle.setLCDPower(1); // keep LCD on for 1 minute
   let settings = require('Storage').readJSON("messages.settings.json", true) || {};
   if (settings.repeat===undefined) settings.repeat = 4;
-  if (c<120 && (Date.now()-this.l)>settings.repeat*1000) {
-    this.l = Date.now();
-    WIDGETS["messages"].buzz(); // buzz every 4 seconds
+  if(settings.repeat!==0) {
+    if (c<120 && (Date.now()-this.l)>settings.repeat*1000) {
+      this.l = Date.now();
+      WIDGETS["messages"].buzz(); // buzz every settings.repeat seconds
+    }
   }
   setTimeout(()=>WIDGETS["messages"].draw(), 1000);
   if (process.env.HWVERSION>1) Bangle.on('touch', this.touch);