altosdroid: add rssi/serial/flight, and re-work UI ordering

[fw/altos] / altosdroid / res / layout / altosdroid.xml

diff --git a/altosdroid/res/layout/altosdroid.xml b/altosdroid/res/layout/altosdroid.xml
index e4b4f605243043310b142bee2b0457bce726b2b7..f185ea9f2144c0ce8402062a74b96aa284118bbe 100644 (file)
--- a/altosdroid/res/layout/altosdroid.xml
+++ b/altosdroid/res/layout/altosdroid.xml
@@ -51,11 +51,77 @@
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/state_container"
+            android:id="@+id/rssi_container"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_toRightOf="@+id/strut" >
+            android:layout_toRightOf="@id/strut"
+            android:layout_alignParentRight="true" >
+
+            <TextView
+                android:id="@+id/rssi_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/rssi_label" />
+
+            <TextView
+                android:id="@+id/rssi_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_below="@+id/rssi_label"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/serial_container"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/callsign_container"
+            android:layout_toLeftOf="@+id/strut" >
+
+            <TextView
+                android:id="@+id/serial_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/serial_label" />
+
+            <TextView
+                android:id="@+id/serial_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_below="@+id/serial_label"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/flight_container"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/callsign_container"
+            android:layout_toRightOf="@+id/strut"
+            android:layout_alignParentRight="true" >
+
+            <TextView
+                android:id="@+id/flight_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/flight_label" />
+
+            <TextView
+                android:id="@+id/flight_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_below="@+id/flight_label"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/state_container"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/serial_container" >
 
             <TextView
                 android:id="@+id/state_label"
@@ -67,10 +133,10 @@
                 android:id="@+id/state_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
                 android:layout_below="@+id/state_label"
-                android:text=""
-                android:textAppearance="?android:attr/textAppearanceLarge" />
+                android:layout_centerInParent="true"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textSize="50dip" />
 
         </RelativeLayout>
 
@@ -79,7 +145,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
-            android:layout_below="@+id/callsign_container"
+            android:layout_below="@+id/state_container"
             android:layout_toLeftOf="@+id/strut" >
 
             <TextView
@@ -154,7 +220,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
-            android:layout_below="@id/accel_container"
+            android:layout_below="@id/speed_container"
             android:layout_toRightOf="@id/strut" >
 
             <TextView
@@ -267,13 +333,14 @@
                 android:textAppearance="?android:attr/textAppearanceLarge" />
 
         </RelativeLayout>
-        
-           <TextView
+
+
+        <TextView
                android:id="@+id/text"
                android:layout_width="fill_parent"
                android:layout_height="0dip"
                android:layout_alignParentBottom="true"
-               android:layout_below="@id/longitude_container"
+               android:layout_below="@+id/longitude_container"
                android:gravity="bottom"
                android:scrollbars="vertical"
                android:textSize="7dp"