added sound during countdown, and upgraded minsdkversion
This commit is contained in:
@ -96,7 +96,7 @@ class ActionModel {
|
||||
position: totalItems,
|
||||
action: action,
|
||||
time: action.restAfterSets!,
|
||||
name: 'rest'));
|
||||
name: 'cooldown'));
|
||||
}
|
||||
|
||||
return items;
|
||||
@ -164,8 +164,20 @@ class Set extends Item {
|
||||
if (action.repType == RepType.time) {
|
||||
for (int i = 0; i < totalReps; i++) {
|
||||
position = position > 0 ? position + 1 : position;
|
||||
|
||||
// don't show a rest before first rep
|
||||
if (i > 0) {
|
||||
items.add(Rest(
|
||||
id: position,
|
||||
position: position,
|
||||
parentId: id,
|
||||
action: action,
|
||||
time: action.restBetweenReps,
|
||||
name: 'rest'));
|
||||
}
|
||||
|
||||
items.add(Reps(
|
||||
id: position, position: position, parentId: id, action: action));
|
||||
id: ++position, position: position, parentId: id, action: action));
|
||||
|
||||
if (action.isAlternating) {
|
||||
items.add(Rest(
|
||||
@ -180,17 +192,6 @@ class Set extends Item {
|
||||
position: position,
|
||||
parentId: id,
|
||||
action: action));
|
||||
|
||||
// don't show a rest after the last rep
|
||||
if (i < totalReps - 1) {
|
||||
items.add(Rest(
|
||||
id: ++position,
|
||||
position: position,
|
||||
parentId: id,
|
||||
action: action,
|
||||
time: action.restBetweenReps,
|
||||
name: 'prepare'));
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user