From 9d459b4d73471b31a22d4f55b375fd5fd2ad275c Mon Sep 17 00:00:00 2001
From: student <jaredcastillo550@gmail.com>
Date: Tue, 1 Mar 2016 13:21:24 -0600
Subject: [PATCH] Comitted on tuesday

---
 .idea/misc.xml                                | 16 +++++
 .../personalizedgreeter/BeGreeted.java        | 12 +++-
 .../main/res/layout/activity_be_greeted.xml   | 70 +++++++++++++++++--
 app/src/main/res/values/strings.xml           |  3 +
 4 files changed, 93 insertions(+), 8 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5d19981..7158618 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -43,4 +43,20 @@
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>1.8</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/pbuskell/personalizedgreeter/BeGreeted.java b/app/src/main/java/com/example/pbuskell/personalizedgreeter/BeGreeted.java
index 8b1a05e..d3029d4 100644
--- a/app/src/main/java/com/example/pbuskell/personalizedgreeter/BeGreeted.java
+++ b/app/src/main/java/com/example/pbuskell/personalizedgreeter/BeGreeted.java
@@ -11,9 +11,13 @@
 public class BeGreeted extends AppCompatActivity {
 
     String strUsersName = "";
+    String strUsersMiddleName = "";
+    String strUsersLastName = "";
 
     Button btnGreetMe;
     EditText edtxtNameField;
+    EditText edtxtMiddleName;
+    EditText edtxtLastName;
     TextView txtvwGreetingSpace;
 
 
@@ -25,6 +29,9 @@ protected void onCreate(Bundle savedInstanceState) {
         btnGreetMe = (Button) findViewById(R.id.btnGreetMe);
         edtxtNameField = (EditText) findViewById(R.id.edtxtNameField);
         txtvwGreetingSpace = (TextView) findViewById(R.id.txtvwGreetingSpace);
+        edtxtMiddleName =(EditText) findViewById(R.id.edtxtMiddleName);
+        edtxtLastName =(EditText) findViewById(R.id.edtxtLastName);
+
     }
 
     public void greetTheUser(View vw)
@@ -32,7 +39,10 @@ public void greetTheUser(View vw)
         Resources res = getResources();
 
         strUsersName = edtxtNameField.getText().toString();
+        strUsersMiddleName = edtxtMiddleName.getText().toString();
+        strUsersLastName = edtxtLastName.getText().toString();
+
 
-        txtvwGreetingSpace.setText(String.format(res.getString(R.string.strGreeting), strUsersName));
+        txtvwGreetingSpace.setText(String.format("Hello, %1$s %2$s %3$s", strUsersName, strUsersMiddleName, strUsersLastName));
     }
 }
diff --git a/app/src/main/res/layout/activity_be_greeted.xml b/app/src/main/res/layout/activity_be_greeted.xml
index 654004a..d5bcef3 100644
--- a/app/src/main/res/layout/activity_be_greeted.xml
+++ b/app/src/main/res/layout/activity_be_greeted.xml
@@ -13,22 +13,22 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:inputType="textPersonName"
-        android:text="@string/strNamePlaceholder"
         android:ems="10"
         android:id="@+id/edtxtNameField"
         android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="96dp" />
+        android:layout_marginTop="96dp"
+        android:layout_alignLeft="@+id/btnGreetMe"
+        android:layout_alignStart="@+id/btnGreetMe" />
 
     <Button
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/strGetGreeted"
         android:id="@+id/btnGreetMe"
-        android:layout_below="@+id/edtxtNameField"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="51dp"
-        android:onClick="greetTheUser" />
+        android:layout_marginTop="39dp"
+        android:onClick="greetTheUser"
+        android:layout_below="@+id/edtxtLastName"
+        android:layout_centerHorizontal="true" />
 
     <TextView
         android:layout_width="wrap_content"
@@ -48,4 +48,60 @@
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="42dp" />
+
+    <EditText
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/edtxtMiddleName"
+        android:layout_below="@+id/edtxtNameField"
+        android:layout_alignRight="@+id/edtxtNameField"
+        android:layout_alignEnd="@+id/edtxtNameField"
+        android:layout_alignLeft="@+id/edtxtNameField"
+        android:layout_alignStart="@+id/edtxtNameField"
+        android:layout_alignParentTop="false"
+        android:layout_alignWithParentIfMissing="false"
+        android:inputType="text" />
+
+    <EditText
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/edtxtLastName"
+        android:layout_alignLeft="@+id/edtxtMiddleName"
+        android:layout_alignStart="@+id/edtxtMiddleName"
+        android:layout_below="@+id/edtxtMiddleName"
+        android:layout_alignRight="@+id/edtxtMiddleName"
+        android:layout_alignEnd="@+id/edtxtMiddleName"
+        android:inputType="text" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/strFirstNamePrompt"
+        android:id="@+id/txtvwFirstName"
+        android:layout_marginTop= "30dp"
+        android:layout_above="@+id/edtxtMiddleName"
+        android:layout_alignLeft="@+id/txtvwMiddleName"
+        android:layout_alignStart="@+id/txtvwMiddleName"
+        android:inputType="text" />
+
+
+
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/strMiddleNamePrompt"
+        android:id="@+id/txtvwMiddleName"
+        android:layout_alignBottom="@+id/edtxtMiddleName"
+        android:layout_toLeftOf="@+id/edtxtMiddleName"
+        android:layout_toStartOf="@+id/edtxtMiddleName" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/strLastNamePrompt"
+        android:id="@+id/txtvwLastName"
+        android:layout_alignBottom="@+id/edtxtLastName"
+        android:layout_alignLeft="@+id/txtvwMiddleName"
+        android:layout_alignStart="@+id/txtvwMiddleName" />
 </RelativeLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 182aeee..7a4380b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,4 +4,7 @@
     <string name="strGetGreeted">Get Greeted!</string>
     <string name="strNamePlaceholder">Name</string>
     <string name="strGreeting">Hello, %1$s!</string>
+    <string name="strFirstNamePrompt">First Name</string>
+    <string name="strMiddleNamePrompt">Middle Name</string>
+    <string name="strLastNamePrompt">Last Name</string>
 </resources>