From 398ce598fcba897e2a0c1454304513741d110799 Mon Sep 17 00:00:00 2001
From: Daniel Thompson <daniel@redfelineninja.org.uk>
Date: Wed, 21 Oct 2020 21:28:09 +0100
Subject: [PATCH] widgets: status: Add a status bar combo widget

Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
---
 res/blestatus.png    | Bin 1608 -> 1627 bytes
 res/notification.png | Bin 1637 -> 1636 bytes
 wasp/icons.py        |  35 ++++++++++++++--------------
 wasp/widgets.py      |  53 +++++++++++++++++++++++++++++++++++++------
 4 files changed, 64 insertions(+), 24 deletions(-)

diff --git a/res/blestatus.png b/res/blestatus.png
index c2725b51354bd631f0d964376eda597ab6765efd..f4a62c556338cde5f69b479f2db877e1bfc1bb7c 100644
GIT binary patch
delta 1593
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

literal 1608
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
GLSTZRto*_N

diff --git a/res/notification.png b/res/notification.png
index f87db061bbf29c9b453d56e04be5677cf9abbd28..18d6f6df7218bdd8b393334ba22253e640303460 100644
GIT binary patch
delta 1572
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
WkWnYiuex*q0000<MNUMnLSTY!(BrxQ

delta 1600
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

diff --git a/wasp/icons.py b/wasp/icons.py
index f7ecfbd..6141b40 100644
--- a/wasp/icons.py
+++ b/wasp/icons.py
@@ -151,27 +151,28 @@ knob = (
     b'\x16\xd0\x1c\xc8\x10'
 )
 
-# 2-bit RLE, generated from res/notification.png, 105 bytes
+# 2-bit RLE, generated from res/notification.png, 104 bytes
 notification = (
     b'\x02'
-    b'  '
-    b'\x0f\xc2\x1d\xc4\x1c\xc4\x19\xca\x14\xce\x11\xd0\x0f\xd2\x0e\xc5'
-    b'\x08\xc5\r\xc4\x0c\xc4\x0c\xc4\x0c\xc4\x0b\xc4\x0e\xc4\n\xc4'
-    b'\x0e\xc4\n\xc4\x0e\xc4\n\xc3\x0f\xc4\t\xc4\x10\xc3\t\xc4'
-    b'\x10\xc4\x08\xc4\x10\xc4\x08\xc4\x10\xc4\x08\xc4\x10\xc4\x08\xc3'
-    b'\x11\xc4\x07\xc4\x12\xc4\x06\xc4\x12\xc4\x06\xc4\x12\xc4\x05\xc5'
-    b'\x12\xc4\x05\xc4\x14\xc4\x03\xc5\x14\xc5\x02\xde\x01\xff\x01\x01'
-    b'\xde\x0f\xc4\x1d\xc2\x0f'
+    b'\x1e '
+    b'\x0e\xc2\x1b\xc4\x1a\xc4\x18\xc8\x14\xcc\x11\xce\x0f\xd0\x0e\xc5'
+    b'\x06\xc5\r\xc4\n\xc4\x0c\xc4\n\xc4\x0b\xc4\x0c\xc4\n\xc4'
+    b'\x0c\xc4\n\xc4\x0c\xc4\n\xc3\r\xc4\t\xc4\x0e\xc3\t\xc4'
+    b'\x0e\xc4\x08\xc4\x0e\xc4\x08\xc4\x0e\xc4\x08\xc4\x0e\xc4\x08\xc3'
+    b'\x0f\xc4\x07\xc4\x10\xc4\x06\xc4\x10\xc4\x06\xc4\x10\xc4\x05\xc5'
+    b'\x10\xc4\x05\xc4\x12\xc4\x03\xc5\x12\xc5\x02\xdc\x01\xfc\x01\xdc'
+    b'\x0e\xc4\x1b\xc2\x0e'
 )
+
 # 2-bit RLE, generated from res/blestatus.png, 104 bytes
 blestatus = (
     b'\x02'
-    b'\x11 '
-    b'\x07\xc1\x10\xc2\x0f\xc3\x0e\xc4\r\xc5\x0c\xc6\x0b\xc7\n\xc3'
-    b'\x01\xc4\x03\xc2\x04\xc3\x02\xc4\x01\xc4\x03\xc3\x03\xc4\x01\xc4'
-    b'\x02\xc3\x02\xc4\x03\xc4\x01\xc3\x01\xc4\x05\xcb\x07\xc9\t\xc7'
-    b'\x0b\xc5\x0c\xc5\x0b\xc7\t\xc9\x07\xcb\x05\xc4\x01\xc3\x01\xc4'
-    b'\x03\xc4\x02\xc3\x02\xc4\x01\xc4\x03\xc3\x03\xc4\x01\xc2\x04\xc3'
-    b'\x02\xc4\x08\xc3\x01\xc4\t\xc7\n\xc6\x0b\xc5\x0c\xc4\r\xc3'
-    b'\x0e\xc2\x0f\xc1\t'
+    b'\x16 '
+    b'\x07\xc1\x15\xc2\x14\xc3\x13\xc4\x12\xc5\x11\xc6\x10\xc7\x0f\xc3'
+    b'\x01\xc4\x08\xc2\x04\xc3\x02\xc4\x06\xc4\x03\xc3\x03\xc4\x06\xc4'
+    b'\x02\xc3\x02\xc4\x08\xc4\x01\xc3\x01\xc4\n\xcb\x0c\xc9\x0e\xc7'
+    b'\x10\xc5\x11\xc5\x10\xc7\x0e\xc9\x0c\xcb\n\xc4\x01\xc3\x01\xc4'
+    b'\x08\xc4\x02\xc3\x02\xc4\x06\xc4\x03\xc3\x03\xc4\x06\xc2\x04\xc3'
+    b'\x02\xc4\r\xc3\x01\xc4\x0e\xc7\x0f\xc6\x10\xc5\x11\xc4\x12\xc3'
+    b'\x13\xc2\x14\xc1\x0e'
 )
diff --git a/wasp/widgets.py b/wasp/widgets.py
index 58392af..7fc4988 100644
--- a/wasp/widgets.py
+++ b/wasp/widgets.py
@@ -115,19 +115,22 @@ class Clock:
 
 class NotificationBar:
     """Show BT status and if there are pending notifications."""
-    def __init__(self, x=8, y=8):
+    def __init__(self, x=2, y=8):
         self._pos = (x, y)
 
     def draw(self):
-        """Update the notification widget.
+        """Redraw the notification widget.
 
         For this simple widget :py:meth:`~.draw` is simply a synonym for
-        :py:meth:`~.update`.
+        :py:meth:`~.update` because we unconditionally update from scratch.
         """
         self.update()
 
     def update(self):
         """Update the widget.
+
+        This widget does not implement lazy redraw internally since this
+        can often be implemented (with less state) by the container.
         """
         draw = watch.drawable
         (x, y) = self._pos
@@ -135,14 +138,50 @@ class NotificationBar:
         if wasp.watch.connected():
             draw.blit(icons.blestatus, x, y, fg=0x7bef)
             if wasp.system.notifications:
-                draw.blit(icons.notification, x+24, y, fg=0x7bef)
+                draw.blit(icons.notification, x+22, y, fg=0x7bef)
             else:
-                draw.fill(0, x+24, y, 32, 32)
+                draw.fill(0, x+22, y, 30, 32)
         elif wasp.system.notifications:
             draw.blit(icons.notification, x, y, fg=0x7bef)
-            draw.fill(0, x+32, y, 32, 32)
+            draw.fill(0, x+30, y, 22, 32)
         else:
-            draw.fill(0, x, y, 56, 32)
+            draw.fill(0, x, y, 52, 32)
+
+class StatusBar:
+    """Combo widget to handle notification, time and battery level."""
+    def __init__(self):
+        self._clock = Clock()
+        self._meter = BatteryMeter()
+        self._notif = NotificationBar()
+
+    @property
+    def clock(self):
+        """True if the clock should be included in the status bar, False
+        otherwise.
+        """
+        return self._clock.enabled
+
+    @clock.setter
+    def clock(self, enabled):
+        self._clock.enabled = enabled
+
+    def draw(self):
+        """Redraw the status bar from scratch."""
+        self._clock.draw()
+        self._meter.draw()
+        self._notif.draw()
+
+    def update(self):
+        """Lazily update the status bar.
+
+        :returns: An time tuple if the time has changed since the last call,
+                  None otherwise.
+        """
+        now = self._clock.update()
+        if now:
+            self._meter.update()
+            self._notif.update()
+        return now
 
 class ScrollIndicator:
     """Scrolling indicator.