refactoring: remove useless parent layout

1 files changed, 80 insertions, 85 deletions

diff --git a/main/res/layout/navigate.xml b/main/res/layout/navigate.xml
index 745b9ef..7e76864 100644
--- a/main/res/layout/navigate.xml
+++ b/main/res/layout/navigate.xml
@@ -5,112 +5,107 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" >
-
-        <LinearLayout
+    <LinearLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical" >
 
+        <TextView
+            android:id="@+id/destination"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:textColor="?text_color"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/cacheinfo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:textColor="?text_color"
+            android:textSize="14sp" />
+
+        <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="30dip" >
+
             <TextView
-                android:id="@+id/destination"
+                android:id="@+id/heading"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
+                android:layout_alignParentLeft="true"
+                android:layout_gravity="left"
+                android:layout_marginLeft="3dip"
+                android:text="@null"
                 android:textColor="?text_color"
-                android:textSize="14sp" />
+                android:textSize="26sp" />
 
             <TextView
-                android:id="@+id/cacheinfo"
+                android:id="@+id/distance"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
+                android:layout_alignParentRight="true"
+                android:layout_gravity="right"
+                android:layout_marginRight="3dip"
+                android:text="@null"
                 android:textColor="?text_color"
-                android:textSize="14sp" />
-
-            <RelativeLayout
-                android:layout_width="fill_parent"
-                android:layout_height="30dip" >
+                android:textSize="26sp" />
+        </RelativeLayout>
+    </LinearLayout>
 
-                <TextView
-                    android:id="@+id/heading"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_gravity="left"
-                    android:layout_marginLeft="3dip"
-                    android:text="@null"
-                    android:textColor="?text_color"
-                    android:textSize="26sp" />
+    <view
+        android:id="@+id/rose"
+        android:layout_width="fill_parent"
+        android:layout_height="295dip"
+        android:layout_centerInParent="true"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="1dip"
+        android:layout_marginLeft="1dip"
+        android:layout_marginRight="1dip"
+        android:layout_marginTop="6dip"
+        class="cgeo.geocaching.ui.CompassView"
+        android:gravity="center"
+        android:keepScreenOn="true"
+        android:minHeight="289dip"
+        android:minWidth="289dip"
+        android:padding="4dip" />
 
-                <TextView
-                    android:id="@+id/distance"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_gravity="right"
-                    android:layout_marginRight="3dip"
-                    android:text="@null"
-                    android:textColor="?text_color"
-                    android:textSize="26sp" />
-            </RelativeLayout>
-        </LinearLayout>
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_marginLeft="6dip"
+        android:layout_marginRight="6dip"
+        android:orientation="vertical" >
 
-        <view
-            android:id="@+id/rose"
-            android:layout_width="fill_parent"
-            android:layout_height="295dip"
-            android:layout_centerInParent="true"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginBottom="1dip"
-            android:layout_marginLeft="1dip"
-            android:layout_marginRight="1dip"
-            android:layout_marginTop="6dip"
-            class="cgeo.geocaching.ui.CompassView"
-            android:gravity="center"
-            android:keepScreenOn="true"
-            android:minHeight="289dip"
-            android:minWidth="289dip"
-            android:padding="4dip" />
+        <TextView
+            android:id="@+id/nav_location"
+            style="@style/location_current"
+            android:text="@string/loc_trying" />
 
-        <LinearLayout
+        <RelativeLayout
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_marginLeft="6dip"
-            android:layout_marginRight="6dip"
-            android:orientation="vertical" >
+            android:layout_height="16dip" >
 
             <TextView
-                android:id="@+id/nav_location"
-                style="@style/location_current"
-                android:text="@string/loc_trying" />
+                android:id="@+id/nav_type"
+                style="@style/location_current_type"
+                android:textColor="?text_color_grey"
+                android:textIsSelectable="false" />
 
-            <RelativeLayout
-                android:layout_width="fill_parent"
-                android:layout_height="16dip" >
-
-                <TextView
-                    android:id="@+id/nav_type"
-                    style="@style/location_current_type"
-                    android:textColor="?text_color_grey"
-                    android:textIsSelectable="false" />
-
-                <TextView
-                    android:id="@+id/nav_accuracy"
-                    style="@style/location_current_accuracy"
-                    android:textColor="?text_color_grey"
-                    android:textIsSelectable="false" />
+            <TextView
+                android:id="@+id/nav_accuracy"
+                style="@style/location_current_accuracy"
+                android:textColor="?text_color_grey"
+                android:textIsSelectable="false" />
 
-                <TextView
-                    android:id="@+id/nav_satellites"
-                    style="@style/location_current_satellites"
-                    android:textColor="?text_color_grey"
-                    android:textIsSelectable="false" />
-            </RelativeLayout>
-        </LinearLayout>
-    </RelativeLayout>
+            <TextView
+                android:id="@+id/nav_satellites"
+                style="@style/location_current_satellites"
+                android:textColor="?text_color_grey"
+                android:textIsSelectable="false" />
+        </RelativeLayout>
+    </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file