nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow user to display imperial units

Browse Source
This commit is contained in:
Chet Henry
2014-11-30 21:55:08 -07:00
parent 842f334ff6
commit f00c2deb1f
3 changed files with 95 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/RideLogger/res/values/strings.xml
View File

@@ -75,6 +75,9 @@
<string name="setting_sensors_title">Display Sensors</string>
<string name="setting_sensors_note">List of Sensors Display</string>
<string name="imperial_units_title">Imperial Units</string>
<string name="imperial_units_note">Show Measurements in Imperial Units</string>
<string name="setting_size_title">Display Text Size</string>
<string name="PREFS_NAME">RideLogger</string>
@@ -86,5 +89,6 @@
<string name="PREF_PHONE_HOME_PERIOD">PhoneHomePeriod</string>
<string name="PREF_TRACKING_SENSORS">TrackingSensors</string>
<string name="PREF_TRACKING_SIZE">TrackingSize</string>
<string name="PREF_TRACKING_IMPERIAL_UNITS">TrackingImperialUnits</string>
</resources>

6
contrib/RideLogger/res/xml/sensors_settings.xml
View File

@@ -8,6 +8,12 @@
android:title="@string/setting_sensors_title"
android:summary="@string/setting_sensors_note"
/>
<CheckBoxPreference
android:key="@string/PREF_TRACKING_IMPERIAL_UNITS"
android:title="@string/imperial_units_title"
android:summary="@string/imperial_units_note"
/>
<EditTextPreference
android:key="@string/PREF_TRACKING_SIZE"
android:title="@string/setting_size_title"

93
contrib/RideLogger/src/com/ridelogger/CurrentValuesAdapter.java
View File

@@ -13,13 +13,15 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
public class CurrentValuesAdapter extends BaseAdapter {
public StartActivity context;
public int count = 0;
public int[] keys;
public TextView[] keyTvs = new TextView[RideService.TOTALSENSORS];
public TextView[] valuesTvs = new TextView[RideService.TOTALSENSORS];
public StartActivity context;
public int[] keys;
public TextView[] keyTvs = new TextView[RideService.TOTALSENSORS];
public TextView[] valuesTvs = new TextView[RideService.TOTALSENSORS];
public RelativeLayout[] lls = new RelativeLayout[RideService.TOTALSENSORS];
public int size = 20;
public int size = 20;
public boolean imperial = false;
public int count = 0;
public static SharedPreferences.OnSharedPreferenceChangeListener spChanged;
public CurrentValuesAdapter(StartActivity c) {
@@ -27,6 +29,8 @@ public class CurrentValuesAdapter extends BaseAdapter {
SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(context);
Set<String> sensors = settings.getStringSet(context.getString(R.string.PREF_TRACKING_SENSORS), null);
size = Integer.valueOf(settings.getString(context.getString(R.string.PREF_TRACKING_SIZE), "20"));
imperial = settings.getBoolean(context.getString(R.string.PREF_TRACKING_IMPERIAL_UNITS), false);
if(sensors != null && sensors.size() > 0) {
keys = new int[sensors.size()];
@@ -55,6 +59,7 @@ public class CurrentValuesAdapter extends BaseAdapter {
valuesTvs[key].setTextSize(TypedValue.COMPLEX_UNIT_SP, size);
keyTvs[key].setTextSize(TypedValue.COMPLEX_UNIT_SP, (int) (size * 0.75));
}
notifyDataSetChanged();
} else if (pkey == context.getString(R.string.PREF_TRACKING_SENSORS)) {
Set<String> sensors = sharedPreferences.getStringSet(context.getString(R.string.PREF_TRACKING_SENSORS), null);
keys = new int[sensors.size()];
@@ -66,6 +71,36 @@ public class CurrentValuesAdapter extends BaseAdapter {
}
context.layout.setAdapter(CurrentValuesAdapter.this);
} else if (pkey == context.getString(R.string.PREF_TRACKING_IMPERIAL_UNITS)) {
imperial = sharedPreferences.getBoolean(pkey, false);
if(!imperial) {
for(int key : keys) {
keyTvs[key].setText(RideService.KEYS[key].toString().toLowerCase());
}
} else {
for(int key : keys) {
switch (key) {
case RideService.ALTITUDE:
keyTvs[key].setText("ft");
break;
case RideService.KPH:
keyTvs[key].setText("mph");
break;
case RideService.KM:
keyTvs[key].setText("m");
break;
default:
keyTvs[key].setText(RideService.KEYS[key].toString().toLowerCase());
break;
}
}
}
notifyDataSetChanged();
}
}
}
@@ -112,7 +147,29 @@ public class CurrentValuesAdapter extends BaseAdapter {
keyTvs[key] = new TextView(context);
keyTvs[key].setTextSize(TypedValue.COMPLEX_UNIT_SP, (int) (size * 0.55));
keyTvs[key].setText(RideService.KEYS[key].toString().toLowerCase());
if(!imperial) {
keyTvs[key].setText(RideService.KEYS[key].toString().toLowerCase());
} else {
switch (key) {
case RideService.ALTITUDE:
keyTvs[key].setText("ft");
break;
case RideService.KPH:
keyTvs[key].setText("mph");
break;
case RideService.KM:
keyTvs[key].setText("miles");
break;
default:
keyTvs[key].setText(RideService.KEYS[key].toString().toLowerCase());
break;
}
}
}
@@ -146,7 +203,27 @@ public class CurrentValuesAdapter extends BaseAdapter {
public void update(float[] values) {
for (int key: keys) {
valuesTvs[key].setText(String.format("%.2f", values[key]));
if(!imperial) {
valuesTvs[key].setText(String.format("%.2f", values[key]));
} else {
switch (key) {
case RideService.ALTITUDE:
valuesTvs[key].setText(String.format("%.2f", values[key] * 3.28084));
break;
case RideService.KPH:
valuesTvs[key].setText(String.format("%.2f", values[key] * 0.621371));
break;
case RideService.KM:
valuesTvs[key].setText(String.format("%.2f", values[key] * 0.621371));
break;
default:
valuesTvs[key].setText(String.format("%.2f", values[key]));
break;
}
}
}
notifyDataSetChanged();