Skip to content

Commit

Permalink
changed setNumber to index of set list
Browse files Browse the repository at this point in the history
  • Loading branch information
@avalax
avalax committed Jun 27, 2014
1 parent 1b1633f commit fd8a11c
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 31 deletions.
2 changes: 1 addition & 1 deletion src/main/java/de/avalax/fitbuddy/application/CurrentExerciseFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ private void changeReps(int moved) {

private void changeSets(int moved) {
Workout workout = workoutSession.getWorkout();
setSet(workout.getExercise(exercisePosition).getSetNumber() + moved);
setSet(workout.getExercise(exercisePosition).getExerciseIndex() + moved);
setViews(exercisePosition);
updateWorkoutProgress(exercisePosition);
updatePage();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/de/avalax/fitbuddy/application/swipeBar/VerticalProgressbarView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ private void attributs(AttributeSet attrs) {
}

public void updateProgressbar(Exercise exercise) {
String currentValueText = exercise.getMaxSets() > 0 ? String.valueOf(exercise.getSetNumber()) : "0";
String currentValueText = exercise.getMaxSets() > 0 ? String.valueOf(exercise.getExerciseIndex() + 1) : "0";
String maxValueText = String.valueOf(exercise.getMaxSets());
updateProgressbar(exercise.getProgress(), currentValueText, maxValueText);
}
Expand All @@ -67,6 +67,6 @@ private void updateProgressbar(double progress, String currentValueText, String

private int calculateProgressbarHeight(double currentValue, int maxValue) {
double scale = currentValue / maxValue;
return (int)Math.round(scale * 10000);
return (int) Math.round(scale * 10000);
}
}
33 changes: 16 additions & 17 deletions src/main/java/de/avalax/fitbuddy/domain/model/exercise/BasicExercise.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
public class BasicExercise implements Exercise {
private String name;
private List<Set> sets;
private int setNumber;
private int exerciseIndex;
private ExerciseId exerciseId;

public BasicExercise() {
Expand All @@ -20,7 +20,7 @@ public BasicExercise() {
public BasicExercise(String name, List<Set> sets) {
this.name = name;
this.sets = sets;
this.setNumber = 1;
this.exerciseIndex = 0;
}

@Override
Expand All @@ -34,61 +34,60 @@ public int getMaxSets() {
}

@Override
public int getSetNumber() {
return setNumber;
public int getExerciseIndex() {
return exerciseIndex;
}

@Override
public Set getCurrentSet() {
if (setNumber > sets.size()) {
if (isIndexGreaterEqualThan(exerciseIndex)) {
throw new SetNotAvailableException();
}
int index = setNumber - 1;
int index = exerciseIndex;
return sets.get(index);
}

@Override
public void setCurrentSet(int setNumber) {
public void setCurrentSet(int index) {
if (sets.isEmpty()) {
return;
}
int index = setNumber - 1;
if (isIndexGreaterEqualThan(index)) {
this.setNumber = getMaxSets();
this.exerciseIndex = sets.size() - 1;
} else if (isIndexNegative(index)) {
this.setNumber = 1;
this.exerciseIndex = 0;
} else {
this.setNumber = setNumber;
this.exerciseIndex = index;
}
}

@Override
public int getReps() {
if (setNumber > sets.size()) {
if (isIndexGreaterEqualThan(exerciseIndex)) {
return 0;
}
return getCurrentSet().getReps();
}

@Override
public void setReps(int reps) {
if (setNumber > sets.size()) {
if (isIndexGreaterEqualThan(exerciseIndex)) {
return;
}
getCurrentSet().setReps(reps);
}

@Override
public int getMaxReps() {
if (setNumber > sets.size()) {
if (isIndexGreaterEqualThan(exerciseIndex)) {
return 0;
}
return getCurrentSet().getMaxReps();
}

@Override
public double getProgress() {
double setsProgress = (setNumber - 1) / (double) getMaxSets();
double setsProgress = (exerciseIndex) / (double) getMaxSets();
double repsProgress = getReps() / (double) getMaxReps() / getMaxSets();
return setsProgress + repsProgress;
}
Expand All @@ -111,7 +110,7 @@ public List<Set> getSets() {
@Override
public void setSets(List<Set> sets) {
this.sets = sets;
this.setNumber = 1;
this.exerciseIndex = 0;
}

@Override
Expand All @@ -125,7 +124,7 @@ public void setName(String name) {

@Override
public double getWeight() {
if (setNumber > sets.size()) {
if (isIndexGreaterEqualThan(exerciseIndex)) {
return 0;
}
return getCurrentSet().getWeight();
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/de/avalax/fitbuddy/domain/model/exercise/Exercise.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ public interface Exercise extends Serializable {

int getMaxSets();

int getSetNumber();
@Deprecated
int getExerciseIndex();

void setReps(int reps);

Expand Down
18 changes: 8 additions & 10 deletions src/test/java/de/avalax/fitbuddy/domain/model/exercise/BasicExerciseTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import de.avalax.fitbuddy.domain.model.set.Set;
import de.avalax.fitbuddy.domain.model.set.SetNotAvailableException;
import de.bechte.junit.runners.context.HierarchicalContextRunner;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
Expand All @@ -16,7 +15,6 @@
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.*;

@RunWith(HierarchicalContextRunner.class)
Expand Down Expand Up @@ -83,7 +81,7 @@ public void setSets_shouldSetSets() throws Exception {
List<Set> sets = new ArrayList<>();
exercise.setSets(sets);
assertThat(exercise.getSets(), equalTo(sets));
assertThat(exercise.getSetNumber(), equalTo(1));
assertThat(exercise.getExerciseIndex(), equalTo(0));
}

@Test
Expand Down Expand Up @@ -160,14 +158,14 @@ public void getCurrentSet_shouldReturnSecondSet() throws Exception {
sets.add(mock(Set.class));
sets.add(set);

exercise.setCurrentSet(2);
exercise.setCurrentSet(1);

assertThat(exercise.getCurrentSet(), equalTo(set));
}

@Test
public void setCurrentSetWithoutSets_shouldDoNothing() throws Exception {
exercise.setCurrentSet(sets.size() + 1);
exercise.setCurrentSet(1);
}

@Test
Expand All @@ -176,7 +174,7 @@ public void setSetNumber_shouldSetSetNumberToZero() throws Exception {

exercise.setCurrentSet(-1);

assertThat(exercise.getSetNumber(), equalTo(1));
assertThat(exercise.getExerciseIndex(), equalTo(0));
}

@Test
Expand Down Expand Up @@ -240,7 +238,7 @@ public void oneSetWithMaxReps_shouldHaveFullProgress() throws Exception {
}

@Test
public void oneSetWithMaxReps_shouldHaveHalfProgress() throws Exception {
public void oneSetWithHalfReps_shouldHaveHalfProgress() throws Exception {
Set set = mock(Set.class);
when(set.getMaxReps()).thenReturn(100);
when(set.getReps()).thenReturn(50);
Expand All @@ -255,7 +253,7 @@ public void twoSetsWithoutReps_shouldHaveHalfProgress() throws Exception {
when(set.getMaxReps()).thenReturn(100);
when(set.getReps()).thenReturn(0);
sets.add(set);
exercise.setCurrentSet(2);
exercise.setCurrentSet(1);
assertThat(exercise.getProgress(), equalTo(0.5));
}

Expand All @@ -266,7 +264,7 @@ public void twoSetsWithMaxReps_shouldHaveFallProgress() throws Exception {
when(set.getMaxReps()).thenReturn(100);
when(set.getReps()).thenReturn(100);
sets.add(set);
exercise.setCurrentSet(2);
exercise.setCurrentSet(1);
assertThat(exercise.getProgress(), equalTo(1.0));
}

Expand All @@ -277,7 +275,7 @@ public void twoSetsWithHalfReps_shouldHave75Progress() throws Exception {
when(set.getMaxReps()).thenReturn(100);
when(set.getReps()).thenReturn(50);
sets.add(set);
exercise.setCurrentSet(2);
exercise.setCurrentSet(1);
assertThat(exercise.getProgress(), equalTo(0.75));
}
}
Expand Down

0 comments on commit fd8a11c

Please sign in to comment.