From 2aac234b42b827de1fb976a11dca3029ec65b9cb Mon Sep 17 00:00:00 2001
From: hughbarney <hughbarney@googlemail.com>
Date: Sat, 2 Apr 2022 14:25:41 +0100
Subject: [PATCH] Daisy 0.06 changed Steps to STEPS, enahnced contrast when
 using light theme

---
 apps/daisy/ChangeLog             |   1 +
 apps/daisy/README.md             |   3 ++-
 apps/daisy/app.js                |  25 ++++++++++++++++---------
 apps/daisy/metadata.json         |   4 ++--
 apps/daisy/screenshot_daisy2.jpg | Bin 4775 -> 0 bytes
 apps/daisy/screenshot_daisy2.png | Bin 0 -> 1246 bytes
 apps/daisy/screenshot_daisy3.png | Bin 0 -> 3265 bytes
 7 files changed, 21 insertions(+), 12 deletions(-)
 delete mode 100644 apps/daisy/screenshot_daisy2.jpg
 create mode 100644 apps/daisy/screenshot_daisy2.png
 create mode 100644 apps/daisy/screenshot_daisy3.png

diff --git a/apps/daisy/ChangeLog b/apps/daisy/ChangeLog
index 26396b75c..d1778dde9 100644
--- a/apps/daisy/ChangeLog
+++ b/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 of dithered ring color
diff --git a/apps/daisy/README.md b/apps/daisy/README.md
index 12a55ddfd..491ed697f 100644
--- a/apps/daisy/README.md
+++ b/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.
diff --git a/apps/daisy/app.js b/apps/daisy/app.js
index cf0287616..7c513726f 100644
--- a/apps/daisy/app.js
+++ b/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;
 }
 
diff --git a/apps/daisy/metadata.json b/apps/daisy/metadata.json
index 15a24592c..6225db055 100644
--- a/apps/daisy/metadata.json
+++ b/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",
   "icon": "app.png",
   "type": "clock",
   "tags": "clock",
   "supports" : ["BANGLEJS2"],
-  "screenshots": [{"url":"screenshot_daisy2.jpg"}],
+  "screenshots": [{"url":"screenshot_daisy2.png"}],
   "readme": "README.md",
   "storage": [
     {"name":"daisy.app.js","url":"app.js"},
diff --git a/apps/daisy/screenshot_daisy2.jpg b/apps/daisy/screenshot_daisy2.jpg
deleted file mode 100644
index fec6a4c7b82c9dd40f3993017eb3edaa1a457b1a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4775
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

diff --git a/apps/daisy/screenshot_daisy2.png b/apps/daisy/screenshot_daisy2.png
new file mode 100644
index 0000000000000000000000000000000000000000..3636f376652628060fe0dedd8b4d631bfc44c7f5
GIT binary patch
literal 1246
zcmV<41R?v0P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px(m`OxIRA@uhnZHkDRTRfR0|iPY6l-E>KxG>vHZ(?ETVM^u21)2lEKCfmiHY_W
z3j6_9gjkUf2~fKJC?q8Anpnt!7FH%&uu!bT0x;j<Uf!KM_s4rP!_MqWCXacXchC8r
z-{(vXxZnxCY8?k~3-}b!{Vwns@RO$@aqZC6J^%@)&)2{&z$?JJ=C1Ew0S^+=z5x8u
zx*A&t@GS5gFl01cRiobkx6Mm(;%Q*J>LJiNfa<*BZ@5t?5L4w3F9*O<$vyrA9+qcN
ziP8m9GEVXUMDd03>ED14Dv4B`_&eYY6BB*;*Yf~uR(UIbSVt+WH8PgS1CZM&n{?wk
z=Q2uP1@4Chhy!>AIPQkj9#2_9pNKo<EzkoPu6l)lJB0zrZT<rO?gi<AQQ*+j2`|Mq
z1NheX{6{?^ycHu7)Xe}ySTYAcc8CEGjR3wh`TlXI%(9xu0_bMStO8;ac>D5&CnF2F
z;5;i70Mu1J58R8W!XJCwIQazl-03X;1D-C<+1lD-a&ofa;M3Dn1_uYPo?ToN3~IGR
z5WWQL7jaquko&w3ycYnV!Q_!?c`YAR$$nF0{spWoI#K<<`uvC-ySuxrudlPbyo`iB
zJ3C`%XNRe&DMm*}IXpb9KaXCH6$$`$f~w++sce<VX41ARVCZ|@zhfYR0ICLXF5O1{
z?+a_)%NN$CYtU;DfF`UemDhD4-)f2n#f4)b>neSH%}q^6*dzeOfMTK6Y8H|PRMKN3
zU_kqRAh+d0$_HCMfE&O+nE;SRrTLWbXC}B4M}-2_%|Z%h0glE%5Wwre4;cW`>>Xe^
zK=%}ITD}cQx`>jS7w8Qfg8<$E))N3)aGR7mIu9Ua0nMnIRby#W;JydmjEgLHux_%r
zxX9AdQqV<2cYc1((9jUa$B~KZHQ+}-22_b-+lJWk@nzuG#8S!tcKzEzR5r5D-T&)v
zThyu*va$uN7wCd@AZ3AG5ZcOMGofiki&o;M>4QG(C213lrE$*!K*>E!*WsyvDUCJ(
z@Y>X_3mOwZiq?)uyP}4HMu=2Jb@$Tc%E}5OBO@#<EO2ymR0><Jzj2$m;o)IcS64YW
zIH143zs_rZex8$)lSW=n0dqs5NRj~p5o#E*rQI^#-rlZ1xA|S))dE<-bA?LhipIWY
z`RE>PBeFAb{Zxa^vBLiTK4W8J%*@O%H#f)Z>}&&LJzHB_L%DroVuHQBy}EGHrtW?n
z5a{XYX*M@C+`{<yI0FL%Xwb31#cN|@qp*PXLfQ{0TRQcvc_y|&;#5|*in=y+pND8{
zu?hhQ6}P%iI~BXZe@gF#B33Bn_}4|0$dK`^gxw5xbIIivtryLD(Nj`-t&-UcUzftK
z@}rcfOHHC&I&kIpLftBGZUdR{f;@n6;Ac}Cv?}@iTJ?T;xD`I3`EVUb$yQP$ZNamt
zQinu*-akKY0rw4?VqN%cNo-!W1+;~8s{ybK`~hby^J{!eZN5UhB2`8=tpTtnyT7)(
z+_YN!*kiA@Mq{9VIgMEvf!lMTvN2Ldk`C3E_AF3F&}*joAB(-H5F?`K*Z=?k07*qo
IM6N<$g7is8EC2ui

literal 0
HcmV?d00001

diff --git a/apps/daisy/screenshot_daisy3.png b/apps/daisy/screenshot_daisy3.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5d55a03744c751c03110f4866ae97fdf9ebfe95
GIT binary patch
literal 3265
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

literal 0
HcmV?d00001