upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-05 02:53:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add an activity setup button in stat page when the activity type is not support to calculate calorie.

Browse Source
This commit is contained in:
youtaol
2013-09-10 11:01:18 +08:00
parent 282c48f530
commit 02587dc27e
9 changed files with 66 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracksLib/src/com/google/android/apps/mytracks/stats/TripStatistics.java
+6 -4
View File
@@ -70,7 +70,7 @@ public class TripStatistics implements Parcelable {
* This value means the calorie value is invalid due to activity type is not
* supported.
*/
public static final double INVALID_CALORIE = -1;
public static final double INVALID_CALORIE = -1.0;
/**
* Default constructor.
@@ -129,7 +129,9 @@ public class TripStatistics implements Parcelable {
gradeExtremities.update(other.gradeExtremities.getMin());
gradeExtremities.update(other.gradeExtremities.getMax());
}
calorie += other.calorie;
if (other.calorie != INVALID_CALORIE) {
calorie += other.calorie;
}
}
/**
@@ -585,9 +587,9 @@ public class TripStatistics implements Parcelable {
*/
public void addCalorie(double calorieAdded) {
if (calorieAdded != INVALID_CALORIE) {
this.calorie += calorieAdded;
calorie = calorie == INVALID_CALORIE ? calorieAdded : calorie + calorieAdded;
} else {
this.calorie = INVALID_CALORIE;
calorie = INVALID_CALORIE;
}
}