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

Review issues corrected

Browse Source
This commit is contained in:
ase69s
2011-09-13 20:26:28 +02:00
parent 057c2d69a9
commit 3c4c215931
8 changed files with 134 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
+58 -47
View File
@@ -189,49 +189,7 @@ public class SettingsActivity extends PreferenceActivity {
});
updateTrackColorModeSettings(trackColorModePreference.getValue());
EditTextPreference trackColorModeFixedSlowPreference =
(EditTextPreference) findPreference(getString(R.string.track_color_mode_fixed_speed_slow_display_key));
trackColorModeFixedSlowPreference.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;
}
});
trackColorModeFixedSlowPreference.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);
return true;
}
});
setTrackColorModePreferenceListeners();
PreferenceCategory speedOptionsCategory =
(PreferenceCategory) findPreference(getString(R.string.track_color_mode_fixed_speed_options_key));
@@ -461,8 +419,10 @@ public class SettingsActivity extends PreferenceActivity {
}.start();
}
/** Set the given edit text preference text.
If the units are not metric convert the value before displaying. */
/**
* Set the given edit text preference text.
* If the units are not metric convert the value before displaying.
*/
private void viewTrackColorModeSettings(EditTextPreference preference, int id) {
CheckBoxPreference metricUnitsPreference = (CheckBoxPreference) findPreference(
getString(R.string.metric_units_key));
@@ -481,8 +441,10 @@ public class SettingsActivity extends PreferenceActivity {
preference.getEditText().setText(String.valueOf(englishspeed));
}
/** Saves the given edit text preference value.
If the units are not metric convert the value before saving. */
/**
* Saves the given edit text preference value.
* If the units are not metric convert the value before saving.
*/
private void validateTrackColorModeSettings(EditTextPreference preference,
String newValue, int id) {
CheckBoxPreference metricUnitsPreference = (CheckBoxPreference) findPreference(
@@ -501,4 +463,53 @@ public class SettingsActivity extends PreferenceActivity {
SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
prefs.edit().putString(getString(id), metricspeed).commit();
}
/**
* 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(
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;
}
});
trackColorModeFixedSlowPreference.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);
return true;
}
});
}
}
MyTracks/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptor.java
+1 -1
View File
@@ -99,7 +99,7 @@ public class DynamicSpeedTrackPathDescriptor
SharedPreferences prefs = context.getSharedPreferences(Constants.SETTINGS_NAME, 0);
long currentTrackId = prefs.getLong(context.getString(R.string.selected_track_key), -1);
if(currentTrackId == -1) {
// in reality this means something went awry, additional logic to exit or so?
// Could not find track.
return false;
}
Track track = MyTracksProviderUtils.Factory.get(context).getTrack(currentTrackId);
MyTracks/src/com/google/android/apps/mytracks/maps/FixedSpeedTrackPathDescriptor.java
+1 -1
View File
@@ -84,7 +84,7 @@ public class FixedSpeedTrackPathDescriptor implements TrackPathDescriptor, OnSha
Log.d(Constants.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)))) {
&& !key.equals(context.getString(R.string.track_color_mode_fixed_speed_medium_key)))) {
return;
}
SharedPreferences prefs = context.getSharedPreferences(Constants.SETTINGS_NAME, 0);
MyTracks/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactory.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class TrackPathPainterFactory {
return new DynamicSpeedTrackPathPainter(context,
new DynamicSpeedTrackPathDescriptor(context));
} else {
Log.i(Constants.TAG, "Unknow colorMode: " + colorMode);
Log.w(Constants.TAG, "Using default track path painter. Unrecognized painter: " + colorMode);
return new SingleColorTrackPathPainter(context);
}
}
MyTracks/src/com/google/android/apps/mytracks/maps/TrackPathUtilities.java
+1
View File
@@ -24,6 +24,7 @@ import android.graphics.Paint;
* @author Vangelis S.
*/
public class TrackPathUtilities {
public static Paint getPaint(int id, Context context) {
Paint paint = new Paint();
paint.setColor(context.getResources().getColor(id));