From 1309e0a457df11f0c4a5c17b9584ceadb684800f Mon Sep 17 00:00:00 2001 From: inhof009 <141580984+inhof009@users.noreply.github.com> Date: Wed, 9 Aug 2023 08:10:52 -0400 Subject: [PATCH 1/5] Update settings.js Modified menu names to make more sense --- apps/usgs/settings.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/usgs/settings.js b/apps/usgs/settings.js index 07abaf88f..1ddde4c60 100644 --- a/apps/usgs/settings.js +++ b/apps/usgs/settings.js @@ -9,7 +9,7 @@ var submenu = { "" : { - "title" : "-- DataStreams --" + "title" : "DataStreams" }, "< Back" : function() { E.showMenu(menu); }, }; @@ -38,7 +38,7 @@ function popSubMenuData(data) { E.showMenu(submenu); } var menu = { - "" : { "title" : "App Name" }, + "" : { "title" : "USGS" }, "< Back" : () => back(), 'Temp unit': { value: !!settings.tempUnitF, // !! converts undefined to false @@ -59,7 +59,7 @@ function popSubMenuData(data) { }, 100); } }, - "Submenu" : function() { popSubMenu();}, + "DataStreams" : function() { popSubMenu();}, }; var keyboard = "textinput"; From 7ae0e8093b4a12303d3548d27c90d1ac4098ae5c Mon Sep 17 00:00:00 2001 From: inhof009 <141580984+inhof009@users.noreply.github.com> Date: Wed, 9 Aug 2023 08:34:06 -0400 Subject: [PATCH 2/5] Update app.js Added button interaction. 1 press for refresh data, double press for launcher. --- apps/usgs/app.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/apps/usgs/app.js b/apps/usgs/app.js index e0b515018..e6f2efa1e 100644 --- a/apps/usgs/app.js +++ b/apps/usgs/app.js @@ -63,5 +63,27 @@ function displayData(dataStreams) { seconds.toString().padStart(2,"0"); E.showMessage(string,timeString); } +function handleButton() { + switch(nPress) { + case 1: + fetchStartup(); + break; + case 2: + Bangle.showLauncher(); + break; + default: + Bangle.buzz(50); + } + nPress=0; +} fetchStartup(); + +nPress = 0; +tPress = 0; + +setWatch(() => { + nPress++; + clearTimeout(tPress); + tPress = setTimeout(() => {handleButton();}, 500); + }, (process.env.HWVERSION==2) ? BTN1 : BTN2, {repeat: true, edge: "rising"}); From 0ed2fd7ad9eb5fbc580a72bbf307482d7d0cf1f2 Mon Sep 17 00:00:00 2001 From: inhof009 <141580984+inhof009@users.noreply.github.com> Date: Wed, 9 Aug 2023 08:34:38 -0400 Subject: [PATCH 3/5] Update ChangeLog --- apps/usgs/ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/usgs/ChangeLog b/apps/usgs/ChangeLog index 5560f00bc..65536966a 100644 --- a/apps/usgs/ChangeLog +++ b/apps/usgs/ChangeLog @@ -1 +1,2 @@ 0.01: New App! +0.02: Changed menu names, added button interaction. From 0b1b2eee6440ce8642772eb819e16c2eea02dc20 Mon Sep 17 00:00:00 2001 From: inhof009 <141580984+inhof009@users.noreply.github.com> Date: Wed, 9 Aug 2023 08:35:09 -0400 Subject: [PATCH 4/5] Update README.md --- apps/usgs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/usgs/README.md b/apps/usgs/README.md index 304c1b761..f8c91f0a6 100644 --- a/apps/usgs/README.md +++ b/apps/usgs/README.md @@ -26,7 +26,7 @@ Simple interface will display most current data for the specified location when ## Controls -No controls currently +Press button (middle on Bangle 1) once to refresh data, twice to return to launcher. ## Creator From 3a5a78ae5acc4c790210b7cf91eb47ec67fbd0cd Mon Sep 17 00:00:00 2001 From: inhof009 <141580984+inhof009@users.noreply.github.com> Date: Wed, 9 Aug 2023 08:36:30 -0400 Subject: [PATCH 5/5] Update metadata.json --- apps/usgs/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/usgs/metadata.json b/apps/usgs/metadata.json index 80bb5a325..6140c59b9 100644 --- a/apps/usgs/metadata.json +++ b/apps/usgs/metadata.json @@ -1,7 +1,7 @@ { "id": "usgs", "name": "USGS Data fetching app", "shortName":"USGS", - "version":"0.01", + "version":"0.02", "description": "App that fetches [USGS water data](https://maps.waterdata.usgs.gov/) for a configurable location (requires connection to Android phone)", "icon": "app.png", "tags": "outdoors,exercise,http",