From bd6ea430d992b498e7734c08a9cc9e85938530b0 Mon Sep 17 00:00:00 2001
From: Miroojin Bakshi <gaglu231094@gmail.com>
Date: Tue, 24 Jun 2014 12:23:22 +0530
Subject: [PATCH 1/4] Add lift-app-challenge content

---
 .../_create_and_edit_carpool.html.md          | 149 ++++++++++++++++++
 .../_create_codelearn_project.html.md         |  12 ++
 lift-app-challenge/_http_requests.html.md     |  75 +++++++++
 3 files changed, 236 insertions(+)
 create mode 100644 lift-app-challenge/_create_and_edit_carpool.html.md
 create mode 100644 lift-app-challenge/_create_codelearn_project.html.md
 create mode 100644 lift-app-challenge/_http_requests.html.md

diff --git a/lift-app-challenge/_create_and_edit_carpool.html.md b/lift-app-challenge/_create_and_edit_carpool.html.md
new file mode 100644
index 0000000..7cd1160
--- /dev/null
+++ b/lift-app-challenge/_create_and_edit_carpool.html.md
@@ -0,0 +1,149 @@
+## Creating and editing a carpool
+Now that we have designed the basic layout for MainActivity we will proceed to design an UI for creating and editing a carpool in **CreateCarpoolActivity**.
+A carpool entity consists of four attributes: phone number, location, start time from home & start time from office.
+For the UI of *CreateCarpoolActivity*, create a new xml file called **carpool_list.xml** and paste the code into the file shown below.
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin" >
+
+    <ScrollView
+        android:id="@+id/Scrollview"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent" >
+
+        <LinearLayout
+            android:id="@+id/LLayout02"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+
+            <LinearLayout
+                android:id="@+id/phn_block"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="30dp"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:id="@+id/phn"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="35"
+                    android:text="@string/lbl_phn" />
+
+                <EditText
+                    android:id="@+id/fld_phn"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="65"
+                    android:hint="@string/lbl_enter_phn"
+                    android:inputType="textPhonetic" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/location_block"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:id="@+id/location"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="35"
+                    android:text="@string/lbl_location" />
+
+                <EditText
+                    android:id="@+id/fld_location"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="65"
+                    android:hint="@string/lbl_enter_location"
+                    android:inputType="textPhonetic" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="#666666" />
+
+            <LinearLayout
+                android:id="@+id/stime_block"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:id="@+id/stime"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="20"
+                    android:text="@string/lbl_stime" />
+
+                <TimePicker
+                    android:id="@+id/fld_stime"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="80" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="#666666" />
+
+            <LinearLayout
+                android:id="@+id/etime_block"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:id="@+id/etime"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="20"
+                    android:text="@string/lbl_etime" />
+
+                <TimePicker
+                    android:id="@+id/fld_etime"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="80" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="#666666" />
+
+            <Button
+                android:id="@+id/carpool_submit"
+                android:layout_width="200dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/lbl_create" />
+        </LinearLayout>
+    </ScrollView>
+    </RelativeLayout>
+
+You should now have a layout looking like this:
+
+
+##Tasks
+
+1. Make MainActivity a one time post-install activty. When the user opens the app for the second time the MainActivity should be skipped to the CarpoolListActivity.
+2. In CreateCarpoolActivity, store carpool details entered by the user in SharedPreference. We need to mandate that you should store the token details in your app in **codelearn_liftapp** SharedPreference with keys **key_pref_phone** for the phone number, **key_pref_location** for the location, **key_pref_stime** for the start time from home & **key_pref_etime** for the start time from office.
+3. Add a menu item to CarpoolListActivity which allows the user to edit/create the carpool details. The user should be presented with the create carpool screen with the fields populated with the carpool details if a carpool has already been created or left empty if not. The user should then be able to edit the carpool details or create a new one.
+
+##Restrictions
+1. The carpool data must be stored in a SharedPreference file named "codelearn_liftapp".
+2. The start from home and start from office values retrieved from the TimePicker views must be stored in the format: **"HH:mm"**.
+3. The resource file for populating the menu in CarpoolListActivity should be named **carpool_list.xml**.
diff --git a/lift-app-challenge/_create_codelearn_project.html.md b/lift-app-challenge/_create_codelearn_project.html.md
new file mode 100644
index 0000000..bcde698
--- /dev/null
+++ b/lift-app-challenge/_create_codelearn_project.html.md
@@ -0,0 +1,12 @@
+
+In the previous level, we created a new Android project: **CodelearnLiftApp**.
+
+## Designing the basic layout
+
+The app should now have MainActivity as the initial screen. We need to design the basic layout for MainAcitivty in it's corresponding layout file, **main_acitivity.xml**.
+
+
+##Tasks
+
+1. Create two blank activites called **CreateCarpoolActivity** and **CarpoolListActivity.**
+2. Create two buttons in the MainActivity layout with ids, **R.id.create** and **R.id.skip** which launch intents to the **CreateCarpoolActivity** and **CarpoolListActivity**, correspondingly.
diff --git a/lift-app-challenge/_http_requests.html.md b/lift-app-challenge/_http_requests.html.md
new file mode 100644
index 0000000..185751f
--- /dev/null
+++ b/lift-app-challenge/_http_requests.html.md
@@ -0,0 +1,75 @@
+## Executing HTTP requests
+In this level, your task is to send different types HTTP requests to the Codelearn Test API and handle the response appropriately.
+
+###Carpool creation API
+The Codelearn LiftApp API endpoint for submitting the carpool data is available at:
+
+<pre>
+http://codelearn-carpool.herokuapp.com/api/create
+</pre>
+
+####Request
+The JSON request object for the HTTP **POST** request can be as follows.
+<pre>
+{
+"phone" : "9876543219",
+"location" : "narnia",
+"stime" : "8:15",
+"etime" : 16:30"
+}
+</pre>
+
+Note that the field names must be same as the ones given above.
+
+####Response
+The API will provide you with the carpool id as a JSON response
+Note that this id is unique for each carpool entity stored in the database.
+<pre>
+{
+"id" : "_sfdf3rcfht4t553"
+}
+</pre>
+
+==================================================================================
+###Carpool updating API
+For updating the carpool data in the database, a **PUT** request encoded with the carpool id can be sent to the API endpoint as follows:
+<pre>
+http://codelearn-carpool.herokuapp.com/api/carpool/{{id}}
+</pre>
+Where ``{{id}}`` should be replaced with your carpool id. For example:
+<pre>
+http://codelearn-carpool.herokuapp.com/api/carpool/_sfdf3rcfht4t553
+</pre>  
+
+####Request
+
+The JSON request object for the HTTP **PUT** request should be similar to the **POST** request.
+<pre>
+{
+"phone" : "9876543219",
+"location" : "narnia_new",
+"stime" : "8:20",
+"etime" : 16:40"
+}
+</pre>
+
+===================================================================================
+###Carpool deletion API
+For deleting a carpool from the database a **DELETE** request encoded with the carpool id could be sent to the API endpoint as follows:
+
+<pre>
+http://codelearn-carpool.herokuapp.com/api/carpool/_sfdf3rcfht4t553
+</pre>  
+
+
+##Tasks
+
+1. Modify the app the send the carpool data to the API endpoint as a HTTP POST call while creating a carpool in the CreateCarpoolActivity.
+2. Once you receive a successful response, store the received id in SharedPreference, specifying the name of the preference file as **codelearn_liftapp** and the name of the preference key as **pref_carpool_id**
+3. For updating the carpool data from the edit/create carpool screen, a HTTP PUT call must be sent to the API endpoint.
+4. Add a menu item to CarpoolListActivity which allows the user to delete the carpool. On clicking the menu item a HTTP DELETE call should be made to the API endpoint.
+
+##Restrictions
+1. The carpool data must be stored in a SharedPreference file named "codelearn_liftapp".
+2. You must use only DefaultHttpClient or AndroidHttpClient for HTTP calls
+3. There must be exactly two items i.e edit and delete in the menu of CarpoolListActivity.

From f03e1aa61c555ecc72d65edc71112ffdc771f97f Mon Sep 17 00:00:00 2001
From: Miroojin Bakshi <gaglu231094@gmail.com>
Date: Fri, 27 Jun 2014 12:32:17 +0530
Subject: [PATCH 2/4] Add level 4 content and update content for previous
 levels.

---
 .../_create_and_edit_carpool.html.md          |  7 +-
 .../_create_codelearn_project.html.md         |  9 ++-
 .../_fetching_carpools_with_http_get.html.md  | 76 +++++++++++++++++++
 lift-app-challenge/_http_requests.html.md     |  2 +-
 4 files changed, 90 insertions(+), 4 deletions(-)
 create mode 100644 lift-app-challenge/_fetching_carpools_with_http_get.html.md

diff --git a/lift-app-challenge/_create_and_edit_carpool.html.md b/lift-app-challenge/_create_and_edit_carpool.html.md
index 7cd1160..af3f16f 100644
--- a/lift-app-challenge/_create_and_edit_carpool.html.md
+++ b/lift-app-challenge/_create_and_edit_carpool.html.md
@@ -1,6 +1,11 @@
 ## Creating and editing a carpool
 Now that we have designed the basic layout for MainActivity we will proceed to design an UI for creating and editing a carpool in **CreateCarpoolActivity**.
-A carpool entity consists of four attributes: phone number, location, start time from home & start time from office.
+A carpool entity consists of four attributes:
+* Phone number: The phone number of the carpool owner.
+* Location: The initial location of the carpool.
+* Start time from home : The departure time from the location.
+* Start time from office : The departure time from the office.
+
 For the UI of *CreateCarpoolActivity*, create a new xml file called **carpool_list.xml** and paste the code into the file shown below.
 
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/lift-app-challenge/_create_codelearn_project.html.md b/lift-app-challenge/_create_codelearn_project.html.md
index bcde698..f2c5146 100644
--- a/lift-app-challenge/_create_codelearn_project.html.md
+++ b/lift-app-challenge/_create_codelearn_project.html.md
@@ -1,6 +1,11 @@
 
-In the previous level, we created a new Android project: **CodelearnLiftApp**.
-
+This challenge involves creating a basic car lift app for office-goers. We will be fetching the list of carpools and submitting new carpools using network calls.
+In this level, we will create a new Android project, **CodelearnLiftApp** with the following attributes:
+* **Package name:** org.codelearn.liftapp
+* **Minimum SDK required:** 9 (Android 2.3)
+* **Target SDK :** The latest android SDK 
+* **Initial Activity:** The initial activity of the app should be called **MainActivity**
+ 
 ## Designing the basic layout
 
 The app should now have MainActivity as the initial screen. We need to design the basic layout for MainAcitivty in it's corresponding layout file, **main_acitivity.xml**.
diff --git a/lift-app-challenge/_fetching_carpools_with_http_get.html.md b/lift-app-challenge/_fetching_carpools_with_http_get.html.md
new file mode 100644
index 0000000..03c187d
--- /dev/null
+++ b/lift-app-challenge/_fetching_carpools_with_http_get.html.md
@@ -0,0 +1,76 @@
+##Fetching carpools using HTTP GET calls.
+
+This level focuses on fetching carpools using the Codelearn Twitter API and displaying them in list in *CarpoolListActivity* and firing up a new activity *CarpoolDetailActivity* which displays all the carpool data when a carpool item is clicked on the list.
+
+###API
+
+Make an HTTP **GET** request call to fetch tweets using-
+<pre>
+http://codelearn-carpool.herokuapp.com/api/carpools
+</pre>
+
+###Request
+
+**Fetching carpools**: A simple GET request without any request parameters is sufficient to get a response.
+
+###Response
+
+**Fetching carpools**: The endpoint will provide an array of carpools as a JSON response when a GET call is received.
+
+<pre>
+[
+  {
+    "etime": "17:20",
+    "stime": "14:20",
+    "location": "narnia",
+    "phone": "9876543210"
+  },
+  {
+    "etime": "17:32",
+    "stime": "14:32",
+    "location": "hogwarts",
+    "phone": "1234567890"
+  },
+  {
+    "etime": "14:35",
+    "stime": "8:35",
+    "location": "mordor",
+    "phone": "9999988888"
+  },
+  {
+    "etime": "18:14",
+    "stime": "10:14",
+    "location": "pandora",
+    "phone": "9538384545"
+  }
+]
+</pre>
+
+## Example
+
+In the JSON response above, the first carpool has location narnia followed by hogwarts, mordor & pandora. It should appear as the order below in CarpoolListScreen 
+
+`order of tweets on CarpoolListActivity`
+<pre>
+narnia
+hogwarts
+mordor
+pandora
+</pre>
+
+##Carpool Details
+
+While displaying minimal details about the carpools in the CarpoolListScreen, we need to fire up a new activity which diplays all the information of the carpool when the corresponding carpool is clicked on the list. We need to also allow the user to call or message the carpool number if the user needs to contact the carpool owner. The layout of the carpool detail activity can be as follows.
+
+
+###Tasks
+
+1. Modify CarpoolListActivity to make an HTTP GET call when the Activity is created to fetch carpools. Handle the received Carpool objects and render them in the ListView.
+
+2. Register an **onListItemClick** listener which, on clicking a list item, fires up the activity **CarpoolDetailAcitivty** to display the corresponding carpool details. 
+
+2. Add two buttons with ids **R.id.call** and **R.id.message** to call or message the carpool phone number repectively. The button click should launch the proper intents. 
+
+###Restrictions
+* You must only use **AndroidHttpClient** or **DefaultHttpClient** to do network calls as they can only be mocked & tested with Robolectric. Any other library is not supported.
+* For JSON parsing, you can use **GSON** & **Jackson** libraries only
diff --git a/lift-app-challenge/_http_requests.html.md b/lift-app-challenge/_http_requests.html.md
index 185751f..dde000a 100644
--- a/lift-app-challenge/_http_requests.html.md
+++ b/lift-app-challenge/_http_requests.html.md
@@ -1,5 +1,5 @@
 ## Executing HTTP requests
-In this level, your task is to send different types HTTP requests to the Codelearn Test API and handle the response appropriately.
+In this level, your task is to send different types HTTP requests to the Codelearn Test API and handle the response appropriately. We will be submitting and updating carpool data and deleting a carpool enitity to the API endpoint.
 
 ###Carpool creation API
 The Codelearn LiftApp API endpoint for submitting the carpool data is available at:

From fa5257a3fccb4dba53333184d4eb6ec9e7068ff3 Mon Sep 17 00:00:00 2001
From: Miroojin Bakshi <gaglu231094@gmail.com>
Date: Fri, 27 Jun 2014 12:34:59 +0530
Subject: [PATCH 3/4] Update name

---
 lift-app-challenge/_fetching_carpools_with_http_get.html.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lift-app-challenge/_fetching_carpools_with_http_get.html.md b/lift-app-challenge/_fetching_carpools_with_http_get.html.md
index 03c187d..c775bfa 100644
--- a/lift-app-challenge/_fetching_carpools_with_http_get.html.md
+++ b/lift-app-challenge/_fetching_carpools_with_http_get.html.md
@@ -1,10 +1,10 @@
 ##Fetching carpools using HTTP GET calls.
 
-This level focuses on fetching carpools using the Codelearn Twitter API and displaying them in list in *CarpoolListActivity* and firing up a new activity *CarpoolDetailActivity* which displays all the carpool data when a carpool item is clicked on the list.
+This level focuses on fetching carpools using the Codelearn Carpool API and displaying them in list in *CarpoolListActivity* and firing up a new activity *CarpoolDetailActivity* which displays all the carpool data when a carpool item is clicked on the list.
 
 ###API
 
-Make an HTTP **GET** request call to fetch tweets using-
+Make an HTTP **GET** request call to fetch carpool using-
 <pre>
 http://codelearn-carpool.herokuapp.com/api/carpools
 </pre>
@@ -50,7 +50,7 @@ http://codelearn-carpool.herokuapp.com/api/carpools
 
 In the JSON response above, the first carpool has location narnia followed by hogwarts, mordor & pandora. It should appear as the order below in CarpoolListScreen 
 
-`order of tweets on CarpoolListActivity`
+`order of carpools on CarpoolListActivity`
 <pre>
 narnia
 hogwarts

From ad9b842e44d0414a5460cb1510811efd8ae97408 Mon Sep 17 00:00:00 2001
From: Miroojin Bakshi <gaglu231094@gmail.com>
Date: Tue, 1 Jul 2014 13:16:06 +0530
Subject: [PATCH 4/4] carpool to lift

---
 ....html.md => _create_and_edit_lift.html.md} | 24 +++---
 .../_create_codelearn_project.html.md         |  8 +-
 .../_fetching_carpools_with_http_get.html.md  | 76 -------------------
 .../_fetching_lifts_with_http_get.html.md     | 76 +++++++++++++++++++
 lift-app-challenge/_http_requests.html.md     | 40 +++++-----
 5 files changed, 112 insertions(+), 112 deletions(-)
 rename lift-app-challenge/{_create_and_edit_carpool.html.md => _create_and_edit_lift.html.md} (79%)
 delete mode 100644 lift-app-challenge/_fetching_carpools_with_http_get.html.md
 create mode 100644 lift-app-challenge/_fetching_lifts_with_http_get.html.md

diff --git a/lift-app-challenge/_create_and_edit_carpool.html.md b/lift-app-challenge/_create_and_edit_lift.html.md
similarity index 79%
rename from lift-app-challenge/_create_and_edit_carpool.html.md
rename to lift-app-challenge/_create_and_edit_lift.html.md
index af3f16f..8818cdc 100644
--- a/lift-app-challenge/_create_and_edit_carpool.html.md
+++ b/lift-app-challenge/_create_and_edit_lift.html.md
@@ -1,12 +1,12 @@
-## Creating and editing a carpool
-Now that we have designed the basic layout for MainActivity we will proceed to design an UI for creating and editing a carpool in **CreateCarpoolActivity**.
-A carpool entity consists of four attributes:
-* Phone number: The phone number of the carpool owner.
-* Location: The initial location of the carpool.
+## Creating and editing a lift
+Now that we have designed the basic layout for MainActivity we will proceed to design an UI for creating and editing a lift in **CreateLiftActivity**.
+A lift entity consists of four attributes:
+* Phone number: The phone number of the car owner.
+* Location: The initial location of the lift.
 * Start time from home : The departure time from the location.
 * Start time from office : The departure time from the office.
 
-For the UI of *CreateCarpoolActivity*, create a new xml file called **carpool_list.xml** and paste the code into the file shown below.
+For the UI of **CreateLiftActivity**, create a new xml file called **activity_create_lift.xml** and paste the code into the file shown below.
 
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
@@ -130,7 +130,7 @@ For the UI of *CreateCarpoolActivity*, create a new xml file called **carpool_li
                 android:background="#666666" />
 
             <Button
-                android:id="@+id/carpool_submit"
+                android:id="@+id/lift_submit"
                 android:layout_width="200dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
@@ -144,11 +144,11 @@ You should now have a layout looking like this:
 
 ##Tasks
 
-1. Make MainActivity a one time post-install activty. When the user opens the app for the second time the MainActivity should be skipped to the CarpoolListActivity.
-2. In CreateCarpoolActivity, store carpool details entered by the user in SharedPreference. We need to mandate that you should store the token details in your app in **codelearn_liftapp** SharedPreference with keys **key_pref_phone** for the phone number, **key_pref_location** for the location, **key_pref_stime** for the start time from home & **key_pref_etime** for the start time from office.
-3. Add a menu item to CarpoolListActivity which allows the user to edit/create the carpool details. The user should be presented with the create carpool screen with the fields populated with the carpool details if a carpool has already been created or left empty if not. The user should then be able to edit the carpool details or create a new one.
+1. Make MainActivity a one time post-install activty. When the user opens the app for the second time the MainActivity should be skipped to the LiftListActivity.
+2. In CreateLiftActivity, store the lift details entered by the user in SharedPreference. We need to mandate that you store the token details in your app in **codelearn_liftapp** SharedPreference with keys **key_pref_phone** for the phone number, **key_pref_location** for the location, **key_pref_stime** for the start time from home & **key_pref_etime** for the start time from office.
+3. Add a menu item to LiftListActivity which allows the user to edit/create the lift details. The user should be presented with the create lift screen with the fields populated with the lift details if a lift has already been created or left empty if not. The user should then be able to edit the lift details or create a new one.
 
 ##Restrictions
-1. The carpool data must be stored in a SharedPreference file named "codelearn_liftapp".
+1. The lift data must be stored in a SharedPreference file named "codelearn_liftapp".
 2. The start from home and start from office values retrieved from the TimePicker views must be stored in the format: **"HH:mm"**.
-3. The resource file for populating the menu in CarpoolListActivity should be named **carpool_list.xml**.
+3. The resource file for populating the menu in LiftListActivity should be named **lift_list.xml**.
diff --git a/lift-app-challenge/_create_codelearn_project.html.md b/lift-app-challenge/_create_codelearn_project.html.md
index f2c5146..bc14b5e 100644
--- a/lift-app-challenge/_create_codelearn_project.html.md
+++ b/lift-app-challenge/_create_codelearn_project.html.md
@@ -1,5 +1,5 @@
 
-This challenge involves creating a basic car lift app for office-goers. We will be fetching the list of carpools and submitting new carpools using network calls.
+This challenge involves creating a basic car lift app for office-goers. We will be fetching the list of lifts and submitting new lifts using network calls.
 In this level, we will create a new Android project, **CodelearnLiftApp** with the following attributes:
 * **Package name:** org.codelearn.liftapp
 * **Minimum SDK required:** 9 (Android 2.3)
@@ -8,10 +8,10 @@ In this level, we will create a new Android project, **CodelearnLiftApp** with t
  
 ## Designing the basic layout
 
-The app should now have MainActivity as the initial screen. We need to design the basic layout for MainAcitivty in it's corresponding layout file, **main_acitivity.xml**.
+The app should now have MainActivity as the initial screen. We need to design the basic layout for MainAcitivty in it's corresponding layout file, **main_acitivity.xml**. We need to link two other activites from the MainActivity to create/edit a lift and fetch the list of all lifts created by other users.
 
 
 ##Tasks
 
-1. Create two blank activites called **CreateCarpoolActivity** and **CarpoolListActivity.**
-2. Create two buttons in the MainActivity layout with ids, **R.id.create** and **R.id.skip** which launch intents to the **CreateCarpoolActivity** and **CarpoolListActivity**, correspondingly.
+1. Create two blank activites called **CreateLiftActivity** and **LiftListActivity.**
+2. Create two buttons in the MainActivity layout with ids, **R.id.create** and **R.id.skip** which launch intents to the **CreateLiftActivity** and **LiftListActivity**, respectively.
diff --git a/lift-app-challenge/_fetching_carpools_with_http_get.html.md b/lift-app-challenge/_fetching_carpools_with_http_get.html.md
deleted file mode 100644
index c775bfa..0000000
--- a/lift-app-challenge/_fetching_carpools_with_http_get.html.md
+++ /dev/null
@@ -1,76 +0,0 @@
-##Fetching carpools using HTTP GET calls.
-
-This level focuses on fetching carpools using the Codelearn Carpool API and displaying them in list in *CarpoolListActivity* and firing up a new activity *CarpoolDetailActivity* which displays all the carpool data when a carpool item is clicked on the list.
-
-###API
-
-Make an HTTP **GET** request call to fetch carpool using-
-<pre>
-http://codelearn-carpool.herokuapp.com/api/carpools
-</pre>
-
-###Request
-
-**Fetching carpools**: A simple GET request without any request parameters is sufficient to get a response.
-
-###Response
-
-**Fetching carpools**: The endpoint will provide an array of carpools as a JSON response when a GET call is received.
-
-<pre>
-[
-  {
-    "etime": "17:20",
-    "stime": "14:20",
-    "location": "narnia",
-    "phone": "9876543210"
-  },
-  {
-    "etime": "17:32",
-    "stime": "14:32",
-    "location": "hogwarts",
-    "phone": "1234567890"
-  },
-  {
-    "etime": "14:35",
-    "stime": "8:35",
-    "location": "mordor",
-    "phone": "9999988888"
-  },
-  {
-    "etime": "18:14",
-    "stime": "10:14",
-    "location": "pandora",
-    "phone": "9538384545"
-  }
-]
-</pre>
-
-## Example
-
-In the JSON response above, the first carpool has location narnia followed by hogwarts, mordor & pandora. It should appear as the order below in CarpoolListScreen 
-
-`order of carpools on CarpoolListActivity`
-<pre>
-narnia
-hogwarts
-mordor
-pandora
-</pre>
-
-##Carpool Details
-
-While displaying minimal details about the carpools in the CarpoolListScreen, we need to fire up a new activity which diplays all the information of the carpool when the corresponding carpool is clicked on the list. We need to also allow the user to call or message the carpool number if the user needs to contact the carpool owner. The layout of the carpool detail activity can be as follows.
-
-
-###Tasks
-
-1. Modify CarpoolListActivity to make an HTTP GET call when the Activity is created to fetch carpools. Handle the received Carpool objects and render them in the ListView.
-
-2. Register an **onListItemClick** listener which, on clicking a list item, fires up the activity **CarpoolDetailAcitivty** to display the corresponding carpool details. 
-
-2. Add two buttons with ids **R.id.call** and **R.id.message** to call or message the carpool phone number repectively. The button click should launch the proper intents. 
-
-###Restrictions
-* You must only use **AndroidHttpClient** or **DefaultHttpClient** to do network calls as they can only be mocked & tested with Robolectric. Any other library is not supported.
-* For JSON parsing, you can use **GSON** & **Jackson** libraries only
diff --git a/lift-app-challenge/_fetching_lifts_with_http_get.html.md b/lift-app-challenge/_fetching_lifts_with_http_get.html.md
new file mode 100644
index 0000000..df43a06
--- /dev/null
+++ b/lift-app-challenge/_fetching_lifts_with_http_get.html.md
@@ -0,0 +1,76 @@
+##Fetching lifts using HTTP GET calls.
+
+This level focuses on fetching lifts using the Codelearn Test API and displaying them in list in *LiftListActivity* and firing up a new activity *LiftDetailActivity* which displays all the lift data when a lift item is clicked on the list.
+
+###API
+
+Make an HTTP **GET** request call to fetch lift using-
+<pre>
+http://codelearn-liftapp.herokuapp.com/api/lifts
+</pre>
+
+###Request
+
+**Fetching lifts**: A simple GET request without any request parameters is sufficient to get a response.
+
+###Response
+
+**Fetching lifts**: The endpoint will provide an array of lifts as a JSON response when a GET call is received.
+
+<pre>
+[
+  {
+    "etime": "17:20",
+    "stime": "14:20",
+    "location": "narnia",
+    "phone": "9876543210"
+  },
+  {
+    "etime": "17:32",
+    "stime": "14:32",
+    "location": "hogwarts",
+    "phone": "1234567890"
+  },
+  {
+    "etime": "14:35",
+    "stime": "8:35",
+    "location": "mordor",
+    "phone": "9999988888"
+  },
+  {
+    "etime": "18:14",
+    "stime": "10:14",
+    "location": "pandora",
+    "phone": "9538384545"
+  }
+]
+</pre>
+
+## Example
+
+In the JSON response above, the first lift has location narnia followed by hogwarts, mordor & pandora. It should appear as the order below in LiftListScreen 
+
+`order of lifts on LiftListActivity`
+<pre>
+narnia
+hogwarts
+mordor
+pandora
+</pre>
+
+##Lift Details
+
+While displaying minimal details about the lifts in the LiftListScreen, we need to fire up a new activity which diplays all the information of the lift when the corresponding lift is clicked on the list. We need to also allow the user to call or message the lift number if the user needs to contact the lift owner. The layout of the lift detail activity can be as follows.
+
+
+###Tasks
+
+1. Modify LiftListActivity to make an HTTP GET call when the Activity is created to fetch lifts. Handle the received Lift objects and render them in the ListView.
+
+2. Register an **onListItemClick** listener which, on clicking a list item, fires up the activity **LiftDetailAcitivty** to display the corresponding lift details. 
+
+2. Add two buttons with ids **R.id.call** and **R.id.message** to call or message the lift phone number repectively. The button click should launch the proper intents. 
+
+###Restrictions
+* You must only use **AndroidHttpClient** or **DefaultHttpClient** to do network calls as they can only be mocked & tested with Robolectric. Any other library is not supported.
+* For JSON parsing, you can use **GSON** & **Jackson** libraries only
diff --git a/lift-app-challenge/_http_requests.html.md b/lift-app-challenge/_http_requests.html.md
index dde000a..0f85627 100644
--- a/lift-app-challenge/_http_requests.html.md
+++ b/lift-app-challenge/_http_requests.html.md
@@ -1,11 +1,11 @@
 ## Executing HTTP requests
-In this level, your task is to send different types HTTP requests to the Codelearn Test API and handle the response appropriately. We will be submitting and updating carpool data and deleting a carpool enitity to the API endpoint.
+In this level, your task is to send different types HTTP requests to the Codelearn Test API and handle the response appropriately. We will be submitting and updating lift data and deleting a lift enitiy using the API endpoint.
 
-###Carpool creation API
-The Codelearn LiftApp API endpoint for submitting the carpool data is available at:
+###Lift creation API
+The Codelearn LiftApp API endpoint for submitting the lift data is available at:
 
 <pre>
-http://codelearn-carpool.herokuapp.com/api/create
+http://codelearn-liftapp.herokuapp.com/api/create
 </pre>
 
 ####Request
@@ -22,8 +22,8 @@ The JSON request object for the HTTP **POST** request can be as follows.
 Note that the field names must be same as the ones given above.
 
 ####Response
-The API will provide you with the carpool id as a JSON response
-Note that this id is unique for each carpool entity stored in the database.
+The API will provide you with the lift id as a JSON response
+Note that this id is unique for each lift entity stored in the database.
 <pre>
 {
 "id" : "_sfdf3rcfht4t553"
@@ -31,14 +31,14 @@ Note that this id is unique for each carpool entity stored in the database.
 </pre>
 
 ==================================================================================
-###Carpool updating API
-For updating the carpool data in the database, a **PUT** request encoded with the carpool id can be sent to the API endpoint as follows:
+###Lift updating API
+For updating the lift data in the database, a **PUT** request encoded with the lift id can be sent to the API endpoint as follows:
 <pre>
-http://codelearn-carpool.herokuapp.com/api/carpool/{{id}}
+http://codelearn-liftapp.herokuapp.com/api/lifts/{{id}}
 </pre>
-Where ``{{id}}`` should be replaced with your carpool id. For example:
+Where ``{{id}}`` should be replaced with your lift id. For example:
 <pre>
-http://codelearn-carpool.herokuapp.com/api/carpool/_sfdf3rcfht4t553
+http://codelearn-liftapp.herokuapp.com/api/lifts/_sfdf3rcfht4t553
 </pre>  
 
 ####Request
@@ -54,22 +54,22 @@ The JSON request object for the HTTP **PUT** request should be similar to the **
 </pre>
 
 ===================================================================================
-###Carpool deletion API
-For deleting a carpool from the database a **DELETE** request encoded with the carpool id could be sent to the API endpoint as follows:
+###Lift deletion API
+For deleting a lift enitiy from the database a **DELETE** request encoded with the lift id could be sent to the API endpoint as follows:
 
 <pre>
-http://codelearn-carpool.herokuapp.com/api/carpool/_sfdf3rcfht4t553
+http://codelearn-liftapp.herokuapp.com/api/lifts/_sfdf3rcfht4t553
 </pre>  
 
 
 ##Tasks
 
-1. Modify the app the send the carpool data to the API endpoint as a HTTP POST call while creating a carpool in the CreateCarpoolActivity.
-2. Once you receive a successful response, store the received id in SharedPreference, specifying the name of the preference file as **codelearn_liftapp** and the name of the preference key as **pref_carpool_id**
-3. For updating the carpool data from the edit/create carpool screen, a HTTP PUT call must be sent to the API endpoint.
-4. Add a menu item to CarpoolListActivity which allows the user to delete the carpool. On clicking the menu item a HTTP DELETE call should be made to the API endpoint.
+1. Modify the app the send the lift data to the API endpoint as a HTTP POST call on creating a lift in the CreateLiftActivity.
+2. Once you receive a successful response, store the received id in SharedPreference, specifying the name of the preference file as **codelearn_liftapp** and the name of the preference key as **pref_lift_id**
+3. For updating the lift data from the edit/create lift screen, a HTTP PUT call must be sent to the API endpoint.
+4. Add a menu item to LiftListActivity which allows the user to delete the lift. On clicking the menu item a HTTP DELETE call should be made to the API endpoint.
 
 ##Restrictions
-1. The carpool data must be stored in a SharedPreference file named "codelearn_liftapp".
+1. The lift id must be stored in a SharedPreference file named "codelearn_liftapp" with preference key, *"pref_lift_id".
 2. You must use only DefaultHttpClient or AndroidHttpClient for HTTP calls
-3. There must be exactly two items i.e edit and delete in the menu of CarpoolListActivity.
+3. There must be exactly two items i.e edit and delete in the menu of LiftListActivity.