diff --git a/apps/regattatimer/ChangeLog b/apps/regattatimer/ChangeLog index d49862849..9f342060d 100644 --- a/apps/regattatimer/ChangeLog +++ b/apps/regattatimer/ChangeLog @@ -1,4 +1,7 @@ 0.10: (2024-02-23) initial alpha upload 0.20: (2024-02-23) fixed minor issues with settings 0.30: (2024-03-01) advanced settings, rearanged ui elements, fixed rendering problems +0.31: (2024-03-06) fixed typos in readme, removed some unnecessary code +0.32: replaced icons with "Graphics.createImage" 0.40: Fixing lint warnings for unused vars +0.41: removed no longer required import of "heatshrink" diff --git a/apps/regattatimer/README.md b/apps/regattatimer/README.md index 8d906e1d7..f93086fe5 100644 --- a/apps/regattatimer/README.md +++ b/apps/regattatimer/README.md @@ -56,19 +56,16 @@ Localization is done by the Bangle.js 2 app "Languages" * Choose your language from the dropdown * Click `upload` -**Some nautical abbreviations which are not part of the Bangle.js 2 app "Languages" app are stored in `translations.json`.** +**Some nautical abbreviations which are not part of the "Languages" app are stored in `translations.json`.** ## Feedback Report bugs or request a feature at [github.com/naden](https://github.com/naden) ## Roadmap -* add a seconds coundown layout; mimic a classic regatta chronograph +* add a second coundown layout; mimic a classic regatta chronograph * add recording of gps course and race time -* add icons for light mode -* add flag icons +* add flag icons for start mode screen ## Created by © 2021 - 2024 [naden.de](https://naden.de) - -Icons by [Icons8](https://icons8.com/) diff --git a/apps/regattatimer/app.js b/apps/regattatimer/app.js index 30d03daed..e1ff64b6a 100644 --- a/apps/regattatimer/app.js +++ b/apps/regattatimer/app.js @@ -3,7 +3,6 @@ */ const Layout = require("Layout"); const locale = require("locale").name == "system" ? "en" : require("locale").name.substring(0, 2); -const hs = require("heatshrink"); // "Anton" bold font Graphics.prototype.setFontAnton = function(scale) { @@ -35,7 +34,6 @@ function Regattatimer() { } }, race: function() { - } }, */ @@ -48,28 +46,43 @@ function Regattatimer() { "Light": { "fgColor": "#000000", "bgColor": "#FFFF00", - "icons": { - "satellites": function() { - return hs.decompress(atob("jEYxH+AH4Ab6QIIBJAfNAAQtSC4gxSCwgYHHBYYMC6IYPC5AZOC8QYMC5YYLC5inSDH4waVbAYJCpgA/AAI=")); - }, - "battery": function() { - return hs.decompress(atob("jEYxH+AHHSAAgXmCgoaRC/4X/C/4X/C/4X/C64Ap")); - } - } }, "Dark": { "fgColor": "#FFFF00", "bgColor": "#000000", - "icons": { - "satellites": function() { - return hs.decompress(atob("jEYxH+AH4Ab6QIIBJAfNAAQtSC4gxSCwgYHHBYYMC6IYPC5AZOC8QYMC5YYLC5inSDH4waVbAYJCpgA/AAI=")); - }, - "battery": function() { - return hs.decompress(atob("jEYxH+AHHSAAgXmCgoaRC/4X/C/4X/C/4X/C64Ap")); - } - } } }, + icons: { + "battery": function() { + return Graphics.createImage(` + XXXX +X X +X XX X +X X +X XX X +X X +X XX X +X X +X XX X +X X +XXXXXX`); + }, + "satellites": function() { + return Graphics.createImage(` + X + XoX + XoX + XoX + XoX o X + XoX o o XoX +XoX o o XoX + X o XoX + XoX + XoX + XoX + X`); + }, + }, settings: Object.assign({ "debug": false, "buzzer": true, @@ -304,11 +317,11 @@ function Regattatimer() { {type: "txt", font: "10%", label: this.translate("speed_unit"), col: this.theme.fgColor, pad:4, fillx:1, filly:1}, ]}, {type: "h", c: [ - {type:"img", pad: 2, src: this.theme["icons"].satellites()}, + {type:"img", pad: 2, col: this.theme.fgColor, bgCol: this.theme.bgColor, src: this.icons.satellites()}, {type: "txt", font: "10%", label: "0", col: this.theme.fgColor, pad: 2, filly:1, id: "satellites"}, // hacky, use empty element with fillx to push the other elments to the left an right side {type: undefined, pad: 2, fillx: 1}, - {type:"img", pad: 2, src: this.theme["icons"].battery()}, + {type:"img", pad: 2, col: this.theme.fgColor, bgCol: this.theme.bgColor, src: this.icons.battery()}, {type: "txt", font: "10%", label: "-", col: this.theme.fgColor, pad: 2, filly: 1, id: "battery"}, ]} ]}, {lazy: true}); @@ -327,9 +340,9 @@ if(regattatimer.settings.gps) { Bangle.on('kill', function() { Bangle.setLCDPower(0); Bangle.setLCDTimeout(10); - + /* if(regattatimer.settings.gps) { Bangle.setGPSPower(0); } + */ }); - diff --git a/apps/regattatimer/metadata.json b/apps/regattatimer/metadata.json index 64b009ea9..3249bb775 100644 --- a/apps/regattatimer/metadata.json +++ b/apps/regattatimer/metadata.json @@ -2,7 +2,7 @@ "id": "regattatimer", "name": "Regatta Timer", "shortName": "RegattaTimer", - "version": "0.40", + "version": "0.41", "description": "Regatta Timer with 5-4-1 Countdown", "icon": "icon.png", "tags": "tool,outdoors,sailing,race,regatta,boat,timer",