From 143e3da6f6a3def2572425122a1ba03ab1158add Mon Sep 17 00:00:00 2001 From: Christian Hemker Date: Wed, 1 Apr 2020 20:14:07 +0200 Subject: [PATCH 1/5] test --- apps/daysl/widget.js | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/daysl/widget.js b/apps/daysl/widget.js index 5a3c170c2..9eaf8afca 100644 --- a/apps/daysl/widget.js +++ b/apps/daysl/widget.js @@ -27,7 +27,6 @@ function updateSettings() { const diffDays = Math.round(Math.abs((targetDate - today) / oneDay)); WIDGETS["daysl"]={area:"tl",width:40,draw:function(){ - g.setFont("6x8", 1); g.drawString(diffDays,this.x+12,this.y+12); }}; \ No newline at end of file From 40be3f0a27653f6aafa22b9c6faf02e2af9c3965 Mon Sep 17 00:00:00 2001 From: Christian Hemker Date: Wed, 1 Apr 2020 20:18:50 +0200 Subject: [PATCH 2/5] calc to end of target day , default year 2020 --- apps/daysl/widget.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/daysl/widget.js b/apps/daysl/widget.js index 9eaf8afca..f71253a3a 100644 --- a/apps/daysl/widget.js +++ b/apps/daysl/widget.js @@ -4,12 +4,12 @@ let settings; function updateSettings() { storage.write('daysleft.json', settings); } - + function resetSettings() { settings = { day : 17, month : 6, - year: 1981 + year: 2020 }; updateSettings(); } @@ -17,12 +17,12 @@ function updateSettings() { settings = storage.readJSON('daysleft.json',1); if (!settings) resetSettings(); - var dd = settings.day+1, - mm = settings.month-1, + var dd = settings.day, + mm = settings.month-1, //month is zero-based yy = settings.year; const oneDay = 24 * 60 * 60 * 1000; // hours*minutes*seconds*milliseconds - const targetDate = new Date(yy, mm, dd); + const targetDate = new Date(yy, mm, dd, 23, 59, 59); const today = new Date(); const diffDays = Math.round(Math.abs((targetDate - today) / oneDay)); From fc409e3f776f7f77cbf03cf59f8186fe15fb6f09 Mon Sep 17 00:00:00 2001 From: Christian Hemker Date: Wed, 1 Apr 2020 21:27:51 +0200 Subject: [PATCH 3/5] changed calculation --- apps/daysl/widget.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/apps/daysl/widget.js b/apps/daysl/widget.js index f71253a3a..6fb755d1e 100644 --- a/apps/daysl/widget.js +++ b/apps/daysl/widget.js @@ -22,9 +22,16 @@ function updateSettings() { yy = settings.year; const oneDay = 24 * 60 * 60 * 1000; // hours*minutes*seconds*milliseconds - const targetDate = new Date(yy, mm, dd, 23, 59, 59); + const targetDate = new Date(yy, mm, dd); const today = new Date(); - const diffDays = Math.round(Math.abs((targetDate - today) / oneDay)); + + //create date object with today, but 00:00:00 + const currentYear = today.getFullYear(); + const currentMonth = today.getMonth(); + const currentDay = today.getDate(); + const todayMorning = new Date (currentYear, currentMonth, currentDay, 0, 0, 0); + + const diffDays = (targetDate - todayMorning) / oneDay; WIDGETS["daysl"]={area:"tl",width:40,draw:function(){ g.setFont("6x8", 1); From b0a0bf1ec04ff8de748a8a1e5c8dd40c0d01c4ef Mon Sep 17 00:00:00 2001 From: Christian Hemker Date: Wed, 1 Apr 2020 22:10:18 +0200 Subject: [PATCH 4/5] changed calculation, new image --- apps.json | 2 +- apps/daysl/ChangeLog | 1 + apps/daysl/app-icon.js | 2 +- apps/daysl/app.png | Bin 287 -> 468 bytes 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps.json b/apps.json index a84a8010c..db7859e1a 100644 --- a/apps.json +++ b/apps.json @@ -27,7 +27,7 @@ { "id": "daysl", "name": "Days left", "icon": "app.png", - "version":"0.01", + "version":"0.02", "description": "Shows you the days left until a certain date. Date can be set with a settings app and is written to a file.", "tags": "", "allow_emulator":false, diff --git a/apps/daysl/ChangeLog b/apps/daysl/ChangeLog index 4c21f3ace..4e0b8e6cf 100644 --- a/apps/daysl/ChangeLog +++ b/apps/daysl/ChangeLog @@ -1 +1,2 @@ 0.01: New Widget! +0.02: Improved calculation, new image for app diff --git a/apps/daysl/app-icon.js b/apps/daysl/app-icon.js index 485478c58..22c03d87a 100644 --- a/apps/daysl/app-icon.js +++ b/apps/daysl/app-icon.js @@ -1 +1 @@ -require("heatshrink").decompress(atob("mEwwMB//D/4CgwHDFYPDgICBAoQCB/4CKADmAAgcBIARCCAqQAXF/4v24CtDgYFR")) \ No newline at end of file +require("heatshrink").decompress(atob("i4A/AH4A/AH4A/AH4A/AH4A/AAUAABQNdF/4v/F64JLBqMrAgMrC54vbGAIuCF54TIBp4JDCIYvNOZINPGAoRCO5wrHBp7vVF/4v/F9IlLF/6PYF9xfRlYEBlYvJBpZeITJsrEASxJBpQuIZLCnPHYovpFwwXKABINdF/4v/F6oA/AH4A/AH4A/AH4A/AH4A7A==")) \ No newline at end of file diff --git a/apps/daysl/app.png b/apps/daysl/app.png index 703e5c366c7bf7ad21000427fcda514c599770e9..42839ae59e2cf440042fd85d0ab7e20047254bc8 100644 GIT binary patch delta 425 zcmV;a0apH>0@MSLBrgGTQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000&x z000&x0ZCFM@R1=De*srXL_t(&L+zQrio!q;#^=Q1YKvfzz;%LYz1laiu&}=F;I7un zC$RKAd;+b6E7A!`Ar`5xyJI#Z#+dz+AWkClgC!qkXPGZESvL3r>*F7^m=0ZAix}WW z3~(a`xDf-~hyiYH&q9+v2}jn)?E2_9LRyHMCw>PCy>>%!f8L$q{I3xtNuqQR1Q5@+ zO6%5dTm_QFP9=Voya6Wz_*8IIrApjjJ|+b!@qF^8HLM0O7)y#H_coX% zNGc;uQ&QzL?j88~+>iq3PA_e!L%xZ*5d+-Fe`MT<0dB+qH)4PrF~E%&;053xq9Tsq Tou?iF00000NkvXXu0mjfigda{ delta 259 zcmV+e0sQ{d1D^trB!32COGiWi{{a60|De66lK=n!)Ja4^RA_m#C0W~(D#yOzI2Go>tAjF@W@Ex!LHFw+bL$f6PI&=U4002ov JPDHLkV1lG)cgX+% From 5829ed618d3057d90abe2406445f05545c60b625 Mon Sep 17 00:00:00 2001 From: Christian Hemker Date: Wed, 1 Apr 2020 22:23:18 +0200 Subject: [PATCH 5/5] corrected image --- apps/daysl/app-icon.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/daysl/app-icon.js b/apps/daysl/app-icon.js index 22c03d87a..bdc0da744 100644 --- a/apps/daysl/app-icon.js +++ b/apps/daysl/app-icon.js @@ -1 +1 @@ -require("heatshrink").decompress(atob("i4A/AH4A/AH4A/AH4A/AH4A/AAUAABQNdF/4v/F64JLBqMrAgMrC54vbGAIuCF54TIBp4JDCIYvNOZINPGAoRCO5wrHBp7vVF/4v/F9IlLF/6PYF9xfRlYEBlYvJBpZeITJsrEASxJBpQuIZLCnPHYovpFwwXKABINdF/4v/F6oA/AH4A/AH4A/AH4A/AH4A7A==")) \ No newline at end of file +require("heatshrink").decompress(atob("mEwgmIAH4A/AH4A/AEEAAAgGOC/4XLAgoGIDgYXTwEIBY4JEAw8YCIOAEY4+EAwwTCL44XNO5IX/C6i6LC8YABa5AXOF67vIwA5DAw5GDMhg7HjAXWIwQLFZIoGNC/4XKAH4A/AH4A/ADoA=")) \ No newline at end of file