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

When in imperial unit, use 150 lb as the default

Browse Source
This commit is contained in:
Jimmy Shih
2013-12-05 13:05:53 -08:00
parent 9085b777a7
commit d52715c513
7 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/util/CalorieUtils.java
+1 -1
View File
@@ -109,7 +109,7 @@ public class CalorieUtils {
R.string.recording_distance_interval_key,
PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT);
double weight = PreferencesUtils.getFloat(
context, R.string.weight_key, PreferencesUtils.WEIGHT_DEFAULT);
context, R.string.weight_key, PreferencesUtils.getDefaultWeight(context));
LocationIterator locationIterator = null;
Cursor cursor = null;
MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java
+24 -15
View File
@@ -122,8 +122,6 @@ public class PreferencesUtils {
public static final int TRACK_WIDGET_ITEM3_DEFAULT = 1; // total time
public static final int TRACK_WIDGET_ITEM4_DEFAULT = 2; // average speed
public static final int VOICE_FREQUENCY_DEFAULT = 0;
public static final float WEIGHT_DEFAULT = 65.0f; // in kilogram
private static final String TAG = PreferencesUtils.class.getSimpleName();
@@ -289,8 +287,8 @@ public class PreferencesUtils {
* @param context the context
*/
public static boolean isMetricUnits(Context context) {
return PreferencesUtils.STATS_UNITS_DEFAULT.equals(
getString(context, R.string.stats_units_key, PreferencesUtils.STATS_UNITS_DEFAULT));
return STATS_UNITS_DEFAULT.equals(
getString(context, R.string.stats_units_key, STATS_UNITS_DEFAULT));
}
/**
@@ -300,8 +298,8 @@ public class PreferencesUtils {
* @param context the context
*/
public static boolean isReportSpeed(Context context) {
return PreferencesUtils.STATS_RATE_DEFAULT.equals(
getString(context, R.string.stats_rate_key, PreferencesUtils.STATS_RATE_DEFAULT));
return STATS_RATE_DEFAULT.equals(
getString(context, R.string.stats_rate_key, STATS_RATE_DEFAULT));
}
/**
@@ -310,8 +308,8 @@ public class PreferencesUtils {
* @param context the context
*/
public static boolean isChartByDistance(Context context) {
return PreferencesUtils.CHART_X_AXIS_DEFAULT.equals(
getString(context, R.string.chart_x_axis_key, PreferencesUtils.CHART_X_AXIS_DEFAULT));
return CHART_X_AXIS_DEFAULT.equals(
getString(context, R.string.chart_x_axis_key, CHART_X_AXIS_DEFAULT));
}
/**
@@ -337,6 +335,18 @@ public class PreferencesUtils {
setString(context, keyId, list + ";" + value);
}
/**
* Gets the default weight.
*
* @param context the context
*/
public static float getDefaultWeight(Context context) {
if (isMetricUnits(context)) {
return 65.0f; // in kg
} else {
return 68.0389f; // 150 lb in kg
}
}
/**
* Stores the weight value, always in metric units.
*
@@ -346,14 +356,14 @@ public class PreferencesUtils {
double value;
try {
value = Double.parseDouble(displayValue);
if (!PreferencesUtils.isMetricUnits(context)) {
if (!isMetricUnits(context)) {
value = value * UnitConversions.LB_TO_KG;
}
} catch (NumberFormatException e) {
Log.e(TAG, "invalid value " + displayValue);
value = PreferencesUtils.WEIGHT_DEFAULT;
value = getDefaultWeight(context);
}
PreferencesUtils.setFloat(context, R.string.weight_key, (float) value);
setFloat(context, R.string.weight_key, (float) value);
}
/**
@@ -362,11 +372,10 @@ public class PreferencesUtils {
* @param context the context
*/
public static double getWeightDisplayValue(Context context) {
double value = PreferencesUtils.getFloat(
context, R.string.weight_key, PreferencesUtils.WEIGHT_DEFAULT);
if (!PreferencesUtils.isMetricUnits(context)) {
double value = getFloat(context, R.string.weight_key, getDefaultWeight(context));
if (!isMetricUnits(context)) {
value = value * UnitConversions.KG_TO_LB;
}
return value;
}
}
}