altosdroid: Display online/offline maps in same tab

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

diff --git a/altosdroid/res/layout/tab_map.xml b/altosdroid/res/layout/tab_map.xml
index b9f4e69e7267d3d48dea9fca2d307ac0bf77cddc..b4c97f9154e2d361e68dde04be9fb0aedb4956bd 100644 (file)
--- a/altosdroid/res/layout/tab_map.xml
+++ b/altosdroid/res/layout/tab_map.xml
@@ -20,13 +20,12 @@
        android:layout_height="match_parent"
        android:orientation="vertical" >
 
-       <LinearLayout
+       <LinearLayout
            android:id="@+id/map"
-               android:orientation="horizontal"
-               android:layout_width="fill_parent"
-               android:layout_height="0dp"
-               android:layout_weight="1">
-
+           android:orientation="horizontal"
+           android:layout_width="fill_parent"
+           android:layout_height="fill_parent"
+           android:layout_weight="1">
        </LinearLayout>
 
        <LinearLayout
@@ -46,16 +45,16 @@
                                android:id="@+id/distance_label"
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
+                               android:paddingRight="4dp"
                                android:text="@string/distance_label" />
 
                        <TextView
                                android:id="@+id/distance_value"
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
-                               android:layout_alignParentRight="true"
-                               android:layout_below="@+id/distance_label"
+                               android:layout_toRightOf="@+id/distance_label"
                                android:text=""
-                               android:textAppearance="?android:attr/textAppearanceLarge" />
+                               android:textAppearance="?android:attr/textAppearanceSmall" />
                </RelativeLayout>
 
                <RelativeLayout
@@ -68,16 +67,16 @@
                                android:id="@+id/bearing_label"
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
+                               android:paddingRight="4dp"
                                android:text="@string/bearing_label" />
 
                        <TextView
                                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_toRightOf="@+id/bearing_label"
                                android:text=""
-                               android:textAppearance="?android:attr/textAppearanceLarge" />
+                               android:textAppearance="?android:attr/textAppearanceSmall" />
                </RelativeLayout>
 
        </LinearLayout>
@@ -96,19 +95,71 @@
                        android:paddingTop="5dp" >
 
                        <TextView
-                               android:id="@+id/lat_label"
+                               android:id="@+id/target_lat_label"
+                               android:layout_width="wrap_content"
+                               android:layout_height="wrap_content"
+                               android:paddingRight="4dp"
+                               android:text="@string/target_latitude_label" />
+
+                       <TextView
+                               android:id="@+id/target_lat_value"
+                               android:layout_width="wrap_content"
+                               android:layout_height="wrap_content"
+                               android:layout_toRightOf="@id/target_lat_label"
+                               android:text=""
+                               android:textAppearance="?android:attr/textAppearanceSmall" />
+               </RelativeLayout>
+
+               <RelativeLayout
+                       android:layout_width="0dp"
+                       android:layout_height="wrap_content"
+                       android:layout_weight="1"
+                       android:paddingTop="5dp" >
+
+                       <TextView
+                               android:id="@+id/target_lon_label"
+                               android:layout_width="wrap_content"
+                               android:layout_height="wrap_content"
+                               android:paddingRight="4dp"
+                               android:text="@string/target_longitude_label" />
+
+                       <TextView
+                               android:id="@+id/target_lon_value"
+                               android:layout_width="wrap_content"
+                               android:layout_height="wrap_content"
+                               android:layout_toRightOf="@id/target_lon_label"
+                               android:text=""
+                               android:textAppearance="?android:attr/textAppearanceSmall" />
+               </RelativeLayout>
+       </LinearLayout>
+
+       <LinearLayout
+               xmlns:android="http://schemas.android.com/apk/res/android"
+               android:layout_width="fill_parent"
+               android:layout_height="wrap_content"
+               android:baselineAligned="true"
+               android:orientation="horizontal" >
+
+               <RelativeLayout
+                       android:layout_width="0dp"
+                       android:layout_height="wrap_content"
+                       android:layout_weight="1"
+                       android:paddingTop="5dp" >
+
+                       <TextView
+                               android:id="@+id/receiver_lat_label"
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
-                               android:text="@string/latitude_label" />
+                               android:paddingRight="4dp"
+                               android:text="@string/receiver_latitude_label" />
 
                        <TextView
-                               android:id="@+id/lat_value"
+                               android:id="@+id/receiver_lat_value"
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
-                               android:layout_alignParentRight="true"
-                               android:layout_below="@id/lat_label"
+                               android:layout_toRightOf="@id/receiver_lat_label"
                                android:text=""
-                               android:textAppearance="?android:attr/textAppearanceLarge" />
+                               android:textAppearance="?android:attr/textAppearanceSmall" />
                </RelativeLayout>
 
                <RelativeLayout
@@ -118,19 +169,19 @@
                        android:paddingTop="5dp" >
 
                        <TextView
-                               android:id="@+id/lon_label"
+                               android:id="@+id/receiver_lon_label"
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
-                               android:text="@string/longitude_label" />
+                               android:paddingRight="4dp"
+                               android:text="@string/receiver_longitude_label" />
 
                        <TextView
-                               android:id="@+id/lon_value"
+                               android:id="@+id/receiver_lon_value"
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
-                               android:layout_alignParentRight="true"
-                               android:layout_below="@id/lon_label"
+                               android:layout_toRightOf="@id/receiver_lon_label"
                                android:text=""
-                               android:textAppearance="?android:attr/textAppearanceLarge" />
+                               android:textAppearance="?android:attr/textAppearanceSmall" />
                </RelativeLayout>
        </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>