Add preference selection for Distance and Velocity.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@350 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index d79944fdb14b63d9fb3b4490d7facc3d7a4a6e5a..5d7b232f070405af904b71f249e865d09a4d08bd 100644 (file)
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -93,36 +93,73 @@
     </string-array>\r
 \r
     <string name="TCMotorSearchFormSubmit">Submit</string>\r
-    <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>\r
+    <string name="simulationSeries1Label">Series 1</string>\r
+    <string name="simulationSeries2Label">Series 2</string>\r
+    <string name="PreferenceUnitLengthOption">PreferenceUnitLengthOption</string>\r
+\r
     <string-array name="PreferenceUnitLengthEntries">\r
-        <item >Millimeters</item>\r
-        <item >Centimeters</item>
-        <item >Meters</item>\r
-        <item >Inches</item>
-        <item >Feet</item>
-    </string-array>
+        <item>Millimeters</item>\r
+        <item>Centimeters</item>\r
+        <item>Meters</item>\r
+        <item>Inches</item>\r
+        <item>Feet</item>\r
+    </string-array>\r
     <string-array name="PreferenceUnitLengthValues">\r
-        <item >mm</item>\r
-        <item >cm</item>
-        <item >m</item>\r
-        <item >in</item>
-        <item >ft</item>
+        <item>mm</item>\r
+        <item>cm</item>\r
+        <item>m</item>\r
+        <item>in</item>\r
+        <item>ft</item>\r
     </string-array>\r
+\r
     <string name="PreferenceUnitMassOption">PreferenceUnitMassOption</string>\r
+\r
     <string-array name="PreferenceUnitMassEntries">\r
-        <item >Grams</item>\r
-        <item >Kilograms</item>\r
-        <item >Ounces</item>\r
-        <item >Pounds</item>\r
+        <item>Grams</item>\r
+        <item>Kilograms</item>\r
+        <item>Ounces</item>\r
+        <item>Pounds</item>\r
     </string-array>\r
     <string-array name="PreferenceUnitMassValues">\r
-        <item >g</item>\r
-        <item >kg</item>\r
-        <item >oz</item>\r
-        <item >lb</item>\r
+        <item>g</item>\r
+        <item>kg</item>\r
+        <item>oz</item>\r
+        <item>lb</item>\r
+    </string-array>\r
+\r
+    <string name="PreferenceUnitVelocityOption">PreferenceUnitVelocityOption</string>\r
+\r
+    <string-array name="PreferenceUnitVelocityEntries">\r
+        <item>Meters/Second</item>\r
+        <item>Kilometers/Hour</item>\r
+        <item>Feet/Second</item>\r
+        <item>Miles/Hour</item>\r
     </string-array>\r
-        \r
+    <string-array name="PreferenceUnitVelocityValues">\r
+        <item>m/s</item>\r
+        <item>km/h</item>\r
+        <item>ft/s</item>\r
+        <item>mph</item>\r
+    </string-array>\r
+\r
+    <string name="PreferenceUnitDistanceOption">PreferenceUnitDistanceOption</string>\r
+\r
+    <string-array name="PreferenceUnitDistanceEntries">\r
+        <item>Meters</item>\r
+        <item>Kilometers</item>\r
+        <item>Feet</item>\r
+        <item>Yards</item>\r
+        <item>Miles</item>\r
+        <item>Nautical Miles</item>\r
+    </string-array>\r
+    <string-array name="PreferenceUnitDistanceValues">\r
+        <item>m</item>\r
+        <item>km</item>\r
+        <item>ft</item>\r
+        <item>yd</item>\r
+        <item>mi</item>\r
+        <item>nmi</item>\r
+    </string-array>\r
+\r
 </resources>
\ No newline at end of file

diff --git a/android/res/xml/preferences.xml b/android/res/xml/preferences.xml
index 1a37a8df090c8fff8533148a256766250ab71817..d229d6efcb42007f9a4ec3616b7db3dd45e96b55 100644 (file)
--- a/android/res/xml/preferences.xml
+++ b/android/res/xml/preferences.xml
@@ -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>
\ No newline at end of file

diff --git a/android/src/net/sf/openrocket/android/PreferencesActivity.java b/android/src/net/sf/openrocket/android/PreferencesActivity.java
index 66f4d7788b01e5606b179f3b14a982a9d30d92f2..5b14bf23fca12e65539c1b6cb0356ee8896e8171 100644 (file)
--- a/android/src/net/sf/openrocket/android/PreferencesActivity.java
+++ b/android/src/net/sf/openrocket/android/PreferencesActivity.java
@@ -43,6 +43,14 @@ implements SharedPreferences.OnSharedPreferenceChangeListener {
                String mass = sharedPreferences.getString(unitMass, "g");\r
                UnitGroup.UNITS_MASS.setDefaultUnit( mass );\r
                \r
+               String unitVelocity = app.getResources().getString(R.string.PreferenceUnitVelocityOption);\r
+               String velocity = sharedPreferences.getString(unitVelocity, "m/s");\r
+               UnitGroup.UNITS_VELOCITY.setDefaultUnit( velocity );\r
+               \r
+               String unitDistance = app.getResources().getString(R.string.PreferenceUnitDistanceOption);\r
+               String distance = sharedPreferences.getString(unitDistance, "m");\r
+               UnitGroup.UNITS_DISTANCE.setDefaultUnit( distance );\r
+               \r
        }\r
        \r
 }\r