From 500d38122026b36554aad1b72ef451f8f004be14 Mon Sep 17 00:00:00 2001 From: Bernhard Date: Sat, 22 Jun 2024 21:29:52 +0200 Subject: [PATCH 1/2] fix: right poly X start fixed, reformat app js file --- apps/measure_time/README.md | 2 +- apps/measure_time/measuretime.app.js | 34 ++++++++++++++-------------- apps/measure_time/metadata.json | 6 +---- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/apps/measure_time/README.md b/apps/measure_time/README.md index 0b7fc4416..78d04f30d 100644 --- a/apps/measure_time/README.md +++ b/apps/measure_time/README.md @@ -2,6 +2,6 @@ Measure time in a fancy way. Inspired by a Watchface I had on my first Pebble Watch. -Written by [prefectAtEarth](https://www.github.com/prefectAtEarth) +Written by [prefectAtEarth](https://www.github.com/prefectAtEarth/) ![](measuretime.png) \ No newline at end of file diff --git a/apps/measure_time/measuretime.app.js b/apps/measure_time/measuretime.app.js index fc1523920..b02e6d8e3 100644 --- a/apps/measure_time/measuretime.app.js +++ b/apps/measure_time/measuretime.app.js @@ -1,7 +1,7 @@ { require("Font7x11Numeric7Seg").add(Graphics); g.setFont("7x11Numeric7Seg"); - g.setFontAlign(0,0); + g.setFontAlign(0, 0); const centerX = g.getWidth() / 2, //88 centerY = g.getHeight() / 2; //88 @@ -20,12 +20,12 @@ drawTime(); }, 60000 - (Date.now() % 60000)); }; - + let drawCenterLine = function () { // center line g.drawLineAA(0, centerY, g.getWidth(), centerY); // left decoration - var steps = [0,1,0,0,1,0,1,1,1,1,1,1,1,1,1,1,1]; + var steps = [0, 1, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]; var stepsReversed = steps.slice(); stepsReversed.reverse(); var polyLeftTop = []; @@ -33,16 +33,16 @@ var polyRightTop = []; var polyRightBottom = []; let xL = 0; - let xR = g.getWidth(); + let xR = g.getWidth() - 1; let yT = centerY - 13; let yB = centerY + 13; - for(i = 0; i < steps.length; i++) { + for (i = 0; i < steps.length; i++) { xL += steps[i]; xR -= steps[i]; yT += stepsReversed[i]; yB -= stepsReversed[i]; - + // Left Top polyLeftTop.push(xL); polyLeftTop.push(yT); @@ -60,15 +60,15 @@ polyRightBottom.push(yB); } - polyLeftTop.push(0,88); - polyLeftBottom.push(0,88); - polyRightTop.push(g.getWidth(),88); - polyRightBottom.push(g.getWidth(),88); + polyLeftTop.push(0, 88); + polyLeftBottom.push(0, 88); + polyRightTop.push(g.getWidth(), 88); + polyRightBottom.push(g.getWidth(), 88); - g.fillPolyAA(polyLeftTop,true); - g.fillPolyAA(polyLeftBottom,true); - g.fillPolyAA(polyRightTop,true); - g.fillPolyAA(polyRightBottom,true); + g.fillPolyAA(polyLeftTop, true); + g.fillPolyAA(polyLeftBottom, true); + g.fillPolyAA(polyRightTop, true); + g.fillPolyAA(polyRightBottom, true); }; let drawTime = function () { @@ -84,15 +84,15 @@ var bottomReached = false; if (g.theme.dark) { - g.setColor(1,1,1); + g.setColor(1, 1, 1); } else { - g.setColor(0,0,0); + g.setColor(0, 0, 0); } drawCenterLine(); var lineEnd = lineEndDefault; g.setFont("7x11Numeric7Seg", 2); - g.setFontAlign(0,0); + g.setFontAlign(0, 0); // gone do { diff --git a/apps/measure_time/metadata.json b/apps/measure_time/metadata.json index 176cc23cc..4c0db8b32 100644 --- a/apps/measure_time/metadata.json +++ b/apps/measure_time/metadata.json @@ -12,10 +12,6 @@ "allow_emulator": true, "storage": [ { "name": "measuretime.app.js", "url": "measuretime.app.js" }, - { - "name": "measuretime.img", - "url": "measuretime-icon.js", - "evaluate": true - } + { "name": "measuretime.img", "url": "measuretime-icon.js", "evaluate": true } ] } From ad59d81601071924473c6c256710c3edc4b1805e Mon Sep 17 00:00:00 2001 From: Bernhard Date: Sat, 22 Jun 2024 21:33:11 +0200 Subject: [PATCH 2/2] fix: rename folder measure_time to measuretime --- apps/{measure_time => measuretime}/ChangeLog | 0 apps/{measure_time => measuretime}/README.md | 0 .../measuretime-icon.js | 0 .../measuretime.app.js | 0 apps/{measure_time => measuretime}/measuretime.png | Bin apps/{measure_time => measuretime}/metadata.json | 0 .../small_measuretime.png | Bin apps/{measure_time => measuretime}/test.json | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename apps/{measure_time => measuretime}/ChangeLog (100%) rename apps/{measure_time => measuretime}/README.md (100%) rename apps/{measure_time => measuretime}/measuretime-icon.js (100%) rename apps/{measure_time => measuretime}/measuretime.app.js (100%) rename apps/{measure_time => measuretime}/measuretime.png (100%) rename apps/{measure_time => measuretime}/metadata.json (100%) rename apps/{measure_time => measuretime}/small_measuretime.png (100%) rename apps/{measure_time => measuretime}/test.json (100%) diff --git a/apps/measure_time/ChangeLog b/apps/measuretime/ChangeLog similarity index 100% rename from apps/measure_time/ChangeLog rename to apps/measuretime/ChangeLog diff --git a/apps/measure_time/README.md b/apps/measuretime/README.md similarity index 100% rename from apps/measure_time/README.md rename to apps/measuretime/README.md diff --git a/apps/measure_time/measuretime-icon.js b/apps/measuretime/measuretime-icon.js similarity index 100% rename from apps/measure_time/measuretime-icon.js rename to apps/measuretime/measuretime-icon.js diff --git a/apps/measure_time/measuretime.app.js b/apps/measuretime/measuretime.app.js similarity index 100% rename from apps/measure_time/measuretime.app.js rename to apps/measuretime/measuretime.app.js diff --git a/apps/measure_time/measuretime.png b/apps/measuretime/measuretime.png similarity index 100% rename from apps/measure_time/measuretime.png rename to apps/measuretime/measuretime.png diff --git a/apps/measure_time/metadata.json b/apps/measuretime/metadata.json similarity index 100% rename from apps/measure_time/metadata.json rename to apps/measuretime/metadata.json diff --git a/apps/measure_time/small_measuretime.png b/apps/measuretime/small_measuretime.png similarity index 100% rename from apps/measure_time/small_measuretime.png rename to apps/measuretime/small_measuretime.png diff --git a/apps/measure_time/test.json b/apps/measuretime/test.json similarity index 100% rename from apps/measure_time/test.json rename to apps/measuretime/test.json