From ebf8e01dd514b55d915a46222a380f0b49f45d20 Mon Sep 17 00:00:00 2001 From: Paul Cockrell Date: Mon, 6 Apr 2020 16:11:05 +0100 Subject: [PATCH 01/11] Tidy up code --- apps/marioclock/marioclock-app.js | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/apps/marioclock/marioclock-app.js b/apps/marioclock/marioclock-app.js index 51f7b916b..dabe7ad9e 100644 --- a/apps/marioclock/marioclock-app.js +++ b/apps/marioclock/marioclock-app.js @@ -1,6 +1,6 @@ /** * BangleJS MARIO CLOCK - * + * * + Original Author: Paul Cockrell https://github.com/paulcockrell * + Created: April 2020 * + Based on Espruino Mario Clock V3 https://github.com/paulcockrell/espruino-mario-clock @@ -90,20 +90,13 @@ function incrementTimer() { function drawBackground() { // Clear screen - if (nightMode) { - g.setColor(NIGHT); - } else { - g.setColor(LIGHTEST); - } + const bgColor = (nightMode) ? NIGHT : LIGHTEST; + g.setColor(bgColor); g.fillRect(0, 10, W, H); - // set cloud colors - if (nightMode) { - g.setColor(DARKEST); - } else { - g.setColor(LIGHT); - } - // draw clouds + // set cloud colors and draw clouds + const cloudColor = (nightMode) ? DARK : LIGHT; + g.setColor(cloudColor); g.fillRect(0, 10, g.getWidth(), 15); g.fillRect(0, 17, g.getWidth(), 17); g.fillRect(0, 19, g.getWidth(), 19); @@ -124,14 +117,15 @@ function drawFloor() { function drawPyramid() { const pPol = [pyramidSprite.x + 10, H - 6, pyramidSprite.x + 50, pyramidSprite.height, pyramidSprite.x + 90, H - 6]; // Pyramid poly - g.setColor(LIGHT); + const color = (nightMode) ? DARK : LIGHT; + g.setColor(color); g.fillPoly(pPol); pyramidSprite.x -= 1; // Reset and randomize pyramid if off-screen if (pyramidSprite.x < - 100) { pyramidSprite.x = 90; - pyramidSprite.height = Math.floor(Math.random() * (60 /* max */ - 25 /* min */ + 1) + 25 /* min */); + pyramidSprite.height = genRanNum(25, 60); } } @@ -146,7 +140,7 @@ function drawTreesFrame(x, y) { function generateTreeSprite() { return { x: 90, - y: Math.floor(Math.random() * (60 /* max */ - 30 /* min */ + 1) + 30 /* min */) + y: genRanNum(30, 60) }; } @@ -257,10 +251,10 @@ function drawCharacter(date, character) { } switch(characterSprite.character) { - case("toad"): + case(TOAD): drawToadFrame(characterSprite.frameIdx, characterSprite.x, characterSprite.y); break; - case("mario"): + case(MARIO): default: drawMarioFrame(characterSprite.frameIdx, characterSprite.x, characterSprite.y); } From 44fff4a8555069dcfae77e50cb58221683faf6bf Mon Sep 17 00:00:00 2001 From: Paul Cockrell Date: Mon, 6 Apr 2020 16:36:18 +0100 Subject: [PATCH 02/11] Add README to Mario Clock. Add README viewer to App installer --- apps/marioclock/README.md | 17 +++++++++++++++++ index.html | 1 + js/index.js | 9 +++++++++ 3 files changed, 27 insertions(+) create mode 100644 apps/marioclock/README.md diff --git a/apps/marioclock/README.md b/apps/marioclock/README.md new file mode 100644 index 000000000..7078f52b4 --- /dev/null +++ b/apps/marioclock/README.md @@ -0,0 +1,17 @@ +# Mario Clock +Let's go back in time with this Gameboy inspired Mario retro clock. + +Enjoy watching Mario, or one of the other game characters run through a level while showing you the time and date. + +## Features + +* Multiple characters - swipe the screen right to change the character +* Night and Day modes - swipe left to toggle mode +* Smooth animation +* Awesome 8-bit style grey-scale graphics +* Mario jumps to change the time, every minute +* You can make Mario jump by pressing the top button (Button 1) on the watch + +## Requests + +If you have any feature requests, please open an issue at the authors [https://github.com/paulcockrell](Github page) diff --git a/index.html b/index.html index 6e1a9b554..0c528c5a7 100644 --- a/index.html +++ b/index.html @@ -133,5 +133,6 @@ + diff --git a/js/index.js b/js/index.js index 60b66436a..674c6e284 100644 --- a/js/index.js +++ b/js/index.js @@ -23,6 +23,13 @@ function showChangeLog(appid) { httpGet(`apps/${appid}/ChangeLog`). then(show).catch(()=>show("No Change Log available")); } +function showReadme(appid) { + var app = appNameToApp(appid); + function show(contents) { + showPrompt(app.name + " README", marked(contents), {ok: true}).catch(() => {}); + } + httpGet(`apps/${appid}/README.md`).then(show).catch(()=>show("No README available")); +} function handleCustomApp(appTemplate) { // Pops up an IFRAME that allows an app to be customised if (!appTemplate.custom) throw new Error("App doesn't have custom HTML"); @@ -175,12 +182,14 @@ function refreshLibrary() { var version = getVersionInfo(app, appInstalled); var versionInfo = version.text; if (versionInfo) versionInfo = " ("+versionInfo+")"; + var readme = `Read me`; return `
${escapeHtml(app.name)}

${escapeHtml(app.name)} ${versionInfo}

+

${readme}

${escapeHtml(app.description)}

See the code on GitHub
From 65078cffef117ebcabcea382017572c34f38379e Mon Sep 17 00:00:00 2001 From: Paul Cockrell Date: Mon, 6 Apr 2020 16:49:42 +0100 Subject: [PATCH 03/11] Add argument to not escape html (in case of markdown->html for README --- js/index.js | 3 ++- js/ui.js | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/js/index.js b/js/index.js index 674c6e284..d2da0338f 100644 --- a/js/index.js +++ b/js/index.js @@ -26,7 +26,8 @@ function showChangeLog(appid) { function showReadme(appid) { var app = appNameToApp(appid); function show(contents) { - showPrompt(app.name + " README", marked(contents), {ok: true}).catch(() => {}); + if (!contents) return; + showPrompt(app.name + " README", marked(contents), {ok: true}, false).catch(() => {}); } httpGet(`apps/${appid}/README.md`).then(show).catch(()=>show("No README available")); } diff --git a/js/ui.js b/js/ui.js index c88091872..8048bbf93 100644 --- a/js/ui.js +++ b/js/ui.js @@ -97,8 +97,10 @@ function showToast(message, type) { } /// Show a yes/no prompt -function showPrompt(title, text, buttons) { +function showPrompt(title, text, buttons, shouldEscapeHtml) { if (!buttons) buttons={yes:1,no:1}; + if (!shouldEscapeHtml) shouldEscapeHtml = true; + return new Promise((resolve,reject) => { var modal = htmlElement(`
@@ -109,7 +111,7 @@ function showPrompt(title, text, buttons) {
- ${escapeHtml(text).replace(/\n/g,'
')} + ${(shouldEscapeHtml) ? escapeHtml(text).replace(/\n/g,'
') : text}
From 094d5181804f0dc3232b02abcf9829c7a112eb3d Mon Sep 17 00:00:00 2001 From: Paul Cockrell Date: Mon, 6 Apr 2020 17:01:41 +0100 Subject: [PATCH 04/11] Test --- js/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/index.js b/js/index.js index d2da0338f..a7e44b67e 100644 --- a/js/index.js +++ b/js/index.js @@ -26,8 +26,9 @@ function showChangeLog(appid) { function showReadme(appid) { var app = appNameToApp(appid); function show(contents) { + document.contents = contents; if (!contents) return; - showPrompt(app.name + " README", marked(contents), {ok: true}, false).catch(() => {}); + showPrompt(app.name + " Documentation", marked(contents), {ok: true}, false).catch(() => {}); } httpGet(`apps/${appid}/README.md`).then(show).catch(()=>show("No README available")); } From e4431987d807b25c204eec93b9a8dc73056b2f77 Mon Sep 17 00:00:00 2001 From: Paul Cockrell Date: Mon, 6 Apr 2020 17:15:25 +0100 Subject: [PATCH 05/11] Correctly set shouldEscapeHtml variable default --- js/index.js | 1 - js/ui.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/js/index.js b/js/index.js index a7e44b67e..be9452061 100644 --- a/js/index.js +++ b/js/index.js @@ -26,7 +26,6 @@ function showChangeLog(appid) { function showReadme(appid) { var app = appNameToApp(appid); function show(contents) { - document.contents = contents; if (!contents) return; showPrompt(app.name + " Documentation", marked(contents), {ok: true}, false).catch(() => {}); } diff --git a/js/ui.js b/js/ui.js index 8048bbf93..616a92555 100644 --- a/js/ui.js +++ b/js/ui.js @@ -99,7 +99,7 @@ function showToast(message, type) { /// Show a yes/no prompt function showPrompt(title, text, buttons, shouldEscapeHtml) { if (!buttons) buttons={yes:1,no:1}; - if (!shouldEscapeHtml) shouldEscapeHtml = true; + if (typeof(shouldEscapeHtml) === 'undefined' || shouldEscapeHtml === null) shouldEscapeHtml = true; return new Promise((resolve,reject) => { var modal = htmlElement(`
From 74809b8bf5a725080970b7bb887e9f0d2ccbb113 Mon Sep 17 00:00:00 2001 From: Paul Cockrell Date: Mon, 6 Apr 2020 17:27:09 +0100 Subject: [PATCH 06/11] Try images --- apps/marioclock/README.md | 4 +++- apps/marioclock/mario-clock-screen-shot.png | Bin 0 -> 3658 bytes 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100755 apps/marioclock/mario-clock-screen-shot.png diff --git a/apps/marioclock/README.md b/apps/marioclock/README.md index 7078f52b4..6055894ee 100644 --- a/apps/marioclock/README.md +++ b/apps/marioclock/README.md @@ -3,6 +3,8 @@ Let's go back in time with this Gameboy inspired Mario retro clock. Enjoy watching Mario, or one of the other game characters run through a level while showing you the time and date. +![](https://raw.githubusercontent.com/paulcockrell/BangleApps/master/apps/marioclock/mario-clock-screen-shot.png) + ## Features * Multiple characters - swipe the screen right to change the character @@ -14,4 +16,4 @@ Enjoy watching Mario, or one of the other game characters run through a level wh ## Requests -If you have any feature requests, please open an issue at the authors [https://github.com/paulcockrell](Github page) +If you have any feature requests, please send an email to the author `paulcockrell@gmail.com` diff --git a/apps/marioclock/mario-clock-screen-shot.png b/apps/marioclock/mario-clock-screen-shot.png new file mode 100755 index 0000000000000000000000000000000000000000..ae2dc78005245f4338c759483491551a99d9d1c2 GIT binary patch literal 3658 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 literal 0 HcmV?d00001 From abca6359c2f16596324023fb11e4e5b4bebd1a85 Mon Sep 17 00:00:00 2001 From: Paul Cockrell Date: Mon, 6 Apr 2020 17:36:38 +0100 Subject: [PATCH 07/11] Fix alignment --- js/index.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/js/index.js b/js/index.js index be9452061..db5587868 100644 --- a/js/index.js +++ b/js/index.js @@ -183,14 +183,13 @@ function refreshLibrary() { var version = getVersionInfo(app, appInstalled); var versionInfo = version.text; if (versionInfo) versionInfo = " ("+versionInfo+")"; - var readme = `Read me`; + var readme = `View docs`; return `
${escapeHtml(app.name)}

-

${escapeHtml(app.name)} ${versionInfo}

-

${readme}

+

${escapeHtml(app.name)} ${versionInfo} ${readme}

${escapeHtml(app.description)}

See the code on GitHub
From 3794dd542ee4c3c65d7354034276cd8d83ade2f7 Mon Sep 17 00:00:00 2001 From: Paul Cockrell Date: Mon, 6 Apr 2020 17:40:17 +0100 Subject: [PATCH 08/11] Move Readme link to below general description --- js/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/index.js b/js/index.js index db5587868..da6fafa09 100644 --- a/js/index.js +++ b/js/index.js @@ -29,7 +29,7 @@ function showReadme(appid) { if (!contents) return; showPrompt(app.name + " Documentation", marked(contents), {ok: true}, false).catch(() => {}); } - httpGet(`apps/${appid}/README.md`).then(show).catch(()=>show("No README available")); + httpGet(`apps/${appid}/README.md`).then(show).catch(()=>show("No more information available.")); } function handleCustomApp(appTemplate) { // Pops up an IFRAME that allows an app to be customised @@ -183,14 +183,14 @@ function refreshLibrary() { var version = getVersionInfo(app, appInstalled); var versionInfo = version.text; if (versionInfo) versionInfo = " ("+versionInfo+")"; - var readme = `View docs`; + var readme = `Read more...`; return `
${escapeHtml(app.name)}

-

${escapeHtml(app.name)} ${versionInfo} ${readme}

-

${escapeHtml(app.description)}

+

${escapeHtml(app.name)} ${versionInfo}

+

${escapeHtml(app.description)}
${readme}

See the code on GitHub
From f384d01c3416a704fa38994fcf61f3a8aa921997 Mon Sep 17 00:00:00 2001 From: Paul Cockrell Date: Mon, 6 Apr 2020 18:16:24 +0100 Subject: [PATCH 09/11] Now we have a readme, shrink the Mario clock apps.json description --- apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps.json b/apps.json index fbe032f91..d28339429 100644 --- a/apps.json +++ b/apps.json @@ -894,7 +894,7 @@ "name": "Mario Clock", "icon": "marioclock.png", "version":"0.07", - "description": "Animated Mario clock, jumps to change the time! Swipe right to change the character, and swipe left to toggle night mode. Press BTN1 to jump.", + "description": "Animated retro Mario clock, with Gameboy style 8-bit grey-scale graphics.", "tags": "clock,mario,retro", "type": "clock", "allow_emulator":true, From 7df6bafdf904636cf284513b25be4cdf086ac2da Mon Sep 17 00:00:00 2001 From: Paul Cockrell Date: Mon, 6 Apr 2020 18:29:34 +0100 Subject: [PATCH 10/11] Let user define README file in apps.json. Only show Read More link if one present --- apps.json | 1 + js/index.js | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apps.json b/apps.json index d28339429..2f057b040 100644 --- a/apps.json +++ b/apps.json @@ -898,6 +898,7 @@ "tags": "clock,mario,retro", "type": "clock", "allow_emulator":true, + "readme": "README.md", "storage": [ {"name":"marioclock.app.js","url":"marioclock-app.js"}, {"name":"marioclock.img","url":"marioclock-icon.js","evaluate":true} diff --git a/js/index.js b/js/index.js index da6fafa09..19716670b 100644 --- a/js/index.js +++ b/js/index.js @@ -23,13 +23,17 @@ function showChangeLog(appid) { httpGet(`apps/${appid}/ChangeLog`). then(show).catch(()=>show("No Change Log available")); } +function hasReadme(appid) { + var app = appNameToApp(appid); + return app.readme; +} function showReadme(appid) { var app = appNameToApp(appid); function show(contents) { if (!contents) return; showPrompt(app.name + " Documentation", marked(contents), {ok: true}, false).catch(() => {}); } - httpGet(`apps/${appid}/README.md`).then(show).catch(()=>show("No more information available.")); + httpGet(`apps/${appid}/${app.readme}`).then(show).catch(()=>show("Failed to load README.")); } function handleCustomApp(appTemplate) { // Pops up an IFRAME that allows an app to be customised @@ -190,7 +194,7 @@ function refreshLibrary() {

${escapeHtml(app.name)} ${versionInfo}

-

${escapeHtml(app.description)}
${readme}

+

${escapeHtml(app.description)}${hasReadme ? `
${readme}` : ''}

See the code on GitHub
From 085bacdf1af95663dcc902c3b12326c2a79878ec Mon Sep 17 00:00:00 2001 From: Paul Cockrell Date: Mon, 6 Apr 2020 18:42:46 +0100 Subject: [PATCH 11/11] Remove superflous function to check if readme key exists in apps.json for each app --- js/index.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/js/index.js b/js/index.js index 19716670b..f9b16768a 100644 --- a/js/index.js +++ b/js/index.js @@ -23,10 +23,6 @@ function showChangeLog(appid) { httpGet(`apps/${appid}/ChangeLog`). then(show).catch(()=>show("No Change Log available")); } -function hasReadme(appid) { - var app = appNameToApp(appid); - return app.readme; -} function showReadme(appid) { var app = appNameToApp(appid); function show(contents) { @@ -194,7 +190,7 @@ function refreshLibrary() {

${escapeHtml(app.name)} ${versionInfo}

-

${escapeHtml(app.description)}${hasReadme ? `
${readme}` : ''}

+

${escapeHtml(app.description)}${app.readme?`
${readme}`:""}

See the code on GitHub