From bae67ecf6d6907d3e95dc9335ab4f3845c4406c7 Mon Sep 17 00:00:00 2001
From: "Minges, Alexander Ralph Michael (almin100)" <alexander.minges@hhu.de>
Date: Fri, 17 Dec 2021 13:51:18 +0100
Subject: [PATCH] calendar: use non-dithering colors by default; localize
 strings; remove unused variables

---
 apps.json                             |   2 +-
 apps/calendar/ChangeLog               |   1 +
 apps/calendar/README.md               |   1 +
 apps/calendar/calendar-icon.js        |   6 +-
 apps/calendar/calendar.js             | 140 +++++++++++++++++++-------
 apps/calendar/calendar.png            | Bin 540 -> 7227 bytes
 apps/calendar/screenshot_calendar.png | Bin 3866 -> 1174 bytes
 apps/calendar/settings.js             |  20 +++-
 8 files changed, 122 insertions(+), 48 deletions(-)

diff --git a/apps.json b/apps.json
index b4ff19d42..2c2073f9e 100644
--- a/apps.json
+++ b/apps.json
@@ -2429,7 +2429,7 @@
   {
     "id": "calendar",
     "name": "Calendar",
-    "version": "0.03",
+    "version": "0.04",
     "description": "Simple calendar",
     "icon": "calendar.png",
     "screenshots": [{"url":"screenshot_calendar.png"}],
diff --git a/apps/calendar/ChangeLog b/apps/calendar/ChangeLog
index de887bfa7..fc0fb287b 100644
--- a/apps/calendar/ChangeLog
+++ b/apps/calendar/ChangeLog
@@ -1,3 +1,4 @@
 0.01: Basic calendar
 0.02: Make Bangle 2 compatible
 0.03: Add setting to start week on Sunday
+0.04: Add setting to switch color schemes. Default color scheme will now use colors that are not dithered on Bangle 2. Use localized names for months and days of the week (Language app needed).
diff --git a/apps/calendar/README.md b/apps/calendar/README.md
index e22d06573..ec759eb26 100644
--- a/apps/calendar/README.md
+++ b/apps/calendar/README.md
@@ -10,4 +10,5 @@ Basic calendar
 ## Settings
 
 - Starts on Sunday: whether the calendar should start on Sunday (default is Monday).
+- Non-dithering Colors: use non-dithering colors (default, recommended for Bangle 2) or the original color scheme.
 
diff --git a/apps/calendar/calendar-icon.js b/apps/calendar/calendar-icon.js
index ed1bf3667..dd65290b0 100644
--- a/apps/calendar/calendar-icon.js
+++ b/apps/calendar/calendar-icon.js
@@ -1,5 +1 @@
-require("heatshrink").decompress(
-  atob(
-    "mEwxH+AH4A/ADuIUCARRDhgePCKIv13YAEDoYJFAA4RJFyQvcGBYRGy4dDy4uLCJgv/DoOBDgOBF5oRLF6IeBDgIvNCJYvQDwQuNCJovRADov/F9OsAEgv/F/4vhwIACAqYv/F/4vnd94vvX/4v/F/7vvF96//F/4v/d94v/F/4wsFxQwjFxgA/AH4A/AH4AZA=="
-  )
-)
+E.toArrayBuffer(atob("MDCDAkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkgEkkkkkkkgEkkkkkkkkkkkkkPwkkkkkkkPwkkkkkkkkkkkkkPwkkkkkkkPwkkkkkkkkkgAAAPwAAAAAAAPwAAAEkkkkkCSSSPwSSSSSSSPwSSSQkkkkkCSSSPwSSSSSSSPwSSSQkkkkkCSSSPwSSSSSSSPwSSSQkkkkkCSSSPwSSSSSSSPwSSSQkkkkkCSSSQCSSSSSSSQCSSSQkkkkkCSSSSSSSSSSSSSSSSSQkkkkkCSSSSSSSSSSSSSSSSSQkkkkkCSSSSSSSSSSSSSSSSSQkkkkkCSSSSSSSSSSSSSSSSSQkkkkkP/////////////////wkkkkkP/////////////////wkkkkkP/////////////////wkkkkkP/////////////////wkkkkkP//+AB+AB+AB+AB///wkkkkkP//+AB+AB+AB+AB///wkkkkkP//+AB+AB+AB+AB///wkkkkkP//+AB+AB+AB+AB///wkkkkkP/////////////////wkkkkkP/////////////////wkkkkkP//+AB+AB+AB+AB///wkkkkkP//+AB+AB+AB+AB///wkkkkkP//+AB+AB+AB+AB///wkkkkkP//+AB+AB+AB+AB///wkkkkkP/////////////////wkkkkkP/////////////////wkkkkkP//+AB+AB+AB+AB///wkkkkkP//+AB+AB+AB+AB///wkkkkkP//+AB+AB+AB+AB///wkkkkkP//+AB+AB+AB+AB///wkkkkkP/////////////////wkkkkkP/////////////////wkkkkkP/////////////////wkkkkkP/////////////////wkkkkkh////////////////+EkkkkkkAAAAAAAAAAAAAAAAAkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkg=="))
\ No newline at end of file
diff --git a/apps/calendar/calendar.js b/apps/calendar/calendar.js
index 5707bd97a..7da903923 100644
--- a/apps/calendar/calendar.js
+++ b/apps/calendar/calendar.js
@@ -1,6 +1,6 @@
 const maxX = g.getWidth();
 const maxY = g.getHeight();
-const fontSize = g.getWidth()>200?2:1;
+const fontSize = g.getWidth() > 200 ? 2 : 1;
 const rowN = 7;
 const colN = 7;
 const headerH = maxY / 7;
@@ -10,26 +10,105 @@ const color1 = "#035AA6";
 const color2 = "#4192D9";
 const color3 = "#026873";
 const color4 = "#038C8C";
-const color5 = "#03A696";
+const gray1 = "#bbbbbb";
 const black = "#000000";
 const white = "#ffffff";
-const gray1 = "#444444";
-const gray2 = "#888888";
-const gray3 = "#bbbbbb";
 const red = "#d41706";
+const blue = "#0000ff";
+const yellow = "#ffff00";
 
 let settings = require('Storage').readJSON("calendar.json", true) || {};
 if (settings.startOnSun === undefined)
   settings.startOnSun = false;
+if (settings.ndColor === undefined)
+  settings.ndColor = true;
+
+if (settings.ndColor === true) {
+  let bgColor = white;
+  let bgColorMonth = blue;
+  let bgColorDow = black;
+  let bgColorWeekend = yellow;
+  let fgOtherMonth = blue;
+  let fgSameMonth = black;
+} else {
+  let bgColor = color4;
+  let bgColorMonth = color1;
+  let bgColorDow = color2;
+  let bgColorWeekend = color3;
+  let fgOtherMonth = gray1;
+  let fgSameMonth = white;
+}
+
+function getDowLbls(locale) {
+  let dowLbls;
+  //TODO: Find some clever way to generate this programmatically from locale lib
+  switch (locale) {
+    case "de_AT":
+    case "de_CH":
+    case "de_DE":
+      if (settings.startOnSun) {
+        dowLbls = ["So", "Mo", "Di", "Mi", "Do", "Fr", "Sa"];
+      } else {
+        dowLbls = ["Mo", "Di", "Mi", "Do", "Fr", "Sa", "So"];
+      }
+      break;
+    case "nl_NL":
+      if (settings.startOnSun) {
+        dowLbls = ["zo", "ma", "di", "wo", "do", "vr", "za"];
+      } else {
+        dowLbls = ["ma", "di", "wo", "do", "vr", "za", "zo"];
+      }
+      break;
+    case "fr_BE":
+    case "fr_CH":
+    case "fr_FR":
+      if (settings.startOnSun) {
+        dowLbls = ["Di", "Lu", "Ma", "Me", "Je", "Ve", "Sa"];
+      } else {
+        dowLbls = ["Lu", "Ma", "Me", "Je", "Ve", "Sa", "Di"];
+      }
+      break;
+    case "sv_SE":
+      if (settings.startOnSun) {
+        dowLbls = ["Di", "Lu", "Ma", "Me", "Je", "Ve", "Sa"];
+      } else {
+        dowLbls = ["Lu", "Ma", "Me", "Je", "Ve", "Sa", "Di"];
+      }
+      break;
+    case "it_CH":
+    case "it_IT":
+      if (settings.startOnSun) {
+        dowLbls = ["Do", "Lu", "Ma", "Me", "Gi", "Ve", "Sa"];
+      } else {
+        dowLbls = ["Lu", "Ma", "Me", "Gi", "Ve", "Sa", "Do"];
+      }
+      break;
+    case "oc_FR":
+      if (settings.startOnSun) {
+        dowLbls = ["dg", "dl", "dm", "dc", "dj", "dv", "ds"];
+      } else {
+        dowLbls = ["dl", "dm", "dc", "dj", "dv", "ds", "dg"];
+      }
+      break;
+    default:
+      if (settings.startOnSun) {
+        dowLbls = ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"];
+      } else {
+        dowLbls = ["Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"];
+      }
+      break;
+  }
+  return dowLbls;
+}
 
 function drawCalendar(date) {
-  g.setBgColor(color4);
+  g.setBgColor(bgColor);
   g.clearRect(0, 0, maxX, maxY);
-  g.setBgColor(color1);
+  g.setBgColor(bgColorMonth);
   g.clearRect(0, 0, maxX, headerH);
-  g.setBgColor(color2);
+  g.setBgColor(bgColorDow);
   g.clearRect(0, headerH, maxX, headerH + rowH);
-  g.setBgColor(color3);
+  g.setBgColor(bgColorWeekend);
   g.clearRect(colW * 5, headerH + rowH, maxX, maxY);
   for (let y = headerH; y < maxY; y += rowH) {
     g.drawLine(0, y, maxX, y);
@@ -40,24 +119,11 @@ function drawCalendar(date) {
 
   const month = date.getMonth();
   const year = date.getFullYear();
-  const monthMap = {
-    0: "January",
-    1: "February",
-    2: "March",
-    3: "April",
-    4: "May",
-    5: "June",
-    6: "July",
-    7: "August",
-    8: "September",
-    9: "October",
-    10: "November",
-    11: "December"
-  };
+  const localeMonth = require('locale').month(date);
   g.setFontAlign(0, 0);
   g.setFont("6x8", fontSize);
   g.setColor(white);
-  g.drawString(`${monthMap[month]} ${year}`, maxX / 2, headerH / 2);
+  g.drawString(`${localeMonth} ${year}`, maxX / 2, headerH / 2);
   g.drawPoly([10, headerH / 2, 20, 10, 20, headerH - 10], true);
   g.drawPoly(
     [maxX - 10, headerH / 2, maxX - 20, 10, maxX - 20, headerH - 10],
@@ -65,12 +131,7 @@ function drawCalendar(date) {
   );
 
   g.setFont("6x8", fontSize);
-  let dowLbls;
-  if (settings.startOnSun) {
-    dowLbls = ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"];
-  } else {
-    dowLbls = ["Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"];
-  }
+  let dowLbls = getDowLbls(require('locale').name);
   dowLbls.forEach((lbl, i) => {
     g.drawString(lbl, i * colW + colW / 2, headerH + rowH / 2);
   });
@@ -120,14 +181,19 @@ function drawCalendar(date) {
         today.year === year && today.month === month && today.day === day - 50;
       if (isToday) {
         g.setColor(red);
+        let x1 = x * colW;
+        let y1 = y * rowH + headerH + rowH;
+        let x2 = x * colW + colW;
+        let y2 = y * rowH + headerH + rowH + rowH;
+        g.drawRect(x1, y1, x2, y2);
         g.drawRect(
-          x * colW,
-          y * rowH + headerH + rowH,
-          x * colW + colW - 1,
-          y * rowH + headerH + rowH + rowH
+          x1 + 1,
+          y1 + 1,
+          x2 - 1,
+          y2 - 1
         );
       }
-      g.setColor(day < 50 ? gray3 : white);
+      g.setColor(day < 50 ? fgOtherMonth : fgSameMonth);
       g.drawString(
         (day > 50 ? day - 50 : day).toString(),
         x * colW + colW / 2,
@@ -145,10 +211,10 @@ const today = {
 };
 drawCalendar(date);
 clearWatch();
-Bangle.on("touch",area=>{
+Bangle.on("touch", area => {
   const month = date.getMonth();
   let prevMonth;
-  if (area==1) {
+  if (area == 1) {
     let prevMonth = month > 0 ? month - 1 : 11;
     if (prevMonth === 11) date.setFullYear(date.getFullYear() - 1);
     date.setMonth(prevMonth);
diff --git a/apps/calendar/calendar.png b/apps/calendar/calendar.png
index 056cab3b7e36928e0f00a595b1fa7b9e0fb9b5f4..ccbcce5fff4e578b44d2e1ba87d21339e5dd19e0 100644
GIT binary patch
literal 7227
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
GhyMqGu%7Dx

delta 527
zcmV+q0`UF2IGhBK7=H)`000120{Mpk000JJOGiWi{{a60|De66lK=n#(Md!>RA_<i
znZHXyQ546&$LA8Hf<z6yT5>3Yeo!PqkmL}w75xqU4f#*xoI~x=(AHoDK|@6lHAOkK
z2|YmzTk@R-qfF0J@5{If_cQs<(eFK9?(y8mdw{|4C&<r_j(^TB)&SZC0A}7=Pc9wn
z(h2xk_-j!cfK5~_K$nhB1F&m8kNDK+h)&QeQBK5dwm8keDu7UJ?xgO!Z^;Grvv?ai
zuf&x7u&^D;UOh<~;trG(aoe@{j)6_o74HhAO0ib7sS{%24a?=r^2*|{q$3(&i_-w2
zQttVs)K;t&ihnv$7nL0;AseW+jYz&!Zj2QhW35ouA-N{6KXJ$-4uC)f=jY0CK;&l{
zE9*q0pz;(N3ilznm#Hr3I0)`%Fc|4mmFbv{Xt~)`ak<*7`O^D$A)^Cf1Qa*Hk52#T
zbwgI!fKDU>eh;#)q2~>VEp+>k>&h0I9gmq7>N<MffPd%RXfw`l?tfh`&rfwUu0qf6
zfH9yOa}ManOd;JE1G+I&NH=B*>Bbn)jhRBa@iL(PxcUDnN<sPQG&Q_?=mID!MMVPv
zmr?*6DW?Z6xD`%G8PUMZ#MmQIWg5T%^tMw8phLGp@wv%ZPGcPggTdgzCkL|4b#tTP
Rxc~qF00>D%PDHLkV1k+>_pbl|

diff --git a/apps/calendar/screenshot_calendar.png b/apps/calendar/screenshot_calendar.png
index 4507d77dd0cbf962e6f435c5d310f481a12f254c..8285932c430aa2fee31b769b9d8b7ae071953fc4 100644
GIT binary patch
delta 1166
zcmV;91abSC9+nA^7=Hu<00018nfYx10004VQb$4nuFf3k0000FP)t-s000000RR60
z0RR60|NsBV7<PaF00cEjL_t(&-tC%EZsRx*L>sHV0O3BsVvz&L&;^=7-TzGU!4|t{
zNsb4TS$K9yIEiG6&*dWIVl$TVo0?4U1iv5Hz71@+2BXHqUVi~weIV5iuv)DhSS_Vk
zF)OfQ1&=r!!Kja5vtrf`%;K~*jb>)0m>m>XU<3oD9KnE<VnBca+eMh!sTH*pR05-x
zBe+^A@vyEw{I+U#Hl=lk?TQU}1fvw7J<QBd%dXgff@*-_(d62n5}xW`ZwZ;V^aM}v
zGw^J){aW*%zJESPC~)2(fcxoHO2-0zaj0jfii#$fM!9sHil}<N59N+NT--gi4PfpN
z&v&2@b!Elg6*E|_!N4h4a<quJ=2iL%SivS=fqA$-g4tuTQboU3te~qvGcnt2vt2et
zHm75}*0E7r_+)}7_#E6S<``cL#rk+>aENFf!r&!;i+?N~Y%qhh@fEeA_VGes55Bfv
zn&6ed%V342;sNY~Vg`d1FN5O2imn(@>waYgNb$;6?0=dSAS(c}!UrpGZp9iZ!-@o#
zl2+7GX!2Zyz;W_?@>ZEQ$OQj~z%RAGxP50ze{#piH(K%eyF8wX-&nD0f`t<(jz1rx
z$>Yoe*ne|$-L@9fqNL7Qt5Pt3a!P*y5I7{j>k=`&Y}+Q=x~(1TLW&1GE2j8&hr0)O
zSt6#FZClr-dIt|kO5s5<BJ)04M+ZN#VgPd(k6?OXhwBA+<;i0!hLk^>ypI;xeey(>
zwys*XZ54^dz`XOO;(t@|Yhn5iwZCV{JHc-W)_*91Jbro(YDBBY6G9*KBKbkzN~J@B
zxJKFLt>W|@>`~3NS5!(6*`I7-+KRhFnCh;@Tal|fST%CaK_?oeux6Nc#p^nxwB~97
z4reQ}1N-}mCmd--Dqi<$I>5@{E^O#{1nU(z6^m$}JQvBy<BmMhc2x(9ENO+vuo9X#
z$bSU?A4=Z2F+IWW4|buH7Rt<_qn~ILP<!UBvh}KIlf6uBSEzbVGDqJVRcJ<2KhbuT
z_b{dX<F)VkMlG${qs@KT*v`y@=DGsjvOG4XMRGTGrFDfM!OyJ7*cNrRV#{^K!s`k^
zIMh9@paqKpWCg8+mMv3y-FRK`kkT3d?SKEo7by*$DLuh6Oy}fH@VAF4ee5dw*6-6W
z%{p(p6Zl>dtQ2hy_g*?5!qh2DCBcQjx9!GZO8cb_+N>rp_GDB5uAYkT_rZ!ATao{I
z6-~u1v1c7AnBaW__$w=N|JeH&rR{~VLWXt4Irv7CC!z`7cZLro@5AKLe#O0%1b>%u
zn>WY=&y=1iJ;84WZeQSu@ioWS_FbgC!xCKDkO<S;c{CxuBo*Tefd|DlC{FM_vgstH
zD=DsnV(uuUc$aceJc3!VRUF5I-j|a6qvAVf-e5%`Vf7MRaRJ^2#aELzcCZx;zMi~!
ggG}%r9;QD4srX7Peals)00000Ne4wvM6N<$g7PCZL;wH)

literal 3866
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
Uc?BnRAa?nz%xqBQCSJt<11SArXaE2J

diff --git a/apps/calendar/settings.js b/apps/calendar/settings.js
index f9c7783a3..76e2c7455 100644
--- a/apps/calendar/settings.js
+++ b/apps/calendar/settings.js
@@ -1,24 +1,34 @@
-(function(back) {
+(function (back) {
   var FILE = "calendar.json";
   var settings = require('Storage').readJSON(FILE, true) || {};
   if (settings.startOnSun === undefined)
-    settings.startOnSun = true;
+    settings.startOnSun = false;
+  if (settings.ndColors === undefined)
+    settings.ndColors = true;
 
   function writeSettings() {
     require('Storage').writeJSON(FILE, settings);
   }
 
   E.showMenu({
-    "" : { "title" : "Calendar" },
-    "< Back" : () => back(),
+    "": { "title": "Calendar" },
+    "< Back": () => back(),
     'Start on Sunday': {
       value: settings.startOnSun,
-      format: v => v?"Yes":"No",
+      format: v => v ? "Yes" : "No",
       onchange: v => {
         settings.startOnSun = v;
         writeSettings();
       }
     },
+    'Non-dithering colors': {
+      value: settings.ndColors,
+      format: v => v ? "Yes" : "No",
+      onchange: v => {
+        settings.ndColors = v;
+        writeSettings();
+      }
+    },
   });
 })