From eb1eac8111bd2e66db1870770327b6c5c82412c9 Mon Sep 17 00:00:00 2001
From: Branden Archer <b.m.archer4@gmail.com>
Date: Sun, 27 Dec 2015 15:29:59 -0500
Subject: [PATCH] Improve start activity layout with LinearLayout and helper
 text

---
 res/layout/activity_start.xml              | 45 ++++++++++++++--------
 res/values/strings.xml                     |  4 ++
 src/protect/babymonitor/StartActivity.java |  4 +-
 3 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/res/layout/activity_start.xml b/res/layout/activity_start.xml
index ea9ee7f..902a38a 100644
--- a/res/layout/activity_start.xml
+++ b/res/layout/activity_start.xml
@@ -1,7 +1,9 @@
-<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:orientation="vertical"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
@@ -9,23 +11,36 @@
     tools:context="protect.babymonitor.StartActivity" >
 
     <Button
-        android:id="@+id/connectMonitorButton"
-        android:layout_width="wrap_content"
+        android:id="@+id/useChildDevice"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/startMonitorButton"
-        android:layout_alignRight="@+id/startMonitorButton"
-        android:layout_below="@+id/startMonitorButton"
-        android:layout_marginTop="72dp"
-        android:text="Use as Parent Device" />
+        android:text="@string/useAsChildDevice"
+        android:textSize="17sp" />
+
+    <TextView
+        android:id="@+id/childDescription"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/childDescription"
+        android:textSize="14sp" />
+
+	<Space
+	   android:layout_width="match_parent"
+	   android:layout_height="15dip" />
 
     <Button
-        android:id="@+id/startMonitorButton"
+        android:id="@+id/useParentDevice"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/useAsParentDevice"
+        android:textSize="17sp" />
+
+    <TextView
+        android:id="@+id/parentDescription"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginTop="129dp"
-        android:text="Use as Child Device" />
+        android:text="@string/parentDescription" />
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 28b3d76..0bf716a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3,5 +3,9 @@
 
     <string name="app_name">Protect Baby Monitor</string>
     <string name="action_settings">Settings</string>
+    <string name="useAsParentDevice">Use as Parent Device</string>
+    <string name="useAsChildDevice">Use as Child Device</string>
+    <string name="childDescription">Device is placed with baby, and sends audio to a paired parent device</string>
+    <string name="parentDescription">Pairs with child device and plays received audio</string>
 
 </resources>
diff --git a/src/protect/babymonitor/StartActivity.java b/src/protect/babymonitor/StartActivity.java
index 9a5eef2..ec777b0 100644
--- a/src/protect/babymonitor/StartActivity.java
+++ b/src/protect/babymonitor/StartActivity.java
@@ -35,7 +35,7 @@ public class StartActivity extends Activity
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_start);
 
-        final Button monitorButton = (Button) findViewById(R.id.startMonitorButton);
+        final Button monitorButton = (Button) findViewById(R.id.useChildDevice);
         monitorButton.setOnClickListener(new View.OnClickListener()
         {
             @Override
@@ -48,7 +48,7 @@ public class StartActivity extends Activity
             }
         });
 
-        final Button connectButton = (Button) findViewById(R.id.connectMonitorButton);
+        final Button connectButton = (Button) findViewById(R.id.useParentDevice);
         connectButton.setOnClickListener(new View.OnClickListener()
         {
             @Override