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

Merge branch 'master' of https://github.com/nh-99/BangleApps into nh-99-master 

Tweaks to do partial text redraw for scrolling - not everything

# Conflicts:
#	apps/messages/app.js
#	apps/messages/metadata.json
master
Gordon Williams 2022-02-24 14:24:06 +00:00
parent 14b6004f1c 33a1c2f19d
commit 2d9259db4c
1 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
apps/messages/app.js
View File

@ -168,27 +168,56 @@ function showMapMessage(msg) {
} }
function showMusicMessage(msg) { function showMusicMessage(msg) {
var updateLabelsInterval;
var trackScrollOffset = 0;
var artistScrollOffset = 0;
var albumScrollOffset = 0;
var trackName = '';
var artistName = '';
var albumName = '';
function fmtTime(s) { function fmtTime(s) {
var m = Math.floor(s/60); var m = Math.floor(s/60);
s = (parseInt(s%60)).toString().padStart(2,0); s = (parseInt(s%60)).toString().padStart(2,0);
return m+":"+s; return m+":"+s;
} }
function reduceStringAndPad(text, offset, maxLen) {
var sliceLength = offset + maxLen > text.length ? text.length - offset : maxLen;
return text.substr(offset, sliceLength).padEnd(maxLen, " ");
}
function back() { function back() {
clearInterval(updateLabelsInterval);
msg.new = false; msg.new = false;
saveMessages(); saveMessages();
layout = undefined; layout = undefined;
checkMessages({clockIfNoMsg:1,clockIfAllRead:1,showMsgIfUnread:1}); checkMessages({clockIfNoMsg:1,clockIfAllRead:1,showMsgIfUnread:1});
} }
function updateLabels() {
trackName = reduceStringAndPad(msg.track, trackScrollOffset, 13);
artistName = reduceStringAndPad(msg.artist, artistScrollOffset, 21);
albumName = reduceStringAndPad(msg.album, albumScrollOffset, 21);
trackScrollOffset++;
artistScrollOffset++;
albumScrollOffset++;
if ((trackScrollOffset + 13) > msg.track.length) trackScrollOffset = 0;
if ((artistScrollOffset + 21) > msg.artist.length) artistScrollOffset = 0;
if ((albumScrollOffset + 21) > msg.album.length) albumScrollOffset = 0;
}
updateLabels();
layout = new Layout({ type:"v", c: [ layout = new Layout({ type:"v", c: [
{type:"h", fillx:1, bgCol:g.theme.bg2, col: g.theme.fg2, c: [ {type:"h", fillx:1, bgCol:g.theme.bg2, col: g.theme.fg2, 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, bgCol:g.theme.bg2, label:artistName, pad:2, id:"artist" },
{ type:"txt", font:fontMedium, label:msg.album, pad:2 } { type:"txt", font:fontMedium, bgCol:g.theme.bg2, label:albumName, pad:2, id:"album" }
]} ]}
]}, ]},
{type:"txt", font:fontLarge, label:msg.track, fillx:1, filly:1, pad:2 }, {type:"txt", font:fontLarge, bgCol:g.theme.bg, label:trackName, fillx:1, filly:1, pad:2, id:"track" },
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
@ -198,6 +227,14 @@ function showMusicMessage(msg) {
]}); ]});
g.clearRect(Bangle.appRect); g.clearRect(Bangle.appRect);
layout.render(); layout.render();
updateLabelsInterval = setInterval(function() {
updateLabels();
layout.artist.label = artistName;
layout.album.label = albumName;
layout.track.label = trackName;
layout.render();
}, 400);
} }
function showMessageScroller(msg) { function showMessageScroller(msg) {