From 3715a5f954bafe02d40a05c7b4f08d4ce33e20f3 Mon Sep 17 00:00:00 2001 From: v1nc Date: Thu, 7 May 2020 14:55:25 +0000 Subject: [PATCH 01/20] Create CNAME --- CNAME | 1 + 1 file changed, 1 insertion(+) create mode 100644 CNAME diff --git a/CNAME b/CNAME new file mode 100644 index 000000000..61fcef003 --- /dev/null +++ b/CNAME @@ -0,0 +1 @@ +app.reckendrees.systems \ No newline at end of file From 36c0d562436983b8b68343d71ad650876668e33e Mon Sep 17 00:00:00 2001 From: v1nc Date: Thu, 7 May 2020 15:13:42 +0000 Subject: [PATCH 02/20] Delete CNAME --- CNAME | 1 - 1 file changed, 1 deletion(-) delete mode 100644 CNAME diff --git a/CNAME b/CNAME deleted file mode 100644 index 61fcef003..000000000 --- a/CNAME +++ /dev/null @@ -1 +0,0 @@ -app.reckendrees.systems \ No newline at end of file From a8adf39be0cc418eca031b556a1dfc1db4a5521b Mon Sep 17 00:00:00 2001 From: v1nc Date: Thu, 7 May 2020 18:02:49 +0200 Subject: [PATCH 03/20] add stepup --- apps.json | 12 ++++++++++++ apps/stepup/ChangeLog | 1 + apps/stepup/README.md | 9 +++++++++ apps/stepup/app-icon.js | 1 + apps/stepup/app.js | 32 ++++++++++++++++++++++++++++++++ apps/stepup/app.png | Bin 0 -> 973 bytes 6 files changed, 55 insertions(+) create mode 100644 apps/stepup/ChangeLog create mode 100644 apps/stepup/README.md create mode 100644 apps/stepup/app-icon.js create mode 100644 apps/stepup/app.js create mode 100644 apps/stepup/app.png diff --git a/apps.json b/apps.json index 62e7da66b..9a68cf245 100644 --- a/apps.json +++ b/apps.json @@ -1675,5 +1675,17 @@ {"name":"findphone.app.js","url":"app.js"}, {"name":"findphone.img","url":"app-icon.js","evaluate":true} ] + }, + { "id": "stepup", + "name": "Stepup", + "icon": "app.png", + "version":"0.01", + "description": "Reminds you to stepup every 20 minutes. Sitting to long is dangerous!", + "tags": "tools", + "allow_emulator":true, + "storage": [ + {"name":"stepup.app.js","url":"app.js"}, + {"name":"stepup.img","url":"app-icon.js","evaluate":true} + ] } ] diff --git a/apps/stepup/ChangeLog b/apps/stepup/ChangeLog new file mode 100644 index 000000000..9297fc6c7 --- /dev/null +++ b/apps/stepup/ChangeLog @@ -0,0 +1 @@ +0.01: First Version \ No newline at end of file diff --git a/apps/stepup/README.md b/apps/stepup/README.md new file mode 100644 index 000000000..870847222 --- /dev/null +++ b/apps/stepup/README.md @@ -0,0 +1,9 @@ +# Find Phone + +Ring your phone via GadgetBridge if you lost it somewhere. + +1. Enable HID in settings +2. Connect GadgetBridge +3. Lose phone +4. Open app +5. Click any button or screen diff --git a/apps/stepup/app-icon.js b/apps/stepup/app-icon.js new file mode 100644 index 000000000..95a73755e --- /dev/null +++ b/apps/stepup/app-icon.js @@ -0,0 +1 @@ +require("heatshrink").decompress(atob("mEwwkCkQA/AEp0JCxkgC5KJMUpYXMgf/AA0wC5sPC4/wC/4XhxAXXwQXtlBIJC5URC4QwIC5PxFgQXT/QUCC6fwC4ZgIC5E/+EYCgJ4JC4/zwfwhAXTnGIC9pHXO66nY//4a63xFYTvUiJeCC6cAOxQXNFxIXllAWIC5oAKC+EDC48wC5oAKC9EBiAXokBGJgQXLMBQWMAH4AZA=")) \ No newline at end of file diff --git a/apps/stepup/app.js b/apps/stepup/app.js new file mode 100644 index 000000000..e2375de09 --- /dev/null +++ b/apps/stepup/app.js @@ -0,0 +1,32 @@ +function remind() { + return Bangle.buzz(1000,1) + .then(() =>setTimeout(remind, 60)); +} + +//init graphics +g.clear(); +require("Font8x12").add(Graphics); +g.setFont("8x12",2); +g.setFontAlign(0,0); +g.flip(); +g.setColor(0xF800); +g.drawString("sitting is dangerous!", g.getWidth()/2, g.getHeight()/2); + + setTimeout(remimd,60);false }; + +//check if HID enabled and show message +if (settings.HID=="kb" || settings.HID=="kbmedia") { + g.setColor(0x03E0); + g.drawString("click to find", g.getWidth()/2, g.getHeight()/2); + + //register all buttons and screen to find phone + setWatch(find, BTN1); + setWatch(find, BTN2); + setWatch(find, BTN3); + setWatch(find, BTN4); + setWatch(find, BTN5); + +}else{ + g.setColor(0xf800); + g.drawString("enable HID!", g.getWidth()/2, g.getHeight()/2); +} \ No newline at end of file diff --git a/apps/stepup/app.png b/apps/stepup/app.png new file mode 100644 index 0000000000000000000000000000000000000000..70d891396e60f9a3a41f6566e0f566a769b1f428 GIT binary patch literal 973 zcmV;;12X)HP)#@du(*S<_~B5_LB_$A_K0 zGZ{C@W;fXx%6?(s-gCd_?D_6JGk4}*XrYA`>cJXd2*?4_;FSZ;1M8ca{KExE+zj7{4Xa%f0l|N<+SJr+z(J>n@lma>jaz{jQ6zGUX?V;|IvScQ1CnHyDz(8MClCSsqXqiX1y20&#MmbP{>ddMHo0y4wmTpx zf2^hp=pQZ6f2jb#Z+A+@K9#-UrJ2>YO&;I%*q8g`1$qzE@(6rViq4v2(*^YQBhjX=RT`yOe6`0u?vEE+@C<7}Z%=}yG1#>}ZftFD?r;ghCAS@U6=l|& zX>|qx2>{r;F=5(~W$mi>%3si68y`ft8RK|Nig=cJUF>wiS#G ze_sCgk4XgE>N6za?ES+pPxyU9Apl_f=Woid(+)aUSsx&5bh>#G>O?iaz)NTvoVVMq z!TdHQd~M9|Rkd#c2%7*0C6ON7>i9i2mF$~|8;b9NY8zXf1Gys#_2E=0(sSqFbN8xy z)(5i{xKQxM^!`vS+bW@*fm#vDdtg3jNI)i&X*hv&I^B?eLnX9G2u}%Vtme|j{@6UyLX5eBSKDA Date: Thu, 7 May 2020 18:15:42 +0200 Subject: [PATCH 04/20] use interval instead of timeout --- apps/stepup/app.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/stepup/app.js b/apps/stepup/app.js index e2375de09..4cdce44cc 100644 --- a/apps/stepup/app.js +++ b/apps/stepup/app.js @@ -1,6 +1,5 @@ function remind() { - return Bangle.buzz(1000,1) - .then(() =>setTimeout(remind, 60)); + Bangle.buzz(1000,1); } //init graphics @@ -12,7 +11,9 @@ g.flip(); g.setColor(0xF800); g.drawString("sitting is dangerous!", g.getWidth()/2, g.getHeight()/2); - setTimeout(remimd,60);false }; +setInterval(remimd,60);;()/2, g.getHeight()/2); + + setInterval(remimd,60);alse }; //check if HID enabled and show message if (settings.HID=="kb" || settings.HID=="kbmedia") { From 6e412abba0676bad93aa78abe3440d4f43c188af Mon Sep 17 00:00:00 2001 From: v1nc Date: Thu, 7 May 2020 19:13:41 +0200 Subject: [PATCH 05/20] rename + fix typos --- apps.json | 11 +++++----- apps/{stepup => getup}/ChangeLog | 0 apps/getup/README.md | 3 +++ apps/{stepup => getup}/app-icon.js | 0 apps/getup/app.js | 22 +++++++++++++++++++ apps/{stepup => getup}/app.png | Bin apps/stepup/README.md | 9 -------- apps/stepup/app.js | 33 ----------------------------- 8 files changed, 31 insertions(+), 47 deletions(-) rename apps/{stepup => getup}/ChangeLog (100%) create mode 100644 apps/getup/README.md rename apps/{stepup => getup}/app-icon.js (100%) create mode 100644 apps/getup/app.js rename apps/{stepup => getup}/app.png (100%) delete mode 100644 apps/stepup/README.md delete mode 100644 apps/stepup/app.js diff --git a/apps.json b/apps.json index 9a68cf245..046463bc8 100644 --- a/apps.json +++ b/apps.json @@ -1676,16 +1676,17 @@ {"name":"findphone.img","url":"app-icon.js","evaluate":true} ] }, - { "id": "stepup", - "name": "Stepup", + { "id": "getup", + "name": "Get Up", + "shortName":"Get Up", "icon": "app.png", "version":"0.01", - "description": "Reminds you to stepup every 20 minutes. Sitting to long is dangerous!", + "description": "Reminds you to getup every 20 minutes. Sitting to long is dangerous!", "tags": "tools", "allow_emulator":true, "storage": [ - {"name":"stepup.app.js","url":"app.js"}, - {"name":"stepup.img","url":"app-icon.js","evaluate":true} + {"name":"getup.app.js","url":"app.js"}, + {"name":"getup.img","url":"app-icon.js","evaluate":true} ] } ] diff --git a/apps/stepup/ChangeLog b/apps/getup/ChangeLog similarity index 100% rename from apps/stepup/ChangeLog rename to apps/getup/ChangeLog diff --git a/apps/getup/README.md b/apps/getup/README.md new file mode 100644 index 000000000..0676dab56 --- /dev/null +++ b/apps/getup/README.md @@ -0,0 +1,3 @@ +# Get Up + +Reminds you to getup every 20 minutes. Sitting to long is dangerous! \ No newline at end of file diff --git a/apps/stepup/app-icon.js b/apps/getup/app-icon.js similarity index 100% rename from apps/stepup/app-icon.js rename to apps/getup/app-icon.js diff --git a/apps/getup/app.js b/apps/getup/app.js new file mode 100644 index 000000000..5689049c7 --- /dev/null +++ b/apps/getup/app.js @@ -0,0 +1,22 @@ +function remind() { + Bangle.buzz(1000,1); + g.clear(); + g.setColor(0xF800); + g.drawString("MOVE!", g.getWidth()/2, g.getHeight()/2); + setTimeout(print_message,60000); +} + +function print_message(){ + g.setColor(0xF800); + g.drawString("sitting is dangerous!", g.getWidth()/2, g.getHeight()/2); +} +//init graphics +g.clear(); +require("Font8x12").add(Graphics); +g.setFont("8x12",2); +g.setFontAlign(0,0); +g.flip(); + +print_message(); +setInterval(remind,60000); + diff --git a/apps/stepup/app.png b/apps/getup/app.png similarity index 100% rename from apps/stepup/app.png rename to apps/getup/app.png diff --git a/apps/stepup/README.md b/apps/stepup/README.md deleted file mode 100644 index 870847222..000000000 --- a/apps/stepup/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# Find Phone - -Ring your phone via GadgetBridge if you lost it somewhere. - -1. Enable HID in settings -2. Connect GadgetBridge -3. Lose phone -4. Open app -5. Click any button or screen diff --git a/apps/stepup/app.js b/apps/stepup/app.js deleted file mode 100644 index 4cdce44cc..000000000 --- a/apps/stepup/app.js +++ /dev/null @@ -1,33 +0,0 @@ -function remind() { - Bangle.buzz(1000,1); -} - -//init graphics -g.clear(); -require("Font8x12").add(Graphics); -g.setFont("8x12",2); -g.setFontAlign(0,0); -g.flip(); -g.setColor(0xF800); -g.drawString("sitting is dangerous!", g.getWidth()/2, g.getHeight()/2); - -setInterval(remimd,60);;()/2, g.getHeight()/2); - - setInterval(remimd,60);alse }; - -//check if HID enabled and show message -if (settings.HID=="kb" || settings.HID=="kbmedia") { - g.setColor(0x03E0); - g.drawString("click to find", g.getWidth()/2, g.getHeight()/2); - - //register all buttons and screen to find phone - setWatch(find, BTN1); - setWatch(find, BTN2); - setWatch(find, BTN3); - setWatch(find, BTN4); - setWatch(find, BTN5); - -}else{ - g.setColor(0xf800); - g.drawString("enable HID!", g.getWidth()/2, g.getHeight()/2); -} \ No newline at end of file From dbf57058d0fe156ea9a721b4584f41999f7c4e6b Mon Sep 17 00:00:00 2001 From: v1nc Date: Thu, 7 May 2020 19:38:34 +0200 Subject: [PATCH 06/20] change colors and interval time --- apps/getup/app.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/getup/app.js b/apps/getup/app.js index 5689049c7..cddd93a65 100644 --- a/apps/getup/app.js +++ b/apps/getup/app.js @@ -7,16 +7,16 @@ function remind() { } function print_message(){ - g.setColor(0xF800); + g.clear(); + g.setColor(0x03E0); g.drawString("sitting is dangerous!", g.getWidth()/2, g.getHeight()/2); } //init graphics -g.clear(); require("Font8x12").add(Graphics); g.setFont("8x12",2); g.setFontAlign(0,0); g.flip(); print_message(); -setInterval(remind,60000); +setInterval(remind,1200000); From c091db0d680ecbd1b42f60735141c7909b7214e7 Mon Sep 17 00:00:00 2001 From: v1nc Date: Thu, 7 May 2020 20:03:11 +0200 Subject: [PATCH 07/20] add settings for move and sit time --- apps/getup/app.js | 20 ++++++++++++++++-- apps/getup/settings.js | 48 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 apps/getup/settings.js diff --git a/apps/getup/app.js b/apps/getup/app.js index cddd93a65..66d0ef868 100644 --- a/apps/getup/app.js +++ b/apps/getup/app.js @@ -1,9 +1,25 @@ +const storage = require("Storage"); +const SETTINGS_FILE = 'getup.settings.json'; + +function setting(key) { +const DEFAULTS = { + 'sitTime' : 20, + 'moveTime' : 1 +}; +if (!settings) { loadSettings(); } +return (key in settings) ? settings[key] : DEFAULTS[key]; +} +let settings; +function loadSettings() { +settings = storage.readJSON(SETTINGS_FILE, 1) || {}; +} + function remind() { Bangle.buzz(1000,1); g.clear(); g.setColor(0xF800); g.drawString("MOVE!", g.getWidth()/2, g.getHeight()/2); - setTimeout(print_message,60000); + setTimeout(print_message,moveTime * 60000); } function print_message(){ @@ -18,5 +34,5 @@ g.setFontAlign(0,0); g.flip(); print_message(); -setInterval(remind,1200000); +setInterval(remind,settings.sitTime * 60000); diff --git a/apps/getup/settings.js b/apps/getup/settings.js new file mode 100644 index 000000000..e7178efe8 --- /dev/null +++ b/apps/getup/settings.js @@ -0,0 +1,48 @@ +// This file should contain exactly one function, which shows the app's settings +/** + * @param {function} back Use back() to return to settings menu + */ +(function(back) { + const SETTINGS_FILE = 'getup.settings.json'; + + // initialize with default settings... + let s = { + 'sitTime' : 20 + 'moveTime' : 1 + }; + // ...and overwrite them with any saved values + // This way saved values are preserved if a new version adds more settings + const storage = require('Storage'); + const saved = storage.readJSON(SETTINGS_FILE, 1) || {}; + for (const key in saved) { + s[key] = saved[key]; + } + + // creates a function to safe a specific setting, e.g. save('color')(1) + function save(key) { + return function (value) { + s[key] = value; + storage.write(SETTINGS_FILE, s); + }; + } + + const menu = { + '': { 'title': 'Get Up' }, + '< Back': back, + 'Sit time (min)': { + value: s.sitTime, + min: 0, + max: 10000, + step: 1, + onchange: save('sitTime'), + }, + 'Move time (min)': { + value: s.moveTime, + min: 0, + max: 5000, + step: 1, + onchange: save('moveTime'), + }, + }; + E.showMenu(menu); +}); From d4ae51cf22b736e1f4acb06b97bc00b71cb3ed85 Mon Sep 17 00:00:00 2001 From: v1nc Date: Thu, 7 May 2020 20:10:27 +0200 Subject: [PATCH 08/20] swap colors --- apps/getup/app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/getup/app.js b/apps/getup/app.js index 66d0ef868..560c5dd56 100644 --- a/apps/getup/app.js +++ b/apps/getup/app.js @@ -17,14 +17,14 @@ settings = storage.readJSON(SETTINGS_FILE, 1) || {}; function remind() { Bangle.buzz(1000,1); g.clear(); - g.setColor(0xF800); + g.setColor(0x03E0); g.drawString("MOVE!", g.getWidth()/2, g.getHeight()/2); setTimeout(print_message,moveTime * 60000); } function print_message(){ g.clear(); - g.setColor(0x03E0); + g.setColor(0xF800); g.drawString("sitting is dangerous!", g.getWidth()/2, g.getHeight()/2); } //init graphics From d428c99bd50c3b0c86c0667b2972b56c1eeb2dca Mon Sep 17 00:00:00 2001 From: v1nc Date: Thu, 7 May 2020 20:15:18 +0200 Subject: [PATCH 09/20] add settings to app.json --- apps.json | 1 + 1 file changed, 1 insertion(+) diff --git a/apps.json b/apps.json index 046463bc8..f29fa16bb 100644 --- a/apps.json +++ b/apps.json @@ -1686,6 +1686,7 @@ "allow_emulator":true, "storage": [ {"name":"getup.app.js","url":"app.js"}, + {"name":"getup.settings.js","url":"settings.js"}, {"name":"getup.img","url":"app-icon.js","evaluate":true} ] } From 6f77f4dcd2d07eea63668a688793eb083ce7885c Mon Sep 17 00:00:00 2001 From: v1nc Date: Thu, 7 May 2020 20:20:00 +0200 Subject: [PATCH 10/20] Fix typo --- apps/getup/settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/getup/settings.js b/apps/getup/settings.js index e7178efe8..f34262f2a 100644 --- a/apps/getup/settings.js +++ b/apps/getup/settings.js @@ -7,7 +7,7 @@ // initialize with default settings... let s = { - 'sitTime' : 20 + 'sitTime' : 20, 'moveTime' : 1 }; // ...and overwrite them with any saved values From e871a97b7ee6f6a63907cf0ffead7de092954022 Mon Sep 17 00:00:00 2001 From: v1nc Date: Thu, 7 May 2020 20:36:32 +0200 Subject: [PATCH 11/20] Make sitTime <= moveTime possible --- apps/getup/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/getup/app.js b/apps/getup/app.js index 560c5dd56..253c06ef5 100644 --- a/apps/getup/app.js +++ b/apps/getup/app.js @@ -26,6 +26,7 @@ function print_message(){ g.clear(); g.setColor(0xF800); g.drawString("sitting is dangerous!", g.getWidth()/2, g.getHeight()/2); + setTimeout(remind,settings.sitTime * 60000); } //init graphics require("Font8x12").add(Graphics); @@ -34,5 +35,4 @@ g.setFontAlign(0,0); g.flip(); print_message(); -setInterval(remind,settings.sitTime * 60000); From d539b15f57e823ea0b859ee0b1d5b41cfa324d37 Mon Sep 17 00:00:00 2001 From: v1nc Date: Thu, 7 May 2020 20:41:06 +0200 Subject: [PATCH 12/20] Update README.md --- apps/getup/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/getup/README.md b/apps/getup/README.md index 0676dab56..c6bacc21a 100644 --- a/apps/getup/README.md +++ b/apps/getup/README.md @@ -1,3 +1,5 @@ # Get Up -Reminds you to getup every 20 minutes. Sitting to long is dangerous! \ No newline at end of file +Reminds you to getup every 20 minutes. Sitting to long is dangerous! + +Sit and move time configurable in settings, default is 20 minute sitting, 1 minute moving. From ca2996e57a34cdb03d0459186f3cafc411a934cb Mon Sep 17 00:00:00 2001 From: v1nc Date: Thu, 7 May 2020 20:45:51 +0200 Subject: [PATCH 13/20] update icon --- apps/getup/app-icon.js | 2 +- apps/getup/app.png | Bin 973 -> 1685 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/getup/app-icon.js b/apps/getup/app-icon.js index 95a73755e..09010684e 100644 --- a/apps/getup/app-icon.js +++ b/apps/getup/app-icon.js @@ -1 +1 @@ -require("heatshrink").decompress(atob("mEwwkCkQA/AEp0JCxkgC5KJMUpYXMgf/AA0wC5sPC4/wC/4XhxAXXwQXtlBIJC5URC4QwIC5PxFgQXT/QUCC6fwC4ZgIC5E/+EYCgJ4JC4/zwfwhAXTnGIC9pHXO66nY//4a63xFYTvUiJeCC6cAOxQXNFxIXllAWIC5oAKC+EDC48wC5oAKC9EBiAXokBGJgQXLMBQWMAH4AZA=")) \ No newline at end of file +require("heatshrink").decompress(atob("mEwxH+AH4A/AH4A75wACCJugAAguaGBouFGCwuF53NFxem6PX6/R0wwVF4xgJEwOsFoMrlYDB1gwUL55dCFQIvE65hUL54jBRgQvF6JgaRxQpCF4SUC67BV5ouLF40yGAOBF64ANR4vXwJhCR6oABq4ACF5TvDAAOsL4LvS4wuGGBi6DGIYuSAAQvGMJiSC6JdSGAovPGAQAFXSQvDrgrBqwvMGAzqTF4d/F4owLADKQGmQv/F7eAF4UySQQwn0ZcCq0ylkySFYyDMEgvDvQwFAAYvk0aLBqy/CAAaUhSAi+BX4QzCAwJkgF4eAX4gzDSsIvDeIzFlGAhhEF9QAHBwIwvF8IwSF7oxMF8gALSEQwRF/4v/YH4v/GD4usAH4A/AH4ARA=")) diff --git a/apps/getup/app.png b/apps/getup/app.png index 70d891396e60f9a3a41f6566e0f566a769b1f428..fec421183023726052c0e2614ad25dd3948c0296 100644 GIT binary patch delta 1651 zcmV-(28{X52bB$wHGc+5Nkl+Seg(HiSaMXd1GnU8EL>)>Pu9 zg#w~!7-@6fhy`@m$C6m?=#ry*9tTE^CG(i${aQi#%mDzu>vl~P(- zq|g9;$=gU1Vkb6h*VzSl_#t&~Tybk8~e|8t+m=YQp%b6^Tnn8J4&DxF|y zttudFyn^DP(d=W0+Nvs=+S1`^-F#v;*q>7(KSJZqYvk&@5;<(B@UHSbOD|8l0cou& zz%b4Lc?nHd(6oiB{GVT0;dy(@$qh>6b%ER@f(8wty1Zf00V{mg4IHUFfMR`;=0;V~ zywQx~?JXxaAb;|AK+Re(gTht$I16(C@O&}Emq)wlJv#s(B5br`!n%Q$N-s(NHNdMX znq8^#TQ{GWtzl~y$Stlapy=W60q}!+7X#4t!FvE)YU!lCsRO_p(gVe7b}j2o#j9C0 zU;;4@u|Fq}J8Qv=sQ9r^R56!X^QQwi?LkMa8LM>zihpA%T3gN2Wi3GAs(jN|-M(s0 zBx|i%taSsTwgOkiXz4>jKeNDa2Y|CMd(6gky z-E0^lc`o?++jb~6$PMBBu|(6n2VKPuwdQfa!{j0F)cpeXfx z;Un)ZXMeQ*;NSMMtKl{F{rRuF_NTvaZ|OoxZ(R_1;{`L`vYNh+hZNE9Ikh>E?4HS>2G7-0oK7Vo>MHO?$jJw#<$%Sjns7E*K#Vhuf zeVt09*&HYX>VTKgId}AxrR%SYj~kvEA}^&PD&Mp8vLRFh(%#g;ncuh3-{vJe5+*zn zroYY0hr8P%;zfy6n~4Xr9(a}YD577(py;Qb>Do~SAcjFG7(maMcHM;-CHv~@Qtpdd zYk&Upm{PnBIFp2Ult}gJhQAGFs zu;@TY4-^C26`Tf!fFT8^QM{-d_F}8z!NOKT_HY1(*B2?|IH%Knv7N#G zKEk08K;<`}GbyZXB~<({TAKNObWb#6_8hWZ)A4-W!-bDeap{vY8!9W^S(B_Yg?}^) zkOt->d>knoqC8J`z3ejn&%bch=RQL6irg% zDhz+rFOs;|Qe~Wo7K4#t^M% z(^vKRK93jwpa=ip0Kt(FGIL#I<+{jnI+>Q0O<#8>KJNg9CG%tHx|B%GAM0Ou>&6*y zV<(@>z>G-Uj^1Z4eHIwq&;#L62*1}8H8gT{n5f-Nr-= zSU=FX2_dw^)>Th$>>%bFVYA!G&6~-sh2N*>o*zhD=sXygd$pPO2vCCXQ{WJA5%8r<5?1-Nq2s_{ zT>S*+L0Y%dlYytU?K}ijU9XWt`?tTaZoGVxb+u?6iiBY_v3YRA4QyzdahUiUfeFon z8*X5qyRHka?`(ky&4U|1gaD9)VI<4P%XCu=D8rUG50;FV>!uhOI$v-S=!vNs_xAdx x7-($V7*--r1DygLhEkhvhK?yrVG7>@{0~GcEy3v{zGVOa002ovPDHLkV1l}2Dc%48 delta 934 zcmV;X16ll)4b2CTHGczwNkluswwRhl)i4=n`+^WuYu z)CX(9`Umt;tXi8F#r~jGL<*rTB^DEX6Z&L>5Fgq?W1$pUmW@?f@JaCpqEuPaW_J>G zH#^6NoxL*|H_2u<*%``yVc_0#zvt}v?maVi=3Z!_g%;|;8h>C2$N|#el>^QL>zkSU z!v#p(e?0_VX@-EIMM%DKooj{wQ#P4QMjAyro%Ra&Z@$T>Is}Mmh|I>TJqa}}jd|r1 zS&$3@L`%S8qH8d}axPA21*|)jKV}P8)_yzDF&i(G0y+nBM?`TH=!iz`q3)BiWF~GX z1w@q^1&RO)Hh)jWt&e8nhU+n^6o@E*)Ik0qaMGbz#8vmrJ<0oi-_Xp!ik+XJ-#u>n zHy?Qi{%+ zW77rn_J1Vk-IM@e%i5^1$6o64((Y9nrC5Bm$3E_l7hCWQYd~*Lf~7IowLWfaZEx;y z3Bo0}9eEXH)|+W{1_22G*t;=d+L2}Lv~PXiJ3MS!%HCcnHYNP!j}!PhAi#_74H8Yh zP%&NCvE&7pq0A#y6u+z z{_q8M@e$Fs6^spkUjFxwNd(*KGbG{c{lhO$_me|j{@6UyLX5eBSKDA$N2mk;807*qo IM6N<$f(YBmHUIzs From 42ee5e647ae1ae95b57d7cc1418ec8a3928eef4e Mon Sep 17 00:00:00 2001 From: v1nc Date: Thu, 7 May 2020 20:53:12 +0200 Subject: [PATCH 14/20] Update README.md --- apps/getup/README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/getup/README.md b/apps/getup/README.md index c6bacc21a..29c9ed7b2 100644 --- a/apps/getup/README.md +++ b/apps/getup/README.md @@ -1,5 +1,7 @@ # Get Up -Reminds you to getup every 20 minutes. Sitting to long is dangerous! +Reminds you to getup every 20 minutes. -Sit and move time configurable in settings, default is 20 minute sitting, 1 minute moving. +Sitting to long is dangerous! + +Sit and move time configurable in settings. From 74eb86d376ea5227649ab9e2f91b7fe7e240f06e Mon Sep 17 00:00:00 2001 From: v1nc Date: Thu, 7 May 2020 20:59:04 +0200 Subject: [PATCH 15/20] Add comments --- apps/getup/app.js | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/apps/getup/app.js b/apps/getup/app.js index 253c06ef5..c4dff2364 100644 --- a/apps/getup/app.js +++ b/apps/getup/app.js @@ -1,19 +1,25 @@ +//init settings const storage = require("Storage"); const SETTINGS_FILE = 'getup.settings.json'; function setting(key) { -const DEFAULTS = { - 'sitTime' : 20, - 'moveTime' : 1 -}; -if (!settings) { loadSettings(); } -return (key in settings) ? settings[key] : DEFAULTS[key]; -} -let settings; -function loadSettings() { -settings = storage.readJSON(SETTINGS_FILE, 1) || {}; + const DEFAULTS = { + 'sitTime' : 20, + 'moveTime' : 1 + } + if (!settings) { + loadSettings(); + } + return (key in settings) ? settings[key] : DEFAULTS[key]; } +let settings; + +function loadSettings() { + settings = storage.readJSON(SETTINGS_FILE, 1) || {}; +} + +//vibrate, draw move message and start timer for sitting message function remind() { Bangle.buzz(1000,1); g.clear(); @@ -21,13 +27,14 @@ function remind() { g.drawString("MOVE!", g.getWidth()/2, g.getHeight()/2); setTimeout(print_message,moveTime * 60000); } - +//draw sitting message and start timer for reminder function print_message(){ g.clear(); g.setColor(0xF800); g.drawString("sitting is dangerous!", g.getWidth()/2, g.getHeight()/2); setTimeout(remind,settings.sitTime * 60000); } + //init graphics require("Font8x12").add(Graphics); g.setFont("8x12",2); From 4b1bb863862cb0181d10bd8e6245cb9ae64cb3f2 Mon Sep 17 00:00:00 2001 From: v1nc Date: Thu, 7 May 2020 21:05:14 +0200 Subject: [PATCH 16/20] Update README.md --- apps/getup/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/getup/README.md b/apps/getup/README.md index 29c9ed7b2..b92bedb7c 100644 --- a/apps/getup/README.md +++ b/apps/getup/README.md @@ -1,6 +1,6 @@ # Get Up -Reminds you to getup every 20 minutes. +Reminds you to getup every x minutes (default: 20). Sitting to long is dangerous! From c0a7711a5aaf3e4910d6143e137999705c6fca05 Mon Sep 17 00:00:00 2001 From: v1nc Date: Thu, 7 May 2020 21:18:55 +0200 Subject: [PATCH 17/20] Fix setting loading --- apps/getup/app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/getup/app.js b/apps/getup/app.js index c4dff2364..3f10e16bb 100644 --- a/apps/getup/app.js +++ b/apps/getup/app.js @@ -25,14 +25,14 @@ function remind() { g.clear(); g.setColor(0x03E0); g.drawString("MOVE!", g.getWidth()/2, g.getHeight()/2); - setTimeout(print_message,moveTime * 60000); + setTimeout(print_message,setting("moveTime") * 60000); } //draw sitting message and start timer for reminder function print_message(){ g.clear(); g.setColor(0xF800); g.drawString("sitting is dangerous!", g.getWidth()/2, g.getHeight()/2); - setTimeout(remind,settings.sitTime * 60000); + setTimeout(remind,setting("sitTime") * 60000); } //init graphics From e7bd0d6f827ccd8f52674d2b93e68d6e6a2d9475 Mon Sep 17 00:00:00 2001 From: v1nc Date: Thu, 7 May 2020 21:26:34 +0200 Subject: [PATCH 18/20] Add readme --- apps.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps.json b/apps.json index f29fa16bb..1d81bbdaa 100644 --- a/apps.json +++ b/apps.json @@ -1681,8 +1681,9 @@ "shortName":"Get Up", "icon": "app.png", "version":"0.01", - "description": "Reminds you to getup every 20 minutes. Sitting to long is dangerous!", - "tags": "tools", + "description": "Reminds you to getup every x minutes. Sitting to long is dangerous!", + "tags": "tools,health", + "readme": "README.md", "allow_emulator":true, "storage": [ {"name":"getup.app.js","url":"app.js"}, From 5f269726b02765db8996efb5e655d35062806a77 Mon Sep 17 00:00:00 2001 From: v1nc Date: Thu, 7 May 2020 21:39:40 +0200 Subject: [PATCH 19/20] Update move font size --- apps/getup/app.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/getup/app.js b/apps/getup/app.js index 3f10e16bb..d80bd21b1 100644 --- a/apps/getup/app.js +++ b/apps/getup/app.js @@ -23,6 +23,7 @@ function loadSettings() { function remind() { Bangle.buzz(1000,1); g.clear(); + g.setFont("8x12",4); g.setColor(0x03E0); g.drawString("MOVE!", g.getWidth()/2, g.getHeight()/2); setTimeout(print_message,setting("moveTime") * 60000); @@ -30,6 +31,7 @@ function remind() { //draw sitting message and start timer for reminder function print_message(){ g.clear(); + g.setFont("8x12",2); g.setColor(0xF800); g.drawString("sitting is dangerous!", g.getWidth()/2, g.getHeight()/2); setTimeout(remind,setting("sitTime") * 60000); @@ -37,7 +39,6 @@ function print_message(){ //init graphics require("Font8x12").add(Graphics); -g.setFont("8x12",2); g.setFontAlign(0,0); g.flip(); From 43d182fd9bf76de90cf46739bd1a510ea0facaae Mon Sep 17 00:00:00 2001 From: v1nc Date: Thu, 7 May 2020 22:11:55 +0200 Subject: [PATCH 20/20] new branch --- apps/getup/app.js | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/getup/app.js b/apps/getup/app.js index d80bd21b1..8e4a4a099 100644 --- a/apps/getup/app.js +++ b/apps/getup/app.js @@ -43,4 +43,3 @@ g.setFontAlign(0,0); g.flip(); print_message(); -