From 26854f8fba96c65c00d81acbf8769b2be9b87953 Mon Sep 17 00:00:00 2001 From: David Peer Date: Tue, 4 Jan 2022 18:37:18 +0100 Subject: [PATCH 1/9] Minor improvements. --- apps/lcars/lcars.app.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js index 74d0450c0..c3e3b2bfc 100644 --- a/apps/lcars/lcars.app.js +++ b/apps/lcars/lcars.app.js @@ -191,7 +191,7 @@ function drawState(){ return; } - g.clearRect(20, 93, 77, 170); + g.clearRect(20, 93, 80, 170); g.setColor(cWhite); var bat = E.getBattery(); var current = new Date(); @@ -206,16 +206,16 @@ function drawState(){ hours % 4 == 1 ? iconMars : hours % 4 == 2 ? iconMoon : iconEarth; - g.drawImage(iconImg, 29, 104); + g.drawImage(iconImg, 31, 104); } else { // Alarm within symbol g.setFontAntonioMedium(); g.setFontAlign(0, 0, 0); g.setColor(cOrange); - g.drawString("ALARM", 29+25, 107); + g.drawString("ALARM", 31+25, 107); g.setColor(cWhite); g.setFontAntonioLarge(); - g.drawString(getAlarmMinutes(), 29+25, 107+35); + g.drawString(getAlarmMinutes(), 31+25, 107+35); } g.setFontAlign(-1, -1, 0); From 34b73682edc0785013cbd3f5dcb4085880da6a62 Mon Sep 17 00:00:00 2001 From: David Peer Date: Wed, 5 Jan 2022 10:30:10 +0100 Subject: [PATCH 2/9] Design improvements --- apps/lcars/lcars.app.js | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js index c3e3b2bfc..cae66c1ec 100644 --- a/apps/lcars/lcars.app.js +++ b/apps/lcars/lcars.app.js @@ -147,14 +147,17 @@ function printData(key, y, c){ } g.setColor(c); + g.fillRect(79, y-2, 85 ,y+18); + + g.setFontAlign(0,-1,0); + g.drawString(value, 109, y); + + g.setColor(c); + g.setFontAlign(-1,-1,0); g.fillRect(133, y-2, 165 ,y+18); g.fillCircle(161, y+8, 10); g.setColor(cBlack); g.drawString(text, 135, y); - - g.setColor(c); - g.setFontAlign(1,-1,0); - g.drawString(value, 130, y); } function drawHorizontalBgLine(color, x1, x2, y, h){ @@ -191,7 +194,7 @@ function drawState(){ return; } - g.clearRect(20, 93, 80, 170); + g.clearRect(20, 93, 75, 170); g.setColor(cWhite); var bat = E.getBattery(); var current = new Date(); @@ -206,16 +209,18 @@ function drawState(){ hours % 4 == 1 ? iconMars : hours % 4 == 2 ? iconMoon : iconEarth; - g.drawImage(iconImg, 31, 104); + + // g.drawRect(25, 104, 25+50, 104+50); + g.drawImage(iconImg, 24, 104); } else { // Alarm within symbol g.setFontAntonioMedium(); g.setFontAlign(0, 0, 0); g.setColor(cOrange); - g.drawString("ALARM", 31+25, 107); + g.drawString("ALARM", 24+25, 108); g.setColor(cWhite); g.setFontAntonioLarge(); - g.drawString(getAlarmMinutes(), 31+25, 107+35); + g.drawString(getAlarmMinutes(), 24+25, 108+35); } g.setFontAlign(-1, -1, 0); @@ -401,7 +406,7 @@ function draw(){ * Step counter via widget */ function getSteps() { - var steps = 0 + var steps = 0; try { health = require("health"); } catch(ex) { From 47b93192b2986cc53e41baa9f9c1ef3a9bf14d61 Mon Sep 17 00:00:00 2001 From: David Peer Date: Wed, 5 Jan 2022 10:33:58 +0100 Subject: [PATCH 3/9] Open luncher on touch. --- apps/lcars/lcars.app.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js index cae66c1ec..727ef6bae 100644 --- a/apps/lcars/lcars.app.js +++ b/apps/lcars/lcars.app.js @@ -558,6 +558,10 @@ Bangle.on("drag", e => { } }); +Bangle.on("touch", e => { + Bangle.showLauncher(); +}); + /* * Lets start widgets, listen for btn etc. From 154dc0a315cd173e69815893dcf4d1c2796caf6a Mon Sep 17 00:00:00 2001 From: David Peer Date: Wed, 5 Jan 2022 10:35:58 +0100 Subject: [PATCH 4/9] Created version 0.09 --- apps.json | 6 +++--- apps/lcars/ChangeLog | 3 ++- apps/lcars/README.md | 4 +++- apps/lcars/screenshot.png | Bin 5195 -> 5630 bytes 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/apps.json b/apps.json index 89c5f7b70..3b593e9d5 100644 --- a/apps.json +++ b/apps.json @@ -4487,7 +4487,7 @@ "name": "LCARS Clock", "shortName":"LCARS", "icon": "lcars.png", - "version":"0.08", + "version":"0.09", "readme": "README.md", "supports": ["BANGLEJS2"], "description": "Library Computer Access Retrieval System (LCARS) clock.", @@ -5099,7 +5099,7 @@ "tags": "clock", "allow_emulator":true, "supports" : ["BANGLEJS2"], - "type": "clock", + "type": "clock", "storage": [ {"name":"contourclock.app.js","url":"app.js"}, {"name":"contourclock.img","url":"app-icon.js","evaluate":true} @@ -5334,7 +5334,7 @@ "icon": "andark_icon.png", "type": "clock", "tags": "clock", - "supports" : ["BANGLEJS2"], + "supports" : ["BANGLEJS2"], "readme": "README.md", "storage": [ {"name":"andark.app.js","url":"app.js"}, diff --git a/apps/lcars/ChangeLog b/apps/lcars/ChangeLog index c171ec3d4..f5d8346da 100644 --- a/apps/lcars/ChangeLog +++ b/apps/lcars/ChangeLog @@ -5,4 +5,5 @@ 0.05: Additional icons for (1) charging and (2) bat < 30%. 0.06: Fix - Alarm disabled, if clock was closed. 0.07: Added settings to adjust data that is shown for each row. -0.08: Support for multiple screens. 24h graph for steps + HRM. Fullscreen Mode. \ No newline at end of file +0.08: Support for multiple screens. 24h graph for steps + HRM. Fullscreen Mode. +0.09: Tab anywhere to open the launcher. \ No newline at end of file diff --git a/apps/lcars/README.md b/apps/lcars/README.md index 97695a408..4bf5218f6 100644 --- a/apps/lcars/README.md +++ b/apps/lcars/README.md @@ -8,13 +8,15 @@ To contribute you can open a PR at this [GitHub Repo]( https://github.com/peerda * LCARS Style watch face. * Full screen mode - widgets are still loaded. * Supports multiple screens with different data. + * Tab anywhere to open the launcher. * [Screen 1] Date + Time + Lock status. * [Screen 1] Shows randomly images of real planets. * [Screen 1] Shows different states such as (charging, out of battery, GPS on etc.) * [Screen 1] Swipe up/down to activate an alarm. * [Screen 1] Shows 3 customizable datapoints on the first screen. * [Screen 1] The lower orange line indicates the battery level. - * [Screen 2] Display month graphs for steps + hrm on the second screen. + * [Screen 2] Display graphs for steps + hrm on the second screen. + * [Screen 2] Switch between day/month via swipe up/down. ## Multiple screens support diff --git a/apps/lcars/screenshot.png b/apps/lcars/screenshot.png index b3dfd42000766a5bff8e62a6e5d66103ac4f2a9b..bbc25abc30d9da3b1bf35a62698083c1d0eca781 100644 GIT binary patch literal 5630 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 Y2PMNWz8ZN*QUCw|07*qoM6N<$f+ZW)KmY&$ delta 5194 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 Ef-RE!%m4rY From 8b89d41e699551caa2dcca4adb2365d8568029b5 Mon Sep 17 00:00:00 2001 From: David Peer Date: Wed, 5 Jan 2022 11:51:16 +0100 Subject: [PATCH 5/9] Minor changes --- apps/lcars/lcars.app.js | 21 ++++++++++----------- apps/lcars/screenshot.png | Bin 5630 -> 5835 bytes 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js index 727ef6bae..1be2cfd43 100644 --- a/apps/lcars/lcars.app.js +++ b/apps/lcars/lcars.app.js @@ -195,12 +195,13 @@ function drawState(){ } g.clearRect(20, 93, 75, 170); - g.setColor(cWhite); - var bat = E.getBattery(); - var current = new Date(); - var hours = current.getHours(); + g.setFontAlign(0, 0, 0); + g.setFontAntonioMedium(); if(!isAlarmEnabled()){ + var bat = E.getBattery(); + var current = new Date(); + var hours = current.getHours(); var iconImg = Bangle.isCharging() ? iconCharging : bat < 30 ? iconNoBattery : @@ -209,18 +210,16 @@ function drawState(){ hours % 4 == 1 ? iconMars : hours % 4 == 2 ? iconMoon : iconEarth; - - // g.drawRect(25, 104, 25+50, 104+50); - g.drawImage(iconImg, 24, 104); + g.drawImage(iconImg, 23, 118); + g.setColor(cWhite); + g.drawString("STATUS", 23+25, 108); } else { // Alarm within symbol - g.setFontAntonioMedium(); - g.setFontAlign(0, 0, 0); g.setColor(cOrange); - g.drawString("ALARM", 24+25, 108); + g.drawString("ALARM", 23+25, 108); g.setColor(cWhite); g.setFontAntonioLarge(); - g.drawString(getAlarmMinutes(), 24+25, 108+35); + g.drawString(getAlarmMinutes(), 23+25, 108+35); } g.setFontAlign(-1, -1, 0); diff --git a/apps/lcars/screenshot.png b/apps/lcars/screenshot.png index bbc25abc30d9da3b1bf35a62698083c1d0eca781..8531913133233045e6ce34b5b99d4dc491432603 100644 GIT binary patch literal 5835 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 V6U{I?5Ptvw002ovPDHLkV1nnu{g40v literal 5630 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 Y2PMNWz8ZN*QUCw|07*qoM6N<$f+ZW)KmY&$ From 5e00b6d13658122ea7c645f25cff77704af7690e Mon Sep 17 00:00:00 2001 From: David Peer Date: Wed, 5 Jan 2022 11:54:56 +0100 Subject: [PATCH 6/9] Minor changes --- apps/lcars/lcars.app.js | 4 ++-- apps/lcars/screenshot.png | Bin 5835 -> 6073 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js index 1be2cfd43..57e56d76c 100644 --- a/apps/lcars/lcars.app.js +++ b/apps/lcars/lcars.app.js @@ -251,7 +251,7 @@ function drawPosition0(){ var currentDate = new Date(); var timeStr = locale.time(currentDate,1); g.setFontAntonioLarge(); - g.drawString(timeStr, 28, 10); + g.drawString(timeStr, 29, 10); // Write date g.setColor(cWhite); @@ -259,7 +259,7 @@ function drawPosition0(){ var dayStr = locale.dow(currentDate, true).toUpperCase(); dayStr += " " + currentDate.getDate(); dayStr += " " + currentDate.getFullYear(); - g.drawString(dayStr, 29, 56); + g.drawString(dayStr, 32, 56); // Draw data g.setFontAlign(-1, -1, 0); diff --git a/apps/lcars/screenshot.png b/apps/lcars/screenshot.png index 8531913133233045e6ce34b5b99d4dc491432603..c749e14517cb8b47035dc15128c5b2ada0ac6061 100644 GIT binary patch literal 6073 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 V6U{I?5Ptvw002ovPDHLkV1nnu{g40v From e0130c451025ecbd6ef04dba4ddbcaa08f6d5004 Mon Sep 17 00:00:00 2001 From: David Peer Date: Wed, 5 Jan 2022 12:30:31 +0100 Subject: [PATCH 7/9] Minor changes. --- apps/lcars/lcars.app.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js index 57e56d76c..0b8c814cd 100644 --- a/apps/lcars/lcars.app.js +++ b/apps/lcars/lcars.app.js @@ -210,16 +210,16 @@ function drawState(){ hours % 4 == 1 ? iconMars : hours % 4 == 2 ? iconMoon : iconEarth; - g.drawImage(iconImg, 23, 118); + g.drawImage(iconImg, 24, 118); g.setColor(cWhite); - g.drawString("STATUS", 23+25, 108); + g.drawString("STATUS", 24+25, 108); } else { // Alarm within symbol g.setColor(cOrange); - g.drawString("ALARM", 23+25, 108); + g.drawString("ALARM", 24+25, 108); g.setColor(cWhite); g.setFontAntonioLarge(); - g.drawString(getAlarmMinutes(), 23+25, 108+35); + g.drawString(getAlarmMinutes(), 24+25, 108+35); } g.setFontAlign(-1, -1, 0); From 793e8c82468a5e9349f3d5d53ba0b92ed264e68d Mon Sep 17 00:00:00 2001 From: David Peer Date: Wed, 5 Jan 2022 14:30:43 +0100 Subject: [PATCH 8/9] Show battery grey --- apps/lcars/lcars.app.js | 3 ++- apps/lcars/screenshot.png | Bin 6073 -> 5918 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js index 0b8c814cd..49d32dbe9 100644 --- a/apps/lcars/lcars.app.js +++ b/apps/lcars/lcars.app.js @@ -24,6 +24,7 @@ let cOrange = "#FF9900"; let cPurple = "#FF00DC"; let cWhite = "#FFFFFF"; let cBlack = "#000000"; +let cGrey = "#9E9E9E"; /* * Global lcars variables @@ -240,7 +241,7 @@ function drawPosition0(){ var bat = E.getBattery() / 100.0; var batX2 = parseInt((172 - 35) * bat + 35); drawHorizontalBgLine(cOrange, 35, batX2, 171, 5); - drawHorizontalBgLine(cPurple, batX2+10, 172, 171, 5); + drawHorizontalBgLine(cGrey, batX2+10, 172, 171, 5); // Draw logo drawLock(); diff --git a/apps/lcars/screenshot.png b/apps/lcars/screenshot.png index c749e14517cb8b47035dc15128c5b2ada0ac6061..fea3ebb78a5d48859e2d27f622a0c10e34270cd0 100644 GIT binary patch literal 5918 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 Date: Wed, 5 Jan 2022 17:17:41 +0100 Subject: [PATCH 9/9] Design adaptions. --- apps/lcars/lcars.app.js | 6 +++--- apps/lcars/screenshot.png | Bin 5918 -> 5527 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js index 49d32dbe9..167adad2d 100644 --- a/apps/lcars/lcars.app.js +++ b/apps/lcars/lcars.app.js @@ -148,10 +148,10 @@ function printData(key, y, c){ } g.setColor(c); - g.fillRect(79, y-2, 85 ,y+18); + g.fillRect(79, y-2, 87 ,y+18); - g.setFontAlign(0,-1,0); - g.drawString(value, 109, y); + g.setFontAlign(1,-1,0); + g.drawString(value, 131, y); g.setColor(c); g.setFontAlign(-1,-1,0); diff --git a/apps/lcars/screenshot.png b/apps/lcars/screenshot.png index fea3ebb78a5d48859e2d27f622a0c10e34270cd0..fba55a9f71739c35e4497386a75c51ea4e1eee3d 100644 GIT binary patch literal 5527 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