Big update to custom expression feature.

[debian/openrocket] / android / res / layout / motor_detail_form.xml

diff --git a/android/res/layout/motor_detail_form.xml b/android/res/layout/motor_detail_form.xml
index 45d595d30ff30d2bf076e91425ce31a1eacc3069..ee035fa3e46bdb6eff74608e52acadd1707344b8 100644 (file)
--- a/android/res/layout/motor_detail_form.xml
+++ b/android/res/layout/motor_detail_form.xml
@@ -1,94 +1,127 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/motorDetailForm"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@android:color/black"
-    android:orientation="vertical"
-    android:paddingTop="10px" >
-
-    <TableRow >
-
-        <TextView
-            android:paddingRight="10px"
-            android:text="Manufacturer" />
-
-        <EditText
-            android:id="@+id/motorDetailsManufacturer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.04"
-            android:editable="false" />
-    </TableRow>
-
-    <TableRow >
-
-        <TextView
-            android:paddingRight="10px"
-            android:text="Name" />
-
-        <EditText
-            android:id="@+id/motorDetailsName"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.04"
-            android:editable="false" />
-    </TableRow>
-
-    <TableRow >
-
-        <TextView
-            android:paddingRight="10px"
-            android:text="Case Info" />
-
-        <EditText
-            android:id="@+id/motorDetailsCaseInfo"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.04"
-            android:editable="false" />
-    </TableRow>
-
-    <TableRow >
-
-        <TextView
-            android:paddingRight="10px"
-            android:text="Impulse Class" />
-
-        <EditText
-            android:id="@+id/motorDetailsImpuseClass"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.04"
-            android:editable="false" />
-    </TableRow>
-
-    <TableRow >
-
-        <TextView
-            android:paddingRight="10px"
-            android:text="Diameter" />
-
-        <EditText
-            android:id="@+id/motorDetailsDiameter"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.04"
-            android:editable="false" />
-    </TableRow>
-
-    <TableRow >
-
-        <TextView
-            android:paddingRight="10px"
-            android:text="Length" />
-
-        <EditText
-            android:id="@+id/motorDetailsLength"
-            android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <TableLayout
+        android:id="@+id/motorDetailForm"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/black"
+        android:orientation="vertical"
+        android:paddingTop="10dp" >
+
+        <TableRow>
+
+            <TextView
+                android:paddingRight="10dp"
+                android:text="@string/motor_manufacturer" />
+
+            <EditText
+                android:id="@+id/motorDetailsManufacturer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.04"
+                android:editable="false"
+                android:inputType="text" />
+        </TableRow>
+
+        <TableRow>
+
+            <TextView
+                android:paddingRight="10dp"
+                android:text="@string/motor_commonname" />
+
+            <EditText
+                android:id="@+id/motorDetailsName"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.04"
+                android:editable="false"
+                android:inputType="text" />
+        </TableRow>
+
+        <TableRow>
+
+            <TextView
+                android:paddingRight="10dp"
+                android:text="@string/motor_delays" />
+
+            <EditText
+                android:id="@+id/motorDetailsDelays"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.04"
+                android:editable="false"
+                android:inputType="number" />
+        </TableRow>
+
+        <TableRow>
+
+            <TextView
+                android:paddingRight="10dp"
+                android:text="@string/motor_caseinfo" />
+
+            <EditText
+                android:id="@+id/motorDetailsCaseInfo"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.04"
+                android:editable="false"
+                android:inputType="text" />
+        </TableRow>
+
+        <TableRow>
+
+            <TextView
+                android:paddingRight="10dp"
+                android:text="@string/motor_impulseclass" />
+
+            <EditText
+                android:id="@+id/motorDetailsImpuseClass"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.04"
+                android:editable="false"
+                android:inputType="text" />
+        </TableRow>
+
+        <TableRow>
+
+            <TextView
+                android:paddingRight="10dp"
+                android:text="@string/motor_diameter" />
+
+            <EditText
+                android:id="@+id/motorDetailsDiameter"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.04"
+                android:editable="false"
+                android:inputType="text" />
+        </TableRow>
+
+        <TableRow>
+
+            <TextView
+                android:paddingRight="10dp"
+                android:text="@string/motor_length" />
+
+            <EditText
+                android:id="@+id/motorDetailsLength"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.04"
+                android:editable="false"
+                android:inputType="text" />
+        </TableRow>
+    </TableLayout>
+    <!--
+        <Button
+            android:id="@+id/motorDetailsSaveButton"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="0.04"
-            android:editable="false" />
-    </TableRow>
+            android:text="@string/save" />
+    -->
 
-</TableLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file