Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Refactored creation of speed limits setting

Browse source
This commit is contained in:
Denis 2014-10-10 15:23:55 +03:00
parent c7d6543197
commit a2f0e41731
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
View file

@ -112,23 +112,21 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
};
registerListPreference(settings.ARRIVAL_DISTANCE_FACTOR, screen, arrivalNames, arrivalValues);
Float[] speedLimits = new Float[]{5f, 7f, 10f, 15f, 20f};
//array size should be equal!
Float[] speedLimitsKm = new Float[]{5f, 7f, 10f, 15f, 20f};
Float[] speedLimitsMiles = new Float[]{3f, 5f, 7f, 10f, 15f};
if (settings.METRIC_SYSTEM.get() == OsmandSettings.MetricsConstants.KILOMETERS_AND_METERS) {
String[] speedNames = new String[]{
speedLimits[0] + " " + getString(R.string.km_h),
speedLimits[1] + " " + getString(R.string.km_h),
speedLimits[2] + " " + getString(R.string.km_h),
speedLimits[3] + " " + getString(R.string.km_h),
speedLimits[4] + " " + getString(R.string.km_h)};
registerListPreference(settings.SPEED_LIMIT_EXCEED, screen, speedNames, speedLimits);
String[] speedNames = new String[speedLimitsKm.length];
for (int i =0; i<speedLimitsKm.length;i++){
speedNames[i] = speedLimitsKm[i] + " " + getString(R.string.km_h);
}
registerListPreference(settings.SPEED_LIMIT_EXCEED, screen, speedNames, speedLimitsKm);
} else {
String[] speedNames = new String[]{
3f + " " + getString(R.string.mile_per_hour),
5f + " " + getString(R.string.mile_per_hour),
7f + " " + getString(R.string.mile_per_hour),
10f + " " + getString(R.string.mile_per_hour),
15f + " " + getString(R.string.mile_per_hour)};
registerListPreference(settings.SPEED_LIMIT_EXCEED, screen, speedNames, speedLimits);
String[] speedNames = new String[speedLimitsKm.length];
for (int i =0; i<speedNames.length;i++){
speedNames[i] = speedLimitsMiles[i] + " " + getString(R.string.mile_per_hour);
}
registerListPreference(settings.SPEED_LIMIT_EXCEED, screen, speedNames, speedLimitsKm);
}
PreferenceCategory category = (PreferenceCategory) screen.findPreference("guidance_preferences");