diff --git a/apps.json b/apps.json index c213fdaa6..e2878d6b2 100644 --- a/apps.json +++ b/apps.json @@ -4488,7 +4488,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.", 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/lcars.app.js b/apps/lcars/lcars.app.js index 74d0450c0..167adad2d 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 @@ -147,14 +148,17 @@ function printData(key, y, c){ } g.setColor(c); + g.fillRect(79, y-2, 87 ,y+18); + + g.setFontAlign(1,-1,0); + g.drawString(value, 131, 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,13 +195,14 @@ function drawState(){ return; } - g.clearRect(20, 93, 77, 170); - g.setColor(cWhite); - var bat = E.getBattery(); - var current = new Date(); - var hours = current.getHours(); + g.clearRect(20, 93, 75, 170); + 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 : @@ -206,16 +211,16 @@ function drawState(){ hours % 4 == 1 ? iconMars : hours % 4 == 2 ? iconMoon : iconEarth; - g.drawImage(iconImg, 29, 104); + g.drawImage(iconImg, 24, 118); + g.setColor(cWhite); + g.drawString("STATUS", 24+25, 108); } else { // Alarm within symbol - g.setFontAntonioMedium(); - g.setFontAlign(0, 0, 0); g.setColor(cOrange); - g.drawString("ALARM", 29+25, 107); + g.drawString("ALARM", 24+25, 108); g.setColor(cWhite); g.setFontAntonioLarge(); - g.drawString(getAlarmMinutes(), 29+25, 107+35); + g.drawString(getAlarmMinutes(), 24+25, 108+35); } g.setFontAlign(-1, -1, 0); @@ -236,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(); @@ -247,7 +252,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); @@ -255,7 +260,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); @@ -401,7 +406,7 @@ function draw(){ * Step counter via widget */ function getSteps() { - var steps = 0 + var steps = 0; try { health = require("health"); } catch(ex) { @@ -553,6 +558,10 @@ Bangle.on("drag", e => { } }); +Bangle.on("touch", e => { + Bangle.showLauncher(); +}); + /* * Lets start widgets, listen for btn etc. diff --git a/apps/lcars/screenshot.png b/apps/lcars/screenshot.png index b3dfd4200..fba55a9f7 100644 Binary files a/apps/lcars/screenshot.png and b/apps/lcars/screenshot.png differ