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

Add support to show both moving time and total time.

Browse Source
This commit is contained in:
Jimmy Shih
2012-08-22 15:52:14 -07:00
parent b3ad974bbb
commit b0bb09db08
9 changed files with 192 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java
+1 -1
View File
@@ -80,7 +80,7 @@ public class PreferencesUtils {
public static final boolean STATS_SHOW_COORDINATE_DEFAULT = false;
public static final boolean STATS_SHOW_ELEVATION_DEFAULT = false;
public static final boolean STATS_SHOW_GRADE_DEFAULT = false;
public static final boolean STATS_USE_TOTAL_TIME_DEFAULT = true;
public static final boolean STATS_SHOW_MOVING_TIME_DEFAULT = false;
public static final int TRACK_COLOR_MODE_MEDIUM_DEFAULT = 15;
public static final int TRACK_COLOR_MODE_PERCENTAGE_DEFAULT = 25;
MyTracks/src/com/google/android/apps/mytracks/util/StatsUtils.java
+45 -44
View File
@@ -104,46 +104,49 @@ public class StatsUtils {
activity, R.string.metric_units_key, PreferencesUtils.METRIC_UNITS_DEFAULT);
boolean reportSpeed = PreferencesUtils.getBoolean(
activity, R.string.report_speed_key, PreferencesUtils.REPORT_SPEED_DEFAULT);
boolean useTotalTime = PreferencesUtils.getBoolean(
activity, R.string.stats_use_total_time_key, PreferencesUtils.STATS_USE_TOTAL_TIME_DEFAULT);
boolean showMovingTime = PreferencesUtils.getBoolean(activity,
R.string.stats_show_moving_time_key, PreferencesUtils.STATS_SHOW_MOVING_TIME_DEFAULT);
// Set total distance
double totalDistance = tripStatistics == null ? Double.NaN : tripStatistics.getTotalDistance();
setDistanceValue(activity, R.id.stats_total_distance_value, totalDistance, metricUnits);
// Set total time/moving time
setTimeLabel(activity, R.id.stats_total_time_label, R.string.stats_total_time,
R.string.stats_moving_time, useTotalTime);
long totalTime;
if (tripStatistics == null) {
totalTime = -1L;
} else {
totalTime = useTotalTime ? tripStatistics.getTotalTime() : tripStatistics.getMovingTime();
}
setTimeValue(activity, R.id.stats_total_time_value, totalTime);
// Set average speed/moving average speed
if (useTotalTime) {
setSpeedLabel(activity, R.id.stats_average_speed_label, R.string.stats_average_speed,
R.string.stats_average_pace, reportSpeed);
} else {
setSpeedLabel(activity, R.id.stats_average_speed_label, R.string.stats_average_moving_speed,
R.string.stats_average_moving_pace, reportSpeed);
}
double averageSpeed;
if (tripStatistics == null) {
averageSpeed = Double.NaN;
} else {
averageSpeed = useTotalTime ? tripStatistics.getAverageSpeed()
: tripStatistics.getAverageMovingSpeed();
// Set total time
setTimeValue(activity, R.id.stats_total_time_value,
tripStatistics != null ? tripStatistics.getTotalTime() : -1L);
// Set moving time
setItemVisibility(activity, R.id.stats_moving_time_label, R.id.stats_moving_time_spacer,
R.id.stats_moving_time_value, showMovingTime);
if (showMovingTime) {
setTimeValue(activity, R.id.stats_moving_time_value,
tripStatistics != null ? tripStatistics.getMovingTime() : -1L);
}
// Set average speed
setSpeedLabel(activity, R.id.stats_average_speed_label, R.string.stats_average_speed,
R.string.stats_average_pace, reportSpeed);
double averageSpeed = tripStatistics != null ? tripStatistics.getAverageSpeed() : Double.NaN;
setSpeedValue(activity, R.id.stats_average_speed_value, averageSpeed, metricUnits, reportSpeed);
// Set average moving speed
setItemVisibility(activity, R.id.stats_average_moving_speed_label,
R.id.stats_average_moving_speed_spacer, R.id.stats_average_moving_speed_value,
showMovingTime);
if (showMovingTime) {
setSpeedLabel(activity, R.id.stats_average_moving_speed_label,
R.string.stats_average_moving_speed, R.string.stats_average_moving_pace, reportSpeed);
double averageMovingSpeed = tripStatistics != null ? tripStatistics.getAverageMovingSpeed()
: Double.NaN;
setSpeedValue(activity, R.id.stats_average_moving_speed_value, averageMovingSpeed,
metricUnits, reportSpeed);
}
// Set max speed
setSpeedLabel(activity, R.id.stats_max_speed_label, R.string.stats_max_speed,
R.string.stats_fastest_pace, reportSpeed);
double maxSpeed = tripStatistics == null ? Double.NaN : tripStatistics.getMaxSpeed();
setSpeedValue(activity, R.id.stats_max_speed_value, maxSpeed, metricUnits, reportSpeed);
setSpeedValue(activity, R.id.stats_max_speed_value, maxSpeed, metricUnits, reportSpeed);
// Set elevation
boolean showElevation = PreferencesUtils.getBoolean(
@@ -189,23 +192,21 @@ public class StatsUtils {
setGradeValue(activity, R.id.stats_max_grade_value, maxGrade);
}
}
/**
* Sets a time label.
*
* @param activity the activity
* @param id the time label resource id
* @param totalTimeId the total time string id
* @param movingTimeId the moving time string id
* @param totalTime true to use total time
*/
private static void setTimeLabel(Activity activity, int id, int totalTimeId, int movingTimeId,
boolean totalTime) {
TextView textView = (TextView) activity.findViewById(id);
if (textView == null) {
return;
private static void setItemVisibility(
Activity activity, int labelId, int spacerId, int valueId, boolean show) {
View label = activity.findViewById(labelId);
View spacer = activity.findViewById(spacerId);
View value = activity.findViewById(valueId);
if (label != null) {
label.setVisibility(show ? View.VISIBLE : View.GONE);
}
if (spacer != null) {
spacer.setVisibility(show ? View.VISIBLE : View.GONE);
}
if (value != null) {
value.setVisibility(show ? View.VISIBLE : View.GONE);
}
textView.setText(totalTime ? totalTimeId : movingTimeId);
}
/**
MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
+63 -40
View File
@@ -79,12 +79,12 @@ public class TrackWidgetProvider extends AppWidgetProvider
private String unknown;
private String trackStartedBroadcastAction;
private String trackStoppedBroadcastAction;
private SharedPreferences sharedPreferences;
private long selectedTrackId;
private boolean metricUnits;
private boolean reportSpeed;
private boolean useTotalTime;
private boolean showMovingTime;
public TrackWidgetProvider() {
super();
@@ -93,21 +93,21 @@ public class TrackWidgetProvider extends AppWidgetProvider
@Override
public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
if (key == null || PreferencesUtils.getKey(context, R.string.metric_units_key).equals(key)) {
if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.metric_units_key))) {
metricUnits = PreferencesUtils.getBoolean(
context, R.string.metric_units_key, PreferencesUtils.METRIC_UNITS_DEFAULT);
}
if (key == null || PreferencesUtils.getKey(context, R.string.report_speed_key).equals(key)) {
if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.report_speed_key))) {
reportSpeed = PreferencesUtils.getBoolean(
context, R.string.report_speed_key, PreferencesUtils.REPORT_SPEED_DEFAULT);
}
if (key == null
|| PreferencesUtils.getKey(context, R.string.stats_use_total_time_key).equals(key)) {
useTotalTime = PreferencesUtils.getBoolean(context, R.string.stats_use_total_time_key,
PreferencesUtils.STATS_USE_TOTAL_TIME_DEFAULT);
|| key.equals(PreferencesUtils.getKey(context, R.string.stats_show_moving_time_key))) {
showMovingTime = PreferencesUtils.getBoolean(context, R.string.stats_show_moving_time_key,
PreferencesUtils.STATS_SHOW_MOVING_TIME_DEFAULT);
}
if (key == null
|| PreferencesUtils.getKey(context, R.string.selected_track_id_key).equals(key)) {
|| key.equals(PreferencesUtils.getKey(context, R.string.selected_track_id_key))) {
selectedTrackId = PreferencesUtils.getLong(context, R.string.selected_track_id_key);
}
if (key != null) {
@@ -155,15 +155,15 @@ public class TrackWidgetProvider extends AppWidgetProvider
context = aContext;
trackObserver = new TrackObserver();
myTracksProviderUtils = MyTracksProviderUtils.Factory.get(context);
unknown = context.getString(R.string.value_unknown);
trackStartedBroadcastAction = context.getString(R.string.track_started_broadcast_action);
trackStoppedBroadcastAction = context.getString(R.string.track_stopped_broadcast_action);
sharedPreferences = context.getSharedPreferences(SETTINGS_NAME, Context.MODE_PRIVATE);
sharedPreferences.registerOnSharedPreferenceChangeListener(this);
onSharedPreferenceChanged(sharedPreferences, null);
context.getContentResolver()
.registerContentObserver(TracksColumns.CONTENT_URI, true, trackObserver);
}
@@ -197,16 +197,17 @@ public class TrackWidgetProvider extends AppWidgetProvider
*/
private void updateButton(RemoteViews remoteViews, String action) {
boolean isRecording = trackStartedBroadcastAction.equals(action);
remoteViews.setViewVisibility(R.id.track_widget_record_button, isRecording ? View.GONE
: View.VISIBLE);
remoteViews.setViewVisibility(R.id.track_widget_stop_button, isRecording ? View.VISIBLE
: View.INVISIBLE);
remoteViews.setViewVisibility(
R.id.track_widget_record_button, isRecording ? View.GONE : View.VISIBLE);
remoteViews.setViewVisibility(
R.id.track_widget_stop_button, isRecording ? View.VISIBLE : View.INVISIBLE);
Intent intent = new Intent(context, ControlRecordingService.class).setAction(
context.getString(isRecording ? R.string.track_action_end : R.string.track_action_start));
PendingIntent pendingIntent = PendingIntent.getService(
context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
remoteViews.setOnClickPendingIntent(isRecording ? R.id.track_widget_stop_button
: R.id.track_widget_record_button, pendingIntent);
remoteViews.setOnClickPendingIntent(
isRecording ? R.id.track_widget_stop_button : R.id.track_widget_record_button,
pendingIntent);
}
/**
@@ -215,31 +216,48 @@ public class TrackWidgetProvider extends AppWidgetProvider
* @param remoteViews the remote views
*/
private void updateView(RemoteViews remoteViews) {
Track track = selectedTrackId != PreferencesUtils.SELECTED_TRACK_ID_DEFAULT
? myTracksProviderUtils.getTrack(selectedTrackId) : myTracksProviderUtils.getLastTrack();
Track track = selectedTrackId != PreferencesUtils.SELECTED_TRACK_ID_DEFAULT ? myTracksProviderUtils
.getTrack(selectedTrackId)
: myTracksProviderUtils.getLastTrack();
TripStatistics tripStatistics = track == null ? null : track.getTripStatistics();
String distance = tripStatistics == null ? unknown
String distanceValue = tripStatistics == null ? unknown
: StringUtils.formatDistance(context, tripStatistics.getTotalDistance(), metricUnits);
int timeLabelId = useTotalTime ? R.string.stats_total_time : R.string.stats_moving_time;
String time = tripStatistics == null ? unknown : StringUtils.formatElapsedTime(
useTotalTime ? tripStatistics.getTotalTime()
: tripStatistics.getMovingTime());
int speedLabelId;
if (useTotalTime) {
speedLabelId = reportSpeed ? R.string.stats_average_speed : R.string.stats_average_pace;
} else {
speedLabelId = reportSpeed ? R.string.stats_average_moving_speed
: R.string.stats_average_moving_pace;
remoteViews.setTextViewText(R.id.track_widget_distance_value, distanceValue);
String totalTimeValue = tripStatistics == null ? unknown
: StringUtils.formatElapsedTime(tripStatistics.getTotalTime());
remoteViews.setTextViewText(R.id.track_widget_total_time_value, totalTimeValue);
String averageSpeedLabel = context.getString(
reportSpeed ? R.string.stats_average_speed : R.string.stats_average_pace);
remoteViews.setTextViewText(R.id.track_widget_average_speed_label, averageSpeedLabel);
String averageSpeedValue = tripStatistics == null ? unknown
: StringUtils.formatSpeed(
context, tripStatistics.getAverageSpeed(), metricUnits, reportSpeed);
remoteViews.setTextViewText(R.id.track_widget_average_speed_value, averageSpeedValue);
setStatVisibility(remoteViews, R.id.track_widget_moving_time_stat,
R.id.track_widget_moving_time_separator, showMovingTime);
if (showMovingTime) {
String movingTimeValue = tripStatistics == null ? unknown
: StringUtils.formatElapsedTime(tripStatistics.getMovingTime());
remoteViews.setTextViewText(R.id.track_widget_moving_time_value, movingTimeValue);
}
String speed = tripStatistics == null ? unknown : StringUtils.formatSpeed(
context, useTotalTime ? tripStatistics.getAverageSpeed()
: tripStatistics.getAverageMovingSpeed(), metricUnits, reportSpeed);
remoteViews.setTextViewText(R.id.track_widget_distance_value, distance);
remoteViews.setTextViewText(R.id.track_widget_time_label, context.getString(timeLabelId));
remoteViews.setTextViewText(R.id.track_widget_time_value, time);
remoteViews.setTextViewText(R.id.track_widget_speed_label, context.getString(speedLabelId));
remoteViews.setTextViewText(R.id.track_widget_speed_value, speed);
setStatVisibility(remoteViews, R.id.track_widget_average_moving_speed_stat,
R.id.track_widget_average_moving_speed_separator, showMovingTime);
if (showMovingTime) {
String averageMovingSpeedLabel = context.getString(
reportSpeed ? R.string.stats_average_moving_speed : R.string.stats_average_moving_pace);
remoteViews.setTextViewText(
R.id.track_widget_average_moving_speed_label, averageMovingSpeedLabel);
String averageMovingSpeedValue = tripStatistics == null ? unknown
: StringUtils.formatSpeed(
context, tripStatistics.getAverageMovingSpeed(), metricUnits, reportSpeed);
remoteViews.setTextViewText(
R.id.track_widget_average_moving_speed_value, averageMovingSpeedValue);
}
Intent intent;
if (track != null) {
@@ -251,8 +269,13 @@ public class TrackWidgetProvider extends AppWidgetProvider
TaskStackBuilder taskStackBuilder = TaskStackBuilder.from(context);
taskStackBuilder.addNextIntent(intent);
PendingIntent pendingIntent = taskStackBuilder.getPendingIntent(0, 0);
remoteViews.setOnClickPendingIntent(
R.id.track_widget_statistics, pendingIntent);
remoteViews.setOnClickPendingIntent(R.id.track_widget_statistics, pendingIntent);
remoteViews.setOnClickPendingIntent(R.id.track_widget_icon, pendingIntent);
}
private void setStatVisibility(
RemoteViews remoteViews, int statId, int separatorId, boolean show) {
remoteViews.setViewVisibility(statId, show ? View.VISIBLE : View.GONE);
remoteViews.setViewVisibility(separatorId, show ? View.VISIBLE : View.GONE);
}
}