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

Review issues corrected, added test case for remaining class TrackPathPainterFactory

Browse Source
This commit is contained in:
ase69s
2011-09-19 20:25:41 +02:00
parent 3c4c215931
commit 53ee9d31bc
10 changed files with 283 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/MapOverlay.java
+1 -1
View File
@@ -462,7 +462,7 @@ public class MapOverlay extends Overlay implements OnSharedPreferenceChangeListe
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
Log.d(Constants.TAG, "MapOverlay: onSharedPreferences changed " + key);
Log.d(TAG, "MapOverlay: onSharedPreferences changed " + key);
if (key != null) {
if (key.equals(context.getString(R.string.track_color_mode_key))) {
trackPathPainter = TrackPathPainterFactory.getTrackPathPainter(context);
MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
+16 -30
View File
@@ -468,46 +468,32 @@ public class SettingsActivity extends PreferenceActivity {
* Sets the TrackColorMode preference listeners.
*/
private void setTrackColorModePreferenceListeners() {
EditTextPreference trackColorModeFixedSlowPreference =
(EditTextPreference) findPreference(getString(R.string.track_color_mode_fixed_speed_slow_display_key));
trackColorModeFixedSlowPreference.setOnPreferenceChangeListener(
setTrackColorModePreferenceListener(R.string.track_color_mode_fixed_speed_slow_display_key,
R.string.track_color_mode_fixed_speed_slow_key);
setTrackColorModePreferenceListener(R.string.track_color_mode_fixed_speed_medium_display_key,
R.string.track_color_mode_fixed_speed_medium_key);
}
/**
* Sets a TrackColorMode preference listener.
*/
private void setTrackColorModePreferenceListener(int displayKey, final int metricKey) {
EditTextPreference trackColorModePreference =
(EditTextPreference) findPreference(getString(displayKey));
trackColorModePreference.setOnPreferenceChangeListener(
new OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference,
Object newValue) {
validateTrackColorModeSettings((EditTextPreference) preference, (String) newValue,
R.string.track_color_mode_fixed_speed_slow_key);
validateTrackColorModeSettings((EditTextPreference) preference, (String) newValue, metricKey);
return true;
}
});
trackColorModeFixedSlowPreference.setOnPreferenceClickListener(
trackColorModePreference.setOnPreferenceClickListener(
new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
viewTrackColorModeSettings((EditTextPreference) preference,
R.string.track_color_mode_fixed_speed_slow_key);
return true;
}
});
EditTextPreference trackColorModeFixedMediumPreference =
(EditTextPreference) findPreference(getString(R.string.track_color_mode_fixed_speed_medium_display_key));
trackColorModeFixedMediumPreference.setOnPreferenceChangeListener(
new OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference,
Object newValue) {
validateTrackColorModeSettings((EditTextPreference) preference, (String) newValue,
R.string.track_color_mode_fixed_speed_slow_key);
return true;
}
});
trackColorModeFixedMediumPreference.setOnPreferenceClickListener(
new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
viewTrackColorModeSettings((EditTextPreference) preference,
R.string.track_color_mode_fixed_speed_medium_key);
viewTrackColorModeSettings((EditTextPreference) preference, metricKey);
return true;
}
});
MyTracks/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptor.java
+3 -1
View File
@@ -15,6 +15,8 @@
*/
package com.google.android.apps.mytracks.maps;
import static com.google.android.apps.mytracks.Constants.TAG;
import com.google.android.apps.mytracks.Constants;
import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
import com.google.android.apps.mytracks.content.Track;
@@ -76,7 +78,7 @@ public class DynamicSpeedTrackPathDescriptor
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
Log.d(Constants.TAG, "DynamicSpeedTrackPathDescriptor: onSharedPreferences changed " + key);
Log.d(TAG, "DynamicSpeedTrackPathDescriptor: onSharedPreferences changed " + key);
if (key == null
|| !key.equals(context.getString(R.string.track_color_mode_dynamic_speed_variation_key))) {
return;
MyTracks/src/com/google/android/apps/mytracks/maps/FixedSpeedTrackPathDescriptor.java
+7 -7
View File
@@ -15,6 +15,8 @@
*/
package com.google.android.apps.mytracks.maps;
import static com.google.android.apps.mytracks.Constants.TAG;
import com.google.android.apps.mytracks.Constants;
import com.google.android.maps.mytracks.R;
@@ -34,7 +36,7 @@ public class FixedSpeedTrackPathDescriptor implements TrackPathDescriptor, OnSha
private int normalSpeed;
private final Context context;
public FixedSpeedTrackPathDescriptor(Context context){
public FixedSpeedTrackPathDescriptor(Context context) {
this.context = context;
context.getSharedPreferences(Constants.SETTINGS_NAME, 0)
@@ -65,8 +67,7 @@ public class FixedSpeedTrackPathDescriptor implements TrackPathDescriptor, OnSha
* Gets the slow speed for reference.
* @return The speed limit considered as slow.
*/
public int getSlowSpeed()
{
public int getSlowSpeed() {
return slowSpeed;
}
@@ -74,14 +75,13 @@ public class FixedSpeedTrackPathDescriptor implements TrackPathDescriptor, OnSha
* Gets the normal speed for reference.
* @return The speed limit considered as normal.
*/
public int getNormalSpeed()
{
public int getNormalSpeed() {
return normalSpeed;
}
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
Log.d(Constants.TAG, "FixedSpeedTrackPathDescriptor: onSharedPreferences changed " + key);
Log.d(TAG, "FixedSpeedTrackPathDescriptor: onSharedPreferences changed " + key);
if (key == null
|| (!key.equals(context.getString(R.string.track_color_mode_fixed_speed_slow_key))
&& !key.equals(context.getString(R.string.track_color_mode_fixed_speed_medium_key)))) {
@@ -104,7 +104,7 @@ public class FixedSpeedTrackPathDescriptor implements TrackPathDescriptor, OnSha
normalSpeed = Integer.parseInt(prefs.getString(context.getString(
R.string.track_color_mode_fixed_speed_medium_key), "17"));
} catch (NumberFormatException e) {
normalSpeed = 17;
normalSpeed = 17;
}
}
MyTracks/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactory.java
+4 -2
View File
@@ -15,6 +15,8 @@
*/
package com.google.android.apps.mytracks.maps;
import static com.google.android.apps.mytracks.Constants.TAG;
import com.google.android.apps.mytracks.Constants;
import com.google.android.maps.mytracks.R;
@@ -45,7 +47,7 @@ public class TrackPathPainterFactory {
}
String colorMode = prefs.getString(context.getString(R.string.track_color_mode_key), null);
Log.i(Constants.TAG, "Creating track path painter of type: " + colorMode);
Log.i(TAG, "Creating track path painter of type: " + colorMode);
if (colorMode == null || colorMode.equals(context.getString(R.string.track_color_mode_none))) {
return new SingleColorTrackPathPainter(context);
@@ -56,7 +58,7 @@ public class TrackPathPainterFactory {
return new DynamicSpeedTrackPathPainter(context,
new DynamicSpeedTrackPathDescriptor(context));
} else {
Log.w(Constants.TAG, "Using default track path painter. Unrecognized painter: " + colorMode);
Log.w(TAG, "Using default track path painter. Unrecognized painter: " + colorMode);
return new SingleColorTrackPathPainter(context);
}
}