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

Display workouts without GPS data

Browse Source
This commit is contained in:
jannis 2020-03-03 15:32:21 +01:00
parent 91d97ae805
commit e5f3f9f0f7
2 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/java/de/tadris/fitness/activity/ShowWorkoutActivity.java
View File

@ -82,34 +82,43 @@ public class ShowWorkoutActivity extends WorkoutActivity implements DialogUtils.
addKeyValue(getString(R.string.workoutDistance), UnitUtils.getDistance(workout.length), getString(R.string.workoutPace), UnitUtils.getPace(workout.avgPace)); addKeyValue(getString(R.string.workoutDistance), UnitUtils.getDistance(workout.length), getString(R.string.workoutPace), UnitUtils.getPace(workout.avgPace));
addTitle(getString(R.string.workoutRoute)); if (hasSamples()) {
addTitle(getString(R.string.workoutRoute));
addMap(); addMap();
map.setClickable(false);
mapRoot.setOnClickListener(v -> startActivity(new Intent(ShowWorkoutActivity.this, ShowWorkoutMapActivity.class)));
}
map.setClickable(false);
mapRoot.setOnClickListener(v -> startActivity(new Intent(ShowWorkoutActivity.this, ShowWorkoutMapActivity.class)));
addTitle(getString(R.string.workoutSpeed)); addTitle(getString(R.string.workoutSpeed));
addKeyValue(getString(R.string.workoutAvgSpeedShort), UnitUtils.getSpeed(workout.avgSpeed), addKeyValue(getString(R.string.workoutAvgSpeedShort), UnitUtils.getSpeed(workout.avgSpeed),
getString(R.string.workoutTopSpeed), UnitUtils.getSpeed(workout.topSpeed)); getString(R.string.workoutTopSpeed), UnitUtils.getSpeed(workout.topSpeed));
addSpeedDiagram(); if (hasSamples()) {
speedDiagram.setOnClickListener(v -> startDiagramActivity(ShowWorkoutMapDiagramActivity.DIAGRAM_TYPE_SPEED)); addSpeedDiagram();
speedDiagram.setOnClickListener(v -> startDiagramActivity(ShowWorkoutMapDiagramActivity.DIAGRAM_TYPE_SPEED));
}
addTitle(getString(R.string.workoutBurnedEnergy)); addTitle(getString(R.string.workoutBurnedEnergy));
addKeyValue(getString(R.string.workoutTotalEnergy), workout.calorie + " kcal", addKeyValue(getString(R.string.workoutTotalEnergy), workout.calorie + " kcal",
getString(R.string.workoutEnergyConsumption), UnitUtils.getRelativeEnergyConsumption((double)workout.calorie / ((double)workout.length / 1000))); getString(R.string.workoutEnergyConsumption), UnitUtils.getRelativeEnergyConsumption((double)workout.calorie / ((double)workout.length / 1000)));
addTitle(getString(R.string.height)); if (hasSamples()) {
addTitle(getString(R.string.height));
addKeyValue(getString(R.string.workoutAscent), UnitUtils.getDistance((int)workout.ascent), addKeyValue(getString(R.string.workoutAscent), UnitUtils.getDistance((int) workout.ascent),
getString(R.string.workoutDescent), UnitUtils.getDistance((int)workout.descent)); getString(R.string.workoutDescent), UnitUtils.getDistance((int) workout.descent));
addHeightDiagram(); addHeightDiagram();
heightDiagram.setOnClickListener(v -> startDiagramActivity(ShowWorkoutMapDiagramActivity.DIAGRAM_TYPE_HEIGHT)); heightDiagram.setOnClickListener(v -> startDiagramActivity(ShowWorkoutMapDiagramActivity.DIAGRAM_TYPE_HEIGHT));
}
} }

16
app/src/main/java/de/tadris/fitness/activity/WorkoutActivity.java
View File

@ -297,9 +297,15 @@ public abstract class WorkoutActivity extends FitoTrackActivity {
return getWindowManager().getDefaultDisplay().getWidth()*3/4; return getWindowManager().getDefaultDisplay().getWidth()*3/4;
} }
protected boolean hasSamples() {
return samples.size() > 1;
}
@Override @Override
protected void onDestroy() { protected void onDestroy() {
map.destroyAll(); if (map != null) {
map.destroyAll();
}
AndroidGraphicFactory.clearResourceMemoryCache(); AndroidGraphicFactory.clearResourceMemoryCache();
super.onDestroy(); super.onDestroy();
} }
@ -307,12 +313,16 @@ public abstract class WorkoutActivity extends FitoTrackActivity {
@Override @Override
public void onPause(){ public void onPause(){
super.onPause(); super.onPause();
downloadLayer.onPause(); if (downloadLayer != null) {
downloadLayer.onPause();
}
} }
public void onResume(){ public void onResume(){
super.onResume(); super.onResume();
downloadLayer.onResume(); if (downloadLayer != null) {
downloadLayer.onResume();
}
} }
@Override @Override