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

Tidy up to adhere to style guidlines

Browse Source
This commit is contained in:
FNelson
2010-08-05 12:51:46 +01:00
parent b464526d5e
commit 0347877290
5 changed files with 98 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/AndroidManifest.xml
+5 -5
View File
@@ -56,17 +56,17 @@
<activity android:name="com.google.android.apps.mytracks.MyTracksSettings"
android:label="@string/mytracks_settings" />
<activity android:name="com.google.android.apps.mytracks.AggregatedStatsActivity"
android:label="@string/aggregated_stats" />
<activity android:name="com.google.android.apps.mytracks.AggregatedStatsActivity"
android:label="@string/aggregated_stats" />
<activity android:name="com.google.android.apps.mytracks.StatsActivity"
android:label="@string/statistics" />
<activity android:name="com.google.android.apps.mytracks.StatsActivity"
android:label="@string/statistics" />
<activity android:name="com.google.android.apps.mytracks.ChartActivity"
android:label="@string/elevation_label"/>
<activity android:name="com.google.android.apps.mytracks.WelcomeActivity"
android:label="@string/welcome"/>
android:label="@string/welcome"/>
<service android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
android:process=":trackrecord"
MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java
+68 -69
View File
@@ -1,6 +1,9 @@
package com.google.android.apps.mytracks;
import java.util.List;
import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
import com.google.android.apps.mytracks.content.Track;
import com.google.android.apps.mytracks.stats.TripStatistics;
import com.google.android.maps.mytracks.R;
import android.app.Activity;
import android.content.SharedPreferences;
@@ -12,10 +15,7 @@ import android.view.Window;
import android.widget.ScrollView;
import android.widget.TextView;
import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
import com.google.android.apps.mytracks.content.Track;
import com.google.android.apps.mytracks.stats.TripStatistics;
import com.google.android.maps.mytracks.R;
import java.util.List;
/**
* Activity for viewing the combined statistics for all the recorded tracks.
@@ -24,38 +24,39 @@ import com.google.android.maps.mytracks.R;
*
* @author Fergus Nelson
*/
public class AggregatedStatsActivity extends Activity
implements OnSharedPreferenceChangeListener {
public class AggregatedStatsActivity extends Activity implements
OnSharedPreferenceChangeListener {
private final StatsUtilities utils;
private MyTracksProviderUtils tracksProvider;
private boolean metricUnits = true;
public AggregatedStatsActivity() {
this.utils = new StatsUtilities(this);
this.tracksProvider = MyTracksProviderUtils.Factory.get(this);
}
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
Log.d(MyTracksConstants.TAG, "StatsActivity: onSharedPreferences changed "
+ key);
if (key != null) {
if (key.equals(MyTracksSettings.METRIC_UNITS)) {
metricUnits = sharedPreferences.getBoolean(
MyTracksSettings.METRIC_UNITS, true);
utils.setMetricUnits(metricUnits);
utils.updateUnits();
loadAggregatedStats();
}
}
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
private final StatsUtilities utils;
private MyTracksProviderUtils tracksProvider;
private boolean metricUnits = true;
public AggregatedStatsActivity() {
this.utils = new StatsUtilities(this);
this.tracksProvider = MyTracksProviderUtils.Factory.get(this);
}
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
String key) {
Log.d(MyTracksConstants.TAG, "StatsActivity: onSharedPreferences changed "
+ key);
if (key != null) {
if (key.equals(MyTracksSettings.METRIC_UNITS)) {
metricUnits = sharedPreferences.getBoolean(
MyTracksSettings.METRIC_UNITS, true);
utils.setMetricUnits(metricUnits);
utils.updateUnits();
loadAggregatedStats();
}
}
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// We don't need a window title bar:
requestWindowFeature(Window.FEATURE_NO_TITLE);
@@ -64,11 +65,10 @@ public class AggregatedStatsActivity extends Activity
ScrollView sv = ((ScrollView) findViewById(R.id.scrolly));
sv.setScrollBarStyle(ScrollView.SCROLLBARS_OUTSIDE_INSET);
SharedPreferences preferences =
getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0);
SharedPreferences preferences = getSharedPreferences(
MyTracksSettings.SETTINGS_NAME, 0);
if (preferences != null) {
metricUnits = preferences.getBoolean(MyTracksSettings.METRIC_UNITS,
true);
metricUnits = preferences.getBoolean(MyTracksSettings.METRIC_UNITS, true);
preferences.registerOnSharedPreferenceChangeListener(this);
}
utils.setMetricUnits(metricUnits);
@@ -82,33 +82,32 @@ public class AggregatedStatsActivity extends Activity
((TextView) findViewById(R.id.speed_register)).setTextSize(80.0f);
}
loadAggregatedStats();
}
/**
* 1. Reads tracks from the db
* 2. Merges the trip stats from the tracks
* 3. Updates the view
*/
private void loadAggregatedStats() {
List<Track> tracks = retrieveTracks();
TripStatistics rollingStats = null;
if (!tracks.isEmpty()) {
rollingStats = new TripStatistics(tracks.iterator().next()
.getStatistics());
for (int i = 1; i < tracks.size(); i++) {
rollingStats.merge(tracks.get(i).getStatistics());
}
}
updateView(rollingStats);
}
private List<Track> retrieveTracks() {
return tracksProvider.retrieveAllTracks();
}
private void updateView(TripStatistics aggStats) {
if (aggStats != null) {
utils.setAllStats(aggStats);
}
}
}
/**
* 1. Reads tracks from the db 2. Merges the trip stats from the tracks 3.
* Updates the view
*/
private void loadAggregatedStats() {
List<Track> tracks = retrieveTracks();
TripStatistics rollingStats = null;
if (!tracks.isEmpty()) {
rollingStats = new TripStatistics(tracks.iterator().next()
.getStatistics());
for (int i = 1; i < tracks.size(); i++) {
rollingStats.merge(tracks.get(i).getStatistics());
}
}
updateView(rollingStats);
}
private List<Track> retrieveTracks() {
return tracksProvider.retrieveAllTracks();
}
private void updateView(TripStatistics aggStats) {
if (aggStats != null) {
utils.setAllStats(aggStats);
}
}
}
MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
+4 -4
View File
@@ -70,8 +70,6 @@ import android.widget.RelativeLayout;
import android.widget.TabHost;
import android.widget.Toast;
import org.xml.sax.SAXException;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -80,6 +78,8 @@ import java.util.Random;
import javax.xml.parsers.ParserConfigurationException;
import org.xml.sax.SAXException;
/**
* The super activity that embeds our sub activities.
*
@@ -434,7 +434,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
help = menu.add(0, MyTracksConstants.MENU_HELP, 10002, R.string.help);
help.setIcon(android.R.drawable.ic_menu_info_details);
aggregatedStats = menu.add(0, MyTracksConstants.MENU_AGGREGATED_STATS,
10003, R.string.aggregated_stats);
10003, R.string.aggregated_stats);
return true;
}
@@ -492,7 +492,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
return true;
}
case MyTracksConstants.MENU_AGGREGATED_STATS: {
Intent startIntent = new Intent(this, AggregatedStatsActivity.class);
Intent startIntent = new Intent(this, AggregatedStatsActivity.class);
startActivity(startIntent);
return true;
}
MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java
+10 -10
View File
@@ -15,13 +15,13 @@
*/
package com.google.android.apps.mytracks.content;
import java.util.List;
import android.content.Context;
import android.database.Cursor;
import android.location.Location;
import android.net.Uri;
import java.util.List;
/**
* Utility to access data from the mytracks content provider.
*
@@ -186,14 +186,14 @@ public interface MyTracksProviderUtils {
*/
Track getTrack(long id);
/**
* Retrieves all tracks without track points. If no tracks exist an empty
* list will be returned. Use {@link #getTrackPoints(Track, int)} to load
* the track points.
*
* @return a list of all the recorded tracks
*/
List<Track> retrieveAllTracks();
/**
* Retrieves all tracks without track points. If no tracks exist an empty
* list will be returned. Use {@link #getTrackPoints(Track, int)} to load
* the track points.
*
* @return a list of all the recorded tracks
*/
List<Track> retrieveAllTracks();
/**
* Loads the track points for a given track.
MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java
+11 -11
View File
@@ -15,8 +15,7 @@
*/
package com.google.android.apps.mytracks.content;
import java.util.LinkedList;
import java.util.List;
import com.google.android.apps.mytracks.stats.TripStatistics;
import android.content.ContentValues;
import android.content.Context;
@@ -25,7 +24,8 @@ import android.location.Location;
import android.net.Uri;
import android.util.Log;
import com.google.android.apps.mytracks.stats.TripStatistics;
import java.util.LinkedList;
import java.util.List;
/**
* Helper class providing easy access to locations and tracks in the
@@ -808,14 +808,14 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
@Override
public List<Track> retrieveAllTracks() {
List<Track> tracks = new LinkedList<Track>();
Cursor cursor = getTracksCursor(null);
if (cursor != null && cursor.moveToFirst()) {
do {
tracks.add(createTrack(cursor));
} while(cursor.moveToNext());
}
return tracks;
List<Track> tracks = new LinkedList<Track>();
Cursor cursor = getTracksCursor(null);
if (cursor != null && cursor.moveToFirst()) {
do {
tracks.add(createTrack(cursor));
} while(cursor.moveToNext());
}
return tracks;
}
@Override