hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add preference selection for Distance and Velocity.

Browse Source
This commit is contained in:
Kevin Ruland 2012-01-14 02:42:21 +00:00
parent 966ab18b07
commit 6e849bcf30
3 changed files with 87 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
android/res/values/strings.xml
View File

@ -93,36 +93,73 @@
</string-array>
<string name="TCMotorSearchFormSubmit">Submit</string>
<string name="tcdownload">Download from ThrustCurve</string>
<string name="simulationSeries1Label">Series 1</string>
<string name="simulationSeries2Label">Series 2</string>
<string name="PreferenceUnitLengthOption">PreferenceUnitLengthOption</string>
<string name="tcdownload">Download from ThrustCurve</string>
<string name="simulationSeries1Label">Series 1</string>
<string name="simulationSeries2Label">Series 2</string>
<string name="PreferenceUnitLengthOption">PreferenceUnitLengthOption</string>
<string-array name="PreferenceUnitLengthEntries">
<item >Millimeters</item>
<item >Centimeters</item>
<item >Meters</item>
<item >Inches</item>
<item >Feet</item>
</string-array>
<string-array name="PreferenceUnitLengthValues">
<item >mm</item>
<item >cm</item>
<item >m</item>
<item >in</item>
<item >ft</item>
<item>Millimeters</item>
<item>Centimeters</item>
<item>Meters</item>
<item>Inches</item>
<item>Feet</item>
</string-array>
<string-array name="PreferenceUnitLengthValues">
<item>mm</item>
<item>cm</item>
<item>m</item>
<item>in</item>
<item>ft</item>
</string-array>
<string name="PreferenceUnitMassOption">PreferenceUnitMassOption</string>
<string-array name="PreferenceUnitMassEntries">
<item >Grams</item>
<item >Kilograms</item>
<item >Ounces</item>
<item >Pounds</item>
<item>Grams</item>
<item>Kilograms</item>
<item>Ounces</item>
<item>Pounds</item>
</string-array>
<string-array name="PreferenceUnitMassValues">
<item >g</item>
<item >kg</item>
<item >oz</item>
<item >lb</item>
<item>g</item>
<item>kg</item>
<item>oz</item>
<item>lb</item>
</string-array>
<string name="PreferenceUnitVelocityOption">PreferenceUnitVelocityOption</string>
<string-array name="PreferenceUnitVelocityEntries">
<item>Meters/Second</item>
<item>Kilometers/Hour</item>
<item>Feet/Second</item>
<item>Miles/Hour</item>
</string-array>
<string-array name="PreferenceUnitVelocityValues">
<item>m/s</item>
<item>km/h</item>
<item>ft/s</item>
<item>mph</item>
</string-array>
<string name="PreferenceUnitDistanceOption">PreferenceUnitDistanceOption</string>
<string-array name="PreferenceUnitDistanceEntries">
<item>Meters</item>
<item>Kilometers</item>
<item>Feet</item>
<item>Yards</item>
<item>Miles</item>
<item>Nautical Miles</item>
</string-array>
<string-array name="PreferenceUnitDistanceValues">
<item>m</item>
<item>km</item>
<item>ft</item>
<item>yd</item>
<item>mi</item>
<item>nmi</item>
</string-array>
</resources>

17
android/res/xml/preferences.xml
View File

@ -30,4 +30,21 @@
android:summary="Set the mass unit"
android:title="Unit of Mass"
/>
<ListPreference
android:defaultValue="m/s"
android:entries="@array/PreferenceUnitVelocityEntries"
android:entryValues="@array/PreferenceUnitVelocityValues"
android:key="@string/PreferenceUnitVelocityOption"
android:summary="Set the velocity unit"
android:title="Unit for Velocity"
/>
<ListPreference
android:defaultValue="m"
android:entries="@array/PreferenceUnitDistanceEntries"
android:entryValues="@array/PreferenceUnitDistanceValues"
android:key="@string/PreferenceUnitDistanceOption"
android:summary="Set the distance unit"
android:title="Unit for Distance and Altitude"
/>
</PreferenceScreen>

8
android/src/net/sf/openrocket/android/PreferencesActivity.java
View File

@ -43,6 +43,14 @@ implements SharedPreferences.OnSharedPreferenceChangeListener {
String mass = sharedPreferences.getString(unitMass, "g");
UnitGroup.UNITS_MASS.setDefaultUnit( mass );
String unitVelocity = app.getResources().getString(R.string.PreferenceUnitVelocityOption);
String velocity = sharedPreferences.getString(unitVelocity, "m/s");
UnitGroup.UNITS_VELOCITY.setDefaultUnit( velocity );
String unitDistance = app.getResources().getString(R.string.PreferenceUnitDistanceOption);
String distance = sharedPreferences.getString(unitDistance, "m");
UnitGroup.UNITS_DISTANCE.setDefaultUnit( distance );
}
}