From 8abb6f3f4ddf658c70788c028c6bde156bb018ea Mon Sep 17 00:00:00 2001
From: Daniel Thompson <daniel@redfelineninja.org.uk>
Date: Mon, 28 Dec 2020 11:12:16 +0000
Subject: [PATCH] widgets: Reduce the size of the battery icon

Currently the battery icon is overlarge compared to other status bar
icons such as the BT and notification icons (both of which are 32px
high). Fix this by redrawing the battery artwork and updating
the widgets in the status bar.

Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
---
 TODO.rst        |   2 +-
 res/battery.png | Bin 3471 -> 5757 bytes
 wasp/icons.py   |  14 ++++++++++++--
 wasp/widgets.py |  39 ++++++++++++++++++---------------------
 4 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/TODO.rst b/TODO.rst
index 78c9fe4..9cff137 100644
--- a/TODO.rst
+++ b/TODO.rst
@@ -39,7 +39,7 @@ Wasp-os
   * [ ] Introduce fwd/back/vol+/vol- buttons to the music player
   * [ ] Update icon for Alarm app
   * [ ] Update art work for buttons in Confirmation view
-  * [ ] Reduce the size of the battery charge icon slightly (match bell)
+  * [X] Reduce the size of the battery charge icon slightly (match bell)
 
 * [ ] Applications
 
diff --git a/res/battery.png b/res/battery.png
index d272dbf538eb16039dbd3c6e6159ac81affcd954..e579e94fa4e28530709f495418279819d5ec148f 100644
GIT binary patch
literal 5757
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
N@{ow&%|U5}{|0@}eHZ`$

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

diff --git a/wasp/icons.py b/wasp/icons.py
index d9d775a..56e24d2 100644
--- a/wasp/icons.py
+++ b/wasp/icons.py
@@ -1,8 +1,18 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 # Copyright (C) 2020 Daniel Thompson
 
-# 1-bit RLE, generated from res/battery.png, 189 bytes
-battery = (36, 48, b'\x97\x0e\x14\x12\x11\x14\x10\x14\x0c\x08\x0c\x08\x08\x08\x0c\x08\x08\x08\x0c\x08\x08\x08\x0c\x08\x08\x04\x14\x04\x08\x04\x14\x04\x08\x04\x0c\x04\x04\x04\x08\x04\x0b\x05\x04\x04\x08\x04\n\x06\x04\x04\x08\x04\t\x07\x04\x04\x08\x04\x08\x07\x05\x04\x08\x04\x07\x07\x06\x04\x08\x04\x06\x07\x07\x04\x08\x04\x05\x07\x08\x04\x08\x04\x04\x0e\x02\x04\x08\x04\x03\x0f\x02\x04\x08\x04\x02\x10\x02\x04\x08\x04\x02\x10\x02\x04\x08\x04\x02\x0f\x03\x04\x08\x04\x02\x0e\x04\x04\x08\x04\x08\x07\x05\x04\x08\x04\x07\x07\x06\x04\x08\x04\x06\x07\x07\x04\x08\x04\x05\x07\x08\x04\x08\x04\x04\x07\t\x04\x08\x04\x04\x06\n\x04\x08\x04\x04\x05\x0b\x04\x08\x04\x04\x04\x0c\x04\x08\x04\x14\x04\x08\x04\x14\x04\x08\x04\x14\x04\x08\x04\x14\x04\x08\x1c\x08\x1c\x08\x1c\x08\x1c\x98')
+# 2-bit RLE, generated from res/battery.png, 104 bytes
+battery = (
+    b'\x02'
+    b'\x18 '
+    b'\x04\x01\x02\xca\x0c\xce\n\xce\t\xd0\x04\xc8\x08\xd0\x08\xd0'
+    b'\x08\xd0\x08\xcc\x04\x08\x04\xc8\x10\xc8\t\xc3\x04\xc8\x08\xc4'
+    b'\x04\xc8\x07\xc5\x04\xc8\x06\xc5\x05\xc8\x05\xc5\x06\xc8\x04\xc5'
+    b'\x01@\xfcA\x05\xc8\x03\xcb\x02\xc8\x02\xcc\x02\xc8\x02\xcc'
+    b'\x02\xc8\x02\xcb\x03\xc8\x05\x01\x01\xc5\x04\xc8\x06\xc5\x05\xc8'
+    b'\x05\xc5\x06\xc8\x04\xc5\x07\xc8\x04\xc4\x08\xc8\x04\xc3\t\xc8'
+    b'\x10\xc8P\xff%'
+)
 
 # 2-bit RLE, generated from res/bomb.png, 100 bytes
 bomb = (
diff --git a/wasp/widgets.py b/wasp/widgets.py
index d39de90..d1cf1fd 100644
--- a/wasp/widgets.py
+++ b/wasp/widgets.py
@@ -39,7 +39,7 @@ class BatteryMeter:
 
         if watch.battery.charging():
             if self.level != -1:
-                draw.rleblit(icon, pos=(239-icon[0], 0),
+                draw.blit(icon, 239-icon[1], 0,
                              fg=wasp.system.theme('battery'))
                 self.level = -1
         else:
@@ -47,30 +47,28 @@ class BatteryMeter:
             if level == self.level:
                 return
 
-            if level > 96:
-                h = 24
-                rgb = 0x07e0
-            else:
-                h = level // 4
 
-                green = level // 3
-                red = 31-green
-                rgb = (red << 11) + (green << 6)
+            green = level // 3
+            if green > 31:
+                green = 31
+            red = 31-green
+            rgb = (red << 11) + (green << 6)
 
             if self.level < 0 or ((level > 5) ^ (self.level > 5)):
                 if level  > 5:
-                    draw.rleblit(icon, pos=(239-icon[0], 0),
+                    draw.blit(icon, 239-icon[1], 0,
                              fg=wasp.system.theme('battery'))
                 else:
                     rgb = 0xf800
-                    draw.rleblit(icon, pos=(239-icon[0], 0), fg=0xf800)
+                    draw.blit(icon, 239-icon[1], 0, fg=0xf800)
 
-            x = 239 - 30
-            w = 16
-            if 24 - h:
-                draw.fill(0, x, 14, w, 24 - h)
+            w = icon[1] - 10
+            x = 239 - 5 - w
+            h = 2*level // 11
+            if 18 - h:
+                draw.fill(0, x, 9, w, 18 - h)
             if h:
-                draw.fill(rgb, x, 38 - h, w, h)
+                draw.fill(rgb, x, 27 - h, w, h)
 
             self.level = level
 
@@ -111,14 +109,14 @@ class Clock:
             draw = wasp.watch.drawable
             draw.set_font(fonts.sans28)
             draw.set_color(wasp.system.theme('status-clock'))
-            draw.string(t1, 52, 12, 138)
+            draw.string(t1, 52, 4, 138)
 
         self.on_screen = now
         return now
 
 class NotificationBar:
     """Show BT status and if there are pending notifications."""
-    def __init__(self, x=2, y=8):
+    def __init__(self, x=0, y=0):
         self._pos = (x, y)
 
     def draw(self):
@@ -213,10 +211,9 @@ class ScrollIndicator:
         color = wasp.system.theme('scroll-indicator')
 
         if self.up:
-            draw.rleblit(icons.up_arrow, pos=self._pos, fg=color)
+            draw.blit(icons.up_arrow, self._pos[0], self._pos[1], fg=color)
         if self.down:
-            draw.rleblit(icons.down_arrow, pos=(self._pos[0], self._pos[1] + 13),
-                         fg=color)
+            draw.blit(icons.down_arrow, self._pos[0], self._pos[1]+13, fg=color)
 
 _SLIDER_KNOB_DIAMETER = const(40)
 _SLIDER_KNOB_RADIUS = const(_SLIDER_KNOB_DIAMETER // 2)