From b8aa33b05998d727e4a6b08d2f54b0e0db32be6c Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Thu, 10 Sep 2020 17:17:41 +0100
Subject: [PATCH] Help UI tweaks, remove colour from buttons

---
 examples/icons/icon-circle.png | Bin 0 -> 1164 bytes
 examples/icons/icon-help.png   | Bin 1192 -> 1270 bytes
 examples/monitor.py            |  41 +++++++++++++++++----------------
 3 files changed, 21 insertions(+), 20 deletions(-)
 create mode 100644 examples/icons/icon-circle.png

diff --git a/examples/icons/icon-circle.png b/examples/icons/icon-circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..aef580b9dce0f4086c5023ea64a0c34bd628c37b
GIT binary patch
literal 1164
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!WpKsVXIz(~Q|QqR!L
z#Kg=%N5ROz$Uxt~RNv4@*U-$$z{JYXTmcG{fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9
zlv<o$T9gcok2GbNW?<Oiw+N&V=o%}R{N&Qy)VvZ;7h5Huh+ax&ij}#!rG>GXnW>wx
zxwE06tD}>Xvy-#Ap}CQPxv`_MixEt(XI^nhVqS78Om8MauL)kgR?bDKi6!|(A^G_^
zu-FU8$S=t+&d4uNFf!CLQqTy`%uC5HFV+NwE!3&0MVV!(DQ-pixeDOGvC72a025~y
zXGar9LpLJ>W02z=%}vc*U5qS@T-_|qOpJ|{pn6lVcpR$N2&Z0spkwqwF^d$_Fd<;_
z0Wsm}7RZ68{M0;PaxVg=>vqel?!Y|p-_yl0q~g|*Y4&_g1|sd;&5AumY>WNoI3!;3
zWZyfdCHlpZ#Vm(-r|j5V$RNAQe$sW;&Oe;%|4mvi{rA%KZ=%j7>0H|qSkn$L<_9!L
zTQmz-bj<tc=reiSL#{n~Owuw9ZxjMOeqGC&G$qxunq!qp!k=taXAcq0vp=UMICLtl
zxm|HmVbWD*Awv(5iIaBp2(@M>-QfQB#_OU}b4DcJ&bCWW+1k`44A;L%<?=OL$z8l$
z!*wQGU|LZ1bH62T4`t;#Hc82c2Y+2%$|LD=Fkary@qE6~gd>?&UDp`w)yt-Det%Im
zTf6hMS=`YK#W@YU5zUrUk1V)W$}V1z^U6S;k&WT;trXimCzq}Vl@Fe-elF{r5}E)w
CyM+w^

literal 0
HcmV?d00001

diff --git a/examples/icons/icon-help.png b/examples/icons/icon-help.png
index 573d479f5b98546c1f7528f77e8ff5030741d4cf..16f792ab7935d981f5c93413fad7f7e66df49e73 100644
GIT binary patch
delta 587
zcmZ3%`HfStGr-TCmrII^fq{Y7)59eQNK1h*2OE%F>E&~7axSy_Mu&5Z3WjFJE-p@H
zrf$aOE{2A#j*ceICXN=)POgq-Mo!L7rjzxUWMGO+a4O1TN>ng$c5!wzaWr%@GB5_4
zWNvEa>SAPJ<mzT=W@2nS`8Cias3Ieriqx5%>Un4XNMK-K%=C0|45_$vWZHhe!v+G!
z=5{Q6b?qDP1ObDmf~Q!7c@*ZgvVOB;5`4v7(Xz7Sf&Z0N%+?_tQ+o}{Gk^BzP4axa
zS>NlZr+xZ|yS1Nw=BNkN-DXvPAn>M9E}~KY1DD$azCEjFl`*JIF=<J^Fr8z|LDL8>
z7p`d{w?EZ)&e(J&i(|^nCcW*G)LgjIrWBtIQhUM7qm{&F^1N&J%3BrJ=k++YYnHdy
z#8iJ<?r7AWoYy&H{kCV9CPlnEF;Ucyb92dC&9|+l>u1`W6l*hHrt|!XMAH2;cUDTu
zWtCm^&V0XPnSs=+&21g)Uf7+xpRuAfKt;4`jfb<!l<6+V8tV(WGhdcGV2sy}?Mc+z
zQSkQMEwLkKlXu-S&z<@HfSK!~-Az0CxN}?XUp*pHqPc@nC9Np#rjvid4o1b#J~sbu
zA71|A=Ug+DOP_VOUp;W%Gdk$L-Q0}<6FK)@nJUK0@vb4cfaTjt6~Vs_`x>hYUhht<
dW07Fs++21~KyHE$FnKU=c)I$ztaD0e0szKp<`@6~

delta 537
zcmeyyxq{QKGr-TCmrII^fq{Y7)59eQNQ;0l2Q!e|75>&9NU@|l`Z_W&Z0zU$lgJ9>
zGZqKAJ29*~C-ZWn+XY5V6DMaEXG=?SS653{Lqk_bOEU{M3u7lkQ*$RvQ*(1CC54LI
z0$*P%&&davMC2ig&2TB6T*Q<Z<LGGQ=44{x3RGkcGSR}^(#+M_(#*)%#L2|P#Y9P=
zxFjew%_=27ximL5uf)^ERtac_UP@+)6;!VqF1?fWnVnePx-Ki6sHk4g;2Pi);_8!G
z2=o<&faA-XIY1-CN`m}?8P0x;<O-X9)pd1#aNCnJM?cKCthed*(RrKofGWB@T^vIs
zE|*S-7OQVo;BjG|)UoL6)lL7GnsK^B^`GM})~jT;(NeH{FPoU5!?!c5<Jc~{`LA|M
zsps6iv9~oV=fa&O|0jn`*rk!vX!86#qjhzP$J&G-51zRTEe~p}PkzxWYp^!y5C5Gl
zzOB>j4h8l6&JS@ho8-2y>tOK@w$dM)(xUC`<e&U2`R=|?>=n0cp5R<=C9&rq-+Q|H
KxvX<aXaWEjaiD+z

diff --git a/examples/monitor.py b/examples/monitor.py
index c0a69ff..c5a6e26 100644
--- a/examples/monitor.py
+++ b/examples/monitor.py
@@ -113,16 +113,16 @@ class View:
             (x + margin, y + margin - 1), text, font=self.font, fill=textcolor
         )
 
-    def overlay(self, text):
+    def overlay(self, text, top=0):
         """Draw an overlay with some auto-sized text."""
         self._draw.rectangle(
-            (0, 20, DISPLAY_WIDTH, DISPLAY_HEIGHT), fill=(192, 225, 254)
+            (0, top, DISPLAY_WIDTH, DISPLAY_HEIGHT), fill=(192, 225, 254)
         )  # Overlay backdrop
-        self._draw.rectangle((0, 20, DISPLAY_WIDTH, 21), fill=COLOR_BLUE)  # Top border
+        self._draw.rectangle((0, top, DISPLAY_WIDTH, top + 1), fill=COLOR_BLUE)  # Top border
         self.text_in_rect(
             text,
             self.font,
-            (3, 20, DISPLAY_WIDTH - 3, DISPLAY_HEIGHT - 2),
+            (3, top, DISPLAY_WIDTH - 3, DISPLAY_HEIGHT - 2),
             line_spacing=1,
         )
 
@@ -244,7 +244,7 @@ class MainView(View):
         self.icon(icon_backdrop, (0, 0), COLOR_WHITE)
         self.icon(icon_rightarrow, (3, 3), (55, 55, 55))
 
-        self.alarm.render((0, DISPLAY_HEIGHT - 19))
+        self.alarm.render((3, DISPLAY_HEIGHT - 23))
 
         self.icon(icon_backdrop.rotate(180), (DISPLAY_WIDTH - 26, 0), COLOR_WHITE)
         self.icon(icon_settings, (DISPLAY_WIDTH - 19 - 3, 3), (55, 55, 55))
@@ -279,25 +279,27 @@ class EditView(View):
             self.label(
                 "Y",
                 "Yes" if mode == "bool" else "++",
-                textcolor=COLOR_WHITE,
-                bgcolor=COLOR_YELLOW,
+                textcolor=COLOR_BLACK,
+                bgcolor=COLOR_WHITE,
             )
             self.label(
                 "B",
                 "No" if mode == "bool" else "--",
-                textcolor=COLOR_WHITE,
-                bgcolor=COLOR_BLUE,
+                textcolor=COLOR_BLACK,
+                bgcolor=COLOR_WHITE,
             )
         else:
-            self.label("B", "Next", textcolor=COLOR_WHITE, bgcolor=COLOR_BLUE)
-            self.label("Y", "Change", textcolor=COLOR_WHITE, bgcolor=COLOR_YELLOW)
+            self.label("B", "Next", textcolor=COLOR_BLACK, bgcolor=COLOR_WHITE)
+            self.label("Y", "Change", textcolor=COLOR_BLACK, bgcolor=COLOR_WHITE)
 
-        self.icon(icon_help, (0, 0), COLOR_BLUE)
-
-        self._draw.text((3, 43), f"{title} : {text}", font=self.font, fill=COLOR_WHITE)
+        self._draw.text((3, 36), f"{title} : {text}", font=self.font, fill=COLOR_WHITE)
 
         if self._help_mode:
-            self.overlay(help)
+            self.icon(icon_backdrop.rotate(90), (0, 0), COLOR_BLUE)
+            self._draw.rectangle((7, 3, 23, 19), COLOR_BLACK)
+            self.overlay(help, top=26)
+
+        self.icon(icon_help, (0, 0), COLOR_BLUE)
 
     def button_a(self):
         self._help_mode = not self._help_mode
@@ -373,7 +375,7 @@ class SettingsView(EditView):
     def render(self):
         self.clear()
         self._draw.text(
-            (23, 3),
+            (28, 5),
             "Settings",
             font=self.font,
             fill=COLOR_WHITE,
@@ -482,8 +484,8 @@ class DetailView(ChannelView):
         self.icon(icon_rightarrow, (3, 3), (55, 55, 55))
 
         # Prev button
-        self.icon(icon_backdrop, (0, DISPLAY_HEIGHT - 26), COLOR_WHITE)
-        self.icon(icon_return, (3, DISPLAY_HEIGHT - 26 + 3), (55, 55, 55))
+        # self.icon(icon_backdrop, (0, DISPLAY_HEIGHT - 26), COLOR_WHITE)
+        # self.icon(icon_return, (3, DISPLAY_HEIGHT - 26 + 3), (55, 55, 55))
 
         # Edit
         self.icon(icon_backdrop.rotate(180), (DISPLAY_WIDTH - 26, 0), COLOR_WHITE)
@@ -837,8 +839,7 @@ class ViewController:
             self.next_view()
 
     def button_b(self):
-        if not self.view.button_b():
-            self.prev_view()
+        self.view.button_b()
 
     def button_x(self):
         if not self.view.button_x():