From 86d43c3fbb5f6dacab2a60f39c50f40546cdd39e Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 4 Mar 2021 10:30:23 +0000
Subject: [PATCH] notify 0.07: Auto-calculate height, and pad text down even
 when there's no title (so it stays on-screen)

---
 apps.json             |  2 +-
 apps/notify/ChangeLog |  1 +
 apps/notify/README.md |  4 ++--
 apps/notify/notify.js | 29 ++++++++++++++++++-----------
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/apps.json b/apps.json
index cd731443c..95e259039 100644
--- a/apps.json
+++ b/apps.json
@@ -80,7 +80,7 @@
     "name": "Notifications (default)",
     "shortName":"Notifications",
     "icon": "notify.png",
-    "version":"0.06",
+    "version":"0.07",
     "description": "A handler for displaying notifications that displays them in a bar at the top of the screen",
     "tags": "widget",
     "type": "notify",
diff --git a/apps/notify/ChangeLog b/apps/notify/ChangeLog
index c823f9033..6450ca2c6 100644
--- a/apps/notify/ChangeLog
+++ b/apps/notify/ChangeLog
@@ -3,3 +3,4 @@
 0.03: Pass `area{x,y,w,h}` to render callback instead of just `y`
 0.05: Adjust position of notification src text
 0.06: Support background color
+0.07: Auto-calculate height, and pad text down even when there's no title (so it stays on-screen)
diff --git a/apps/notify/README.md b/apps/notify/README.md
index cef9f2124..ee1bf9be0 100644
--- a/apps/notify/README.md
+++ b/apps/notify/README.md
@@ -10,13 +10,13 @@ other applications or widgets to display messages.
 ```JS
 options = {
   on : bool, // turn screen on, default true
-  size : int, // height of notification, default 80 (max)  
+  size : int, // height of notification, default is fit to height (80 max)  
   title : string, // optional title
   id // optional notification ID, used with hide()
   src : string, // optional source name
   body : string, // optional body text
   icon : string, // optional icon (image string)
-  render function(area) {} // function callback to render in area{x,y,w,h} 
+  render function(area) {} // function callback to render in area{x,y,w,h}
 };
 // eg... show notification
 require("notify").show({title:"Test", body:"Hello"});
diff --git a/apps/notify/notify.js b/apps/notify/notify.js
index b18826d24..1373fc2bd 100644
--- a/apps/notify/notify.js
+++ b/apps/notify/notify.js
@@ -70,8 +70,18 @@ exports.show = function(options) {
   options = options || {};
   if (options.on===undefined) options.on = true;
   id = ("id" in options)?options.id:null;
-  let size = options.size || 80;
-  if (size>80) {size = 80}
+  let w = 240;
+  let text = [];
+  let size = options.size;
+  if (options.body) {
+    const bh = (size || 80) - 20,
+          maxRows=Math.floor((bh-4)/8), // font=6x8
+          maxChars=Math.floor(w/6)-2;
+    text=fitWords(options.body, maxRows, maxChars);
+    // set size based on newlines
+    if (!size) size = 28 + (text.match(/\n/g).length+1)*8;
+  } else size = 20;
+  if (size>80) size = 80;
   const oldMode = Bangle.getLCDMode();
   // TODO: throw exception if double-buffered?
   // TODO: throw exception if size>80?
@@ -80,7 +90,6 @@ exports.show = function(options) {
   // drawing area
   let x = 0,
     y = 320-size,
-    w = 240,
     h = size,
     b = y+h-1, r = x+w-1; // bottom,right
   g.setClipRect(x,y, r,b);
@@ -99,20 +108,18 @@ exports.show = function(options) {
       g.setFont("6x8", 1).setFontAlign(1, 1, 0);
       g.drawString(options.src.substring(0, 10), g.getWidth()-23,y+18);
     }
-    y += 20;h -= 20;
   }
+  // we always need to pad because of the curved edges of the screen
+  y += 20; h -= 20;
   if (options.icon) {
     let i = options.icon, iw;
     g.drawImage(i, x,y+4);
-    if ("string"==typeof i) {iw = i.charCodeAt(0)}
-    else {iw = i[0]}
+    if ("string"==typeof i) iw = i.charCodeAt(0);
+    else iw = i[0];
     x += iw;w -= iw;
   }
   // body text
   if (options.body) {
-    const maxRows=Math.floor((h-4)/8), // font=6x8
-      maxChars=Math.floor(w/6)-2,
-      text=fitWords(options.body, maxRows, maxChars);
     g.setColor(-1).setFont("6x8", 1).setFontAlign(-1, -1, 0).drawString(text, x+6,y+4);
   }
 
@@ -133,7 +140,7 @@ exports.show = function(options) {
   }
   anim();
   Bangle.on("touch", exports.hide);
-}
+};
 
 /**
  options = {
@@ -152,4 +159,4 @@ exports.hide = function(options) {
     if (pos < 0) setTimeout(anim, 10);
   }
   anim();
-}
+};