luv090909/FitoTrack
1
0
Fork 0
mirror of https://github.com/russok/FitoTrack.git synced 2025-10-28 16:22:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs in Manual workout adding

Browse Source 
- Save end time correctly
- Show hint 'comment' instead of 'custom'
This commit is contained in:
jannis 2020-03-11 12:13:39 +01:00
parent 8665d5ca14
commit 289e25949f
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/de/tadris/fitness/activity/EnterWorkoutActivity.java
View File

@ -96,7 +96,7 @@ public class EnterWorkoutActivity extends InformationActivity implements SelectW
durationLine.lineRoot.setOnClickListener(v -> showDurationSelection()); durationLine.lineRoot.setOnClickListener(v -> showDurationSelection());
durationTextView = durationLine.value; durationTextView = durationLine.value;
addTitle(getString(R.string.custom)); addTitle(getString(R.string.comment));
commentEditText = new EditText(this); commentEditText = new EditText(this);
commentEditText.setSingleLine(true); commentEditText.setSingleLine(true);

5
app/src/main/java/de/tadris/fitness/data/WorkoutBuilder.java
View File

@ -50,20 +50,19 @@ public class WorkoutBuilder {
// Calculate values // Calculate values
workout.start = start.getTimeInMillis(); workout.start = start.getTimeInMillis();
workout.duration = duration;
workout.end = workout.start + workout.duration; workout.end = workout.start + workout.duration;
workout.id = workout.start; workout.id = workout.start;
workout.setWorkoutType(workoutType); workout.setWorkoutType(workoutType);
workout.duration = duration;
workout.pauseDuration = 0;
workout.length = length; workout.length = length;
workout.avgSpeed = (double) length / (double) (duration / 1000); workout.avgSpeed = (double) length / (double) (duration / 1000);
workout.topSpeed = 0; workout.topSpeed = 0;
workout.avgPace = ((double) workout.duration / 1000 / 60) / ((double) workout.length / 1000); workout.avgPace = ((double) workout.duration / 1000 / 60) / ((double) workout.length / 1000);
workout.pauseDuration = 0;
workout.ascent = 0; workout.ascent = 0;
workout.descent = 0; workout.descent = 0;

1
app/src/main/res/values/strings.xml
View File

@ -113,7 +113,6 @@
<string name="workoutTypeUnknown">Unknown</string> <string name="workoutTypeUnknown">Unknown</string>
<string name="type">Type</string> <string name="type">Type</string>
<string name="custom">Custom</string>
<string name="enterWorkout">Enter Workout</string> <string name="enterWorkout">Enter Workout</string>
<string name="setDuration">Set Duration</string> <string name="setDuration">Set Duration</string>