diff options
Diffstat (limited to 'wasp/apps')
| -rw-r--r-- | wasp/apps/chrono.py | 9 | ||||
| -rw-r--r-- | wasp/apps/clock.py | 6 | ||||
| -rw-r--r-- | wasp/apps/heart.py | 2 | ||||
| -rw-r--r-- | wasp/apps/steps.py | 2 | ||||
| -rw-r--r-- | wasp/apps/stopwatch.py | 7 |
5 files changed, 13 insertions, 13 deletions
diff --git a/wasp/apps/chrono.py b/wasp/apps/chrono.py index a327127..3eae3a1 100644 --- a/wasp/apps/chrono.py +++ b/wasp/apps/chrono.py @@ -58,9 +58,8 @@ class ChronoApp(): True then a full redraw is be performed. """ draw = wasp.watch.drawable - hi = wasp.system.theme('accent-hi') - mid = wasp.system.theme('accent-mid') - lo = wasp.system.theme('accent-lo') + hi = wasp.system.theme('bright') + c1 = draw.darken(wasp.system.theme('spot1'), wasp.system.theme('contrast')) if redraw: now = wasp.watch.rtc.get_localtime() @@ -72,7 +71,7 @@ class ChronoApp(): wasp.system.bar.draw() # Draw the dividers - draw.set_color(mid) + draw.set_color(wasp.system.theme('mid')) for theta in range(12): draw.polar(120, 120, theta * 360 // 12, 110, 118, 3) @@ -98,5 +97,5 @@ class ChronoApp(): hh = (30 * (self._hh % 12)) + (self._mm / 2) mm = 6 * self._mm draw.polar(120, 120, hh, 5, 75, 7, hi) - draw.polar(120, 120, hh, 5, 60, 3, lo) + draw.polar(120, 120, hh, 5, 60, 3, draw.darken(c1, 2)) draw.polar(120, 120, mm, 5, 106, 5, hi) diff --git a/wasp/apps/clock.py b/wasp/apps/clock.py index f0af15b..9e6ba05 100644 --- a/wasp/apps/clock.py +++ b/wasp/apps/clock.py @@ -70,9 +70,9 @@ class ClockApp(): True then a full redraw is be performed. """ draw = wasp.watch.drawable - hi = wasp.system.theme('accent-hi') - mid = wasp.system.theme('accent-mid') - lo = wasp.system.theme('accent-lo') + hi = wasp.system.theme('bright') + lo = wasp.system.theme('mid') + mid = draw.lighten(lo, 1) if redraw: now = wasp.watch.rtc.get_localtime() diff --git a/wasp/apps/heart.py b/wasp/apps/heart.py index bff558e..b465cb4 100644 --- a/wasp/apps/heart.py +++ b/wasp/apps/heart.py @@ -45,7 +45,7 @@ class HeartApp(): 0, 6, width=240) # Graph is orange by default... - color = 0xffc0 + color = wasp.system.theme('spot1') # If the maths goes wrong lets show it in the chart! if spl > 100 or spl < -100: diff --git a/wasp/apps/steps.py b/wasp/apps/steps.py index 321a0c1..c7899a6 100644 --- a/wasp/apps/steps.py +++ b/wasp/apps/steps.py @@ -102,5 +102,5 @@ class StepCounterApp(): t = str(count) w = fonts.width(fonts.sans36, t) draw.set_font(fonts.sans36) - draw.set_color(0xfff0) + draw.set_color(draw.lighten(wasp.system.theme('spot1'), wasp.system.theme('contrast'))) draw.string(t, 228-w, 132-18) diff --git a/wasp/apps/stopwatch.py b/wasp/apps/stopwatch.py index 43166a6..0d572af 100644 --- a/wasp/apps/stopwatch.py +++ b/wasp/apps/stopwatch.py @@ -88,6 +88,9 @@ class StopwatchApp(): return y = 240 - 6 - (len(splits) * 24) + draw.set_font(fonts.sans24) + draw.set_color(wasp.system.theme('mid')) + n = self._nsplits for i, s in enumerate(splits): centisecs = s @@ -99,8 +102,6 @@ class StopwatchApp(): t = '# {} {:02}:{:02}.{:02}'.format(n, minutes, secs, centisecs) n -= 1 - draw.set_font(fonts.sans24) - draw.set_color(0xe73c) w = fonts.width(fonts.sans24, t) draw.string(t, 0, y + (i*24), 240) @@ -139,7 +140,7 @@ class StopwatchApp(): draw = wasp.watch.drawable draw.set_font(fonts.sans36) - draw.set_color(0xc67f) + draw.set_color(draw.lighten(wasp.system.theme('ui'), wasp.system.theme('contrast'))) w = fonts.width(fonts.sans36, t1) draw.string(t1, 180-w, 120-36) draw.fill(0, 0, 120-36, 180-w, 36) |