FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

spotrem: fix lint warnings no-undef

pull/3633/head
thyttan 2024-11-01 01:43:12 +01:00
parent c217a4f858
commit 163df7be62
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/spotrem/ChangeLog
View File

@ -7,9 +7,7 @@
0.07: Remove just the specific listeners to not interfere with Quick Launch 0.07: Remove just the specific listeners to not interfere with Quick Launch
when fastloading. when fastloading.
0.08: Issue newline before GB commands (solves issue with console.log and ignored commands) 0.08: Issue newline before GB commands (solves issue with console.log and ignored commands)
0.09: Don't send the gadgetbridge wake command twice. Once should do since we 0.09: Don't send the gadgetbridge wake command twice. Once should do since we issue newline before GB commands.
issue newline before GB commands.
0.10: Some refactoring to shorten the code. 0.10: Some refactoring to shorten the code.
0.11: Further refactoring to shorten the code. Fixed search and play that was 0.11: Further refactoring to shorten the code. Fixed search and play that was broken in v0.10.
broken in v0.10. 0.12: Fix some warnings from the linter.

26
apps/spotrem/app.js
View File

@ -13,7 +13,7 @@ let dark = g.theme.dark; // bool
let gfx = function() { let gfx = function() {
widgetUtils.hide(); widgetUtils.hide();
R = Bangle.appRect; R = Bangle.appRect;
marigin = 8; const MARIGIN = 8;
// g.drawString(str, x, y, solid) // g.drawString(str, x, y, solid)
g.clearRect(R); g.clearRect(R);
g.reset(); g.reset();
@ -21,38 +21,38 @@ let gfx = function() {
if (dark) {g.setColor(0x07E0);} else {g.setColor(0x03E0);} // Green on dark theme, DarkGreen on light theme. if (dark) {g.setColor(0x07E0);} else {g.setColor(0x03E0);} // Green on dark theme, DarkGreen on light theme.
g.setFont("4x6:2"); g.setFont("4x6:2");
g.setFontAlign(1, 0, 0); g.setFontAlign(1, 0, 0);
g.drawString("->", R.x2 - marigin, R.y + R.h/2); g.drawString("->", R.x2 - MARIGIN, R.y + R.h/2);
g.setFontAlign(-1, 0, 0); g.setFontAlign(-1, 0, 0);
g.drawString("<-", R.x + marigin, R.y + R.h/2); g.drawString("<-", R.x + MARIGIN, R.y + R.h/2);
g.setFontAlign(-1, 0, 1); g.setFontAlign(-1, 0, 1);
g.drawString("<-", R.x + R.w/2, R.y + marigin); g.drawString("<-", R.x + R.w/2, R.y + MARIGIN);
g.setFontAlign(1, 0, 1); g.setFontAlign(1, 0, 1);
g.drawString("->", R.x + R.w/2, R.y2 - marigin); g.drawString("->", R.x + R.w/2, R.y2 - MARIGIN);
g.setFontAlign(0, 0, 0); g.setFontAlign(0, 0, 0);
g.drawString("Play\nPause", R.x + R.w/2, R.y + R.h/2); g.drawString("Play\nPause", R.x + R.w/2, R.y + R.h/2);
g.setFontAlign(-1, -1, 0); g.setFontAlign(-1, -1, 0);
g.drawString("Menu", R.x + 2*marigin, R.y + 2*marigin); g.drawString("Menu", R.x + 2*MARIGIN, R.y + 2*MARIGIN);
g.setFontAlign(-1, 1, 0); g.setFontAlign(-1, 1, 0);
g.drawString("Wake", R.x + 2*marigin, R.y + R.h - 2*marigin); g.drawString("Wake", R.x + 2*MARIGIN, R.y + R.h - 2*MARIGIN);
g.setFontAlign(1, -1, 0); g.setFontAlign(1, -1, 0);
g.drawString("Srch", R.x + R.w - 2*marigin, R.y + 2*marigin); g.drawString("Srch", R.x + R.w - 2*MARIGIN, R.y + 2*MARIGIN);
g.setFontAlign(1, 1, 0); g.setFontAlign(1, 1, 0);
g.drawString("Saved", R.x + R.w - 2*marigin, R.y + R.h - 2*marigin); g.drawString("Saved", R.x + R.w - 2*MARIGIN, R.y + R.h - 2*MARIGIN);
}; };
// Touch handler for main layout // Touch handler for main layout
let touchHandler = function(_, xy) { let touchHandler = function(_, xy) {
x = xy.x; let x = xy.x;
y = xy.y; let y = xy.y;
len = (R.w<R.h+1)?(R.w/3):(R.h/3); let len = (R.w<R.h+1)?(R.w/3):(R.h/3);
// doing a<b+1 seemed faster than a<=b, also using a>b-1 instead of a>b. // doing a<b+1 seemed faster than a<=b, also using a>b-1 instead of a>b.
if ((R.x-1<x && x<R.x+len) && (R.y-1<y && y<R.y+len)) { if ((R.x-1<x && x<R.x+len) && (R.y-1<y && y<R.y+len)) {
@ -82,7 +82,7 @@ let touchHandler = function(_, xy) {
spotifyWidget("NEXT"); spotifyWidget("NEXT");
} else if ((R.x-1<x && x<R.x2+1) && (R.y-1<y && y<R.y2+1)){ } else if ((R.x-1<x && x<R.x2+1) && (R.y-1<y && y<R.y2+1)){
//play/pause //play/pause
playPause = isPaused?"play":"pause"; let playPause = isPaused?"play":"pause";
Bangle.musicControl(playPause); Bangle.musicControl(playPause);
isPaused = !isPaused; isPaused = !isPaused;
} }

2
apps/spotrem/metadata.json
View File

@ -1,7 +1,7 @@
{ {
"id": "spotrem", "id": "spotrem",
"name": "Remote for Spotify", "name": "Remote for Spotify",
"version": "0.11", "version": "0.12",
"description": "Control spotify on your android device.", "description": "Control spotify on your android device.",
"readme": "README.md", "readme": "README.md",
"type": "app", "type": "app",