Merge remote-tracking branch 'mjb/master'

2 files changed, 101 insertions, 106 deletions

diff --git a/altosdroid/res/layout/altosdroid.xml b/altosdroid/res/layout/altosdroid.xml
index 33d89d52..f185ea9f 100644
--- 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
@@ -92,23 +158,11 @@
                 android:id="@+id/speed_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
                 android:layout_below="@id/speed_label"
-                android:layout_toLeftOf="@+id/speed_units"
                 android:text=""
                 android:textAppearance="?android:attr/textAppearanceLarge" />
 
-            <TextView
-                android:id="@+id/speed_units"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignBaseline="@id/speed_value"
-                android:layout_alignParentRight="true"
-                android:layout_below="@id/speed_label"
-                android:gravity="right"
-                android:paddingLeft="10dip"
-                android:text="@string/speed_units"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
         </RelativeLayout>
 
         <RelativeLayout
@@ -129,22 +183,11 @@
                 android:id="@+id/accel_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
                 android:layout_below="@+id/accel_label"
-                android:layout_toLeftOf="@+id/accel_units"
                 android:text=""
                 android:textAppearance="?android:attr/textAppearanceLarge" />
 
-            <TextView
-                android:id="@+id/accel_units"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignBaseline="@+id/accel_value"
-                android:layout_alignParentRight="true"
-                android:layout_below="@+id/accel_label"
-                android:gravity="right"
-                android:paddingLeft="10dip"
-                android:text="@string/accel_units"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -165,63 +208,39 @@
                 android:id="@+id/range_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
                 android:layout_below="@+id/range_label"
-                android:layout_toLeftOf="@+id/range_units"
                 android:text=""
                 android:textAppearance="?android:attr/textAppearanceLarge" />
 
-            <TextView
-                android:id="@+id/range_units"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignBaseline="@+id/range_value"
-                android:layout_alignParentRight="true"
-                android:layout_below="@+id/range_label"
-                android:gravity="right"
-                android:paddingLeft="10dip"
-                android:text="@string/range_units"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/altitude_container"
+            android:id="@+id/height_container"
             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
-                android:id="@+id/altitude_label"
+                android:id="@+id/height_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/altitude_label" />
+                android:text="@string/height_label" />
 
             <TextView
-                android:id="@+id/altitude_value"
+                android:id="@+id/height_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/altitude_label"
-                android:layout_toLeftOf="@+id/altitude_units"
+                android:layout_alignParentRight="true"
+                android:layout_below="@+id/height_label"
                 android:text=""
                 android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <TextView
-                android:id="@+id/altitude_units"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignBaseline="@+id/altitude_value"
-                android:layout_alignParentRight="true"
-                android:layout_below="@+id/altitude_label"
-                android:gravity="right"
-                android:paddingLeft="10dip"
-                android:text="@string/altitude_units"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/azimuth_container"
+            android:id="@+id/elevation_container"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
@@ -229,30 +248,19 @@
             android:layout_toLeftOf="@id/strut" >
 
             <TextView
-                android:id="@+id/azimuth_label"
+                android:id="@+id/elevation_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/azimuth_label" />
+                android:text="@string/elevation_label" />
 
             <TextView
-                android:id="@+id/azimuth_value"
+                android:id="@+id/elevation_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/azimuth_label"
-                android:layout_toLeftOf="@+id/azimuth_units"
+                android:layout_alignParentRight="true"
+                android:layout_below="@+id/elevation_label"
                 android:text=""
                 android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <TextView
-                android:id="@+id/azimuth_units"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_below="@+id/azimuth_label"
-                android:gravity="right"
-                android:paddingLeft="10dip"
-                android:text="@string/azimuth_units"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -260,7 +268,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
-            android:layout_below="@+id/altitude_container"
+            android:layout_below="@+id/range_container"
             android:layout_toRightOf="@+id/strut" >
 
             <TextView
@@ -273,28 +281,18 @@
                 android:id="@+id/bearing_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
                 android:layout_below="@+id/bearing_label"
-                android:layout_toLeftOf="@+id/bearing_units"
                 android:text=""
                 android:textAppearance="?android:attr/textAppearanceLarge" />
 
-            <TextView
-                android:id="@+id/bearing_units"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_below="@+id/bearing_label"
-                android:gravity="right"
-                android:paddingLeft="10dip"
-                android:text="@string/bearing_units"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/latitude_container"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/azimuth_container" >
+            android:layout_below="@+id/elevation_container" >
 
             <TextView
                 android:id="@+id/latitude_label"
@@ -335,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"
diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml
index 59f4f827..f8038406 100644
--- a/altosdroid/res/values/strings.xml
+++ b/altosdroid/res/values/strings.xml
@@ -43,21 +43,17 @@
 
 	<!-- UI fields -->
     <string name="callsign_label">Callsign</string>
+    <string name="serial_label">Serial no.</string>
+    <string name="flight_label">Flight no.</string>
+    <string name="rssi_label">RSSI</string>
     <string name="state_label">State</string>
     <string name="speed_label">Speed</string>
-    <string name="speed_units">m/s</string>
     <string name="accel_label">Acceleration</string>
-    <string name="accel_units">m/s²</string>
     <string name="range_label">Range</string>
-    <string name="range_units">m</string>
-    <string name="altitude_label">Altitude</string>
-    <string name="altitude_units">m</string>
-    <string name="azimuth_label">Azimuth</string>
-    <string name="azimuth_units">°</string>
+    <string name="height_label">Height</string>
+    <string name="elevation_label">Elevation</string>
     <string name="bearing_label">Bearing</string>
-    <string name="bearing_units">°</string>
     <string name="latitude_label">Latitude</string>
     <string name="longitude_label">Longitude</string>
 
-
 </resources>