FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Fix track name, artist, and album names clipping

pull/1491/head
Noah Howard 2022-02-19 16:37:34 -05:00 committed by GitHub
parent eb64a7a436
commit b25611ee84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/messages/app.js
View File

@ -165,6 +165,10 @@ function showMapMessage(msg) {
}); });
} }
function reduceStringAndPad(text, maxLen) {
return text.length > maxLen ? text.substr(0, maxLen - 1) + '...' : text;
}
function showMusicMessage(msg) { function showMusicMessage(msg) {
function fmtTime(s) { function fmtTime(s) {
var m = Math.floor(s/60); var m = Math.floor(s/60);
@ -178,15 +182,20 @@ function showMusicMessage(msg) {
layout = undefined; layout = undefined;
checkMessages({clockIfNoMsg:1,clockIfAllRead:1,showMsgIfUnread:1}); checkMessages({clockIfNoMsg:1,clockIfAllRead:1,showMsgIfUnread:1});
} }
var trackName = reduceStringAndPad(msg.track, 13);
var artistName = reduceStringAndPad(msg.artist, 21);
var albumName = reduceStringAndPad(msg.album, 21);
layout = new Layout({ type:"v", c: [ layout = new Layout({ type:"v", c: [
{type:"h", fillx:1, bgCol:colBg, c: [ {type:"h", fillx:1, bgCol:colBg, c: [
{ type:"btn", src:getBackImage, cb:back }, { type:"btn", src:getBackImage, cb:back },
{ type:"v", fillx:1, c: [ { type:"v", fillx:1, c: [
{ type:"txt", font:fontMedium, label:msg.artist, pad:2 }, { type:"txt", font:fontMedium, label:artistName, pad:2 },
{ type:"txt", font:fontMedium, label:msg.album, pad:2 } { type:"txt", font:fontMedium, label:albumName, pad:2 }
]} ]}
]}, ]},
{type:"txt", font:fontLarge, label:msg.track, fillx:1, filly:1, pad:2 }, {type:"txt", font:fontLarge, label:trackName, fillx:1, filly:1, pad:2 },
Bangle.musicControl?{type:"h",fillx:1, c: [ Bangle.musicControl?{type:"h",fillx:1, c: [
{type:"btn", pad:8, label:"\0"+atob("FhgBwAADwAAPwAA/wAD/gAP/gA//gD//gP//g///j///P//////////P//4//+D//gP/4A/+AD/gAP8AA/AADwAAMAAA"), cb:()=>Bangle.musicControl("play")}, // play {type:"btn", pad:8, label:"\0"+atob("FhgBwAADwAAPwAA/wAD/gAP/gA//gD//gP//g///j///P//////////P//4//+D//gP/4A/+AD/gAP8AA/AADwAAMAAA"), cb:()=>Bangle.musicControl("play")}, // play
{type:"btn", pad:8, label:"\0"+atob("EhaBAHgHvwP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP3gHg"), cb:()=>Bangle.musicControl("pause")}, // pause {type:"btn", pad:8, label:"\0"+atob("EhaBAHgHvwP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP/wP3gHg"), cb:()=>Bangle.musicControl("pause")}, // pause