From e82cfeacd5f0899d236268a7888a893db3ea39c2 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Sat, 27 Oct 2012 11:03:07 -0400
Subject: [PATCH] add EditText and Button

---
 res/layout/main.xml    | 13 ++++++++-----
 res/values/strings.xml |  4 +++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/res/layout/main.xml b/res/layout/main.xml
index e745f63..6e60b03 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+    android:orientation="horizontal"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     >
-<TextView
-    android:layout_width="fill_parent"
+  <EditText android:id="@+id/edit_message"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="Hello World, MainActivity"
-    />
+    android:hint="@string/edit_message" />
+  <Button
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/button_send" />
 </LinearLayout>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0be1647..5803011 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">MainActivity</string>
+    <string name="app_name">Joshs First App</string>
+    <string name="edit_message">Enter your message, fu</string>
+    <string name="button_send">Send It, Yo</string>
 </resources>