Bram
/
BangleApps
forked from FOSS/BangleApps
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #1833 from peerdavid/master 

[BW CLock] Improve positioning of date and time
master
Gordon Williams 2022-05-16 14:41:32 +01:00 committed by GitHub
parent c59eea39ae ba34b88270
commit 401535baf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/bwclk/ChangeLog
View File

@ -3,4 +3,5 @@
0.03: Adapt colors based on the theme of the user. 0.03: Adapt colors based on the theme of the user.
0.04: Steps can be hidden now such that the time is even larger. 0.04: Steps can be hidden now such that the time is even larger.
0.05: Included icons for information. 0.05: Included icons for information.
0.06: Design and usability improvements. 0.06: Design and usability improvements.
0.07: Improved positioning.

19
apps/bwclk/app.js
View File

@ -259,11 +259,12 @@ function draw() {
function drawDate(){ function drawDate(){
// Draw background // Draw background
var y = H/5*2 + (settings.fullscreen ? 0 : 8); var y = H/5*2;
g.reset().clearRect(0,0,W,W); g.reset().clearRect(0,0,W,W);
// Draw date // Draw date
y -= settings.fullscreen ? 8 : 0; y = parseInt(y/2);
y += settings.fullscreen ? 0 : 15;
var date = new Date(); var date = new Date();
var dateStr = date.getDate(); var dateStr = date.getDate();
dateStr = ("0" + dateStr).substr(-2); dateStr = ("0" + dateStr).substr(-2);
@ -276,14 +277,14 @@ function drawDate(){
var dayW = Math.max(g.stringWidth(dayStr), g.stringWidth(monthStr)); var dayW = Math.max(g.stringWidth(dayStr), g.stringWidth(monthStr));
var fullDateW = dateW + 10 + dayW; var fullDateW = dateW + 10 + dayW;
g.setFontAlign(-1,1); g.setFontAlign(-1,0);
g.setMediumFont(); g.setMediumFont();
g.setColor(g.theme.fg); g.setColor(g.theme.fg);
g.drawString(dateStr, W/2 - fullDateW / 2, y+5); g.drawString(dateStr, W/2 - fullDateW / 2, y+5);
g.setSmallFont(); g.setSmallFont();
g.drawString(monthStr, W/2 - fullDateW/2 + 10 + dateW, y+3); g.drawString(monthStr, W/2 - fullDateW/2 + 10 + dateW, y+14);
g.drawString(dayStr, W/2 - fullDateW/2 + 10 + dateW, y-23); g.drawString(dayStr, W/2 - fullDateW/2 + 10 + dateW, y-10);
} }
@ -296,9 +297,9 @@ function drawTime(){
// Draw time // Draw time
g.setColor(g.theme.bg); g.setColor(g.theme.bg);
g.setFontAlign(0,-1); g.setFontAlign(0,0);
var timeStr = locale.time(date,1); var timeStr = locale.time(date,1);
y += settings.fullscreen ? 14 : 10; y += parseInt((H - y)/2) + 5;
var infoEntry = getInfoEntry(); var infoEntry = getInfoEntry();
var infoStr = infoEntry[0]; var infoStr = infoEntry[0];
@ -307,9 +308,9 @@ function drawTime(){
// Show large or small time depending on info entry // Show large or small time depending on info entry
if(infoStr == null){ if(infoStr == null){
y += 10;
g.setLargeFont(); g.setLargeFont();
} else { } else {
y -= 15;
g.setMediumFont(); g.setMediumFont();
} }
g.drawString(timeStr, W/2, y); g.drawString(timeStr, W/2, y);
@ -319,7 +320,7 @@ function drawTime(){
return; return;
} }
y += H/5*2-5; y += 35;
g.setFontAlign(0,0); g.setFontAlign(0,0);
g.setSmallFont(); g.setSmallFont();
var imgWidth = 0; var imgWidth = 0;

2
apps/bwclk/metadata.json
View File

@ -1,7 +1,7 @@
{ {
"id": "bwclk", "id": "bwclk",
"name": "BW Clock", "name": "BW Clock",
"version": "0.06", "version": "0.07",
"description": "BW Clock.", "description": "BW Clock.",
"readme": "README.md", "readme": "README.md",
"icon": "app.png", "icon": "app.png",