From 8ffa4f9a474026f5a6523b26919a78565e0ed74c Mon Sep 17 00:00:00 2001
From: Mike Beattie <mike@ethernal.org>
Date: Thu, 30 Aug 2012 13:13:20 +1200
Subject: [PATCH] altosdroid: move units into code, to match altosui

Signed-off-by: Mike Beattie <mike@ethernal.org>
---
 altosdroid/res/layout/altosdroid.xml          | 82 ++-----------------
 altosdroid/res/values/strings.xml             |  6 --
 .../altusmetrum/AltosDroid/AltosDroid.java    | 12 +--
 3 files changed, 13 insertions(+), 87 deletions(-)

diff --git a/altosdroid/res/layout/altosdroid.xml b/altosdroid/res/layout/altosdroid.xml
index 33d89d52..0392ba01 100644
--- a/altosdroid/res/layout/altosdroid.xml
+++ b/altosdroid/res/layout/altosdroid.xml
@@ -92,23 +92,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 +117,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,23 +142,11 @@
                 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
@@ -203,21 +168,9 @@
                 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: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
@@ -239,20 +192,9 @@
                 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: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 +202,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,21 +215,11 @@
                 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
diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml
index 59f4f827..e100100f 100644
--- a/altosdroid/res/values/strings.xml
+++ b/altosdroid/res/values/strings.xml
@@ -45,17 +45,11 @@
     <string name="callsign_label">Callsign</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="bearing_label">Bearing</string>
-    <string name="bearing_units">°</string>
     <string name="latitude_label">Latitude</string>
     <string name="longitude_label">Longitude</string>
 
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index ba424e79..9ecce681 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -179,13 +179,13 @@ public class AltosDroid extends Activity {
 		double speed = state.speed;
 		if (!state.ascent)
 			speed = state.baro_speed;
-		mSpeedView.setText(String.format("%6.0f", speed));
-		mAccelView.setText(String.format("%6.0f", state.acceleration));
-		mRangeView.setText(String.format("%6.0f", state.range));
-		mAltitudeView.setText(String.format("%6.0f", state.height));
-		mAzimuthView.setText(String.format("%3.0f", state.elevation));
+		mSpeedView.setText(String.format("%6.0f m/s", speed));
+		mAccelView.setText(String.format("%6.0f m/s²", state.acceleration));
+		mRangeView.setText(String.format("%6.0f m", state.range));
+		mAltitudeView.setText(String.format("%6.0f m", state.height));
+		mAzimuthView.setText(String.format("%3.0f°", state.elevation));
 		if (state.from_pad != null)
-			mBearingView.setText(String.format("%3.0f", state.from_pad.bearing));
+			mBearingView.setText(String.format("%3.0f°", state.from_pad.bearing));
 		mLatitudeView.setText(pos(state.gps.lat, "N", "S"));
 		mLongitudeView.setText(pos(state.gps.lon, "W", "E"));
 	}
-- 
2.30.2