From 2e9ca0de88d726cd850b9c814a3d065c8ac73efe Mon Sep 17 00:00:00 2001
From: Branden Archer <b.m.archer4@gmail.com>
Date: Sun, 27 Dec 2015 16:14:35 -0500
Subject: [PATCH] Improve listen activity layout with Linear Layout

---
 res/layout/activity_listen.xml              | 88 +++++++++------------
 res/values/strings.xml                      |  4 +
 src/protect/babymonitor/ListenActivity.java | 12 ++-
 3 files changed, 51 insertions(+), 53 deletions(-)

diff --git a/res/layout/activity_listen.xml b/res/layout/activity_listen.xml
index 16c783a..a16e2db 100644
--- a/res/layout/activity_listen.xml
+++ b/res/layout/activity_listen.xml
@@ -1,70 +1,58 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/LinearLayout1"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:keepScreenOn="true"
+    android:orientation="vertical"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    android:keepScreenOn="true"
     tools:context="protect.babymonitor.MonitorActivity" >
 
-    <TableLayout
-        android:id="@+id/tableLayout1"
-        android:layout_width="wrap_content"
+    <TextView
+        android:id="@id/parentDeviceTitle"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginTop="124dp" >
+        android:gravity="center"
+        android:text="@string/parentDevice"
+        android:textSize="25sp" />
 
-        <TableRow
-            android:id="@+id/tableRow1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" >
-
-            <TextView
-                android:id="@+id/textStatusTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/activity_horizontal_margin"
-                android:text="Status:"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <Space
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-
-            <TextView
-                android:id="@+id/textStatus"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Listening..."
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <Space
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-        </TableRow>
-    </TableLayout>
+    <Space
+       android:layout_width="match_parent"
+       android:layout_height="15dip" />
 
     <TextView
-        android:id="@+id/connectedToTextView"
+        android:id="@+id/connectedToTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:padding="@dimen/activity_horizontal_margin"
-        android:text="Connected to:"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
+        android:text="@string/connectedTo"
+        android:textSize="20sp" />
 
     <TextView
-        android:id="@+id/connectedDeviceNameTextView"
+        android:id="@+id/connectedTo"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/connectedToTextView"
-        android:layout_below="@+id/connectedToTextView"
-        android:layout_marginLeft="20dp"
-        android:text=" "
-        android:textAppearance="?android:attr/textAppearanceLarge" />
+        android:text=""
+        android:textSize="20sp" />
 
-</RelativeLayout>
\ No newline at end of file
+    <Space
+       android:layout_width="match_parent"
+       android:layout_height="15dip" />
+
+    <TextView
+        android:id="@+id/status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/status"
+        android:textSize="20sp" />
+
+    <TextView
+        android:id="@+id/textStatus"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text=""
+        android:textSize="20sp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4f6b4d0..1c690f9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -16,5 +16,9 @@
     <string name="waitingForParent">Waiting for Parent...</string>
     <string name="parentDevice">Parent Device</string>
     <string name="selectChildDevice">Select Child Device:</string>
+    <string name="status">Status:</string>
+    <string name="connectedTo">Connected To:</string>
+    <string name="disconnected">Disconnected</string>
+    <string name="listening">Listening...</string>
 
 </resources>
diff --git a/src/protect/babymonitor/ListenActivity.java b/src/protect/babymonitor/ListenActivity.java
index 2f510c8..f2e5b9e 100644
--- a/src/protect/babymonitor/ListenActivity.java
+++ b/src/protect/babymonitor/ListenActivity.java
@@ -110,8 +110,11 @@ public class ListenActivity extends Activity
             @Override
             public void run()
             {
-                final TextView statusText = (TextView) findViewById(R.id.connectedDeviceNameTextView);
-                statusText.setText(_name);
+                final TextView connectedText = (TextView) findViewById(R.id.connectedTo);
+                connectedText.setText(_name);
+
+                final TextView statusText = (TextView) findViewById(R.id.textStatus);
+                statusText.setText(R.string.listening);
             }
         });
 
@@ -139,8 +142,11 @@ public class ListenActivity extends Activity
                     @Override
                     public void run()
                     {
+                        final TextView connectedText = (TextView) findViewById(R.id.connectedTo);
+                        connectedText.setText("");
+
                         final TextView statusText = (TextView) findViewById(R.id.textStatus);
-                        statusText.setText("Listening stopped");
+                        statusText.setText(R.string.disconnected);
                     }
                 });
             }