From 4846c45885ab7565f44d3eb342a0b69f9edfd3ab Mon Sep 17 00:00:00 2001 From: Alain Saas Date: Thu, 5 Jan 2023 06:35:42 -0500 Subject: [PATCH 1/5] Update app.js --- apps/a_clock_timer/app.js | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/apps/a_clock_timer/app.js b/apps/a_clock_timer/app.js index d13098b26..07be1964f 100644 --- a/apps/a_clock_timer/app.js +++ b/apps/a_clock_timer/app.js @@ -18,19 +18,29 @@ var timervalue = 0; var istimeron = false; var timertick; -Bangle.on('touch',t=>{ - if (t == 1) { +Bangle.on('touch',(touchside, touchdata)=>{ + if (touchside == 1) { Bangle.buzz(30); - if (timervalue < 5*60) { timervalue = 1 ; } - else { timervalue -= 5*60; } + var changevalue = 0; + if(touchdata.y > 88) { + changevalue += 60*5; + } else { + changevalue += 60*1; + } + if (timervalue < changevalue) { timervalue = 1 ; } + else { timervalue -= changevalue; } } - else if (t == 2) { + else if (touchside == 2) { Bangle.buzz(30); if (!istimeron) { istimeron = true; timertick = setInterval(countDown, 1000); } - timervalue += 60*10; + if(touchdata.y > 88) { + timervalue += 60*10; + } else { + timervalue += 60*1; + } } }); @@ -103,18 +113,21 @@ function draw() { g.reset().clearRect(0,24,g.getWidth(),g.getHeight()-IMAGEHEIGHT); g.drawImage(getImg(),0,g.getHeight()-IMAGEHEIGHT); - var x_sun = 176 - (getGmt().getHours() / 24 * 176 + 4); + var gmtHours = getGmt().getHours(); + + var x_sun = 176 - (gmtHours / 24 * 176 + 4); g.setColor('#ff0').drawLine(x_sun, g.getHeight()-IMAGEHEIGHT, x_sun, g.getHeight()); g.reset(); - var x_night_start = 176 - (((getGmt().getHours()-6)%24) / 24 * 176 + 4); - var x_night_end = 176 - (((getGmt().getHours()+6)%24) / 24 * 176 + 4); - for (let x = x_night_start; x < 176; x+=2) { - g.setColor('#000').drawLine(x, g.getHeight()-IMAGEHEIGHT, x, g.getHeight()); + var x_night_start = 176 - (((gmtHours-6)%24) / 24 * 176 + 4); + var x_night_end = 176 - (((gmtHours+6)%24) / 24 * 176 + 4); + g.setColor('#000'); + for (let x = x_night_start; x < (x_night_end < x_night_start ? 176 : x_night_end); x+=2) { + g.drawLine(x, g.getHeight()-IMAGEHEIGHT, x, g.getHeight()); } if (x_night_end < x_night_start) { for (let x = 0; x < x_night_end; x+=2) { - g.setColor('#000').drawLine(x, g.getHeight()-IMAGEHEIGHT, x, g.getHeight()); + g.drawLine(x, g.getHeight()-IMAGEHEIGHT, x, g.getHeight()); } } From 5b5410e77e9aebcff0cdf39649c3798a15234f25 Mon Sep 17 00:00:00 2001 From: Alain Saas Date: Thu, 5 Jan 2023 06:39:51 -0500 Subject: [PATCH 2/5] Update README.md --- apps/a_clock_timer/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/a_clock_timer/README.md b/apps/a_clock_timer/README.md index e435bdb3f..3fcc00b28 100644 --- a/apps/a_clock_timer/README.md +++ b/apps/a_clock_timer/README.md @@ -2,7 +2,10 @@ * Works with Bangle 2 * Timer - * Right tap: start/increase by 10 minutes; Left tap: decrease by 5 minutes + * Top Right tap: increase by 1 minute + * Top Left tap: decrease by 1 minute + * Bottom Right tap: increase by 10 minutes + * Bottom Left tap: decrease by 5 minutes * Short buzz at T-30, T-20, T-10 ; Double buzz at T * Other time zones * Currently hardcoded to Paris and Tokyo (this will be customizable in a future version) From 3abf65dffbbc212b706829e3b39f726f92702370 Mon Sep 17 00:00:00 2001 From: Alain Saas Date: Thu, 5 Jan 2023 06:40:53 -0500 Subject: [PATCH 3/5] Update metadata.json --- apps/a_clock_timer/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/a_clock_timer/metadata.json b/apps/a_clock_timer/metadata.json index b488f33bc..4e7a36b8a 100644 --- a/apps/a_clock_timer/metadata.json +++ b/apps/a_clock_timer/metadata.json @@ -1,7 +1,7 @@ { "id": "a_clock_timer", "name": "A Clock with Timer", - "version": "0.02", + "version": "0.03", "description": "A Clock with Timer, Map and Time Zones", "icon": "app.png", "screenshots": [{"url":"screenshot.png"}], From 6b736e971d091b6fde0d75839496f6b7c0b09482 Mon Sep 17 00:00:00 2001 From: Alain Saas Date: Thu, 5 Jan 2023 06:40:55 -0500 Subject: [PATCH 4/5] Update ChangeLog --- apps/a_clock_timer/ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/a_clock_timer/ChangeLog b/apps/a_clock_timer/ChangeLog index 26b8d73d7..262f30295 100644 --- a/apps/a_clock_timer/ChangeLog +++ b/apps/a_clock_timer/ChangeLog @@ -1,2 +1,3 @@ 0.01: Beta version for Bangle 2 (2021/11/28) 0.02: Shows night time on the map (2022/12/28) +0.03: Add 1 minute timer with upper taps (2023/01/05) From 30edc6d144f2f608c2abbd1cea3952ef06db2f2d Mon Sep 17 00:00:00 2001 From: Alain Saas Date: Thu, 5 Jan 2023 06:44:33 -0500 Subject: [PATCH 5/5] Update app.js --- apps/a_clock_timer/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/a_clock_timer/app.js b/apps/a_clock_timer/app.js index 07be1964f..441229842 100644 --- a/apps/a_clock_timer/app.js +++ b/apps/a_clock_timer/app.js @@ -83,7 +83,7 @@ function countDown() { function showWelcomeMessage() { g.reset().clearRect(0, 76, 44+44, g.getHeight()/2+6); g.setFontAlign(0, 0).setFont("6x8"); - g.drawString("Touch right to", 44, 80); + g.drawString("Tap right to", 44, 80); g.drawString("start timer", 44, 88); setTimeout(function(){ g.reset().clearRect(0, 76, 44+44, g.getHeight()/2+6); }, 8000); }