Merge pull request #1649 from hughbarney/master

Daisey 0.06, change Steps to STEPS, enhanced contrast for light theme

apps/daisy/ChangeLog

@@ -3,3 +3,4 @@
 0.03: fix metadata.json to allow setting as clock
 0.04: added heart rate which is switched on when cycled to it through up/down touch on rhs
 0.05: changed text to uppercase, just looks better, removed colons on text
+0.06: better contrast for light theme, use fg color instead of dithered for ring

apps/daisy/README.md

@@ -28,5 +28,6 @@ See [#1248](https://github.com/espruino/BangleApps/issues/1248)
 
 ## Screenshots
 ![](screenshot_daisy1.png)
+![](screenshot_daisy3.png)
 
-It is worth looking at the real thing though as the screenshot does not do it justice.
+It is worth looking at the real thing though as the screenshots do not do it justice.

apps/daisy/app.js

@@ -41,10 +41,17 @@ Graphics.prototype.setFontRoboto20 = function(scale) {
 };
 
 function assignPalettes() {
-  // palette for 0-40%
-  pal1 = new Uint16Array([g.theme.bg, g.toColor(settings.gy), g.toColor(settings.fg), g.toColor("#00f")]);
-  // palette for 50-100%
-  pal2 = new Uint16Array([g.theme.bg, g.toColor(settings.fg), g.toColor(settings.gy), g.toColor("#00f")]);
+  if (g.theme.dark) {
+    // palette for 0-40%
+    pal1 = new Uint16Array([g.theme.bg, g.toColor(settings.gy), g.toColor(settings.fg), g.toColor("#00f")]);
+    // palette for 50-100%
+    pal2 = new Uint16Array([g.theme.bg, g.toColor(settings.fg), g.toColor(settings.gy), g.toColor("#00f")]);
+  } else {
+    // palette for 0-40%
+    pal1 = new Uint16Array([g.theme.bg, g.theme.fg, g.toColor(settings.fg), g.toColor("#00f")]);
+    // palette for 50-100%
+    pal2 = new Uint16Array([g.theme.bg, g.toColor(settings.fg), g.theme.fg, g.toColor("#00f")]);
+  }
 }
 
 function setSmallFont20() {
@@ -109,10 +116,10 @@ function updateSunRiseSunSet(now, lat, lon, line){
 const infoData = {
   ID_DATE:  { calc: () => {var d = (new Date()).toString().split(" "); return d[2] + ' ' + d[1] + ' ' + d[3];} },
   ID_DAY:   { calc: () => {var d = require("locale").dow(new Date()).toLowerCase(); return d[0].toUpperCase() + d.substring(1);} },
-  ID_SR:    { calc: () => 'Sunrise ' + sunRise },
-  ID_SS:    { calc: () => 'Sunset ' + sunSet },
-  ID_STEP:  { calc: () => 'Steps ' + getSteps() },
-  ID_BATT:  { calc: () => 'Battery ' + E.getBattery() + '%' },
+  ID_SR:    { calc: () => 'SUNRISE ' + sunRise },
+  ID_SS:    { calc: () => 'SUNSET ' + sunSet },
+  ID_STEP:  { calc: () => 'STEPS ' + getSteps() },
+  ID_BATT:  { calc: () => 'BATTERY ' + E.getBattery() + '%' },
   ID_HRM:   { calc: () => hrmCurrent }
 };
 
@@ -225,7 +232,7 @@ function drawSteps() {
   setSmallFont();
   g.setFontAlign(0,0);
   g.setColor(g.theme.fg);
-  g.drawString('Steps ' + getSteps(), w/2, (3*h/4) - 4);
+  g.drawString('STEPS ' + getSteps(), w/2, (3*h/4) - 4);
   drawingSteps = false;
 }
 

apps/daisy/metadata.json

@@ -1,13 +1,13 @@
 { "id": "daisy",
   "name": "Daisy",
-  "version":"0.05",
+  "version":"0.06",
   "dependencies": {"mylocation":"app"},
-  "description": "A clock based on the Pastel clock with large ring guage for steps",
+  "description": "A beautiful digital clock with large ring guage, idle timer and a cyclic information line that includes, day, date, steps, battery, sunrise and sunset times",
   "icon": "app.png",
   "type": "clock",
   "tags": "clock",
   "supports" : ["BANGLEJS2"],
-  "screenshots": [{"url":"screenshot_daisy2.jpg"}],
+  "screenshots": [{"url":"screenshot_daisy3.png"}],
   "readme": "README.md",
   "storage": [
     {"name":"daisy.app.js","url":"app.js"},