karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Address comments.

Browse Source
This commit is contained in:
Sandor Dornbush
2011-07-11 22:50:06 -07:00
parent 0b40b92340
commit dd4054c4fc
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
+13 -9
View File
@@ -68,9 +68,9 @@ public class TrackWidgetProvider
private MyTracksProviderUtils providerUtils; private MyTracksProviderUtils providerUtils;
private Context context; private Context context;
private String unknown; private String unknown;
private String distance; private String distanceLabel;
private String speed; private String speedLabel;
private String pace; private String paceLabel;
private TrackObserver trackObserver; private TrackObserver trackObserver;
private boolean isMetric; private boolean isMetric;
private boolean reportSpeed; private boolean reportSpeed;
@@ -86,6 +86,9 @@ public class TrackWidgetProvider
} }
private void initialize(Context context) { private void initialize(Context context) {
if (this.context != null) {
return;
}
this.context = context; this.context = context;
trackObserver = new TrackObserver(); trackObserver = new TrackObserver();
providerUtils = MyTracksProviderUtils.Factory.get(context); providerUtils = MyTracksProviderUtils.Factory.get(context);
@@ -228,7 +231,8 @@ public class TrackWidgetProvider
if (!isMetric) { if (!isMetric) {
displayDistance *= UnitConversions.KM_TO_MI; displayDistance *= UnitConversions.KM_TO_MI;
} }
String distance = StringUtils.formatSingleDecimalPlace(displayDistance) + " " + this.distance; String distance =
StringUtils.formatSingleDecimalPlace(displayDistance) + " " + this.distanceLabel;
// convert ms to minutes // convert ms to minutes
String time = StringUtils.formatTime(stats.getMovingTime()); String time = StringUtils.formatTime(stats.getMovingTime());
@@ -240,10 +244,10 @@ public class TrackWidgetProvider
displaySpeed *= UnitConversions.KMH_TO_MPH; displaySpeed *= UnitConversions.KMH_TO_MPH;
} }
if (reportSpeed) { if (reportSpeed) {
speed = StringUtils.formatSingleDecimalPlace(displaySpeed) + " " + this.speed; speed = StringUtils.formatSingleDecimalPlace(displaySpeed) + " " + this.speedLabel;
} else { } else {
long displayPace = (long) (3600000.0 / displaySpeed); long displayPace = (long) (3600000.0 / displaySpeed);
speed = StringUtils.formatTime(displayPace) + " " + pace; speed = StringUtils.formatTime(displayPace) + " " + paceLabel;
} }
} }
@@ -257,9 +261,9 @@ public class TrackWidgetProvider
String metricUnitsKey = context.getString(R.string.metric_units_key); String metricUnitsKey = context.getString(R.string.metric_units_key);
if (key == null || key.equals(metricUnitsKey)) { if (key == null || key.equals(metricUnitsKey)) {
isMetric = prefs.getBoolean(metricUnitsKey, true); isMetric = prefs.getBoolean(metricUnitsKey, true);
distance = context.getString(isMetric ? R.string.kilometer : R.string.mile); distanceLabel = context.getString(isMetric ? R.string.kilometer : R.string.mile);
speed = context.getString(isMetric ? R.string.kilometer_per_hour : R.string.mile_per_hour); speedLabel = context.getString(isMetric ? R.string.kilometer_per_hour : R.string.mile_per_hour);
pace = context.getString(isMetric ? R.string.min_per_kilometer : R.string.min_per_mile); paceLabel = context.getString(isMetric ? R.string.min_per_kilometer : R.string.min_per_mile);
} }
String reportSpeedKey = context.getString(R.string.report_speed_key); String reportSpeedKey = context.getString(R.string.report_speed_key);