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

Change code style about calorie.

Browse Source
This commit is contained in:
youtaol
2013-10-10 11:16:58 +08:00
parent 800fabd5a0
commit 8e9be4fcf0
5 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracksLib/src/com/google/android/apps/mytracks/stats/TripStatistics.java
+6 -6
View File
@@ -66,10 +66,10 @@ 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.0;
public static final double CALORIE_UNDEFINED = -1.0;
// The calorie of current track.
private double calorie = INVALID_CALORIE;
private double calorie = CALORIE_UNDEFINED;
/**
* Default constructor.
@@ -128,7 +128,7 @@ public class TripStatistics implements Parcelable {
gradeExtremities.update(other.gradeExtremities.getMin());
gradeExtremities.update(other.gradeExtremities.getMax());
}
if (other.calorie != INVALID_CALORIE) {
if (other.calorie != CALORIE_UNDEFINED) {
calorie += other.calorie;
}
}
@@ -585,10 +585,10 @@ public class TripStatistics implements Parcelable {
* @param calorieAdded add the value to the total calorie
*/
public void addCalorie(double calorieAdded) {
if (calorieAdded != INVALID_CALORIE) {
calorie = calorie == INVALID_CALORIE ? calorieAdded : calorie + calorieAdded;
if (calorieAdded != CALORIE_UNDEFINED) {
calorie = calorie == CALORIE_UNDEFINED ? calorieAdded : calorie + calorieAdded;
} else {
calorie = INVALID_CALORIE;
calorie = CALORIE_UNDEFINED;
}
}