From 5dc01069fc754327c794ece3cbf5a74f7055c65e Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Thu, 13 Nov 2014 21:49:44 -0800
Subject: [PATCH] Update PC view to avoid scrunched up text when looking for a
 PC on phones in portrait orientation

---
 .../main/res/layout-land/activity_pc_view.xml | 59 +++++++++----------
 .../main/res/layout-port/activity_pc_view.xml | 57 +++++++++---------
 2 files changed, 55 insertions(+), 61 deletions(-)

diff --git a/app/src/main/res/layout-land/activity_pc_view.xml b/app/src/main/res/layout-land/activity_pc_view.xml
index 68e830ab..8d304dcc 100644
--- a/app/src/main/res/layout-land/activity_pc_view.xml
+++ b/app/src/main/res/layout-land/activity_pc_view.xml
@@ -9,42 +9,39 @@
     tools:context=".PcView" >
 
     <RelativeLayout
+        android:id="@+id/no_pc_found_layout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toLeftOf="@+id/manuallyAddPc"
-        android:layout_toRightOf="@+id/settingsButton">
-        <GridView
-            android:id="@+id/pcGridView"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:numColumns="auto_fit"
-            android:columnWidth="160dp"
-            android:gravity="center"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentTop="true"/>
-        <RelativeLayout
-            android:id="@+id/no_pc_found_layout"
+        android:layout_centerInParent="true"
+        android:layout_centerVertical="true"
+        android:layout_centerHorizontal="true">
+        <ImageView
+            android:id="@+id/pcs_loading"
+            android:layout_width="75dp"
+            android:layout_height="75dp"
+            android:src="@drawable/image_loading"/>
+        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
+            android:layout_toRightOf="@+id/pcs_loading"
+            android:layout_marginLeft="5dp"
             android:layout_centerVertical="true"
-            android:layout_centerHorizontal="true">
-            <ImageView
-                android:id="@+id/pcs_loading"
-                android:layout_width="75dp"
-                android:layout_height="75dp"
-                android:src="@drawable/image_loading"/>
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_toRightOf="@+id/pcs_loading"
-                android:layout_marginLeft="5dp"
-                android:layout_centerVertical="true"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:gravity="center"
-		android:text="@string/searching_pc"/>
-            </RelativeLayout>
-        </RelativeLayout>
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:gravity="center"
+            android:text="@string/searching_pc"/>
+    </RelativeLayout>
+
+    <GridView
+        android:id="@+id/pcGridView"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:numColumns="auto_fit"
+        android:columnWidth="160dp"
+        android:gravity="center"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentTop="true"
+        android:layout_toLeftOf="@+id/manuallyAddPc"
+        android:layout_toRightOf="@+id/settingsButton"/>
 
     <ImageButton
         android:id="@+id/settingsButton"
diff --git a/app/src/main/res/layout-port/activity_pc_view.xml b/app/src/main/res/layout-port/activity_pc_view.xml
index 5f3bc8b9..138f6f44 100644
--- a/app/src/main/res/layout-port/activity_pc_view.xml
+++ b/app/src/main/res/layout-port/activity_pc_view.xml
@@ -9,43 +9,40 @@
     tools:context=".PcView" >
 
     <RelativeLayout
+        android:id="@+id/no_pc_found_layout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toLeftOf="@+id/manuallyAddPc"
-        android:layout_toRightOf="@+id/settingsButton">
-        <GridView
-            android:id="@+id/pcGridView"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:numColumns="auto_fit"
-            android:columnWidth="160dp"
-            android:gravity="center"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentTop="true"/>
-        <RelativeLayout
-            android:id="@+id/no_pc_found_layout"
+        android:layout_centerInParent="true"
+        android:layout_centerVertical="true"
+        android:layout_centerHorizontal="true">
+        <ImageView
+            android:id="@+id/pcs_loading"
+            android:layout_width="75dp"
+            android:layout_height="75dp"
+            android:src="@drawable/image_loading"/>
+        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
+            android:layout_toRightOf="@+id/pcs_loading"
+            android:layout_marginLeft="5dp"
             android:layout_centerVertical="true"
-            android:layout_centerHorizontal="true">
-            <ImageView
-                android:id="@+id/pcs_loading"
-                android:layout_width="75dp"
-                android:layout_height="75dp"
-                android:src="@drawable/image_loading"/>
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_toRightOf="@+id/pcs_loading"
-                android:layout_marginLeft="5dp"
-                android:layout_centerVertical="true"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:gravity="center"
-		android:text="@string/searching_pc"/>
-        </RelativeLayout>
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:gravity="center"
+            android:text="@string/searching_pc"/>
     </RelativeLayout>
 
+    <GridView
+        android:id="@+id/pcGridView"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:numColumns="auto_fit"
+        android:columnWidth="160dp"
+        android:gravity="center"
+        android:layout_toLeftOf="@+id/manuallyAddPc"
+        android:layout_toRightOf="@+id/settingsButton"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentTop="true"/>
+
     <ImageButton
         android:id="@+id/settingsButton"
         android:layout_width="70dp"