From dad7294103d0f03f9aff5ebdd66ad1ba91d15ca4 Mon Sep 17 00:00:00 2001
From: student <sulitpaul@gmail.com>
Date: Wed, 2 Mar 2016 14:34:59 -0600
Subject: [PATCH] Change it to first name to full name (first name, middle
 name, last name)

---
 .idea/.name                                   |  2 +-
 .idea/misc.xml                                | 16 ++++++
 .idea/modules.xml                             |  2 +-
 .../personalizedgreeter/BeGreeted.java        | 11 +++-
 .../main/res/layout/activity_be_greeted.xml   | 54 +++++++++++++------
 app/src/main/res/values/strings.xml           |  9 ++--
 6 files changed, 71 insertions(+), 23 deletions(-)

diff --git a/.idea/.name b/.idea/.name
index 8cce00d..08a5efa 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-PersonalizedGreeter
\ No newline at end of file
+PersonalizedGreeter1
\ No newline at end of file
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/.idea/modules.xml b/.idea/modules.xml
index ce43c14..fef6439 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/PersonalizedGreeter.iml" filepath="$PROJECT_DIR$/PersonalizedGreeter.iml" />
+      <module fileurl="file://$PROJECT_DIR$/PersonalizedGreeter1.iml" filepath="$PROJECT_DIR$/PersonalizedGreeter1.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
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..a6915ed 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 strMidName = "";
+    String strLstName = "";
 
     Button btnGreetMe;
     EditText edtxtNameField;
+    EditText edtxtMidName;
+    EditText edtxtLstName;
     TextView txtvwGreetingSpace;
 
 
@@ -24,7 +28,10 @@ protected void onCreate(Bundle savedInstanceState) {
 
         btnGreetMe = (Button) findViewById(R.id.btnGreetMe);
         edtxtNameField = (EditText) findViewById(R.id.edtxtNameField);
+        edtxtMidName = (EditText) findViewById(R.id. edtxtMidName);
+        edtxtLstName = (EditText) findViewById(R.id. edtxtLstName);
         txtvwGreetingSpace = (TextView) findViewById(R.id.txtvwGreetingSpace);
+
     }
 
     public void greetTheUser(View vw)
@@ -32,7 +39,9 @@ public void greetTheUser(View vw)
         Resources res = getResources();
 
         strUsersName = edtxtNameField.getText().toString();
+        strMidName = edtxtMidName.getText().toString();
+        strLstName = edtxtLstName.getText().toString();
 
-        txtvwGreetingSpace.setText(String.format(res.getString(R.string.strGreeting), strUsersName));
+        txtvwGreetingSpace.setText(String.format(res.getString(R.string.strGreeting), strUsersName, strMidName, strLstName));
     }
 }
diff --git a/app/src/main/res/layout/activity_be_greeted.xml b/app/src/main/res/layout/activity_be_greeted.xml
index 654004a..e97331a 100644
--- a/app/src/main/res/layout/activity_be_greeted.xml
+++ b/app/src/main/res/layout/activity_be_greeted.xml
@@ -16,28 +16,39 @@
         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_below="@+id/txtvwPrompt"
+        android:layout_centerHorizontal="true" />
 
-    <Button
+    <EditText
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/strGetGreeted"
-        android:id="@+id/btnGreetMe"
+        android:id="@+id/edtxtMidName"
         android:layout_below="@+id/edtxtNameField"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="51dp"
-        android:onClick="greetTheUser" />
+        android:layout_alignLeft="@+id/edtxtNameField"
+        android:layout_alignStart="@+id/edtxtNameField"
+        android:layout_alignRight="@+id/edtxtNameField"
+        android:layout_alignEnd="@+id/edtxtNameField"
+        android:text="@string/strMidNamePlaceholder" />
 
-    <TextView
+    <EditText
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:id="@+id/txtvwGreetingSpace"
-        android:layout_below="@+id/btnGreetMe"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="77dp" />
+        android:id="@+id/edtxtLstName"
+        android:layout_below="@+id/edtxtMidName"
+        android:layout_alignLeft="@+id/edtxtMidName"
+        android:layout_alignStart="@+id/edtxtMidName"
+        android:layout_alignRight="@+id/edtxtMidName"
+        android:layout_alignEnd="@+id/edtxtMidName"
+        android:text="@string/strLstNamePlaceholder" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/strGetGreeted"
+        android:id="@+id/btnGreetMe"
+        android:onClick="greetTheUser"
+        android:layout_below="@+id/edtxtLstName"
+        android:layout_centerHorizontal="true" />
 
     <TextView
         android:layout_width="wrap_content"
@@ -46,6 +57,15 @@
         android:text="@string/strPromptQuestion"
         android:id="@+id/txtvwPrompt"
         android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="42dp" />
+        android:layout_centerHorizontal="true" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:id="@+id/txtvwGreetingSpace"
+        android:layout_marginTop="61dp"
+        android:layout_below="@+id/btnGreetMe"
+        android:layout_centerHorizontal="true" />
+
 </RelativeLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 182aeee..d8188fd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,10 @@
 <resources>
     <string name="app_name">PersonalizedGreeter</string>
-    <string name="strPromptQuestion">What is your first name?</string>
+    <string name="strPromptQuestion">What is your full name?</string>
     <string name="strGetGreeted">Get Greeted!</string>
-    <string name="strNamePlaceholder">Name</string>
-    <string name="strGreeting">Hello, %1$s!</string>
+    <string name="strNamePlaceholder">First Name</string>
+    <string name="strMidNamePlaceholder">Middle Name</string>
+    <string name="strLstNamePlaceholder">Last Name</string>
+    <string name="strGreeting">Hello, %1$s %2$s %3$s!</string>
+
 </resources>