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

Fix set complete UI message

pull/343/head
Paul Cockrell 2020-04-23 07:06:25 +01:00
parent bf1fe5de4e
commit 3384f493e2
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/buffgym/buffgym.app.js
View File

@ -85,9 +85,12 @@ function drawWorkoutDone() {
g.flip(); g.flip();
} }
function drawSetComp() { function drawSetComp(exercise) {
const title = "Good work"; const title = "Good work";
const msg = "No need to rest\nmove straight on\nto the next\nexercise.Your\nweight has been\nincreased for\nnext time!"; const msg1= "No need to rest\nmove straight on\nto the next\nexercise.";
const msg2 = exercise.canProgress()?
"Your\nweight has been\nincreased for\nnext time!":
"You'll\nsmash it next\ntime!";
g.clear(); g.clear();
drawMenu({showBTN2: true}); drawMenu({showBTN2: true});
@ -97,14 +100,12 @@ function drawSetComp() {
g.setFont("6x8", 2); g.setFont("6x8", 2);
g.drawString(title, W / 2, 10); g.drawString(title, W / 2, 10);
g.setFont("6x8", 1); g.setFont("6x8", 1);
g.drawString(msg, (W / 2) - 2, 45); g.drawString(msg1 + msg2, (W / 2) - 2, 45);
g.flip(); g.flip();
} }
function drawRestTimer(workout) { function drawRestTimer(exercise) {
const exercise = workout.currentExercise();
g.clear(); g.clear();
drawMenu({showBTN2: true}); drawMenu({showBTN2: true});
g.setFontAlign(0, -1); g.setFontAlign(0, -1);
@ -124,15 +125,15 @@ function redraw(workout) {
if (workout.isCompleted()) { if (workout.isCompleted()) {
saveWorkout(workout); saveWorkout(workout);
drawWorkoutDone(workout); drawWorkoutDone();
return; return;
} }
if (exercise.isRestTimerRunning()) { if (exercise.isRestTimerRunning()) {
if (exercise.isLastSet()) { if (exercise.isLastSet()) {
drawSetComp(workout); drawSetComp(exercise);
} else { } else {
drawRestTimer(workout); drawRestTimer(exercise);
} }
return; return;