From 1f357911403fb6ef301f5d211b2da8910841641e Mon Sep 17 00:00:00 2001
From: Adam Saturna <saturna@ualberta.ca>
Date: Mon, 11 Mar 2013 11:49:22 -0600
Subject: [PATCH 01/18] Database Added, comments will be added later I just
 wanted to make it available ASAP.

Note:
Recipe Class modified for the database support, the advanced features can be added later.
---
 .../cmput301/recipebot/model/DbHelper.java    | 348 ++++++++++++++++++
 .../com/cmput301/recipebot/model/Recipe.java  |  15 +
 2 files changed, 363 insertions(+)
 create mode 100644 app/src/main/java/com/cmput301/recipebot/model/DbHelper.java

diff --git a/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java b/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java
new file mode 100644
index 0000000..2a962f9
--- /dev/null
+++ b/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java
@@ -0,0 +1,348 @@
+package com.cmput301.recipebot.model;
+//code from: http://www.youtube.com/watch?v=v61A90qlK9s
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.provider.BaseColumns;
+import android.util.Log;
+
+import java.util.ArrayList;
+
+public class DbHelper extends SQLiteOpenHelper {
+
+    private static final String TAG = "DbHelper";
+    public static final String DB_NAME = "log.db";
+    public static final int DB_VERSION = 21;
+
+    public static final String INGREDIENTS_TABLE = "ingredients";
+    public static final String I_ID = BaseColumns._ID;
+    public static final String REC_ID = "rec_id";
+    public static final String INGREDIENT = "ingredient";
+
+    public static final String FOODS_TABLE = "foods";
+    public static final String F_NAME = "f_name";
+
+    public static final String RECIPES_TABLE = "recepies";
+    public static final String R_ID = BaseColumns._ID;
+    public static final String R_NAME = "r_name";
+    public static final String WRITER = "writer";
+    public static final String PREP = "prep";
+
+    public static final String HASIMAGES_TABLE = "has_images";
+    public static final String HIT_ID = BaseColumns._ID;
+    public static final String RECIPE = "r_id";
+    public static final String IMAGE_PATH = "image_path";
+    
+    public DbHelper(Context context) {
+        super(context, DB_NAME, null, DB_VERSION);
+
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+
+        //FOODS_TABLE
+        String sql1 = String.format("create table %s (%s TEXT primary key)",
+                FOODS_TABLE, F_NAME);
+         Log.d(TAG, "creating FOODS_TABLE");
+        //RECIPES_TABLE
+        String sql2 = String.format("create table %s (%s INTEGER primary key, %s TEXT, %s TEXT, " +
+                "%s TEXT)",
+                RECIPES_TABLE, R_ID, WRITER, R_NAME, PREP);
+
+        //HASIMAGES_TABLE
+        String sql3 = String.format("create table %s (%s INTEGER primary key, %s INTEGER, %s TEXT, " +
+                "foreign key(%s) references %s)",
+                HASIMAGES_TABLE, HIT_ID, RECIPE, IMAGE_PATH, RECIPE, RECIPES_TABLE);
+
+        //INGREDIENTS_TABLE
+        String sql4 = String.format("create table %s (%s INTEGER primary key, %s INTEGER, %s TEXT, " +
+        		"foreign key(%s) references %s)",
+                INGREDIENTS_TABLE, I_ID, REC_ID, INGREDIENT, REC_ID, RECIPES_TABLE);
+        
+
+        try {
+            db.execSQL(sql1);
+        } catch (Exception e) {
+            Log.e(TAG, "FAILED TO CREATE TABLE: " + FOODS_TABLE);
+        }
+        try {
+            db.execSQL(sql2);
+        } catch (Exception e) {
+            Log.e(TAG, "FAILED TO CREATE TABLE: " + RECIPES_TABLE);
+        }
+        try {
+            db.execSQL(sql3);
+        } catch (Exception e) {
+            Log.e(TAG, "FAILED TO CREATE TABLE: " + HASIMAGES_TABLE);
+        }
+        try {
+            db.execSQL(sql4);
+        } catch (Exception e) {
+            Log.e(TAG, "FAILED TO CREATE TABLE: " + INGREDIENTS_TABLE);
+        }
+    }
+
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+    	try {
+        db.execSQL("drop table if exists " + FOODS_TABLE);
+        db.execSQL("drop table if exists " + RECIPES_TABLE);
+        db.execSQL("drop table if exists " + HASIMAGES_TABLE);
+        db.execSQL("drop table if exists " + INGREDIENTS_TABLE);
+    	} catch (Exception e) {
+    		Log.d("dbUPGRADE", "failed to drop all tables");
+    	}
+
+        Log.d(TAG, "onUpdate dropped table ALL");
+        this.onCreate(db);
+    }
+    // code from: http://www.androidhive.info/2011/11/android-sqlite-database-tutorial/
+    //returns a list of log entries
+
+    public ArrayList<String> loadPantry() {
+
+        ArrayList<String> logList = new ArrayList<String>();
+        SQLiteDatabase db = this.getReadableDatabase();
+
+        Cursor cursor = db.rawQuery("SELECT * FROM " + FOODS_TABLE, null);
+        if (cursor.moveToFirst()) {
+            try {
+                do {
+                    logList.add(cursor.getString(0));
+                } while (cursor.moveToNext());
+            } catch (Exception e) {
+                Log.e(TAG, "failed to load all Foods from: " + FOODS_TABLE);
+            }
+        }
+        cursor.close();
+        db.close();
+        return logList;
+    }
+
+    public ArrayList<Recipe> loadRecipes() {
+
+        ArrayList<Recipe> logList = new ArrayList<Recipe>();
+        ArrayList<Ingredient> ingredients = new ArrayList<Ingredient>();
+        ArrayList<String> photos = new ArrayList<String>();
+        ArrayList<String> directions = new ArrayList<String>();
+        SQLiteDatabase db = this.getReadableDatabase();
+
+        Cursor cursor = db.rawQuery("SELECT * FROM " + RECIPES_TABLE + " ORDER BY " + R_NAME + " ASC", null);
+        if (cursor.moveToFirst()) {
+            try {
+                do {
+                	//SET RECIPE INFO
+                    Recipe recipe = new Recipe();
+                    recipe.setId(cursor.getInt(0));
+                    recipe.setUser(cursor.getString(1));
+                    recipe.setName(cursor.getString(2));
+                    directions.add(cursor.getString(3));
+                    recipe.setDirections(directions);
+                    
+                    //SET INGREDIENTS
+                    Cursor cursor2 = db.rawQuery("SELECT " + INGREDIENT + " FROM " + INGREDIENTS_TABLE + " WHERE " +
+                    		REC_ID + " =" + cursor.getInt(0), null);
+                    if(cursor2.moveToFirst()) {
+                    	try{
+                    		do {
+                                Ingredient ingredient = new Ingredient(cursor2.getString(0), "", 0);
+                    			ingredients.add(ingredient);
+                    		} while(cursor2.moveToNext());
+                    	} catch (Exception e) {
+                    		Log.e(TAG, "failed to load INGREDIENTS from: " + INGREDIENTS_TABLE);
+                    	}
+                    }
+                    cursor2.close();
+                    recipe.setIngredients(ingredients);
+
+                    //SET PHOTOS
+                    Cursor cursor3 = db.rawQuery("SELECT " + IMAGE_PATH + " FROM " + HASIMAGES_TABLE + " WHERE " +
+                    		RECIPE + " =" + cursor.getInt(0), null);
+                    if(cursor3.moveToFirst()) {
+                    	try{
+                    		do {
+                    			photos.add(cursor3.getString(0));
+                    		} while(cursor3.moveToNext());
+                    	} catch (Exception e) {
+                    		Log.e(TAG, "failed to load IMAGES from: " + HASIMAGES_TABLE);
+                    	}
+                    }
+                    cursor3.close();
+                    recipe.setPhotos(photos);
+
+                    logList.add(recipe);
+                } while (cursor.moveToNext());
+            } catch (Exception e) {
+                Log.e(TAG, "failed to load all Recipes from: " + RECIPES_TABLE);
+            }
+        }
+        cursor.close();
+        db.close();
+        return logList;
+    }
+
+     //TODO
+    public void addRecipe(int id, String writer, String recipe_name, String prep, ArrayList<String> ingr, ArrayList<String> pics) {
+        SQLiteDatabase db = this.getWritableDatabase();
+
+        ContentValues values = new ContentValues();
+        values.put(WRITER, writer);
+        values.put(R_NAME, recipe_name);
+        values.put(PREP, prep);
+        values.put(R_ID, id);
+
+        // Inserting Row
+        try {
+            db.insertOrThrow(RECIPES_TABLE, null, values);
+        } catch (Exception e) {
+            Log.e(TAG, "Couldn't put entry into: " + RECIPES_TABLE);
+        }
+
+        ContentValues values2 = new ContentValues();
+
+        for(int x = 0; x < ingr.size(); x++) {
+            values2.put(INGREDIENT, ingr.get(x));
+            values2.put(REC_ID, id);
+
+            try {
+                db.insertOrThrow(INGREDIENTS_TABLE, null, values2);
+                Log.d(TAG, "try: add ingredient SUCCESS: " + ingr.get(x));
+            } catch (Exception e) {
+                Log.e(TAG, "Couldn't put entry into: " + INGREDIENTS_TABLE + ": " + ingr.get(x));
+            }
+            values2.clear();
+        }
+
+        ContentValues values3 = new ContentValues();
+        for(int y = 0; y < pics.size(); y++) {  	
+            values3.put(IMAGE_PATH, pics.get(y));
+            values3.put(RECIPE, id);
+
+            try {
+                db.insertOrThrow(HASIMAGES_TABLE, null, values3);
+                Log.d(TAG, "try: add photo SUCCESS: " + pics.get(y));
+            } catch (Exception e) {
+                Log.e(TAG, "Couldn't put entry into: " + HASIMAGES_TABLE + ": " + pics.get(y));
+            }
+            values3.clear();
+        }
+        values.clear();
+        db.close();
+    }
+    
+    public void editRecipeName(Recipe recipe, String r_name) {
+	    SQLiteDatabase db = this.getWritableDatabase();
+	
+	    String sql1 = String.format("UPDATE " + RECIPES_TABLE + " SET " + R_NAME + " ='%s'" +
+	    		" WHERE " + R_ID + " =%s", r_name, recipe.getId());
+	    try {
+	        db.execSQL(sql1);
+	        recipe.setName(r_name);
+	    } catch (Exception e) {
+	        Log.e(TAG, "FAILED TO UPDATE A RECIPE: " + recipe.getName());
+	    }
+	
+	    db.close();
+    }
+    
+    public void editRecipePrep(Recipe recipe, String prep) {
+	    SQLiteDatabase db = this.getWritableDatabase();
+	    ArrayList<String> preparation = new ArrayList<String>();
+        preparation.add(prep);
+
+	    //UPDATE RECIPE_TABLE
+	    String sql1 = String.format("UPDATE " + RECIPES_TABLE + " SET " + PREP + " ='%s'" +
+	    		" WHERE " + R_ID + " =%s", prep, recipe.getId());
+	    try {
+	        db.execSQL(sql1);
+	        recipe.setDirections(preparation);
+	    } catch (Exception e) {
+	        Log.e(TAG, "FAILED TO UPDATE A RECIPE: " + prep);
+	    }
+	
+	    db.close();
+    }
+    
+    public void editRecipeIngredients(Recipe recipe, ArrayList<String> ingredients) {
+	    SQLiteDatabase db = this.getWritableDatabase();
+	    ContentValues values = new ContentValues(0);
+        ArrayList<Ingredient> ingr = new ArrayList<Ingredient>();
+
+	    db.delete(INGREDIENTS_TABLE, REC_ID + " = ?", new String[] {String.valueOf(recipe.getId())});
+	    
+	    for(int x = 0; x < ingredients.size(); x++) {
+
+	   	    values.put(REC_ID, recipe.getId());
+	   	    values.put(INGREDIENT, ingredients.get(x));
+            Ingredient ingredient = new Ingredient(ingredients.get(x), "", 0);
+            ingr.add(ingredient);
+		    try {
+		    	db.insertOrThrow(INGREDIENTS_TABLE, null, values);
+		    } catch (Exception e) {
+		        Log.e(TAG, "FAILED TO UPDATE INGREDIENT: " + ingredients.get(x));
+		    }
+	    }
+        recipe.setIngredients(ingr);
+	    db.close();
+    }
+    
+    public void editRecipePictures(Recipe recipe, ArrayList<String> pictures) {
+	    SQLiteDatabase db = this.getWritableDatabase();
+	    ContentValues values = new ContentValues(0);
+	    db.delete(HASIMAGES_TABLE, RECIPE + " = ?", new String[] {String.valueOf(recipe.getId())});
+	    
+	    for(int x = 0; x < pictures.size(); x++) {
+
+	    	values.put(RECIPE, recipe.getId());
+	    	values.put(IMAGE_PATH, pictures.get(x));
+		    try {
+		    	db.insertOrThrow(HASIMAGES_TABLE, null, values);
+		    	recipe.setPhotos(pictures);
+		    } catch (Exception e) {
+		        Log.e(TAG, "FAILED TO UPDATE A PICTURE: " + pictures.get(x));
+		    }
+	    }
+	
+	    db.close();
+    }
+
+    public void removeRecipe(int r_id) {
+        SQLiteDatabase db = this.getWritableDatabase();
+        try {
+        	Log.d(TAG, "removing recipe and depenencies");
+            db.delete(RECIPES_TABLE, R_ID + " = ?", new String[] {String.valueOf(r_id)});
+            db.delete(INGREDIENTS_TABLE, REC_ID + " = ?", new String[] {String.valueOf(r_id)});
+            db.delete(HASIMAGES_TABLE, RECIPE + " = ?", new String[] {String.valueOf(r_id)});
+        } catch (Exception e) {
+            Log.e(TAG, "Couldn't remove a recipe and all db sub trees");
+        }
+        db.close();
+    }
+
+    public void removePantryItem(String food_name) {
+        SQLiteDatabase db = this.getWritableDatabase();
+        try {
+            db.delete(FOODS_TABLE, F_NAME + " = ?", new String[] {String.valueOf(food_name)});
+        } catch(Exception e) {
+            Log.e(TAG, "FAILED TO REMOVE FROM PANTRY: " + food_name);
+        }
+        db.close();
+    }
+
+    public void addPantryItem(String food_name) {
+        SQLiteDatabase db = this.getWritableDatabase();
+        ContentValues value = new ContentValues();
+        value.put(F_NAME, food_name);
+        try {
+            db.insertOrThrow(FOODS_TABLE, null, value);
+        } catch(Exception e) {
+            Log.d(TAG, "FAILED TO ADD A PANTRY ITEM: " + food_name + "(already exists)");
+        }
+        db.close();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/model/Recipe.java b/app/src/main/java/com/cmput301/recipebot/model/Recipe.java
index dac980f..7fb4433 100644
--- a/app/src/main/java/com/cmput301/recipebot/model/Recipe.java
+++ b/app/src/main/java/com/cmput301/recipebot/model/Recipe.java
@@ -35,6 +35,7 @@ public class Recipe {
     private ArrayList<Ingredient> ingredients;
     private ArrayList<String> directions;
     private ArrayList<Bitmap> images;
+    private ArrayList<String> photos;
 
     public Recipe(int id, String user, String name, ArrayList<Ingredient> ingredients,
                   ArrayList<String> directions, ArrayList<Bitmap> images) {
@@ -46,6 +47,16 @@ public Recipe(int id, String user, String name, ArrayList<Ingredient> ingredient
         this.images = images;
     }
 
+
+    //Another constructor added for db support
+    public Recipe() {
+        this.id = 0;
+        this.user = "";
+        this.name = "";
+        this.ingredients = new ArrayList<Ingredient>();
+        this.directions = new ArrayList<String>();
+    }
+
     /**
      * Get the unique id for this recipe.
      *
@@ -125,6 +136,10 @@ public void setImage(ArrayList<Bitmap> images) {
         this.images = images;
     }
 
+    public void setPhotos(ArrayList<String> photos) {
+        this.photos = photos;
+    }
+
     @Override
     public String toString() {
         return "Recipe [id=" + id + ", user=" + user + ", name=" + name + ", ingredients="

From a9c09b5ac2e3fbd050343a721522fa9ff2e52d9d Mon Sep 17 00:00:00 2001
From: Ethan Mykytiuk <emykytiu@ualberta.ca>
Date: Mon, 11 Mar 2013 13:01:57 -0600
Subject: [PATCH 02/18] Adding in code for the pantry

---
 app/res/layout/fragment_pantry.xml | 74 ++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 app/res/layout/fragment_pantry.xml

diff --git a/app/res/layout/fragment_pantry.xml b/app/res/layout/fragment_pantry.xml
new file mode 100644
index 0000000..2dc6a2b
--- /dev/null
+++ b/app/res/layout/fragment_pantry.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <Button
+            android:layout_width="200dp"
+            android:layout_height="100dp"
+            android:text="@string/search_recipe"
+            android:id="@+id/search_button"
+            android:layout_centerHorizontal="true" android:layout_alignParentTop="true"
+            android:layout_marginTop="700dp" />
+
+    <EditText
+            android:layout_width="300dp"
+            android:layout_height="wrap_content"
+            android:id="@+id/ingredients_box" android:layout_centerHorizontal="true" android:layout_alignParentTop="true"
+            android:clickable="false" android:maxLines="1"
+            android:inputType="text" android:layout_marginTop="50dp"/>
+    <Button
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            android:text="@string/add_item"
+            android:id="@+id/add_button"
+            android:layout_centerHorizontal="true" android:layout_alignParentTop="true"
+            android:layout_marginTop="100dp"/>
+    <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="497dp"
+            android:layout_height="1032dp"
+            android:id="@id/checkBox_LinearLayout"
+            android:layout_alignLeft="@+id/add_button" android:layout_alignParentTop="true"
+            android:layout_marginTop="210dp">
+    </LinearLayout>
+    <CheckBox
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/selectall"
+            android:id="@+id/checkBoxAll" android:layout_gravity="left|center_vertical" android:checked="false"
+            android:layout_alignLeft="@+id/add_button" android:layout_alignParentTop="true"
+            android:layout_marginTop="160dp"/>
+    <TabHost
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent" android:id="@+id/tabHost"
+            android:layout_alignLeft="@+id/ingredients_box" android:layout_alignParentTop="true">
+        <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:orientation="vertical">
+            <TabWidget
+                    android:id="@android:id/tabs"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content">
+            </TabWidget>
+            <FrameLayout
+                    android:id="@android:id/tabcontent"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent">
+                <LinearLayout
+                        android:id="@id/saved"
+                        android:layout_width="fill_parent"
+                        android:layout_height="fill_parent">
+                </LinearLayout>
+                <LinearLayout
+                        android:id="@id/pantry"
+                        android:layout_width="fill_parent"
+                        android:layout_height="fill_parent">
+                </LinearLayout>
+            </FrameLayout>
+        </LinearLayout>
+    </TabHost>
+
+</RelativeLayout>
\ No newline at end of file

From fa3c86f06a94095369eef4ca82a9f00166708889 Mon Sep 17 00:00:00 2001
From: Ethan Mykytiuk <emykytiu@ualberta.ca>
Date: Mon, 11 Mar 2013 13:07:31 -0600
Subject: [PATCH 03/18] More files for pantry

---
 app/res/layout/fragment_pantry.xml            |  38 +--
 app/res/values/strings.xml                    |   1 +
 .../ui/fragments/PantryFragment.java          | 268 ++++++++++++++++--
 3 files changed, 254 insertions(+), 53 deletions(-)

diff --git a/app/res/layout/fragment_pantry.xml b/app/res/layout/fragment_pantry.xml
index 2dc6a2b..505d6c3 100644
--- a/app/res/layout/fragment_pantry.xml
+++ b/app/res/layout/fragment_pantry.xml
@@ -7,7 +7,7 @@
     <Button
             android:layout_width="200dp"
             android:layout_height="100dp"
-            android:text="@string/search_recipe"
+            android:text="@string/menu_search"
             android:id="@+id/search_button"
             android:layout_centerHorizontal="true" android:layout_alignParentTop="true"
             android:layout_marginTop="700dp" />
@@ -21,7 +21,7 @@
     <Button
             android:layout_width="100dp"
             android:layout_height="wrap_content"
-            android:text="@string/add_item"
+            android:text="@string/menu_add"
             android:id="@+id/add_button"
             android:layout_centerHorizontal="true" android:layout_alignParentTop="true"
             android:layout_marginTop="100dp"/>
@@ -29,46 +29,16 @@
             android:orientation="vertical"
             android:layout_width="497dp"
             android:layout_height="1032dp"
-            android:id="@id/checkBox_LinearLayout"
+            android:id="@+id/checkBox_LinearLayout"
             android:layout_alignLeft="@+id/add_button" android:layout_alignParentTop="true"
             android:layout_marginTop="210dp">
     </LinearLayout>
     <CheckBox
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/selectall"
+            android:text="@string/select_all"
             android:id="@+id/checkBoxAll" android:layout_gravity="left|center_vertical" android:checked="false"
             android:layout_alignLeft="@+id/add_button" android:layout_alignParentTop="true"
             android:layout_marginTop="160dp"/>
-    <TabHost
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent" android:id="@+id/tabHost"
-            android:layout_alignLeft="@+id/ingredients_box" android:layout_alignParentTop="true">
-        <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:orientation="vertical">
-            <TabWidget
-                    android:id="@android:id/tabs"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content">
-            </TabWidget>
-            <FrameLayout
-                    android:id="@android:id/tabcontent"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent">
-                <LinearLayout
-                        android:id="@id/saved"
-                        android:layout_width="fill_parent"
-                        android:layout_height="fill_parent">
-                </LinearLayout>
-                <LinearLayout
-                        android:id="@id/pantry"
-                        android:layout_width="fill_parent"
-                        android:layout_height="fill_parent">
-                </LinearLayout>
-            </FrameLayout>
-        </LinearLayout>
-    </TabHost>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/res/values/strings.xml b/app/res/values/strings.xml
index cad6b68..ca28933 100755
--- a/app/res/values/strings.xml
+++ b/app/res/values/strings.xml
@@ -29,6 +29,7 @@
 
     <!-- Pantry Fragment !-->
     <string name="fragment_pantry_title">Pantry</string>
+    <string name="select_all">SELECT ALL</string>
 
     <!-- Saved Recipes Fragment !-->
     <string name="fragment_saved_recipes_title">Saved Recipes</string>
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java b/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java
index ed7b06d..01fae94 100644
--- a/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java
+++ b/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java
@@ -19,21 +19,37 @@
 
 package com.cmput301.recipebot.ui.fragments;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.widget.ArrayAdapter;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.*;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.cmput301.recipebot.R;
 import com.cmput301.recipebot.ui.AddPantryItemActivity;
+import com.cmput301.recipebot.ui.MainActivity;
 import com.github.rtyley.android.sherlock.roboguice.fragment.RoboSherlockListFragment;
 
+import java.util.ArrayList;
+
+
 /**
- * A fragment that shows a list of items in the pantry - {@link com.cmput301.recipebot.model.PantryItem}
+ * A fragment that shows a list of items in the pantry.
  */
 public class PantryFragment extends RoboSherlockListFragment {
 
+    // id is 0 because the select all has a different id
+    int id = 0;
+    ArrayList<String> pantry_ingredients_list = new ArrayList<String>();
+
+    // Not sure which one needs to be used. Commented out onCreateView
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
@@ -41,25 +57,88 @@ public void onActivityCreated(Bundle savedInstanceState) {
         setHasOptionsMenu(true);
         fillView();
 
+        Button addButton = (Button) getView().findViewById(R.id.add_button);
+        Button searchButton = (Button) getView().findViewById(R.id.search_button);
+        CheckBox allChecked = (CheckBox) getView().findViewById(R.id.checkBoxAll);
+
+        // Handles the event when the add button is clicked
+        addButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+                EditText ingredientsText = (EditText) getView().findViewById(R.id.ingredients_box);
+                Log.v("Adding Ingredient", ingredientsText.getText().toString());
+                addIngredients(ingredientsText.getText().toString());
+
+            }
+        });
+        // Handles the event when the search button is clicked
+        searchButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Log.v("Search", "Search Clicked");
+                searchRecipes();
+            }
+        });
+
+        // Handles the event when the select all checkbox is clicked
+        allChecked.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                selectAll();
+            }
+        });
     }
+    /*
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View v = inflater.inflate(R.layout.fragment_pantry, container, false);
 
-    private void fillView() {
-        setListShown(false);
+        setHasOptionsMenu(true);
+        fillView();
 
-        // TODO : fill with stuff
-        setEmptyText(getSherlockActivity().getResources().getString(R.string.no_pantry_items));
 
-        String[] values = new String[]{"Android", "iPhone", "WindowsMobile",
-                "Blackberry", "WebOS", "Ubuntu", "Windows7", "Max OS X",
-                "Linux", "OS/2"};
+        Button addButton = (Button) v.findViewById(R.id.add_button);
+        Button searchButton = (Button) v.findViewById(R.id.search_button);
+        CheckBox allChecked = (CheckBox) v.findViewById(R.id.checkBoxAll);
 
-        ArrayAdapter<String> adapter = new ArrayAdapter<String>(getSherlockActivity(),
-                android.R.layout.simple_list_item_1, android.R.id.text1, values);
+        // Handles the event when the add button is clicked
+        addButton.setOnClickListener(new View.OnClickListener() {
 
-        setListAdapter(adapter);
+            @Override
+            public void onClick(View view) {
 
-        setListShown(true);
+                EditText ingredientsText = (EditText) getView().findViewById(R.id.ingredients_box);
+                Log.v("Adding Ingredient", ingredientsText.getText().toString());
+                addIngredients(ingredientsText.getText().toString());
 
+            }
+        });
+        // Handles the event when the search button is clicked
+        searchButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Log.v("Search", "Search Clicked");
+                searchRecipes();
+            }
+        });
+
+        // Handles the event when the select all checkbox is clicked
+        allChecked.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                selectAll();
+            }
+        });
+        return v;
+    }
+    */
+
+    // Should take everything from the array list and create checklist the
+    private void fillView() {
+        for(int i = 0; i < pantry_ingredients_list.size(); i++){
+            newCheckBox(pantry_ingredients_list.get(i));
+        }
     }
 
     @Override
@@ -71,19 +150,170 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.menu_add_pantry:
-                addPantryItem();
+                addEntry();
                 return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
     }
 
-    /**
-     * Start an activity to add a new PantryItem
-     */
-    private void addPantryItem() {
+    private void addEntry() {
         Intent i = new Intent(getSherlockActivity(), AddPantryItemActivity.class);
         startActivity(i);
     }
 
-}
\ No newline at end of file
+    // method used to add ingredients
+    // need to change to array list once DB is set up
+    // TODO: SQL statement adding into database
+    public void addIngredients(String ingredients){
+
+
+        // Test to make sure ingredients it not null
+        assert(!ingredients.isEmpty());
+
+        // create new Edit Text object and set it to the one on the screen
+        EditText ingredientsText = (EditText) getView().findViewById(R.id.ingredients_box);
+
+        // If the edit text is empty give alert to user
+        if(ingredientsText.getText().toString().isEmpty()){
+            Log.v("Empty Ingredient", "Yes");
+
+            // AlertDialog.Builder builder = new AlertDialog.Builder(MyActivity.this);
+            // Using getActivity instead of myActivity.this
+            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+
+            builder.setMessage("No item entered. Nothing has been added to your pantry.")
+                    .setCancelable(false).setPositiveButton("Okay", new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int id) {
+                    dialog.cancel();
+                }
+            });
+
+            // Build the alert and show it to the user
+            AlertDialog alert = builder.create();
+            alert.show();
+
+        } else {
+
+            newCheckBox(ingredients.toUpperCase());
+
+            // ADD INSERT INTO DB
+            addToDB();
+
+            // clear the text in the edit text
+            ingredientsText.getEditableText().clear();
+        }
+    }
+
+    // non-functional method for searching
+    // add in parameter for the container
+    public void searchRecipes(){
+
+        for(int i = 0; i < pantry_ingredients_list.size(); i++){
+            CheckBox checker = (CheckBox) getView().findViewById(i);
+
+            // Test to make sure the checkbox is activated
+            assert(checker.isActivated());
+
+            // search all recipes that have this ingredient then add the recipe name to an arraylist
+            // once list is made then output it
+            if(checker.isChecked()){
+                // add to list being searched
+                Log.v("Checked Off", checker.getText().toString());
+            }
+        }
+
+        // traverse all of the check boxes
+        /* if (is_checked)
+            get the text from the check box and add it into database and local cache (depending on how we want to do this)
+
+        SQL SEARCH (Supposed to search the ingredients db (the one holding all recipes) and find matches from the pantry
+                    db, then * output all recipes that have at least one of the matching recipes[assumption] *)
+            SELECT i.recipe_name
+            FROM ingredients i, pantry p
+            WHERE i.ingredients = p.description
+
+            go to another activity that shows all the searched?
+         */
+
+    }
+
+    // Used to create a new checkbox from the added ingredients and inserts the ingredient into the array list
+    // TODO: need to add to DB once that is setup
+    public void newCheckBox(String ingredients){
+
+        LinearLayout checkBoxLL = (LinearLayout) getView().findViewById(R.id.checkBox_LinearLayout);
+
+        if(!checkDuplicates(ingredients)) {
+
+            CheckBox cb = new CheckBox(getActivity().getApplicationContext());
+            cb.setId(id);
+            cb.setText(ingredients);
+            pantry_ingredients_list.add(ingredients);
+            Log.v("ArrayList", pantry_ingredients_list.get(id));
+            checkBoxLL.addView(cb);
+            // increase id counter so they have different id
+            id++;
+
+        }
+    }
+
+    public void selectAll(){
+
+        CheckBox selectAll = (CheckBox) getView().findViewById(R.id.checkBoxAll);
+
+        if(selectAll.isChecked()){
+            // Goes through the boxes and sets them to checked
+            for(int i = 0; i < pantry_ingredients_list.size(); i++){
+                CheckBox checker = (CheckBox) getView().findViewById(i);
+
+                Log.v("ID SET", Integer.toString(checker.getId()));
+                Log.v("VALUE OF CHECKBOX", checker.getText().toString());
+
+                checker.setChecked(true);
+
+            }
+        } else{
+            for(int i = 0; i < pantry_ingredients_list.size(); i++){
+                CheckBox checker = (CheckBox) getView().findViewById(i);
+                checker.setChecked(false);
+            }
+        }
+
+    }
+
+    // returns true if the value added is already in the list
+    public boolean checkDuplicates(String ingredients){
+
+        for(int i = 0; i < pantry_ingredients_list.size(); i++){
+
+            CheckBox checker = (CheckBox) getView().findViewById(i);
+            if(checker.getText().toString().equals(ingredients)){
+
+                // Using getActivity instead of myActivity.this
+                AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+
+                builder.setMessage("Duplicate item. " + checker.getText().toString().toUpperCase()
+                        + " is already in your pantry.").setCancelable(false).setPositiveButton
+                        ("Okay", new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int id) {
+                                dialog.cancel();
+                            }
+                        });
+
+                // Build the alert and show it to the user
+                AlertDialog alert = builder.create();
+                alert.show();
+                Log.v("Value", ingredients);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    // Stub method for now. Actual search will take place in DB Manager
+    public void addToDB(){
+
+    }
+
+}

From dbba42d125ecbf818b8bb669e209ccfee0765580 Mon Sep 17 00:00:00 2001
From: Adam Saturna <saturna@ualberta.ca>
Date: Mon, 11 Mar 2013 15:08:45 -0600
Subject: [PATCH 04/18] DbHelper: some comments added

---
 .../cmput301/recipebot/model/DbHelper.java    | 59 +++++++++++++++----
 1 file changed, 47 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java b/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java
index 2a962f9..68b4e12 100644
--- a/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java
+++ b/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java
@@ -1,6 +1,18 @@
 package com.cmput301.recipebot.model;
 //code from: http://www.youtube.com/watch?v=v61A90qlK9s
 
+/*
+* Method Summary:
+*
+*   public void addRecipe(int id, String writer, String recipe_name, String prep, ArrayList<String> ingr, ArrayList<String> pics) {
+        SQLiteDatabase db = this.getWritableDatabase();
+    public ArrayList<String> loadPantry();
+    public ArrayList<Recipe> loadRecipes();
+    public void editRecipeName(Recipe recipe, String r_name);
+    public void addPantryItem(String food_name);
+    public void removePantryItem(String food_name);
+* */
+
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
@@ -13,6 +25,7 @@
 
 public class DbHelper extends SQLiteOpenHelper {
 
+    //Define Database table + column names
     private static final String TAG = "DbHelper";
     public static final String DB_NAME = "log.db";
     public static final int DB_VERSION = 21;
@@ -63,7 +76,7 @@ public void onCreate(SQLiteDatabase db) {
         		"foreign key(%s) references %s)",
                 INGREDIENTS_TABLE, I_ID, REC_ID, INGREDIENT, REC_ID, RECIPES_TABLE);
         
-
+         //Create tables
         try {
             db.execSQL(sql1);
         } catch (Exception e) {
@@ -104,6 +117,10 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
     // code from: http://www.androidhive.info/2011/11/android-sqlite-database-tutorial/
     //returns a list of log entries
 
+    /*
+    * Function returns a list of ingredients
+    * from the user's pantry
+    * */
     public ArrayList<String> loadPantry() {
 
         ArrayList<String> logList = new ArrayList<String>();
@@ -123,7 +140,10 @@ public ArrayList<String> loadPantry() {
         db.close();
         return logList;
     }
-
+    /*
+    * Returns all the Recipes that are stored
+    * in the database of a user
+    * */
     public ArrayList<Recipe> loadRecipes() {
 
         ArrayList<Recipe> logList = new ArrayList<Recipe>();
@@ -186,7 +206,9 @@ public ArrayList<Recipe> loadRecipes() {
         return logList;
     }
 
-     //TODO
+    /*
+    * Adds a recipe to the database
+    * */
     public void addRecipe(int id, String writer, String recipe_name, String prep, ArrayList<String> ingr, ArrayList<String> pics) {
         SQLiteDatabase db = this.getWritableDatabase();
 
@@ -204,7 +226,7 @@ public void addRecipe(int id, String writer, String recipe_name, String prep, Ar
         }
 
         ContentValues values2 = new ContentValues();
-
+        //Insert all the ingredients of the recipe and give it a common id
         for(int x = 0; x < ingr.size(); x++) {
             values2.put(INGREDIENT, ingr.get(x));
             values2.put(REC_ID, id);
@@ -219,6 +241,7 @@ public void addRecipe(int id, String writer, String recipe_name, String prep, Ar
         }
 
         ContentValues values3 = new ContentValues();
+        //Insert all the pictures of the recipe and give it a common id
         for(int y = 0; y < pics.size(); y++) {  	
             values3.put(IMAGE_PATH, pics.get(y));
             values3.put(RECIPE, id);
@@ -234,8 +257,17 @@ public void addRecipe(int id, String writer, String recipe_name, String prep, Ar
         values.clear();
         db.close();
     }
-    
-    public void editRecipeName(Recipe recipe, String r_name) {
+    /*
+    * Edit complex edits different parts of the recipe object
+    * changing the corresponding data in the database as well
+    * as in the passed Recipe object. For Images and Ingredients
+    * upon edit calls, the database deletes any old images or ingredients
+    * and then adds the new ones that are passed to the function
+    * (it is done so for the simplicity of implementation)
+    * */
+
+     //Edits the Recipe Name
+     public void editRecipeName(Recipe recipe, String r_name) {
 	    SQLiteDatabase db = this.getWritableDatabase();
 	
 	    String sql1 = String.format("UPDATE " + RECIPES_TABLE + " SET " + R_NAME + " ='%s'" +
@@ -249,7 +281,7 @@ public void editRecipeName(Recipe recipe, String r_name) {
 	
 	    db.close();
     }
-    
+    //Edits the Description/Preparation of a recipe
     public void editRecipePrep(Recipe recipe, String prep) {
 	    SQLiteDatabase db = this.getWritableDatabase();
 	    ArrayList<String> preparation = new ArrayList<String>();
@@ -267,7 +299,7 @@ public void editRecipePrep(Recipe recipe, String prep) {
 	
 	    db.close();
     }
-    
+    //Edits the recipe's ingredients removing old ones first and adding the new ones
     public void editRecipeIngredients(Recipe recipe, ArrayList<String> ingredients) {
 	    SQLiteDatabase db = this.getWritableDatabase();
 	    ContentValues values = new ContentValues(0);
@@ -290,7 +322,7 @@ public void editRecipeIngredients(Recipe recipe, ArrayList<String> ingredients)
         recipe.setIngredients(ingr);
 	    db.close();
     }
-    
+    //edits the recipe's pictures
     public void editRecipePictures(Recipe recipe, ArrayList<String> pictures) {
 	    SQLiteDatabase db = this.getWritableDatabase();
 	    ContentValues values = new ContentValues(0);
@@ -310,7 +342,10 @@ public void editRecipePictures(Recipe recipe, ArrayList<String> pictures) {
 	
 	    db.close();
     }
-
+    /*
+    *  Given the recipe id, it removes the recipe and all
+    *  corresponding pictures and ingredients
+    * */
     public void removeRecipe(int r_id) {
         SQLiteDatabase db = this.getWritableDatabase();
         try {
@@ -323,7 +358,7 @@ public void removeRecipe(int r_id) {
         }
         db.close();
     }
-
+    //Removes a pantry item called food_name
     public void removePantryItem(String food_name) {
         SQLiteDatabase db = this.getWritableDatabase();
         try {
@@ -333,7 +368,7 @@ public void removePantryItem(String food_name) {
         }
         db.close();
     }
-
+   //adds a new item to the user's pantry
     public void addPantryItem(String food_name) {
         SQLiteDatabase db = this.getWritableDatabase();
         ContentValues value = new ContentValues();

From 569946a73c212c1cf2666d946d3adda510ad4901 Mon Sep 17 00:00:00 2001
From: Prateek Srivastava <f2prateek@gmail.com>
Date: Wed, 13 Mar 2013 01:15:38 -0600
Subject: [PATCH 05/18] Remove breaking stuff

---
 app/AndroidManifest.xml                       |  15 +-
 app/res/drawable-hdpi/buttonimage.jpg         | Bin 19542 -> 0 bytes
 app/res/layout/add_recipe.xml                 | 124 -------
 app/res/layout/cell.xml                       |  22 --
 app/res/layout/email_entry.xml                |  13 -
 app/res/layout/fragment_pantry.xml            |  44 ---
 app/res/menu/recipe_share.xml                 |   9 -
 .../cmput301/recipebot/client/ESResponse.java |   2 +
 .../cmput301/recipebot/model/DbHelper.java    | 209 +++++------
 .../cmput301/recipebot/model/PantryItem.java  |   2 +
 .../com/cmput301/recipebot/ui/AddRecipe.java  | 329 ------------------
 .../cmput301/recipebot/ui/MainActivity.java   |   1 +
 .../cmput301/recipebot/ui/PagerContainer.java | 129 -------
 .../recipebot/ui/RecipePagerAdapter.java      |  93 -----
 .../ui/adapters/RecipeGridAdapter.java        |   1 +
 .../ui/fragments/PantryFragment.java          | 259 +-------------
 .../ui/fragments/SavedRecipesFragment.java    |   6 +-
 17 files changed, 130 insertions(+), 1128 deletions(-)
 delete mode 100644 app/res/drawable-hdpi/buttonimage.jpg
 delete mode 100644 app/res/layout/add_recipe.xml
 delete mode 100644 app/res/layout/cell.xml
 delete mode 100644 app/res/layout/email_entry.xml
 delete mode 100644 app/res/layout/fragment_pantry.xml
 delete mode 100644 app/res/menu/recipe_share.xml
 delete mode 100644 app/src/main/java/com/cmput301/recipebot/ui/AddRecipe.java
 delete mode 100644 app/src/main/java/com/cmput301/recipebot/ui/PagerContainer.java
 delete mode 100644 app/src/main/java/com/cmput301/recipebot/ui/RecipePagerAdapter.java

diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
index d38f443..bc5d539 100755
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -32,20 +32,9 @@
         <activity
                 android:name=".ui.AddPantryItemActivity"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:label="@string/activity_add_pantry_item_title"/>
+                android:label="@string/activity_add_pantry_item_title"/><![CDATA[
                 -->
-        <activity
-                android:name=".ui.AddRecipe"
-                android:label="@string/app_name">
-            <!--
-        <intent-filter>
-            <action android:name="android.intent.action.MAIN"/>
-
-            <category android:name="android.intent.category.LAUNCHER"/>
-
-            <category android:name="android.intent.category.DEFAULT"/>
-        </intent-filter>                  -->
-        </activity>
+        ]]>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/res/drawable-hdpi/buttonimage.jpg b/app/res/drawable-hdpi/buttonimage.jpg
deleted file mode 100644
index 115017b96be8de4228554b3c1b843da92e593ccf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19542
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
Z-_wYH*kJI>Lh!A{?XRYnpSqKK@IR?~E{FgC

diff --git a/app/res/layout/add_recipe.xml b/app/res/layout/add_recipe.xml
deleted file mode 100644
index 6295e10..0000000
--- a/app/res/layout/add_recipe.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"      >
-        <!--android:theme="Theme.Black"> -->
-
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                  android:id="@+id/linearLayout"
-                  android:orientation="vertical"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-
-
-            >
-        <!--
-      <android.support.v4.view.ViewPager
-                android:id="@+id/pager"
-                android:layout_width="fill_parent"
-                android:layout_height="250dp"
-                android:layout_weight="1"
-                />
-
-        <com.viewpagerindicator.CirclePageIndicator
-                android:id="@+id/indicator"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:padding="10dip" />  -->
-       <!-- <com.cmput301.recipebot.ui.PagerContainer
-                android:id="@+id/pager_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="#CCC">       -->
-
-           <!-- <android.support.v4.view.ViewPager
-                    android:id="@+id/viewPager"
-                    android:layout_width="150dp"
-                    android:layout_height="150dp"
-                    android:layout_gravity="center_horizontal" />     -->
-       <!-- </com.cmput301.recipebot.ui.PagerContainer> -->
-
-        <ImageButton
-                android:id="@+id/ImageButton"
-                android:layout_width="330dp"
-                android:layout_height="wrap_content"
-
-                android:contentDescription="Add Image"
-                android:src="@drawable/buttonimage" android:layout_gravity="center"/>
-        <!--
-        <HorizontalScrollView
-                android:id="@+id/hscroll"
-                android:layout_width="900dp"
-                android:layout_height="200dp" android:fillViewport="false">
-
-            <GridLayout
-                    android:layout_width="900dp"
-                    android:layout_height="200dp" android:layout_gravity="center"
-                  >
-                  -->
-        <!--
-                android:layout_alignBottom="@+id/scrollView"/> -->
-
-        <!--
-        <ScrollView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/scrollView" android:layout_alignParentRight="true"
-                android:layout_alignParentBottom="true"/>                      -->
-        <!--</GridLayout> =-->
-        <!-- </HorizontalScrollView>      -->
-
-        <TextView
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="Ingredients:"
-                />
-
-        <EditText
-                android:id="@+id/IngredientID"
-                android:layout_width="fill_parent"
-                android:layout_height="110dp"
-                android:hint="Insert Ingredients Needed"
-                android:background="@android:color/transparent"
-                android:textSize="16dp"
-                >
-        </EditText>
-        <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/imageView" android:layout_gravity="right|center_vertical"/>
-        <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Instructions:"
-                android:id="@+id/textView" android:layout_gravity="left"/>
-        <EditText
-                android:id="@+id/InstructionID"
-                android:layout_width="fill_parent"
-                android:layout_height="110dp"
-                android:hint="Add Instructions"
-                android:background="@android:color/transparent"
-                android:textSize="16dp"
-                />
-        <GridLayout
-                android:orientation="vertical"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent">
-            <Button
-                    android:layout_width="150dp"
-                    android:layout_height="wrap_content"
-                    android:text="Share"
-                    android:id="@+id/PublishButton" android:layout_row="0" android:layout_column="1"/>
-            <Button
-                    android:layout_width="150dp"
-                    android:layout_height="wrap_content"
-                    android:text="Save"
-                    android:id="@+id/SaveButton"
-                    android:layout_row="0" android:layout_column="3"/>
-        </GridLayout>
-
-
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/app/res/layout/cell.xml b/app/res/layout/cell.xml
deleted file mode 100644
index 9a3843b..0000000
--- a/app/res/layout/cell.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:id="@+id/linearLayout1"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:orientation="vertical" >
-
-    <ImageView android:id="@+id/buttonimage"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"/>
-
-    <TextView android:id="@+id/_imageName"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_gravity="center_horizontal"/>
-
-    <EditText android:id="@+id/eText"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/res/layout/email_entry.xml b/app/res/layout/email_entry.xml
deleted file mode 100644
index b68b6d8..0000000
--- a/app/res/layout/email_entry.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-    <EditText android:hint="Enter Email"
-              android:id="@+id/emailaddress"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"></EditText>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/res/layout/fragment_pantry.xml b/app/res/layout/fragment_pantry.xml
deleted file mode 100644
index 505d6c3..0000000
--- a/app/res/layout/fragment_pantry.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <Button
-            android:layout_width="200dp"
-            android:layout_height="100dp"
-            android:text="@string/menu_search"
-            android:id="@+id/search_button"
-            android:layout_centerHorizontal="true" android:layout_alignParentTop="true"
-            android:layout_marginTop="700dp" />
-
-    <EditText
-            android:layout_width="300dp"
-            android:layout_height="wrap_content"
-            android:id="@+id/ingredients_box" android:layout_centerHorizontal="true" android:layout_alignParentTop="true"
-            android:clickable="false" android:maxLines="1"
-            android:inputType="text" android:layout_marginTop="50dp"/>
-    <Button
-            android:layout_width="100dp"
-            android:layout_height="wrap_content"
-            android:text="@string/menu_add"
-            android:id="@+id/add_button"
-            android:layout_centerHorizontal="true" android:layout_alignParentTop="true"
-            android:layout_marginTop="100dp"/>
-    <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="497dp"
-            android:layout_height="1032dp"
-            android:id="@+id/checkBox_LinearLayout"
-            android:layout_alignLeft="@+id/add_button" android:layout_alignParentTop="true"
-            android:layout_marginTop="210dp">
-    </LinearLayout>
-    <CheckBox
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/select_all"
-            android:id="@+id/checkBoxAll" android:layout_gravity="left|center_vertical" android:checked="false"
-            android:layout_alignLeft="@+id/add_button" android:layout_alignParentTop="true"
-            android:layout_marginTop="160dp"/>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/res/menu/recipe_share.xml b/app/res/menu/recipe_share.xml
deleted file mode 100644
index 90164d2..0000000
--- a/app/res/menu/recipe_share.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/menu_item_share"
-          android:showAsAction="ifRoom|withText"
-          android:title="Share"
-          android:actionProviderClass="android.widget.ShareActionProvider" />
-
-</menu>
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/client/ESResponse.java b/app/src/main/java/com/cmput301/recipebot/client/ESResponse.java
index b52843d..f7be9cf 100644
--- a/app/src/main/java/com/cmput301/recipebot/client/ESResponse.java
+++ b/app/src/main/java/com/cmput301/recipebot/client/ESResponse.java
@@ -22,6 +22,7 @@
 /**
  * A wrapper class for response from ElasticSearch
  * Fields are mappings of a query retrieval from ElasticSearch.
+ *
  * @param <T> the data that is wrapped in this response
  */
 public class ESResponse<T> {
@@ -36,6 +37,7 @@ public class ESResponse<T> {
 
     /**
      * Get the object associated with this repsonse.
+     *
      * @return Object of type T
      */
     public T getSource() {
diff --git a/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java b/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java
index 68b4e12..11ce8c9 100644
--- a/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java
+++ b/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java
@@ -48,7 +48,7 @@ public class DbHelper extends SQLiteOpenHelper {
     public static final String HIT_ID = BaseColumns._ID;
     public static final String RECIPE = "r_id";
     public static final String IMAGE_PATH = "image_path";
-    
+
     public DbHelper(Context context) {
         super(context, DB_NAME, null, DB_VERSION);
 
@@ -60,7 +60,7 @@ public void onCreate(SQLiteDatabase db) {
         //FOODS_TABLE
         String sql1 = String.format("create table %s (%s TEXT primary key)",
                 FOODS_TABLE, F_NAME);
-         Log.d(TAG, "creating FOODS_TABLE");
+        Log.d(TAG, "creating FOODS_TABLE");
         //RECIPES_TABLE
         String sql2 = String.format("create table %s (%s INTEGER primary key, %s TEXT, %s TEXT, " +
                 "%s TEXT)",
@@ -73,10 +73,10 @@ public void onCreate(SQLiteDatabase db) {
 
         //INGREDIENTS_TABLE
         String sql4 = String.format("create table %s (%s INTEGER primary key, %s INTEGER, %s TEXT, " +
-        		"foreign key(%s) references %s)",
+                "foreign key(%s) references %s)",
                 INGREDIENTS_TABLE, I_ID, REC_ID, INGREDIENT, REC_ID, RECIPES_TABLE);
-        
-         //Create tables
+
+        //Create tables
         try {
             db.execSQL(sql1);
         } catch (Exception e) {
@@ -102,14 +102,14 @@ public void onCreate(SQLiteDatabase db) {
 
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-    	try {
-        db.execSQL("drop table if exists " + FOODS_TABLE);
-        db.execSQL("drop table if exists " + RECIPES_TABLE);
-        db.execSQL("drop table if exists " + HASIMAGES_TABLE);
-        db.execSQL("drop table if exists " + INGREDIENTS_TABLE);
-    	} catch (Exception e) {
-    		Log.d("dbUPGRADE", "failed to drop all tables");
-    	}
+        try {
+            db.execSQL("drop table if exists " + FOODS_TABLE);
+            db.execSQL("drop table if exists " + RECIPES_TABLE);
+            db.execSQL("drop table if exists " + HASIMAGES_TABLE);
+            db.execSQL("drop table if exists " + INGREDIENTS_TABLE);
+        } catch (Exception e) {
+            Log.d("dbUPGRADE", "failed to drop all tables");
+        }
 
         Log.d(TAG, "onUpdate dropped table ALL");
         this.onCreate(db);
@@ -140,6 +140,7 @@ public ArrayList<String> loadPantry() {
         db.close();
         return logList;
     }
+
     /*
     * Returns all the Recipes that are stored
     * in the database of a user
@@ -156,41 +157,41 @@ public ArrayList<Recipe> loadRecipes() {
         if (cursor.moveToFirst()) {
             try {
                 do {
-                	//SET RECIPE INFO
+                    //SET RECIPE INFO
                     Recipe recipe = new Recipe();
                     recipe.setId(cursor.getInt(0));
                     recipe.setUser(cursor.getString(1));
                     recipe.setName(cursor.getString(2));
                     directions.add(cursor.getString(3));
                     recipe.setDirections(directions);
-                    
+
                     //SET INGREDIENTS
                     Cursor cursor2 = db.rawQuery("SELECT " + INGREDIENT + " FROM " + INGREDIENTS_TABLE + " WHERE " +
-                    		REC_ID + " =" + cursor.getInt(0), null);
-                    if(cursor2.moveToFirst()) {
-                    	try{
-                    		do {
+                            REC_ID + " =" + cursor.getInt(0), null);
+                    if (cursor2.moveToFirst()) {
+                        try {
+                            do {
                                 Ingredient ingredient = new Ingredient(cursor2.getString(0), "", 0);
-                    			ingredients.add(ingredient);
-                    		} while(cursor2.moveToNext());
-                    	} catch (Exception e) {
-                    		Log.e(TAG, "failed to load INGREDIENTS from: " + INGREDIENTS_TABLE);
-                    	}
+                                ingredients.add(ingredient);
+                            } while (cursor2.moveToNext());
+                        } catch (Exception e) {
+                            Log.e(TAG, "failed to load INGREDIENTS from: " + INGREDIENTS_TABLE);
+                        }
                     }
                     cursor2.close();
                     recipe.setIngredients(ingredients);
 
                     //SET PHOTOS
                     Cursor cursor3 = db.rawQuery("SELECT " + IMAGE_PATH + " FROM " + HASIMAGES_TABLE + " WHERE " +
-                    		RECIPE + " =" + cursor.getInt(0), null);
-                    if(cursor3.moveToFirst()) {
-                    	try{
-                    		do {
-                    			photos.add(cursor3.getString(0));
-                    		} while(cursor3.moveToNext());
-                    	} catch (Exception e) {
-                    		Log.e(TAG, "failed to load IMAGES from: " + HASIMAGES_TABLE);
-                    	}
+                            RECIPE + " =" + cursor.getInt(0), null);
+                    if (cursor3.moveToFirst()) {
+                        try {
+                            do {
+                                photos.add(cursor3.getString(0));
+                            } while (cursor3.moveToNext());
+                        } catch (Exception e) {
+                            Log.e(TAG, "failed to load IMAGES from: " + HASIMAGES_TABLE);
+                        }
                     }
                     cursor3.close();
                     recipe.setPhotos(photos);
@@ -227,7 +228,7 @@ public void addRecipe(int id, String writer, String recipe_name, String prep, Ar
 
         ContentValues values2 = new ContentValues();
         //Insert all the ingredients of the recipe and give it a common id
-        for(int x = 0; x < ingr.size(); x++) {
+        for (int x = 0; x < ingr.size(); x++) {
             values2.put(INGREDIENT, ingr.get(x));
             values2.put(REC_ID, id);
 
@@ -242,7 +243,7 @@ public void addRecipe(int id, String writer, String recipe_name, String prep, Ar
 
         ContentValues values3 = new ContentValues();
         //Insert all the pictures of the recipe and give it a common id
-        for(int y = 0; y < pics.size(); y++) {  	
+        for (int y = 0; y < pics.size(); y++) {
             values3.put(IMAGE_PATH, pics.get(y));
             values3.put(RECIPE, id);
 
@@ -266,82 +267,86 @@ public void addRecipe(int id, String writer, String recipe_name, String prep, Ar
     * (it is done so for the simplicity of implementation)
     * */
 
-     //Edits the Recipe Name
-     public void editRecipeName(Recipe recipe, String r_name) {
-	    SQLiteDatabase db = this.getWritableDatabase();
-	
-	    String sql1 = String.format("UPDATE " + RECIPES_TABLE + " SET " + R_NAME + " ='%s'" +
-	    		" WHERE " + R_ID + " =%s", r_name, recipe.getId());
-	    try {
-	        db.execSQL(sql1);
-	        recipe.setName(r_name);
-	    } catch (Exception e) {
-	        Log.e(TAG, "FAILED TO UPDATE A RECIPE: " + recipe.getName());
-	    }
-	
-	    db.close();
+    //Edits the Recipe Name
+    public void editRecipeName(Recipe recipe, String r_name) {
+        SQLiteDatabase db = this.getWritableDatabase();
+
+        String sql1 = String.format("UPDATE " + RECIPES_TABLE + " SET " + R_NAME + " ='%s'" +
+                " WHERE " + R_ID + " =%s", r_name, recipe.getId());
+        try {
+            db.execSQL(sql1);
+            recipe.setName(r_name);
+        } catch (Exception e) {
+            Log.e(TAG, "FAILED TO UPDATE A RECIPE: " + recipe.getName());
+        }
+
+        db.close();
     }
+
     //Edits the Description/Preparation of a recipe
     public void editRecipePrep(Recipe recipe, String prep) {
-	    SQLiteDatabase db = this.getWritableDatabase();
-	    ArrayList<String> preparation = new ArrayList<String>();
+        SQLiteDatabase db = this.getWritableDatabase();
+        ArrayList<String> preparation = new ArrayList<String>();
         preparation.add(prep);
 
-	    //UPDATE RECIPE_TABLE
-	    String sql1 = String.format("UPDATE " + RECIPES_TABLE + " SET " + PREP + " ='%s'" +
-	    		" WHERE " + R_ID + " =%s", prep, recipe.getId());
-	    try {
-	        db.execSQL(sql1);
-	        recipe.setDirections(preparation);
-	    } catch (Exception e) {
-	        Log.e(TAG, "FAILED TO UPDATE A RECIPE: " + prep);
-	    }
-	
-	    db.close();
+        //UPDATE RECIPE_TABLE
+        String sql1 = String.format("UPDATE " + RECIPES_TABLE + " SET " + PREP + " ='%s'" +
+                " WHERE " + R_ID + " =%s", prep, recipe.getId());
+        try {
+            db.execSQL(sql1);
+            recipe.setDirections(preparation);
+        } catch (Exception e) {
+            Log.e(TAG, "FAILED TO UPDATE A RECIPE: " + prep);
+        }
+
+        db.close();
     }
+
     //Edits the recipe's ingredients removing old ones first and adding the new ones
     public void editRecipeIngredients(Recipe recipe, ArrayList<String> ingredients) {
-	    SQLiteDatabase db = this.getWritableDatabase();
-	    ContentValues values = new ContentValues(0);
+        SQLiteDatabase db = this.getWritableDatabase();
+        ContentValues values = new ContentValues(0);
         ArrayList<Ingredient> ingr = new ArrayList<Ingredient>();
 
-	    db.delete(INGREDIENTS_TABLE, REC_ID + " = ?", new String[] {String.valueOf(recipe.getId())});
-	    
-	    for(int x = 0; x < ingredients.size(); x++) {
+        db.delete(INGREDIENTS_TABLE, REC_ID + " = ?", new String[]{String.valueOf(recipe.getId())});
+
+        for (int x = 0; x < ingredients.size(); x++) {
 
-	   	    values.put(REC_ID, recipe.getId());
-	   	    values.put(INGREDIENT, ingredients.get(x));
+            values.put(REC_ID, recipe.getId());
+            values.put(INGREDIENT, ingredients.get(x));
             Ingredient ingredient = new Ingredient(ingredients.get(x), "", 0);
             ingr.add(ingredient);
-		    try {
-		    	db.insertOrThrow(INGREDIENTS_TABLE, null, values);
-		    } catch (Exception e) {
-		        Log.e(TAG, "FAILED TO UPDATE INGREDIENT: " + ingredients.get(x));
-		    }
-	    }
+            try {
+                db.insertOrThrow(INGREDIENTS_TABLE, null, values);
+            } catch (Exception e) {
+                Log.e(TAG, "FAILED TO UPDATE INGREDIENT: " + ingredients.get(x));
+            }
+        }
         recipe.setIngredients(ingr);
-	    db.close();
+        db.close();
     }
+
     //edits the recipe's pictures
     public void editRecipePictures(Recipe recipe, ArrayList<String> pictures) {
-	    SQLiteDatabase db = this.getWritableDatabase();
-	    ContentValues values = new ContentValues(0);
-	    db.delete(HASIMAGES_TABLE, RECIPE + " = ?", new String[] {String.valueOf(recipe.getId())});
-	    
-	    for(int x = 0; x < pictures.size(); x++) {
-
-	    	values.put(RECIPE, recipe.getId());
-	    	values.put(IMAGE_PATH, pictures.get(x));
-		    try {
-		    	db.insertOrThrow(HASIMAGES_TABLE, null, values);
-		    	recipe.setPhotos(pictures);
-		    } catch (Exception e) {
-		        Log.e(TAG, "FAILED TO UPDATE A PICTURE: " + pictures.get(x));
-		    }
-	    }
-	
-	    db.close();
+        SQLiteDatabase db = this.getWritableDatabase();
+        ContentValues values = new ContentValues(0);
+        db.delete(HASIMAGES_TABLE, RECIPE + " = ?", new String[]{String.valueOf(recipe.getId())});
+
+        for (int x = 0; x < pictures.size(); x++) {
+
+            values.put(RECIPE, recipe.getId());
+            values.put(IMAGE_PATH, pictures.get(x));
+            try {
+                db.insertOrThrow(HASIMAGES_TABLE, null, values);
+                recipe.setPhotos(pictures);
+            } catch (Exception e) {
+                Log.e(TAG, "FAILED TO UPDATE A PICTURE: " + pictures.get(x));
+            }
+        }
+
+        db.close();
     }
+
     /*
     *  Given the recipe id, it removes the recipe and all
     *  corresponding pictures and ingredients
@@ -349,33 +354,35 @@ public void editRecipePictures(Recipe recipe, ArrayList<String> pictures) {
     public void removeRecipe(int r_id) {
         SQLiteDatabase db = this.getWritableDatabase();
         try {
-        	Log.d(TAG, "removing recipe and depenencies");
-            db.delete(RECIPES_TABLE, R_ID + " = ?", new String[] {String.valueOf(r_id)});
-            db.delete(INGREDIENTS_TABLE, REC_ID + " = ?", new String[] {String.valueOf(r_id)});
-            db.delete(HASIMAGES_TABLE, RECIPE + " = ?", new String[] {String.valueOf(r_id)});
+            Log.d(TAG, "removing recipe and depenencies");
+            db.delete(RECIPES_TABLE, R_ID + " = ?", new String[]{String.valueOf(r_id)});
+            db.delete(INGREDIENTS_TABLE, REC_ID + " = ?", new String[]{String.valueOf(r_id)});
+            db.delete(HASIMAGES_TABLE, RECIPE + " = ?", new String[]{String.valueOf(r_id)});
         } catch (Exception e) {
             Log.e(TAG, "Couldn't remove a recipe and all db sub trees");
         }
         db.close();
     }
+
     //Removes a pantry item called food_name
     public void removePantryItem(String food_name) {
         SQLiteDatabase db = this.getWritableDatabase();
         try {
-            db.delete(FOODS_TABLE, F_NAME + " = ?", new String[] {String.valueOf(food_name)});
-        } catch(Exception e) {
+            db.delete(FOODS_TABLE, F_NAME + " = ?", new String[]{String.valueOf(food_name)});
+        } catch (Exception e) {
             Log.e(TAG, "FAILED TO REMOVE FROM PANTRY: " + food_name);
         }
         db.close();
     }
-   //adds a new item to the user's pantry
+
+    //adds a new item to the user's pantry
     public void addPantryItem(String food_name) {
         SQLiteDatabase db = this.getWritableDatabase();
         ContentValues value = new ContentValues();
         value.put(F_NAME, food_name);
         try {
             db.insertOrThrow(FOODS_TABLE, null, value);
-        } catch(Exception e) {
+        } catch (Exception e) {
             Log.d(TAG, "FAILED TO ADD A PANTRY ITEM: " + food_name + "(already exists)");
         }
         db.close();
diff --git a/app/src/main/java/com/cmput301/recipebot/model/PantryItem.java b/app/src/main/java/com/cmput301/recipebot/model/PantryItem.java
index 1c073d6..2b2c502 100644
--- a/app/src/main/java/com/cmput301/recipebot/model/PantryItem.java
+++ b/app/src/main/java/com/cmput301/recipebot/model/PantryItem.java
@@ -34,6 +34,7 @@ public PantryItem(String name) {
 
     /**
      * Get the name of the item
+     *
      * @return Name of item.
      */
     public String getName() {
@@ -42,6 +43,7 @@ public String getName() {
 
     /**
      * Set the name of the item.
+     *
      * @param name Name of item.
      */
     public void setName(String name) {
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/AddRecipe.java b/app/src/main/java/com/cmput301/recipebot/ui/AddRecipe.java
deleted file mode 100644
index 3e53a54..0000000
--- a/app/src/main/java/com/cmput301/recipebot/ui/AddRecipe.java
+++ /dev/null
@@ -1,329 +0,0 @@
-package com.cmput301.recipebot.ui;
-
-
-//import android.R;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.database.Cursor;
-import android.graphics.BitmapFactory;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.MediaStore;
-import android.text.method.ScrollingMovementMethod;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.*;
-import com.cmput301.recipebot.R;
-
-//import com.actionbarsherlock.view.MenuItem;
-
-/*
- * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- *     This class handles users creating a new recipe. It currently takes an uploaded user image
- *     and two edit texts for Instruction and Ingredients. The Save button would when implemented
- *     saved the Recipe for offline viewing. Users can share the recipe by uploading it online or
- *     publishing onto the database for online viewing/saving by other users.
- *
- *     ToDo:
- *     Horizontal Scroll On Images
- *     Multiple Images
- *     Waiting on DB for Publish/Save/Email
- *
- *     Save Title,Author, Date (Not sure how to implement this.. context menu on save?)
- *
- *
- *     Completed:
- *     User can publish photo to recipe
- *
- *     Attach Photo to Downloaded Recipe should use logic from previous.
- *
- *     Publish photo/recipe is stubbed and ready for database implementation
- *
- *     Save recipe is stubbed and also ready for cacheing
- *
- *     Share recipe needs menu button fixed.
- *
- *     Dialog for email appears, just need to implement a button for the send
- *
- *
- */
-public class AddRecipe extends Activity {
-
-
-    private static int RESULT_LOAD_IMAGE = 1;
-    private ShareActionProvider mShareActionProvider;
-
-    /** To be Implemented after **/
-//
-//    private int[] Images = new int[] { R.drawable.buttonimage};
-//
-//    // mainLayout is the child of the HorizontalScrollView
-//    private LinearLayout mainLayout;
-//
-//    // Array that holds our image button/future drawables
-//    private int[] images = {R.drawable.buttonimage, R.drawable.buttonimage,
-//            R.drawable.buttonimage, R.drawable.buttonimage, R.drawable.buttonimage, R.drawable.buttonimage, R.drawable.buttonimage};
-//
-//    private View cell;
-//    private TextView text;
-//
-//    private ViewPager viewPager;
-    //@InjectView(R.id.viewPager)
-   // ViewPager viewPager;
-
-//    @Override
-//    public void onBackPressed() {
-//
-//        if(viewPager != null && viewPager.isShown()){
-//
-//            viewPager.setVisibility(View.GONE);
-//        }
-//        else{
-//
-//            super.onBackPressed();
-//        }
-//    }
-
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.add_recipe);
-
-        /**Move here later**/
-        //Buttons
-        Button publishButton = (Button) findViewById(R.id.PublishButton);
-        Button saveButton = (Button) findViewById(R.id.SaveButton);
-
-
-        //requestWindowFeature(Window.FEATURE_NO_TITLE);
-
-        /* Allows for Edit Texts to be Scrollable
-         *
-         * Get the string from these edit texts simply by
-         * IngredientEditText.toString();
-         * InstructionEditText.toString();
-         *
-         */
-        final EditText IngredientEditText = (EditText) findViewById(R.id.IngredientID);
-        IngredientEditText.setMovementMethod(new ScrollingMovementMethod());
-        final EditText InstructionEditText = (EditText) findViewById(R.id.InstructionID);
-        InstructionEditText.setMovementMethod(new ScrollingMovementMethod());
-
-        /*
-        This is the publish button's on click listener.
-        The data from this recipe should be uploaded to the database.
-
-        Until menu's share button works this button opens a context menu
-        that asks the user whether they wish to publish or share...
-        if we intend to keep this way we should change "Publish" to "Share"
-         */
-        publishButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                //To change body of implemented methods use File | Settings | File Templates.
-                // Context menu example. Possibly use for save/share if needed
-                final CharSequence[] items = {"Publish","Email"};
-
-                AlertDialog.Builder builder = new AlertDialog.Builder(AddRecipe.this);
-                builder.setTitle("How would you like to share?");
-                builder.setItems(items, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int item) {
-                        Toast.makeText(getApplicationContext(),items[item], Toast.LENGTH_SHORT).show();
-
-                        System.out.println("ITEM IS: "+item);
-
-                        if(item == 1){
-                            AlertDialog.Builder ebuilder = new AlertDialog.Builder(AddRecipe.this);
-                            LayoutInflater inflater = getLayoutInflater();
-                            final View myView = inflater.inflate(R.layout.email_entry, null);
-                            ebuilder.setTitle("Who would you like to email?");
-                            ebuilder.setView(myView);
-                            AlertDialog alert = ebuilder.create();
-                            alert.show();
-
-
-                        }
-                    }
-
-                });
-                AlertDialog alert = builder.create();
-
-                alert.show();
-                    /*
-                    STUB
-                     */
-
-            }
-        });
-
-         /*
-        This is the Save button's on click listener.
-        The data from this recipe should be stored for the user to view if needed.
-         */
-        saveButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                //To change body of implemented methods use File | Settings | File Templates.
-                //onCreateContextMenu();
-
-                    /*
-                    STUB
-                     */
-
-            }
-        });
-
-   ImageButton imageButton = (ImageButton) findViewById(R.id.ImageButton);
-         /*
-        This is the Image button's on click listener.
-        A context menu should appear and ask what the user wishes to do with images.
-         */
-        imageButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                //To change body of implemented methods use File | Settings | File Templates.
-                Intent i = new Intent(
-                        Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
-
-                startActivityForResult(i, RESULT_LOAD_IMAGE);
-
-                    /*
-                    STUB
-                     */
-
-            }
-        });
-    }
-
-    /**
-     *  Allows for an image to be selected from the phone's Gallery
-     */
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data){
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if(requestCode == RESULT_LOAD_IMAGE && resultCode == RESULT_OK && null != data) {
-            Uri selectedImage = data.getData();
-
-            String[] filePathColumn = { MediaStore.Images.Media.DATA };
-
-            Cursor cursor = getContentResolver().query(selectedImage,filePathColumn, null,null,null);
-            cursor.moveToFirst();
-
-            int columnIndex = cursor.getColumnIndex(filePathColumn[0]);
-            String picturePath = cursor.getString(columnIndex);
-            cursor.close();
-
-            ImageView myImage = (ImageView) findViewById(R.id.ImageButton);
-            myImage.setImageBitmap(BitmapFactory.decodeFile(picturePath));
-
-        }
-
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate menu resource file.
-        getMenuInflater().inflate(R.menu.recipe_share, menu);
-
-        // Locate MenuItem with ShareActionProvider
-        MenuItem item = menu.findItem(R.id.menu_item_share);
-
-        mShareActionProvider = (ShareActionProvider) item.getActionProvider();
-
-//        Intent myShareIntent = new Intent(Intent.ACTION_SEND);
-
-
-        mShareActionProvider.setShareIntent(getShareIntent());
-        this.setShareIntent(getShareIntent());
-
-        //Return true to display menu
-        return true;
-    }
-
-
-    //Call to update the share intent
-
-    private void setShareIntent (Intent shareIntent){
-        //if(mShareActionProvider != null){
-            mShareActionProvider.setShareIntent(shareIntent);
-        //}
-    }
-    // Gets the share intent
-    private Intent getShareIntent(){
-        Intent myShareIntent = new Intent();
-        myShareIntent.setAction(Intent.ACTION_SEND);
-        myShareIntent.setType("text/plain");
-        myShareIntent.putExtra(Intent.EXTRA_TEXT,"TEST");
-
-       // myShareIntent.setType("image/jpeg");
-        return myShareIntent;
-    }
-
-
-
-}
-
-
-/**
- //        viewPager = (ViewPager) findViewById(R.id.viewPager);
- //
- //        mainLayout = (LinearLayout) findViewById(R.id.linearLayout);
- //
- //            for (int i = 0; i < images.length; i++) {
- //
- //                cell = getLayoutInflater().inflate(R.layout.cell, null);
- //
- //                ImageView imageButton = (ImageView) cell.findViewById(R.id.buttonimage);
- //                imageButton.setOnClickListener(new View.OnClickListener() {
- //
- //                    @Override
- //                    public void onClick(View v) {
- //
- //                        viewPager.setVisibility(View.VISIBLE);
- //                        viewPager.setAdapter
- //                                (new RecipePagerAdapter(AddRecipe.this, images));
- //                        viewPager.setCurrentItem(v.getId());
- //
- //
- //                        // Allows for image upload from gallery
- //                         Intent i = new Intent(
- //                         Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
- //
- //                         startActivityForResult(i, RESULT_LOAD_IMAGE);
- //                    }
- //                });
- //
- //                imageButton.setId(i);
- //
- //                text = (TextView) cell.findViewById(R.id._imageName);
- //
- //                imageButton.setImageResource(images[i]);
- //                text.setText("Image#"+(i+1));
- //
- //                mainLayout.addView(cell);
- //     }
- */
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/MainActivity.java b/app/src/main/java/com/cmput301/recipebot/ui/MainActivity.java
index ff4113b..05cb17a 100644
--- a/app/src/main/java/com/cmput301/recipebot/ui/MainActivity.java
+++ b/app/src/main/java/com/cmput301/recipebot/ui/MainActivity.java
@@ -61,6 +61,7 @@ private void setupTabs() {
 
     /**
      * Simply switches between our tabs.
+     *
      * @param <T>
      */
     public static class TabListener<T extends Fragment> implements ActionBar.TabListener {
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/PagerContainer.java b/app/src/main/java/com/cmput301/recipebot/ui/PagerContainer.java
deleted file mode 100644
index bb4a27e..0000000
--- a/app/src/main/java/com/cmput301/recipebot/ui/PagerContainer.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.cmput301.recipebot.ui;
-
-/**
- * Sources:
- * https://gist.github.com/devunwired/8cbe094bb7a783e37ad1
- * http://commonsware.com/blog/2012/08/20/multiple-view-viewpager-options.html
- */
-
-/*
- * Copyright (c) 2012 Wireless Designs, LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * Might be needed for another kind of implementation of pager
- */
-import android.content.Context;
-import android.graphics.Point;
-import android.support.v4.view.ViewPager;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.FrameLayout;
-/**
- * PagerContainer: A layout that displays a ViewPager with its children that are outside
- * the typical pager bounds.
- */
-public class PagerContainer extends FrameLayout implements ViewPager.OnPageChangeListener {
-
-    private ViewPager mPager;
-    boolean mNeedsRedraw = false;
-
-    public PagerContainer(Context context) {
-        super(context);
-        init();
-    }
-
-    public PagerContainer(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init();
-    }
-
-    public PagerContainer(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        init();
-    }
-
-    private void init() {
-        //Disable clipping of children so non-selected pages are visible
-        setClipChildren(false);
-
-        //Child clipping doesn't work with hardware acceleration in Android 3.x/4.x
-        //You need to set this value here if using hardware acceleration in an
-        // application targeted at these releases.
-        setLayerType(View.LAYER_TYPE_SOFTWARE, null);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        try {
-            mPager = (ViewPager) getChildAt(0);
-            mPager.setOnPageChangeListener(this);
-        } catch (Exception e) {
-            throw new IllegalStateException("The root child of PagerContainer must be a ViewPager");
-        }
-    }
-
-    public ViewPager getViewPager() {
-        return mPager;
-    }
-
-    private Point mCenter = new Point();
-    private Point mInitialTouch = new Point();
-
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        mCenter.x = w / 2;
-        mCenter.y = h / 2;
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent ev) {
-        //We capture any touches not already handled by the ViewPager
-        // to implement scrolling from a touch outside the pager bounds.
-        switch (ev.getAction()) {
-            case MotionEvent.ACTION_DOWN:
-                mInitialTouch.x = (int)ev.getX();
-                mInitialTouch.y = (int)ev.getY();
-            default:
-                ev.offsetLocation(mCenter.x - mInitialTouch.x, mCenter.y - mInitialTouch.y);
-                break;
-        }
-
-        return mPager.dispatchTouchEvent(ev);
-    }
-
-    @Override
-    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-        //Force the container to redraw on scrolling.
-        //Without this the outer pages render initially and then stay static
-        if (mNeedsRedraw) invalidate();
-    }
-
-    @Override
-    public void onPageSelected(int position) { }
-
-    @Override
-    public void onPageScrollStateChanged(int state) {
-        mNeedsRedraw = (state != ViewPager.SCROLL_STATE_IDLE);
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/RecipePagerAdapter.java b/app/src/main/java/com/cmput301/recipebot/ui/RecipePagerAdapter.java
deleted file mode 100644
index 6ccc386..0000000
--- a/app/src/main/java/com/cmput301/recipebot/ui/RecipePagerAdapter.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.cmput301.recipebot.ui;
-
-import android.app.Activity;
-import android.os.Parcelable;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.view.View;
-import android.widget.ImageView;
-
-/**
- * Sources:
- * http://developer.android.com/reference/android/support/v4/view/PagerAdapter.html
- * http://stackoverflow.com/questions/6879137/imageview-and-pageradapter
- *
- * Recipe Pager Adapter holds our ViewPager and in the future should scroll our images.
- *
- */
-
-public class RecipePagerAdapter extends PagerAdapter {
-
-    private Activity activity;
-    private int[] drawableIDs;
-
-    public RecipePagerAdapter(Activity activity,int[] drawableIDs){
-
-        this.activity = activity;
-        this.drawableIDs = drawableIDs;
-    }
-
-    @Override
-    public int getCount() {
-        return drawableIDs.length;
-    }
-
-     /**
-     *
-     * Create the page for the given position. The adapter is responsible
-     * for adding the view to the container given here. Methods may need to
-     * be updated since a lot of methods are deprecated.. Need to update possibly
-     *
-     * param container The containing View in which the page will be shown.
-     * @param position The page position to be instantiated.
-     * @return Returns an Object representing the new page. This does not
-     * need to be a View, but can be some other container of the page.
-     */
-    @Override
-    public Object instantiateItem(View collection, int position) {
-
-        ImageView imageView = new ImageView(activity);
-
-        imageView.setBackgroundResource(drawableIDs[position]);
-
-        ((ViewPager) collection).addView(imageView,0);
-
-        return imageView;
-    }
-
-    /**
-     * Remove a page for the given position. The adapter is responsible
-     * for removing the view from its container, although it only must ensure
-     * this is done by the time it returns from finup
-     */
-    @Override
-    public void destroyItem(View collection, int position, Object view) {
-        ((ViewPager) collection).removeView((ImageView) view);
-    }
-
-    @Override
-    public boolean isViewFromObject(View view, Object object) {
-        return view==((ImageView)object);
-    }
-
-    /**
-     * Called when the a change in the shown pages has been completed. At this
-     * point you must ensure that all of the pages have actually been added or
-     * removed from the container as appropriate.
-     * param container The containing View which is displaying this adapter's
-     * page views.
-     */
-    @Override
-    public void finishUpdate(View arg0) {}
-
-    @Override
-    public void restoreState(Parcelable arg0, ClassLoader arg1) {}
-
-    @Override
-    public Parcelable saveState() {
-        return null;
-    }
-
-    @Override
-    public void startUpdate(View arg0) {}
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/adapters/RecipeGridAdapter.java b/app/src/main/java/com/cmput301/recipebot/ui/adapters/RecipeGridAdapter.java
index 0e389db..97b7d5e 100644
--- a/app/src/main/java/com/cmput301/recipebot/ui/adapters/RecipeGridAdapter.java
+++ b/app/src/main/java/com/cmput301/recipebot/ui/adapters/RecipeGridAdapter.java
@@ -36,6 +36,7 @@ public class RecipeGridAdapter extends BaseAdapter {
 
     /**
      * Construct the Adapter
+     *
      * @param context everything needs a context =(
      * @param recipes List of {@link Recipe} to display
      */
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java b/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java
index 01fae94..3c9bf7c 100644
--- a/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java
+++ b/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java
@@ -19,37 +19,21 @@
 
 package com.cmput301.recipebot.ui.fragments;
 
-import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.*;
+import android.widget.ArrayAdapter;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.cmput301.recipebot.R;
 import com.cmput301.recipebot.ui.AddPantryItemActivity;
-import com.cmput301.recipebot.ui.MainActivity;
 import com.github.rtyley.android.sherlock.roboguice.fragment.RoboSherlockListFragment;
 
-import java.util.ArrayList;
-
-
 /**
  * A fragment that shows a list of items in the pantry.
  */
 public class PantryFragment extends RoboSherlockListFragment {
 
-    // id is 0 because the select all has a different id
-    int id = 0;
-    ArrayList<String> pantry_ingredients_list = new ArrayList<String>();
-
-    // Not sure which one needs to be used. Commented out onCreateView
-
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
@@ -57,88 +41,25 @@ public void onActivityCreated(Bundle savedInstanceState) {
         setHasOptionsMenu(true);
         fillView();
 
-        Button addButton = (Button) getView().findViewById(R.id.add_button);
-        Button searchButton = (Button) getView().findViewById(R.id.search_button);
-        CheckBox allChecked = (CheckBox) getView().findViewById(R.id.checkBoxAll);
-
-        // Handles the event when the add button is clicked
-        addButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-
-                EditText ingredientsText = (EditText) getView().findViewById(R.id.ingredients_box);
-                Log.v("Adding Ingredient", ingredientsText.getText().toString());
-                addIngredients(ingredientsText.getText().toString());
-
-            }
-        });
-        // Handles the event when the search button is clicked
-        searchButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Log.v("Search", "Search Clicked");
-                searchRecipes();
-            }
-        });
-
-        // Handles the event when the select all checkbox is clicked
-        allChecked.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                selectAll();
-            }
-        });
     }
-    /*
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.fragment_pantry, container, false);
-
-        setHasOptionsMenu(true);
-        fillView();
 
+    private void fillView() {
+        setListShown(false);
 
-        Button addButton = (Button) v.findViewById(R.id.add_button);
-        Button searchButton = (Button) v.findViewById(R.id.search_button);
-        CheckBox allChecked = (CheckBox) v.findViewById(R.id.checkBoxAll);
+        // TODO : fill with stuff
+        setEmptyText(getSherlockActivity().getResources().getString(R.string.no_pantry_items));
 
-        // Handles the event when the add button is clicked
-        addButton.setOnClickListener(new View.OnClickListener() {
+        String[] values = new String[]{"Android", "iPhone", "WindowsMobile",
+                "Blackberry", "WebOS", "Ubuntu", "Windows7", "Max OS X",
+                "Linux", "OS/2"};
 
-            @Override
-            public void onClick(View view) {
+        ArrayAdapter<String> adapter = new ArrayAdapter<String>(getSherlockActivity(),
+                android.R.layout.simple_list_item_1, android.R.id.text1, values);
 
-                EditText ingredientsText = (EditText) getView().findViewById(R.id.ingredients_box);
-                Log.v("Adding Ingredient", ingredientsText.getText().toString());
-                addIngredients(ingredientsText.getText().toString());
+        setListAdapter(adapter);
 
-            }
-        });
-        // Handles the event when the search button is clicked
-        searchButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Log.v("Search", "Search Clicked");
-                searchRecipes();
-            }
-        });
+        setListShown(true);
 
-        // Handles the event when the select all checkbox is clicked
-        allChecked.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                selectAll();
-            }
-        });
-        return v;
-    }
-    */
-
-    // Should take everything from the array list and create checklist the
-    private void fillView() {
-        for(int i = 0; i < pantry_ingredients_list.size(); i++){
-            newCheckBox(pantry_ingredients_list.get(i));
-        }
     }
 
     @Override
@@ -162,158 +83,4 @@ private void addEntry() {
         startActivity(i);
     }
 
-    // method used to add ingredients
-    // need to change to array list once DB is set up
-    // TODO: SQL statement adding into database
-    public void addIngredients(String ingredients){
-
-
-        // Test to make sure ingredients it not null
-        assert(!ingredients.isEmpty());
-
-        // create new Edit Text object and set it to the one on the screen
-        EditText ingredientsText = (EditText) getView().findViewById(R.id.ingredients_box);
-
-        // If the edit text is empty give alert to user
-        if(ingredientsText.getText().toString().isEmpty()){
-            Log.v("Empty Ingredient", "Yes");
-
-            // AlertDialog.Builder builder = new AlertDialog.Builder(MyActivity.this);
-            // Using getActivity instead of myActivity.this
-            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-
-            builder.setMessage("No item entered. Nothing has been added to your pantry.")
-                    .setCancelable(false).setPositiveButton("Okay", new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface dialog, int id) {
-                    dialog.cancel();
-                }
-            });
-
-            // Build the alert and show it to the user
-            AlertDialog alert = builder.create();
-            alert.show();
-
-        } else {
-
-            newCheckBox(ingredients.toUpperCase());
-
-            // ADD INSERT INTO DB
-            addToDB();
-
-            // clear the text in the edit text
-            ingredientsText.getEditableText().clear();
-        }
-    }
-
-    // non-functional method for searching
-    // add in parameter for the container
-    public void searchRecipes(){
-
-        for(int i = 0; i < pantry_ingredients_list.size(); i++){
-            CheckBox checker = (CheckBox) getView().findViewById(i);
-
-            // Test to make sure the checkbox is activated
-            assert(checker.isActivated());
-
-            // search all recipes that have this ingredient then add the recipe name to an arraylist
-            // once list is made then output it
-            if(checker.isChecked()){
-                // add to list being searched
-                Log.v("Checked Off", checker.getText().toString());
-            }
-        }
-
-        // traverse all of the check boxes
-        /* if (is_checked)
-            get the text from the check box and add it into database and local cache (depending on how we want to do this)
-
-        SQL SEARCH (Supposed to search the ingredients db (the one holding all recipes) and find matches from the pantry
-                    db, then * output all recipes that have at least one of the matching recipes[assumption] *)
-            SELECT i.recipe_name
-            FROM ingredients i, pantry p
-            WHERE i.ingredients = p.description
-
-            go to another activity that shows all the searched?
-         */
-
-    }
-
-    // Used to create a new checkbox from the added ingredients and inserts the ingredient into the array list
-    // TODO: need to add to DB once that is setup
-    public void newCheckBox(String ingredients){
-
-        LinearLayout checkBoxLL = (LinearLayout) getView().findViewById(R.id.checkBox_LinearLayout);
-
-        if(!checkDuplicates(ingredients)) {
-
-            CheckBox cb = new CheckBox(getActivity().getApplicationContext());
-            cb.setId(id);
-            cb.setText(ingredients);
-            pantry_ingredients_list.add(ingredients);
-            Log.v("ArrayList", pantry_ingredients_list.get(id));
-            checkBoxLL.addView(cb);
-            // increase id counter so they have different id
-            id++;
-
-        }
-    }
-
-    public void selectAll(){
-
-        CheckBox selectAll = (CheckBox) getView().findViewById(R.id.checkBoxAll);
-
-        if(selectAll.isChecked()){
-            // Goes through the boxes and sets them to checked
-            for(int i = 0; i < pantry_ingredients_list.size(); i++){
-                CheckBox checker = (CheckBox) getView().findViewById(i);
-
-                Log.v("ID SET", Integer.toString(checker.getId()));
-                Log.v("VALUE OF CHECKBOX", checker.getText().toString());
-
-                checker.setChecked(true);
-
-            }
-        } else{
-            for(int i = 0; i < pantry_ingredients_list.size(); i++){
-                CheckBox checker = (CheckBox) getView().findViewById(i);
-                checker.setChecked(false);
-            }
-        }
-
-    }
-
-    // returns true if the value added is already in the list
-    public boolean checkDuplicates(String ingredients){
-
-        for(int i = 0; i < pantry_ingredients_list.size(); i++){
-
-            CheckBox checker = (CheckBox) getView().findViewById(i);
-            if(checker.getText().toString().equals(ingredients)){
-
-                // Using getActivity instead of myActivity.this
-                AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-
-                builder.setMessage("Duplicate item. " + checker.getText().toString().toUpperCase()
-                        + " is already in your pantry.").setCancelable(false).setPositiveButton
-                        ("Okay", new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int id) {
-                                dialog.cancel();
-                            }
-                        });
-
-                // Build the alert and show it to the user
-                AlertDialog alert = builder.create();
-                alert.show();
-                Log.v("Value", ingredients);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    // Stub method for now. Actual search will take place in DB Manager
-    public void addToDB(){
-
-    }
-
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java b/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java
index 6eb39ff..5639a89 100644
--- a/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java
+++ b/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java
@@ -19,7 +19,6 @@
 
 package com.cmput301.recipebot.ui.fragments;
 
-import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
@@ -34,7 +33,6 @@
 import com.actionbarsherlock.view.MenuItem;
 import com.cmput301.recipebot.R;
 import com.cmput301.recipebot.model.Recipe;
-import com.cmput301.recipebot.ui.AddRecipe;
 import com.cmput301.recipebot.ui.adapters.RecipeGridAdapter;
 import com.github.rtyley.android.sherlock.roboguice.fragment.RoboSherlockFragment;
 
@@ -84,11 +82,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
      * Start an activity to add a new Recipe
      */
     private void addRecipe() {
-        Intent i = new Intent(getActivity(), AddRecipe.class);
-        startActivity(i);
+        Toast.makeText(getSherlockActivity(), "TODO : Add New Recipe ", Toast.LENGTH_SHORT).show();
     }
 
-
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         Toast.makeText(getSherlockActivity(), "clicked recipe # " + position, Toast.LENGTH_SHORT).show();

From adb2fd0396d6d00cccb8d747605169ec6d0d646b Mon Sep 17 00:00:00 2001
From: Prateek Srivastava <f2prateek@gmail.com>
Date: Wed, 13 Mar 2013 01:55:20 -0600
Subject: [PATCH 06/18] Don't use this yet. Add from
 https://code.google.com/p/romannurik-code/source/browse/misc/scrolltricks/

---
 app/res/layout/activity_main.xml              | 13 ---
 app/res/layout/fragment_pantry.xml            | 51 +++++++++++
 app/res/values/colors.xml                     | 22 +++++
 app/res/values/dimens.xml                     | 22 +++++
 app/res/values/styles.xml                     | 47 ++++++++++
 .../recipebot/ui/ObservableScrollView.java    | 53 ++++++++++++
 .../ui/fragments/PantryFragment.java          | 85 ++++++++-----------
 7 files changed, 232 insertions(+), 61 deletions(-)
 delete mode 100644 app/res/layout/activity_main.xml
 create mode 100644 app/res/layout/fragment_pantry.xml
 create mode 100644 app/res/values/dimens.xml
 create mode 100644 app/res/values/styles.xml
 create mode 100644 app/src/main/java/com/cmput301/recipebot/ui/ObservableScrollView.java

diff --git a/app/res/layout/activity_main.xml b/app/res/layout/activity_main.xml
deleted file mode 100644
index 80b9d0a..0000000
--- a/app/res/layout/activity_main.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-    <TextView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="hello"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/res/layout/fragment_pantry.xml b/app/res/layout/fragment_pantry.xml
new file mode 100644
index 0000000..20375bb
--- /dev/null
+++ b/app/res/layout/fragment_pantry.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright 2012 Roman Nurik + Nick Butcher
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+
+    <com.cmput301.recipebot.ui.ObservableScrollView
+            android:id="@+id/scroll_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+        <LinearLayout android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:orientation="vertical">
+
+            <View style="@style/Item.Top"/>
+
+            <View android:id="@+id/placeholder"
+                  android:layout_width="match_parent"
+                  android:layout_height="@dimen/sticky_height"/>
+
+            <View style="@style/Item.Bottom"/>
+            <View style="@style/Item.Bottom.Alt"/>
+            <View style="@style/Item.Bottom"/>
+            <View style="@style/Item.Bottom.Alt"/>
+            <View style="@style/Item.Bottom"/>
+            <View style="@style/Item.Bottom.Alt"/>
+
+        </LinearLayout>
+
+    </com.cmput301.recipebot.ui.ObservableScrollView>
+
+    <TextView android:id="@+id/sticky" style="@style/Item.Sticky"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/res/values/colors.xml b/app/res/values/colors.xml
index c04a2e0..3de65af 100755
--- a/app/res/values/colors.xml
+++ b/app/res/values/colors.xml
@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 
+<!--
+  Copyright 2012 Roman Nurik + Nick Butcher
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
 <resources>
 
     <!-- A light Holo shade of blue -->
@@ -23,4 +39,10 @@
     <!-- A really bright Holo shade of blue -->
     <color name="holo_blue_bright">#ff00ddff</color>
 
+    <color name="top_item">#a6c</color>
+    <color name="sticky_item">#fff</color>
+    <color name="sticky_item_text">#09c</color>
+    <color name="bottom_item">#f44</color>
+    <color name="bottom_item_alt">#c00</color>
+
 </resources>
\ No newline at end of file
diff --git a/app/res/values/dimens.xml b/app/res/values/dimens.xml
new file mode 100644
index 0000000..b324990
--- /dev/null
+++ b/app/res/values/dimens.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright 2012 Roman Nurik + Nick Butcher
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<resources>
+    <dimen name="sticky_height">120dp</dimen>
+    <dimen name="page_margin">16dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/res/values/styles.xml b/app/res/values/styles.xml
new file mode 100644
index 0000000..65cd7f3
--- /dev/null
+++ b/app/res/values/styles.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright 2012 Roman Nurik + Nick Butcher
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<resources>
+    <style name="Item">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">300dp</item>
+    </style>
+
+    <style name="Item.Top">
+        <item name="android:background">@color/top_item</item>
+    </style>
+
+    <style name="Item.Sticky">
+        <item name="android:background">@color/sticky_item</item>
+        <item name="android:layout_height">@dimen/sticky_height</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textAppearance">?android:textAppearanceLarge</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:textColor">@color/sticky_item_text</item>
+    </style>
+
+    <style name="Item.Bottom">
+        <item name="android:background">@color/bottom_item</item>
+    </style>
+
+    <style name="Item.Bottom.Alt">
+        <item name="android:background">@color/bottom_item_alt</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/ObservableScrollView.java b/app/src/main/java/com/cmput301/recipebot/ui/ObservableScrollView.java
new file mode 100644
index 0000000..d3ed531
--- /dev/null
+++ b/app/src/main/java/com/cmput301/recipebot/ui/ObservableScrollView.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2012 Roman Nurik + Nick Butcher
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.cmput301.recipebot.ui;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.ScrollView;
+
+/**
+ * A custom ScrollView that can accept a scroll listener.
+ */
+public class ObservableScrollView extends ScrollView {
+    private Callbacks mCallbacks;
+
+    public ObservableScrollView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void onScrollChanged(int l, int t, int oldl, int oldt) {
+        super.onScrollChanged(l, t, oldl, oldt);
+        if (mCallbacks != null) {
+            mCallbacks.onScrollChanged();
+        }
+    }
+
+    @Override
+    public int computeVerticalScrollRange() {
+        return super.computeVerticalScrollRange();
+    }
+
+    public void setCallbacks(Callbacks listener) {
+        mCallbacks = listener;
+    }
+
+    public static interface Callbacks {
+        public void onScrollChanged();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java b/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java
index 3c9bf7c..310da99 100644
--- a/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java
+++ b/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java
@@ -19,68 +19,57 @@
 
 package com.cmput301.recipebot.ui.fragments;
 
-import android.content.Intent;
 import android.os.Bundle;
-import android.widget.ArrayAdapter;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuInflater;
-import com.actionbarsherlock.view.MenuItem;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.widget.TextView;
 import com.cmput301.recipebot.R;
-import com.cmput301.recipebot.ui.AddPantryItemActivity;
-import com.github.rtyley.android.sherlock.roboguice.fragment.RoboSherlockListFragment;
+import com.cmput301.recipebot.ui.ObservableScrollView;
+import com.github.rtyley.android.sherlock.roboguice.fragment.RoboSherlockFragment;
 
 /**
  * A fragment that shows a list of items in the pantry.
+ * Contains an edit text box in addition to a ListView
  */
-public class PantryFragment extends RoboSherlockListFragment {
+public class PantryFragment extends RoboSherlockFragment implements ObservableScrollView.Callbacks {
 
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-        setHasOptionsMenu(true);
-        fillView();
-
-    }
-
-    private void fillView() {
-        setListShown(false);
-
-        // TODO : fill with stuff
-        setEmptyText(getSherlockActivity().getResources().getString(R.string.no_pantry_items));
-
-        String[] values = new String[]{"Android", "iPhone", "WindowsMobile",
-                "Blackberry", "WebOS", "Ubuntu", "Windows7", "Max OS X",
-                "Linux", "OS/2"};
-
-        ArrayAdapter<String> adapter = new ArrayAdapter<String>(getSherlockActivity(),
-                android.R.layout.simple_list_item_1, android.R.id.text1, values);
-
-        setListAdapter(adapter);
-
-        setListShown(true);
+    private TextView mStickyView;
+    private View mPlaceholderView;
+    private ObservableScrollView mObservableScrollView;
 
+    public PantryFragment() {
     }
 
     @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.fragment_pantry, menu);
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        ViewGroup rootView = (ViewGroup) inflater
+                .inflate(R.layout.fragment_pantry, container, false);
+
+        mObservableScrollView = (ObservableScrollView) rootView.findViewById(R.id.scroll_view);
+        mObservableScrollView.setCallbacks(this);
+
+        mStickyView = (TextView) rootView.findViewById(R.id.sticky);
+        mStickyView.setText(R.string.add);
+        mPlaceholderView = rootView.findViewById(R.id.placeholder);
+
+        mObservableScrollView.getViewTreeObserver().addOnGlobalLayoutListener(
+                new ViewTreeObserver.OnGlobalLayoutListener() {
+                    @Override
+                    public void onGlobalLayout() {
+                        onScrollChanged();
+                    }
+                });
+
+        return rootView;
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.menu_add_pantry:
-                addEntry();
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-
-    private void addEntry() {
-        Intent i = new Intent(getSherlockActivity(), AddPantryItemActivity.class);
-        startActivity(i);
+    public void onScrollChanged() {
+        mStickyView.setTranslationY(
+                Math.max(0, mPlaceholderView.getTop() - mObservableScrollView.getScrollY()));
     }
 
 }
\ No newline at end of file

From a8e30d1ffde9aa397dca0242d5ebee76a2084259 Mon Sep 17 00:00:00 2001
From: Prateek Srivastava <f2prateek@gmail.com>
Date: Wed, 13 Mar 2013 03:25:00 -0600
Subject: [PATCH 07/18] ViewPager in MainActivity

Clean up
---
 app/res/layout/activity_main.xml              |   8 +
 app/res/layout/fragment_pantry.xml            |  51 ------
 app/res/values/colors.xml                     |  35 ++--
 app/res/values/dimens.xml                     |  32 ++--
 app/res/values/styles.xml                     |  55 ++-----
 app/res/values/theme.xml                      |  19 +++
 .../cmput301/recipebot/ui/MainActivity.java   | 155 ++++++++++++------
 .../recipebot/ui/ObservableScrollView.java    |  53 ------
 .../ui/fragments/PantryFragment.java          |  84 +++++-----
 .../recipebot/test/MainActivityTest.java      |  26 ++-
 10 files changed, 250 insertions(+), 268 deletions(-)
 create mode 100644 app/res/layout/activity_main.xml
 delete mode 100644 app/res/layout/fragment_pantry.xml
 delete mode 100644 app/src/main/java/com/cmput301/recipebot/ui/ObservableScrollView.java

diff --git a/app/res/layout/activity_main.xml b/app/res/layout/activity_main.xml
new file mode 100644
index 0000000..00a1b55
--- /dev/null
+++ b/app/res/layout/activity_main.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
+                                   android:id="@+id/pager"
+                                   android:layout_width="match_parent"
+                                   android:layout_height="match_parent">
+
+</android.support.v4.view.ViewPager>
\ No newline at end of file
diff --git a/app/res/layout/fragment_pantry.xml b/app/res/layout/fragment_pantry.xml
deleted file mode 100644
index 20375bb..0000000
--- a/app/res/layout/fragment_pantry.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Copyright 2012 Roman Nurik + Nick Butcher
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent">
-
-    <com.cmput301.recipebot.ui.ObservableScrollView
-            android:id="@+id/scroll_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-        <LinearLayout android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:orientation="vertical">
-
-            <View style="@style/Item.Top"/>
-
-            <View android:id="@+id/placeholder"
-                  android:layout_width="match_parent"
-                  android:layout_height="@dimen/sticky_height"/>
-
-            <View style="@style/Item.Bottom"/>
-            <View style="@style/Item.Bottom.Alt"/>
-            <View style="@style/Item.Bottom"/>
-            <View style="@style/Item.Bottom.Alt"/>
-            <View style="@style/Item.Bottom"/>
-            <View style="@style/Item.Bottom.Alt"/>
-
-        </LinearLayout>
-
-    </com.cmput301.recipebot.ui.ObservableScrollView>
-
-    <TextView android:id="@+id/sticky" style="@style/Item.Sticky"/>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/res/values/colors.xml b/app/res/values/colors.xml
index 3de65af..51acf6b 100755
--- a/app/res/values/colors.xml
+++ b/app/res/values/colors.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2012 Roman Nurik + Nick Butcher
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~ Copyright 2013 Adam Saturna
+  ~ Copyright 2013 Brian Trinh
+  ~ Copyright 2013 Ethan Mykytiuk
+  ~ Copyright 2013 Prateek Srivastava (@f2prateek)
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
   -->
 
 <resources>
@@ -39,10 +42,4 @@
     <!-- A really bright Holo shade of blue -->
     <color name="holo_blue_bright">#ff00ddff</color>
 
-    <color name="top_item">#a6c</color>
-    <color name="sticky_item">#fff</color>
-    <color name="sticky_item_text">#09c</color>
-    <color name="bottom_item">#f44</color>
-    <color name="bottom_item_alt">#c00</color>
-
 </resources>
\ No newline at end of file
diff --git a/app/res/values/dimens.xml b/app/res/values/dimens.xml
index b324990..a035003 100644
--- a/app/res/values/dimens.xml
+++ b/app/res/values/dimens.xml
@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2012 Roman Nurik + Nick Butcher
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~ Copyright 2013 Adam Saturna
+  ~ Copyright 2013 Brian Trinh
+  ~ Copyright 2013 Ethan Mykytiuk
+  ~ Copyright 2013 Prateek Srivastava (@f2prateek)
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
   -->
 
 <resources>
-    <dimen name="sticky_height">120dp</dimen>
-    <dimen name="page_margin">16dp</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/app/res/values/styles.xml b/app/res/values/styles.xml
index 65cd7f3..a035003 100644
--- a/app/res/values/styles.xml
+++ b/app/res/values/styles.xml
@@ -1,47 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2012 Roman Nurik + Nick Butcher
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~ Copyright 2013 Adam Saturna
+  ~ Copyright 2013 Brian Trinh
+  ~ Copyright 2013 Ethan Mykytiuk
+  ~ Copyright 2013 Prateek Srivastava (@f2prateek)
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
   -->
 
 <resources>
-    <style name="Item">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">300dp</item>
-    </style>
-
-    <style name="Item.Top">
-        <item name="android:background">@color/top_item</item>
-    </style>
-
-    <style name="Item.Sticky">
-        <item name="android:background">@color/sticky_item</item>
-        <item name="android:layout_height">@dimen/sticky_height</item>
-        <item name="android:gravity">center</item>
-        <item name="android:textAppearance">?android:textAppearanceLarge</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:fontFamily">sans-serif-light</item>
-        <item name="android:textColor">@color/sticky_item_text</item>
-    </style>
-
-    <style name="Item.Bottom">
-        <item name="android:background">@color/bottom_item</item>
-    </style>
-
-    <style name="Item.Bottom.Alt">
-        <item name="android:background">@color/bottom_item_alt</item>
-    </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/res/values/theme.xml b/app/res/values/theme.xml
index ec6b77b..367a11e 100755
--- a/app/res/values/theme.xml
+++ b/app/res/values/theme.xml
@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 
+<!--
+~ Copyright 2013 Adam Saturna
+~ Copyright 2013 Brian Trinh
+~ Copyright 2013 Ethan Mykytiuk
+~ Copyright 2013 Prateek Srivastava (@f2prateek)
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+
 <resources>
 
     <!--
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/MainActivity.java b/app/src/main/java/com/cmput301/recipebot/ui/MainActivity.java
index 05cb17a..2174183 100644
--- a/app/src/main/java/com/cmput301/recipebot/ui/MainActivity.java
+++ b/app/src/main/java/com/cmput301/recipebot/ui/MainActivity.java
@@ -19,94 +19,151 @@
 
 package com.cmput301.recipebot.ui;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.app.FragmentTransaction;
+import android.support.v4.view.ViewPager;
 import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.cmput301.recipebot.R;
 import com.cmput301.recipebot.ui.fragments.PantryFragment;
 import com.cmput301.recipebot.ui.fragments.SavedRecipesFragment;
 
+import java.util.ArrayList;
+
 /**
  * Main Activity, that shows two fragments {@link PantryFragment} and {@link SavedRecipesFragment}.
  */
 public class MainActivity extends BaseActivity {
 
+    ViewPager mViewPager;
+    TabsAdapter mTabsAdapter;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
-        setupTabs();
+        setContentView(R.layout.activity_main);
+        mViewPager = (ViewPager) findViewById(R.id.pager);
+
+        setupTabs(savedInstanceState);
     }
 
     /**
      * Setup the tabs two display our fragments.
      */
-    private void setupTabs() {
+    private void setupTabs(Bundle savedInstanceState) {
         ActionBar actionBar = getSupportActionBar();
-        ActionBar.Tab tab = actionBar.newTab()
-                .setText(R.string.fragment_pantry_title)
-                .setTabListener(new TabListener<PantryFragment>(
-                        this, "pantry", PantryFragment.class));
-        actionBar.addTab(tab);
-
-        tab = actionBar.newTab()
-                .setText(R.string.fragment_saved_recipes_title)
-                .setTabListener(new TabListener<SavedRecipesFragment>(
-                        this, "saved recipes", SavedRecipesFragment.class));
-        actionBar.addTab(tab);
+        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
+        actionBar.setDisplayOptions(0, ActionBar.DISPLAY_SHOW_TITLE);
+
+        mTabsAdapter = new TabsAdapter(this, mViewPager);
+        mTabsAdapter.addTab(actionBar.newTab().setText(R.string.fragment_pantry_title),
+                PantryFragment.class, null);
+        mTabsAdapter.addTab(actionBar.newTab().setText(R.string.fragment_saved_recipes_title),
+                SavedRecipesFragment.class, null);
+
+        if (savedInstanceState != null) {
+            actionBar.setSelectedNavigationItem(savedInstanceState.getInt("tab", 0));
+        }
+
     }
 
     /**
-     * Simply switches between our tabs.
-     *
-     * @param <T>
+     * This is a helper class that implements the management of tabs and all
+     * details of connecting a ViewPager with associated TabHost.  It relies on a
+     * trick.  Normally a tab host has a simple API for supplying a View or
+     * Intent that each tab will show.  This is not sufficient for switching
+     * between pages.  So instead we make the content part of the tab host
+     * 0dp high (it is not shown) and the TabsAdapter supplies its own dummy
+     * view to show as the tab content.  It listens to changes in tabs, and takes
+     * care of switch to the correct paged in the ViewPager whenever the selected
+     * tab changes.
      */
-    public static class TabListener<T extends Fragment> implements ActionBar.TabListener {
-        private final FragmentActivity mActivity;
-        private final String mTag;
-        private final Class<T> mClass;
-        private Fragment mFragment;
-
-        /**
-         * Constructor used each time a new tab is created.
-         *
-         * @param activity The host Activity, used to instantiate the fragment
-         * @param tag      The identifier tag for the fragment
-         * @param clz      The fragment's Class, used to instantiate the fragment
-         */
-        public TabListener(FragmentActivity activity, String tag, Class<T> clz) {
-            mActivity = activity;
-            mTag = tag;
-            mClass = clz;
+    public static class TabsAdapter extends FragmentPagerAdapter
+            implements ActionBar.TabListener, ViewPager.OnPageChangeListener {
+        private final Context mContext;
+        private final ActionBar mActionBar;
+        private final ViewPager mViewPager;
+        private final ArrayList<TabInfo> mTabs = new ArrayList<TabInfo>();
+
+        static final class TabInfo {
+            private final Class<?> clss;
+            private final Bundle args;
+
+            TabInfo(Class<?> _class, Bundle _args) {
+                clss = _class;
+                args = _args;
+            }
         }
 
-    /* The following are each of the ActionBar.TabListener callbacks */
+        public TabsAdapter(SherlockFragmentActivity activity, ViewPager pager) {
+            super(activity.getSupportFragmentManager());
+            mContext = activity;
+            mActionBar = activity.getSupportActionBar();
+            mViewPager = pager;
+            mViewPager.setAdapter(this);
+            mViewPager.setOnPageChangeListener(this);
+        }
 
+        public void addTab(ActionBar.Tab tab, Class<?> clss, Bundle args) {
+            TabInfo info = new TabInfo(clss, args);
+            tab.setTag(info);
+            tab.setTabListener(this);
+            mTabs.add(info);
+            mActionBar.addTab(tab);
+            notifyDataSetChanged();
+        }
+
+        @Override
+        public int getCount() {
+            return mTabs.size();
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            TabInfo info = mTabs.get(position);
+            return Fragment.instantiate(mContext, info.clss.getName(), info.args);
+        }
+
+        @Override
+        public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+        }
+
+        @Override
+        public void onPageSelected(int position) {
+            mActionBar.setSelectedNavigationItem(position);
+        }
+
+        @Override
+        public void onPageScrollStateChanged(int state) {
+        }
+
+        @Override
         public void onTabSelected(ActionBar.Tab tab, FragmentTransaction ft) {
-            // Check if the fragment is already initialized
-            if (mFragment == null) {
-                // If not, instantiate and add it to the activity
-                mFragment = Fragment.instantiate(mActivity, mClass.getName());
-                ft.add(android.R.id.content, mFragment, mTag);
-            } else {
-                // If it exists, simply attach it in order to show it
-                ft.attach(mFragment);
+            Object tag = tab.getTag();
+            for (int i = 0; i < mTabs.size(); i++) {
+                if (mTabs.get(i) == tag) {
+                    mViewPager.setCurrentItem(i);
+                }
             }
         }
 
+        @Override
         public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction ft) {
-            if (mFragment != null) {
-                // Detach the fragment, because another one is being attached
-                ft.detach(mFragment);
-            }
         }
 
+        @Override
         public void onTabReselected(ActionBar.Tab tab, FragmentTransaction ft) {
-            // User selected the already selected tab. Usually do nothing.
         }
     }
 
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt("tab", getActionBar().getSelectedNavigationIndex());
+    }
+
 }
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/ObservableScrollView.java b/app/src/main/java/com/cmput301/recipebot/ui/ObservableScrollView.java
deleted file mode 100644
index d3ed531..0000000
--- a/app/src/main/java/com/cmput301/recipebot/ui/ObservableScrollView.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2012 Roman Nurik + Nick Butcher
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cmput301.recipebot.ui;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.ScrollView;
-
-/**
- * A custom ScrollView that can accept a scroll listener.
- */
-public class ObservableScrollView extends ScrollView {
-    private Callbacks mCallbacks;
-
-    public ObservableScrollView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    protected void onScrollChanged(int l, int t, int oldl, int oldt) {
-        super.onScrollChanged(l, t, oldl, oldt);
-        if (mCallbacks != null) {
-            mCallbacks.onScrollChanged();
-        }
-    }
-
-    @Override
-    public int computeVerticalScrollRange() {
-        return super.computeVerticalScrollRange();
-    }
-
-    public void setCallbacks(Callbacks listener) {
-        mCallbacks = listener;
-    }
-
-    public static interface Callbacks {
-        public void onScrollChanged();
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java b/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java
index 310da99..021ade9 100644
--- a/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java
+++ b/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java
@@ -19,57 +19,67 @@
 
 package com.cmput301.recipebot.ui.fragments;
 
+import android.content.Intent;
 import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.widget.TextView;
+import android.widget.ArrayAdapter;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
 import com.cmput301.recipebot.R;
-import com.cmput301.recipebot.ui.ObservableScrollView;
-import com.github.rtyley.android.sherlock.roboguice.fragment.RoboSherlockFragment;
+import com.cmput301.recipebot.ui.AddPantryItemActivity;
+import com.github.rtyley.android.sherlock.roboguice.fragment.RoboSherlockListFragment;
 
 /**
  * A fragment that shows a list of items in the pantry.
- * Contains an edit text box in addition to a ListView
  */
-public class PantryFragment extends RoboSherlockFragment implements ObservableScrollView.Callbacks {
+public class PantryFragment extends RoboSherlockListFragment {
 
-    private TextView mStickyView;
-    private View mPlaceholderView;
-    private ObservableScrollView mObservableScrollView;
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        setHasOptionsMenu(true);
+        fillView();
+
+    }
+
+    private void fillView() {
+        setListShown(false);
+
+        setEmptyText(getSherlockActivity().getResources().getString(R.string.no_pantry_items));
+
+        String[] values = new String[]{"Android", "iPhone", "WindowsMobile",
+                "Blackberry", "WebOS", "Ubuntu", "Windows7", "Max OS X",
+                "Linux", "OS/2"};
+
+        ArrayAdapter<String> adapter = new ArrayAdapter<String>(getSherlockActivity(),
+                android.R.layout.simple_list_item_1, android.R.id.text1, values);
+
+        setListAdapter(adapter);
+
+        setListShown(true);
 
-    public PantryFragment() {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        ViewGroup rootView = (ViewGroup) inflater
-                .inflate(R.layout.fragment_pantry, container, false);
-
-        mObservableScrollView = (ObservableScrollView) rootView.findViewById(R.id.scroll_view);
-        mObservableScrollView.setCallbacks(this);
-
-        mStickyView = (TextView) rootView.findViewById(R.id.sticky);
-        mStickyView.setText(R.string.add);
-        mPlaceholderView = rootView.findViewById(R.id.placeholder);
-
-        mObservableScrollView.getViewTreeObserver().addOnGlobalLayoutListener(
-                new ViewTreeObserver.OnGlobalLayoutListener() {
-                    @Override
-                    public void onGlobalLayout() {
-                        onScrollChanged();
-                    }
-                });
-
-        return rootView;
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.fragment_pantry, menu);
     }
 
     @Override
-    public void onScrollChanged() {
-        mStickyView.setTranslationY(
-                Math.max(0, mPlaceholderView.getTop() - mObservableScrollView.getScrollY()));
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_add_pantry:
+                addEntry();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    private void addEntry() {
+        Intent i = new Intent(getSherlockActivity(), AddPantryItemActivity.class);
+        startActivity(i);
     }
 
 }
\ No newline at end of file
diff --git a/integration-tests/src/main/java/com/cmput301/recipebot/test/MainActivityTest.java b/integration-tests/src/main/java/com/cmput301/recipebot/test/MainActivityTest.java
index 14682d3..03dfa4b 100755
--- a/integration-tests/src/main/java/com/cmput301/recipebot/test/MainActivityTest.java
+++ b/integration-tests/src/main/java/com/cmput301/recipebot/test/MainActivityTest.java
@@ -20,8 +20,9 @@
 package com.cmput301.recipebot.test;
 
 import android.app.Instrumentation;
+import android.support.v4.view.ViewPager;
 import android.test.ActivityInstrumentationTestCase2;
-import com.actionbarsherlock.app.ActionBar;
+import com.cmput301.recipebot.R;
 import com.cmput301.recipebot.ui.MainActivity;
 import com.squareup.spoon.Spoon;
 
@@ -60,12 +61,27 @@ public void testActivityExists() {
 
     /**
      * Verify that two tabs are shown to the user.
-     * TODO : verify the titles themselves?
      */
     public void testTabsExist() {
-        Spoon.screenshot(activity, "initial_state");
-        ActionBar actionBar = activity.getSupportActionBar();
-        assertEquals(2, actionBar.getTabCount());
+        final ViewPager viewPager = (ViewPager) activity.findViewById(R.id.pager);
+
+        instrumentation.runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                viewPager.setCurrentItem(0);
+            }
+        });
+        instrumentation.waitForIdleSync();
+        Spoon.screenshot(activity, "tab_0");
+
+        instrumentation.runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                viewPager.setCurrentItem(1);
+            }
+        });
+        instrumentation.waitForIdleSync();
+        Spoon.screenshot(activity, "tab_1");
     }
 }
 

From 5b021924054fa98b775c1d7a071a6a3ff7acb3c9 Mon Sep 17 00:00:00 2001
From: Prateek Srivastava <f2prateek@gmail.com>
Date: Thu, 14 Mar 2013 13:20:40 -0600
Subject: [PATCH 08/18] Recipe Loader

This also makes some changes to our model.
Photos will be stored as Uri's.
This way we can have multiple sources (say file or network location)
with the same strucutre, and have the Uri's handle diffeeneitation
betwene the two for us.
---
 app/AndroidManifest.xml                       |   8 ++--
 app/pom.xml                                   |   5 ++
 .../drawable-nodpi/test_recipe_image_1.jpg    | Bin 6025 -> 0 bytes
 .../drawable-nodpi/test_recipe_image_2.jpg    | Bin 22450 -> 0 bytes
 .../drawable-nodpi/test_recipe_image_3.jpg    | Bin 6499 -> 0 bytes
 .../drawable-nodpi/test_recipe_image_4.jpg    | Bin 15086 -> 0 bytes
 .../drawable-nodpi/test_recipe_image_5.jpg    | Bin 7119 -> 0 bytes
 .../drawable-nodpi/test_recipe_image_6.jpg    | Bin 28980 -> 0 bytes
 app/res/layout/fragment_saved_recipes.xml     |  13 ++----
 app/res/layout/item_recipe_image.xml          |   8 ++++
 app/res/values/strings.xml                    |   1 +
 .../recipebot/RecipeBotApplication.java       |  24 ++++++++++
 .../cmput301/recipebot/model/DbHelper.java    |  33 ++++++-------
 .../com/cmput301/recipebot/model/Recipe.java  |  41 ++++++----------
 .../ui/adapters/RecipeGridAdapter.java        |  15 +++---
 .../ui/fragments/SavedRecipesFragment.java    |  44 +++++++++++++-----
 .../recipebot/core/core/ClientTest.java       |   2 +-
 integration-tests/AndroidManifest.xml         |   1 +
 test-cli-lab.sh                               |  14 ++++++
 19 files changed, 135 insertions(+), 74 deletions(-)
 delete mode 100644 app/res/drawable-nodpi/test_recipe_image_1.jpg
 delete mode 100644 app/res/drawable-nodpi/test_recipe_image_2.jpg
 delete mode 100644 app/res/drawable-nodpi/test_recipe_image_3.jpg
 delete mode 100644 app/res/drawable-nodpi/test_recipe_image_4.jpg
 delete mode 100644 app/res/drawable-nodpi/test_recipe_image_5.jpg
 delete mode 100644 app/res/drawable-nodpi/test_recipe_image_6.jpg
 create mode 100644 app/res/layout/item_recipe_image.xml
 create mode 100755 test-cli-lab.sh

diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
index bc5d539..9d3413b 100755
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -9,6 +9,9 @@
             android:minSdkVersion="8"
             android:targetSdkVersion="16"/>
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
     <application
             android:name=".RecipeBotApplication"
             android:icon="@drawable/icon"
@@ -32,9 +35,8 @@
         <activity
                 android:name=".ui.AddPantryItemActivity"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:label="@string/activity_add_pantry_item_title"/><![CDATA[
-                -->
-        ]]>
+                android:label="@string/activity_add_pantry_item_title"/>
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/pom.xml b/app/pom.xml
index 6934fdb..da790a8 100755
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -75,6 +75,11 @@
             <artifactId>otto</artifactId>
             <version>1.3.2</version>
         </dependency>
+        <dependency>
+            <groupId>com.nostra13.universalimageloader</groupId>
+            <artifactId>universal-image-loader</artifactId>
+            <version>1.8.2</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/app/res/drawable-nodpi/test_recipe_image_1.jpg b/app/res/drawable-nodpi/test_recipe_image_1.jpg
deleted file mode 100644
index 9e56cc975f5d022293e426c1fa3346eb3183a844..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6025
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

diff --git a/app/res/drawable-nodpi/test_recipe_image_2.jpg b/app/res/drawable-nodpi/test_recipe_image_2.jpg
deleted file mode 100644
index 21757376b635cc331c26992e16d520d8a2e2cc8e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22450
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

diff --git a/app/res/drawable-nodpi/test_recipe_image_3.jpg b/app/res/drawable-nodpi/test_recipe_image_3.jpg
deleted file mode 100644
index a640c1c8e378b5063f9a7d4e5aca6ce83169d98e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6499
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

diff --git a/app/res/drawable-nodpi/test_recipe_image_4.jpg b/app/res/drawable-nodpi/test_recipe_image_4.jpg
deleted file mode 100644
index 015a152118b5280932ec7e8bfeab496e6789ab9b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15086
zcmeIYcU%-r^DjE&43Z=V2`V5cIY<zdELm8BfaJ`Qlfaq)B??HEpd<kS$r&Vr<eYO}
za!$+c8Pw-_-uHLHd(QdX`^Wu!ZtwO?bxn13Rd?;q)OQ*+hMEJeDatCy0%%~lgLVf1
zQ1irwGM?5J0HCZ4Z~_2;3*ey<1Lz=y237!#<X`A(|3Z@i7{6pdDKuID>yNxQ8r|RY
zYqZ;cWI%1`<p0PAS_7DW<b%N8bzpt)yZz@(_B!D&EofG+lm4b1KL7v@D2aKGkN4gO
zj9=DJfW18<(0=pL&@q5WGywmPwvb5lzx#fS#Q2;4DH8K<Iz1BmZ<%kAcz>(}6-46y
z%`b`c`KABL*YwoCY~a0jFBR>#JPHK>spx-sMescp<1ZSg56%GK{k8`@{!@O<F4#n4
z{_o3QQh&?*Vf?S!*k~AkY{v$b{=FjTg#WAvI>o=O2-;sZqSK@QZ9Adp@3H=UMNng?
zN#GHHi;azgjfIPYgM){Mi%&>FL`XnDNJB<WLcu`G#K=HPPtVN8bBmef4l6zVZDEc(
z_jm;a1ek7#N{H}@^Y9DsT`57s!^0yaAfzTDqUO6ne}nJ;xS)Ojq`06lW*BHU0CZ9`
z3{o^yGr$Bojdc~(Xn#!-00sjl7B&tp9zFpmPznYw8U_YBCI%K3CK!HbzE{D5Ns2{w
zgI5}xT-_Ll#fgINRm5jp)`x`+lp6iJZ2Tt9ukrA&Q&H2<vfsRQn}bt8P)JxrRP51X
z8Cf}b1x3xLTG|jDT|HAXa|=r=Ya16=H+K(DFYh;R{R0Buy$_0v`WPJ(8yBDOB`rN8
zGwW-1PEm15X<2ziWmRKSb4zPmd&kd#!J*-i(XsJ~`Gv)$<(1X7b@<-?!Qs*I$?4ho
zm0w_l{dVhb&;E;Fq@Z8un3x!tI9Gn5p?h38PKt?jgBP1jS{=vOiJXP+6)wfYh|h%$
zc&z*yyObu*{rK0}1m@ZIu3Y=&+5etnum7(+``fX9{F(p=G0?!p!ypBufW3FmaZ0VE
zZAfem;7_&+Gl)_bgX$?$RJfAo41zi(au#&<1~LlMpOi@sp@8q<ipeIGvWX-%0ZPPT
znk&Q_A;%&}+V14eiEKW?)nd9Tbv+j}hSCBRE^PuyIZ8f{=Qa&yDk6Ee?R;~ES|dJF
zhL`GxHBDqhJ2#G9Xx26I4}8eSZkzc0g2V=WS#(omT~}BPX2==ExbiGUN=lJ4UnXdz
ztX3p1*!Ia{5H+`Q@C)%d0LEF!-(br1c+5jHfU^k$uJDD|*(6DZTw?$)pF0^&0OOnO
zzSg?jNM&FB9SzQ#>|6MzBNy<Bd2OrHwfr7G=l<(QembmhUfrh-ymso*<0cX=k8Pc(
zq64^2j+f3YrSxK-ytJ`;qD))lc#-lFc7B@ADfskmm(6+yEz=k|W8?$aoE(BvXm@L#
zhJc1?=M`eZY9YI0O}0h1M%0fYrPzUK^Sji@cZb6jIWy039XHJ9K_ir`x6E4OqqqZm
z{EP;I`tnF<j7V)ZPN2{HFc4f`v2DjFz^_+Fg+HaRjCbS2b|hL%$u&&=C)CuViF<*d
zI$JiqeAcEsqyt}sxBaKzp4v~X!cx!4l(-?O$>U5rWy(fbZ2Ys&@7KfU=~r=P=?|U_
z7THTPz_cAWRb5P4bxS1@?(|JfO;tdIw(c84=mI&ZFfl$I@605npH{6ttf2Kvp*6^@
zYj@|c5C<N<`n0r~tgtB9t3jM`-_BN*2s3FstayVqGei8`BGFfj?Ag0i4}w-zW|LZy
z2PygkuB!pcEbIE+78d(V5ic<u`Oq*XDhhQ(#cX3;at<@NM5%g%EkncOiUV-ABb%7w
zZyjbwwQ|%L$Lo}19fuF4b|7p!J#EShRY~X!sGjdBs=71l7TzRY=&SfaBOWzb;BeG^
zy3(_#bHU!7H{8TW!r@<BL}h}8@mdT}m73|L$?u}1(ai0>m4pA(n)Cfrh-%jocMVnU
zY?=~QYXJ-PWZa4c&H2vBm)iCrdjmFCC4$&lj}sK|L*V%yalA2<kd_{u3$5vq8yWvi
z@1k<k(=aE9&;5LxD&J-&>+{s);W3uU-u8_!u|+s;K8I*4#QPIIukBO24MVm;!Amir
zipnVEA%U~EWuqTVOaem?H4N!)G)U4<d&#WYQA!m<e!~)V@n02g>P+d#AE%}qFPfj}
z@3t))JcVa5sFyLm$z_*4_8vzHS#2ZftgfFQWu{6iaRHCXAKBkrU&SO0_!#>0EpV^m
zR<h$gdz;S8$q5_n1oO9IY_zVeBTA*5pOZe=-#NWAHdSfpx69_5$EDC3x)AnEPLOjy
zH8~h2weh)k9U{y~U0+xm`?Rd0cxtfQ1>>yIeF9?1<jOFHfq_F!sKRMPd>W|ctF50a
zx^x|VNkFK`Fy36<|8o2R&HEoe=pBKLXW1Rq1?%w(tc;M`#f5u4X=%!H>vX#B^lZtS
zXD$5Y^<Pf;vk`u%#ls0Pb1PsgjND?IC|4viUM`81s(FgTBt$~*=<S|gRW$4Y_tv$*
zcXQm<^fr2Ag94hJt=FBf`hrB~FFPL>ezT){`C$C@1De$#??V`Z?fOJ=M8!m~2?d!`
zZM>(Ud;{0dBMFh6XXGo2Tei;JloW$EOZG5)V*~;kcowDo<0kB9#8!#k%mmFQbIJDm
zM0g+2!y@KJu)Yi*-7Y77xE_Ry0_x23j0jIn+L|FNlM2-%cSpo&sK;8+Th^WgXohDF
zs1Reh-sZS3p~BJX7|vfL_qk!WS9*}=hVA;cMSS~nT1__V5Ry5(^VQntZC_4RUSwlN
z8t6|iMM0e#DcP1#0RC%H31=AXVhhAyxPz#_4%=<e&BVqUd40e&H_E&GyzHZVTZ*k~
z#skR<mHACa-%vZx#KvSETbvgRCY`!t!UXnms=+Uu#(y+OsY#ahzxtZ1X`6GeZN%kk
zmO6CU%2WC@(3gUQ!rLP3`@N^n6HM%Hs64&qIk%6^X)o29%rhe1smyb9hgrQ!+OAMH
zYw*M-J!;*+URSuV6F0kCR;<iIf5uQL`!YUn0=~SA`>kl{XY;PKgiA#D*8<1glcvj?
z+${H#oH=H;KE8iW4n&km1AIp!i}}Q=Bb63uRKC3yx_OGOlp?YN+wR3{2|O84HY!@4
zWcyWB?vKqmOO8&hxDBiMGET|7r$!8y2?m~S_J<qqjL$Zw$RbT|eeI$9x|1wslIORl
zC%?NWDm}BBsB?O^`9ynpJAdm=yiQJwmm}%krzK)P4TTnp<m-1fwW6y&g+$5gldeH%
zP(bF(@IlH6Pl7hR-nTI;BfeO(Ppa;JY7B{dJl48wa?i63r_Wim=X)SmZO=CgUK5Ur
zR(!6#`&@S!bf4r$z&}u`<nnzAKPjvr$z0TPJ}r2hfUU42Fsgxfxwvg~0j{3E7kPsT
zMaj^rPLOIx99139?r?29(*&tLD+gIdq{2;Ak;bI#%fZQ7b2tj1zgaif8j&eb<%-V4
zT}su|b4vd~?1p4>vM2MX0}g>0)yHyQVjly~VMVSi&9L3U7Q2H<>jPO<H*Ed);l%te
zt7T<H#a(vRb*jEOTMf!H2Vaw)Y-*nS+#!xmf)N&&um<@!;j1$1?oT}wR9kf(zvmeM
zpYU|x9uTMsQfKMutgL9jNXEwPdC)6iyVl7>H#1{ZR#le5=DdEwsieU2x?kaknP0s5
z2`e*3U&y+4qS}dvcsXQ3Wq<60=ZLPw<&cwjaOH^5eQA-7tsYgFiSO4@9|M>4Q|A+{
z+K;#_ST~;7^U3=y*}Pc&bo2xBINzJ}Q>NIbY$o0*I7FDA#=^}*LZyYNUEKijwQZuq
zjWL#w`n_<ZKfOI4BMjf7#qDy?D>7Mr2L+5uDe5H{UY}L>>+mHA*uNzU$CJhWc6(&X
zCr!<GtEO+tJED`tT3n)lx~|{F*oDIM4SV1I4}=kALMOd)S3|o5Yp+o@GX4vn#uz&l
zoseEpt&+Yw4rk9e^<g&q(3k2E{jM$+`T$Nm9K=fTv3+mc_W2Ygmi$lOjGiA4kGtIr
z3HFj!-)!?RVz4$j`WrH!fEx~7Pj}^4XOnBC$2Ywugj~D#Eci)pHR*Z9%@t$aQ1TGz
z$cMH_a@Xy-Oe9vk^?SJW_~ApsqZ`;1mM`V$7uPWDo<aEUrG+&}lRxpmKyWHk)O#Ka
zUN-i}4{2v{*f7YRW8x8QHCu^sD*hm8A4t+vgVw@a{fdQ82bNWxKPHSvC&>9g-R)dE
zx`h(R?Y9-*@JhZQ4blc4;L@*TWq&c;X%8rIAockAW8Uc;U&A{!Ge4e!Q@kgMgefl1
zUP$mlx&Ei5yTJ?!;6MSiKhxZWUf;6-RGAM=WgN;x%_~vk0BVcULd^>53U#r9Ix_R~
z+yg`&Dkx*D<EuGaJGe3{I9Nch5)MzWq5<;Y2Q27^=nqiasBH{vbPWK&x{ZMV0FjiF
zd)KZm0>C|yl=EHieD$CYRuoDk<=F98>+0&CawVS&0EA$Z8F%Bx6zWg;FV`u4S+j+&
zVeSI8b91$ZI$Q}{yUL6~jbM)a`+OyZNklEH!z^b9H8HkheqwED<!bF<$t>+)X=i@b
z=PILR{3S<2_K%#jovXF0o7ulhU>p$q_FmS`*wO{;ca<OhDrmoE2NR$85!BJk`DzU2
zE19cnpr=>bZ(XBMG<Gz0Fn2L${&yu{M*COlgZ|5_BdSMGJE$|Wys@2yE7ZZ9S<~G0
z%I2#P<$=2v7NEQxcm(ssU;2M@KF25g&EfmS*8`7#$q4@9aR0;kHPY#yk)ApmJGfYw
zJOArQj#n%6KPnh&pqBp^uKijATx>ZvYcumJSAnar0cQsN!SDKe9x)k-v^1VDL*31t
zo&N}4t>EwZr^VK^vo`(R`xVIi?fund00$QU@Iyf28Xyg51KfZJ_~8ZkK#Cs_04wh=
z>K<?pl=*8tt~&lz{)Km?=StsyD!)9Upn78L1x~HPV`e#X2Xkj*S8!<`8oOMD)-N>W
zmlPqTin#|f#M;3O>fyrt)XL4?#KG9w4gg4{LAk53!Sw)?KvE3=OhB5H9iRr#!2Evh
zFJuV)&+ibm4G>G4K~2m7vzK5WG%$I83lQSs;^N^Ff+;*H0X_jKB?%!R2_-c-IVCwc
zH7Vh*^5^us@n4T<L<9sx#6;JKiLX%*6BAQh9f&D@cOm`XQSdwaR{|U{&{+P;{-?nS
zz(F;mNr6`WI|hIO=E8qr0N~I0-!Fm*=-&XrH2@704Fm_!v2d_)u`meve`TkbH^_Lg
zq}7edS)5++VN-w^^g~uQN{t2+egWs#{f}_iBQ<yD_e@;`uYW0ebMtZ3Q!|;yG*=<2
z0j&k|{o=PxgKmolvbR2_`<FyF4=o*Ll(q~nA8A{-2gGESwT`SD3(G+)JpyC1%G*X)
zPry9>Pa+S379h+b_{)SFykwZ51x_sFSRgn-ab-aRh)wXbnan%Cj(ns^Y3d@d$Bunv
z0M1Rp#sScXG%7P0Eg@I)g}+VspIdP29}`gjmXsglz;V7KC==EgF}5``{hhzLWCnd&
z8J95>+11W%W5jRKK`Ksr&M2}x9kP&${NCjt0O4xg)7A}L3M8}cb+{YJ+_JBy+_L|e
zx=x`?GcEd9EpFkA8&-72=2R0|lt(XT;>D~R%n)->sQQ{HuF5f-?5p^4Tw24^a(de@
zYx&LlPaRtKRmfyCQGLs6ZM2l`IpWu~U^?ffUO5N5<CpMZn7;QTuQX<agy7?aj*E=%
z?2OypA`@KErjgHG<_Zhz$_^)|*A`93k7HlorXewRjYZnpm!@=Yqkz2POZK7BbDL5=
zm;J3Kd#xe5XWrq^yhkl%k8EA6$D{rDbC9N%<Cjb&^$4o3z1qhY8nrTPJ^sx`!Cuk#
z1h<Eg5y4odLyor&B*e<4ybG1AzQ58c9aB;c9h+N!?vZW}-GRV~5=X8}n(py&6ixXa
z*3O>}ZRZEX4(R&2EsetYMmBr1!w(IP3yOx<wUCUZu$-g1)Xl7kk-5HE?domn19t<J
z%tC__eQl=9PR_C#Th4J`6wqJS4>yoI@N8e)w72@$ai%(EpsfWd&?0`Jb75BY{DuDE
zO#ag0ruS{%;i=VgQ<sD}$#>@t4!u+7upwPhiAQNGuAM0cc?^oJI0H1<*?A|z<f9&I
zo9ECY6u`HI%uq^bId4|#VAED0W>L~3q21WB*x7|0*`#OivlxF355K&Pj1q8CR9~2=
z4lF!O1YYAhVx`;QO0HBEp5@!frb<oV#}3zJa;>}8j^gOL##}F1Yg`q|k&@QhxunzE
zS+zl+0Odr^JnOJ}mAd&7k(T6Y;H9_&b<eTiR&u0SWyR|U?*%+PHqMRGE`A<cj<>mR
zEjnKGrD&31GQ}CtiIrzp51MY-KL5~f(2On&otBkJQ99EaijI%_Kongf5P>+lYwh^j
zz1)p*)F8~gH^V$+9L|1HVS_tgz(BgyS==!lnuQ;FT17eNCU>~{+$i>qzQi+kx?s7Y
zqP|&8`$Ps)DaGk;1^t)Y?kM05(#@&d*QCcq!BXC|&6$s3R<$QDsFfq+O^_JO`%9e&
zzdSj;a~v%rb-W)b4AsBF>zA5T3K_17_Pxcos>Hj`<q6HgnR51xhD6k+^yeL3CWj^$
ztVbi5a$)KzUX5^w8{v~6LpZ~SHf`${iL66K1rHG+w~R`Uy|tk^Rj{U<lcS#OSk<(l
zSqDvOH0)8Kxm)X0_bHKCwX^G-)yR@8BOMyOrKerF)&=G-+Fy)~T)dIkF5tI70dCP+
z(6#!c{HkH{SnlaDhB~8VB)O+?tGCwa*3#iHESM+yk^YbvvAbsRZOMGfFt_U(C&f<r
z_39z!unZT8Tiz*06A+1^D(zePnKj6_winv{h7j2oFRQXjS`nP~NEp@Zr8jJA0xl?}
zTe!yuug;9sy03FSX*+ITFsYw+WSenzf6~0+LQ2ju4bknE?e?TD+sy)*`zqL8bkN*m
zS!3!+S-@7_hz7i_+qYW6yZ%!a|LEbY<pHIH7(d&yFRpNK{`(+{{@V9s)2aKw=yYv6
zoX}x{)P0w%Ud_^TX40O3)^_LAJbyN^0|vA$3V7J&?FaUO%>~2g;5+I+8wv=%q?A9~
z*G(LG@4~CEy;{DRBsj8lbW&G)R=%JGJ7?NWjuu~;7~`nFMK_v}k?tTQAd$N5t6bQ9
z?48G$vX)%SIGbmr?Op${9w+OFR?I^6b206=SVAL(Ilosal||)(_5Hq31$q-Qvedi1
zNUO^cLtAV^$m<6eF{(K%53fnhgq)&)HF06h^Wwk(-Yu9~SIN|B4Br%?SBrff&rzY2
z@D|k;^fP4b+>hIfv3}j5n(Ai4p%~L}SfF`p(wX~_H^+rOSLQk6^spX$t2u8gZS!uY
zy<d2)R?L!JQFn5NQBR&vjmp>ga3kgQ;mhZlF&dKv<(#R8=eG6&E5_%#bl>d??CUZ|
z&Qmf922nsMfmF8ZOzmKRipq82G090Y@!9AwK92kdqw($5o{sk8V%FiFmJ`TEG1J+I
zE|RqV8_TI!a<mijWUVwziNdm}pp$%kAGu+gcDR$PyGWZrH{>|6Dwb1TR?hojgJGu*
z&XYY-JA(+|>m4pA?}LaH3>#+ohau`xeB)2MEp`-N+t!q?cXFkdh4juGdkae;sB%qK
z_v%gN2PTVL#N2r-ls1p@9F#A$r+Wg0M(5^YO!dvnE_N<7w+oP^=S9_t$a}c!X_>A@
zB~9fxNAzt1W(++qz8%_R)Fl}y)FsWP9qJ-Rgijw!eDX_+rJiaB;{h>z%HFlyej{X$
zAfLl0dS-dUdG9=l=59`PfxGB;0WAvyJHLA_;oryYL-S{gt6gBqkONpx{h=GTn6rLV
zNSo=Ajnn0W2Q97BIy}>B3AsY^!!LXxexY@xm2^_uqX(TBG?OUck*2*%JFfxzzyr+6
z#xjTL!qBN5oAsPEDc!pcJP_5U!<@=*z7?@L6Sf6x65SUr)-DVl;}R)W7Z_mjUJCI|
zs6Q+W;mv6a6ZV*{?OqV!)NIGCLQg|O-rZnOEGjOhKOTPG*?d%cJ(%aYeKqZB>9=aq
zN_{>DXd1liJm-kx2-dLd7nt1CxIQlW%@o;N8+K%95LG!USG{?t6>On=O1)WpNV%kI
z5Ucx0vLAk@_4%dQy4%u<<-)S24CcT|&DQ6hyl#8h=>qeSMc*uzf+F2;#Ll|!-4(L>
zJl+#sgK_i_%i8UX-Y;2(#yh1Yn)Y(`lvAs-b-|agqRDe5sTA1|^T)Jj1uIe~-JVON
zw<c546Dp=8>-kXwjg})>f}!@c1nFaYojtgiAjXX0W{(0=ORCVi&Igkn3(qa()=Niq
z%QhnhH@s}kOUnmyPW0gutJMc({FawxNaNK!k@otmA*l$z8wdm2dU%8*pXB#B^KxOj
z+`(|S=P&nSL(518Y}d@og+^cv=bX5EW3@FrDBzZ=@U)2e77Y#ZeO&Vm6d>kfbUL}|
zrXKFE9OtP^(%#v|?c#A=V<ZWCl5@RuL2U&Lyh(ehbl94&>Y>-!@llOkLD}J^&vOT~
zO06GXIt?4Q%6&8DL(31LhnM%ArR0zV2cy?#3v{%{MptQ({Vu&<5jYYbw|T23IeObB
z<#HJ>c#EYzT}ovkN$pI09oO?rleEs>+G3URwZ56JrsCalpM~dC&UY(5WpzZRSIGFx
zeC>QQjHJ8HG5>BTc!Q=n<(%mYygEl`l+J~#d!1N(?5v~V#rt@dxC^fA*%bJ~(tJJa
zR4eUG)cYal#DVirk@3@=tf9;c`mO-cnZY$Jc=1s2p~?|Vx$YSDwg?4idN1$$)y%1T
z{<M$ZJg(4@z|XOLPiJ$<U5*SN^r%0p_SNcLf`w?CE|uTPoC~xV0X21XhEB>f*@xyb
zQJ5@(Du#~w8Uo|M*8&wRl71{C6flpz>YLB7F&#WrNl2(NeI@;9V7-a;NIt(zU;XuI
zmY&jA$~wAt3iB>RUKy;k2_{EB71_$1h_Anq0^X@`wCXZc!H`&Wb4|{MsYu9O53+Bw
zeRhE%!EgJBc+%k5GAeRK3$YwCYLxl2ek14@G7>(qV_)n2dB~Z1jcUTdR$o70)GwIi
z<|l98t=#eOfL;iKJ-MiIu-K|9#YmWQV)I){u~5KwY+#@lGQNHu{$dg_dg(oD@T`MV
z44Vf++S%gF67WfiKe~T!*CG4lNNLknGE7jgLVG|?Xi2wpHdhe*W7!+u7~eTW0ST9E
zi7IM6MIlNKR>UzS<d#|bVSRTd;ai8d%-<Q9hqshe1!~-86N-?3Ax)=uA`v~c!PvU(
zQGb}y0~6lV?S+dLG+*FVq5!iaqFGDKpzgPV$+_`|1{ST%%$9j!<bzqKxvO!;%yMC(
zrs=(;@9V0-dz$Y7d`AH$_rsUER}^~Ru9&+!FLU)`+}v&aQLR|6W#+8XkZ)c1R}`Rb
zg`;2O99sXy;dqPg0kKnF^u)1buikmw?5NbIv=c5vuOs~&Gq;{t)iIvK^D+Xxt|<$m
z5xt*3a;d%!bQ+b-dSo2$tV$^(-)vFly1Uf`p#TW%D?PRTbsU}338HA)?TWhT=t&p7
z3vLu3ZBV9r3>#>Q<O>aAa~<u!n7w-ha|;ex64!{O2=6lgh5}mez9^~*+BSbVtJRI(
z<-uDmRGG+Rl!*fDqjd()wIz;WX@*WmS@4u$#>C{VpF7o5*b>h|o@k5h&#@kQj>>jP
zse=#eB+$>uz`?^y!Qx;)Id$87clEj;;i#xP<^sc|1->z6Iue{okLvtql2TGp02Y$Q
zD{IuD7NWm_-DOENZ}MF|*tF@*H>;bSeBX}n+!2W><|*;#Op2vKx7**Cyh7-7y_IJk
zCqWG!&`yTwtX59C@8U)-_`S1*!G|_3#2Lba>E%tI36)rPho4KLfNn5kk<nTT0<VT*
z)XXzvxzDSlAa(UdOk@`ual%jAbUH3)wIfW0Vb%(@82MwyN%uKcf2bQvoo#6~BVQoy
zGR^r#)<z)OktrzP**O!N+pZ2*UIAnn`ptdJ7W(8T$u)Uj6*C-PvYn^=4$Fi+@1q7g
z6Nl__X-8l$XSl!jZjXk-g^|-mnVb+5APhP9#I!0IJ|NW%n?(UJZ?9z=F4WW?vQ1g7
z`3?2@5?NE?NHj~on0tK5U0M!1+Xi2Uh2)nF=vWlu*hx#(R-Y-p*YxPKr1v=!&+H9U
zx#^%kee~jifu~Pi{}4w7EnjFF{Rc4X_^?=8T-uwr{0&yRV=C2mo^n(wy-n=Ij2-sF
zU1cYAMpWE6HADm^;{bDccM<Jv)cHdATv!991gBW#O-@^L^mI5Gk$*ifG8uNBXK{A^
z!~=;1AE|POg%a0xcNg4PiexagVH3EdojkAGfv%hvR3piUo@Eps`@qu5BwZ>e(-1d%
z5hO#i>#1>}rmMWubQ0nHA+M$+7-6HywL^RRx4S&cX?I5wX8Lq~OnZ!K>iv`e?=bTc
zcfn9wK>=}xjuR7){L7Q_rm^zq-j5!J=4C<qW2z6sH8Uk_vh2E@_~&LpIYHGNm`vk>
z`~5|_+WK}BFodlCn&5CAwz2pSp6=~c4`P|W5SAOX+UCwKAW+C`3bl7McC|LKwzGEi
zVz&N+WNKYuC09TT2?!9G0Z_mMFb9|cHNXm_UBT+|i@Jhg$p3=`Gav-;`~i}Fjg3vH
zs3s%FtnOxfH6*A3+?9d@qB`Jss0H)~3XdKcscERnDm;<-Wdiy=>BkRc(60f2y@RW>
zhTKDDaI*q4PA`aOVO(_v0Ao`ZM`<;+Cs(us2oYYL|GgZK{6?_`xvzBn`?der!Z&qv
zb_JzC{1)H?(Ku6ZYVLuwt%s{4$VdAG(iA4Pzv%B*wDVJqM<Bl$q=_wm(?eIZ$!~h;
zigpH_0A&uZ<Sl>E=vNpTg~@N4{)%=r_q-Yx_y<Pi6%`d_{sm_-YkIl3n%ld8*t03r
z*%1mNY3632>~H(7dVyfs74F4+HDkBIjv^etxc?6xuGZnVx&!rJ^NV)9>mS}f1DU!x
zyZ>pSq4NX4e`^1u;}bOisAhoBAmSgMKq$CN=?)l~(f{yn@`6z2T>z;2^lOI?IvU#5
z_fNsV!ni8f;O-I-7X!EbfE5>y01p=zAKV0lPlS(8a0T$;;1QD$5fWd~zjpY5y{~$K
zUqW0Q-2Vyz{^$0;?C|*;<NN=2`22r(hY!MZcgKHZKK8^kE5n=0AAw#(c{zs2)o(CF
zo9f(O&G0UNTSp(oVh&S8WHH1mI+y64=+U<Y_%UP?TojJ&ijBTVMTlrXPUQCUFB**q
zC$v<jk2iu2p+tx~QxINc^nB;Fi)dQsh!t9@CRV=iX=L=Mbqao2YyC};!-D6#D4?<H
z_T}ihfnU^aipVt0@j|8LyNDX=LH%TM>)p?uXHtqKDfoS>C$JA2Ml!lSTxxRQlZWDW
z$?MEMXTG&uB=)=q8k;_YQjLys=k*BpLP6-;>OSO_>b#MT(ryV~%JkwI7wgkg<qu=w
zQvQ&Un@m;SI;Zt5Dfr^wfA;MiZW!7x6!>3Iz6;-IQ@qG(smJs9@uTe=5_LK{PyAyn
z<b~5nmGwf31_R@FNv>f(`mZ(6>F}RH=L9;ZdYwMA)l&YHQ-zV+rUj-+yLVrqze52Y
z9c?y8I~WMD16`Wf!BRg{9ppHSd^3F8$H155qVS>AvEoT^r_`iNL)Vv$#(KJM5X-o4
zJ~vznqux~N=zoA<IunZ)d?{#jTR6(a^4mfI5i4q4b4N>2$Xe9_DQtw$K~2TLO%rb*
zq$Q01B?XxZ+8ny-b7fb?o5KP|{#9M)zD;s3+^ja}yRn+NFrT=*++pPzeD#U6-Ta7h
z54I`lwb!;l72;;Thmg7^HGgxrHW)4@lQd8loBd3$0)0XLMnzf7%v^I{)4l*!P%j6j
z{|#sT<Eq`Mstvgu>pJ%DgYzLR?3F`lRS9-QoH0hlH))=6MSUouZg8ZdT<W~#&+${x
zyc@b)hXS%UwHsEVIT|ylom&;*$F=z*x!rm9^Hc|+fiqOY;->RTy`)xEv~WX40~HCz
zR=85hciYLB68*?`Q7$a+5RC>8m^1tG9~JFLGac8zHXW`JHWjL6?}~f`CFD4OzMm0o
z!f59e&}1dq$(%XbRc%ayX`jyBL6X7~AVD?i3;JtYJF|}}M^<&VQpX%vJ0~)#ANQy2
zSn~;Gvlqv77mV*9@wp3-9W%GWe;~06zwc$#Zq1IBzzQciT--SDXqAXcY@W5VMY%KR
zDX`&Z6qn%dy4=CCeEVtFBg&hb8$Rf+D(7|vcYW?G-slmnWNm-9fAdld)^y+Roz-lq
zR3jG(AZ!C4bS%GlDBCqSblvzAv458Ms^hHiRh!{dLjNhvybe-qeV`+=H={u?ih2k0
z#3mQRylg4tlUTO-Vy5)jE6USL(}nsVBSs|mM#5;*EC2#m&DZVO%8N4NQ>SO-9E4({
z_}I*GfaFS%9iz`oMN~nOcl~-(@S!D%;8q1BPidS@@$~ewP_hHp{^(G$`PVJ0vIX=u
zsr)xME9Z(KO$$Xe8@E&UC^!xd*taJwwsQ3hCg7LQk+#0hKr0o)pP^cAGfIAwDF(16
zR+}ix&LMHhpJJp=cMbWZhTXf>>n=mZ)!Eo%hy;ho@Pxm{oo}~_c@&VPAn_UUtjZ(l
z)&$oaOkzF8C-lEQ#{6(^#w>p^gbbfi^(Q3HZrx~CLy7-u+wzow-juSaPI|Raf3|5K
zRm=bg9+^B)z!?-gC|n5H<|}<7f%vF*X|%%mi77;V#XoNfUZZqDb=t!PiEzcPd@n6p
zUJ+my{ybj+E&?R%!rrA|=L>YMZ#jH(;Lc~hZx*BzB*s|trv0eEZ?}AF$95rwUhYdn
zPKoy$*0X)pG((mKdYN>nU^*eDCr|2@IT5q?HEN%EFk{g@g%<b?*v>OuJN0NzW~r(y
ze3UUIH-FKYd#g6tT){NlPDAD=3;&jnKl%30K*2+VaN^?LSiNa*+U8u8{gF0u!vhf;
zufs^%GSVzZ!WogdTpY_6-krgHtOp&p@#?AEjS_p~P;R$)@e$(h$%@2_*ppfqNpi}z
zI$v!KeK^AP#=*R3IIAi|1cbvjT$@-ul-tVl(TvhHe`c$2I^}GlfNB&l$(W~t)+VdM
z*K7=Kq%bntAV?0KhfY$>&o<sAusWA&=w{?*`k@wDPAm6bVDf%&s6_hx<QFeK(4@sz
zvcLJtbB)qC@`dWy;BoG0#O{mc3BSZS*t?DeCW4t~?EYnM@`@Gk*vp90sYn+?s>GRJ
zc0GKxk4UZ~yZm_9IAKxsG-FRmfr=m|j3gkYP>kLgFYsvt<`HIiW3B!%?WMmD-GwFM
zNn+D1p^x%j!2)|-OrgS8)myJzYq3Y=2)js^huDUe2`V@my~yNe^!d_^3!UfBhixj=
zzYe7&&D4IIMA&%^+q|Gv(Fro#(H@S?t&N5IdR-{{O-hl#Z0r4F_-!YU*}KIHBuzv%
z68cSboc%(!Q97Nak3Sn*1gWxUL6argR$g;Y4&9DjP@N#xJB2PX1=a6Hz|Tn<>))LR
z<W<d=?qI@&lPLlqtk%NbKF4hx6?WU~YOLhZceLJJa_q(;uC30M|LCPyD`&hnBCeHh
zGnyZZ8wD?d>)A)V<$UeeK^b+;i!k4Oy0YTg!MvE<X3GViXK|}X|LlxsL6hGdYlD@(
z8ab!y!FHQnn?EiSrrC_*k=m9~FVj}3zZH&mImh`Lk?ZlrK8>CzQZ)=(&lRp4?K`Ou
z()HshI$x%ZY?78B^EgR7)pLrjjGkC=f;e<kC)FcJxsD(9p#WP|Oi!fFr0Ooy%T&)p
z27QG-K{U4o64LY!pCj)lsYh78ZdrI5l2H-5!o?C#X)-o#v_)hK-gX<1_^09XDS>r_
z{dE{t_4r3#;v8Q+lc(oOm4YXO1#G<>c*-QY7Vb(i^pW010rI*G`X`Sq5R8|v>u3-d
zdp^lL<$GDJci$YyzoOIM?R`HVIUq6~FnssegGy~FV4MT8vn-{)$y82-AU`<%Tz_im
z<u!)_f|4;$7mwNan^HY5=8;jy8$VdN-tDl2nnpgXzfHzwBfb1%=|a~*DA_l9|GABG
zkC@^}mGbn>a)pd6o^XRBNz0HN<L{L<8LvL21*A0LxyTr>B~7?!+McCv=U3^RR?m@y
z3HFW|EvUXi7-aj%?bg5dVOpKqsOo)pXgmL{Z9)GP=15~-G-sde!bXQbp%d=%L<jwV
zWK+Qf4RS15Y{*Z*#*k$<x!|kJoDM=UR!=Hm2Vs6QH&>rIh^We^tWd^9yoc5Qi%!F%
zrHAh;c)R@^K->W<YA-MlA?%wqhPZ#qZu@zf?K*^455ZS>A)ZYTpXxvGyg!02iiPV2
z{?tnn!Mt4$B)-#yn%{t&`fhJi3Y88*qHlBILN>LIp=?l`$}-^o!(!{>;~lo}el>o6
zEQya1Y4epbig}9pqqST1Rq*W;<%!Y~Nf@R6g{)uWN2-#fZwr(54%?9)8%vRj9jqt!
zk@(qriSttLrJg6r!h&h-BuP#i78p34=974E!e*O4Op|Tc^MAAJWhgu|d>Z$0LKoMP
zGizUU-mqZ7UP|LaqW)dp^<IMz>sYF~8wA<<V=^~n4!WHER!{V`8hFXj@6nTy{FEd-
zjan$U=3{7pZjZg#lFT;bru99*N>H6`qIthU$4vVp*@8j4`uipv&14s&3Zueu1nJ3q
z@~hpus-t!HtY>c2?YRwCKgwPU{?@{nlG)Qs*G2&mYO^b%j#ne)4eg4gy!afwBA8PZ
z@o_U!!Nox6aJr=2wn%Q1o?r8g^PTr{_j1LKGIu&V**ll1J6grF^Po2q2iwmy7uvS6
ze0QBY4f}oM7^AZ`s))B}S5*R4$_5?MD(xfWzmC*tmZ&$aY(@KNdwK_`v6iC%B3LTI
z`INR;Dqw!M=EG!qq|$QYMsOl*YO>Js5k;ha(k}T*S4Kq0^RhYBjq+fadBIy4T@CM7
ztBKJ@)qpMVW<jc(Bxz;zq`Z8Hk)4C%eFD3jjGUHf*@O0<d>GD>yeQ!HM_2={ogcR+
zc5ky0+WhWplhidUF<#qQ{AamJS@0*HS1{%M6S(}@zYt>NF5D3?5iftQ$*h&VKc7=w
zX}CXKU^uO{>F1#u^7VF(W?H8$JY{YGd=(1!Sp<K~$4wPRIAas*hImDL0g2{hE%v$f
z{)9~S4>4aIKco0y>F0$b+M{AskRW*-{N?k(tWp?Gjq`nE7Q%5($yR3IR?LIq1`E{R
zpilHWy$TyCkAG}$KV2m{xYz!?3u1X}XvyTx8(IYg;oyCVwLNTnr37_|9~99Wag;)4
zLpIH)gP_?XYZvpaHPc2sl_i-svVt|R!RB&dlqg^>*&WHgyHdPscz!S+8}g~weL^d#
zJ0?5*S=`&3+cOJhyi(hZ7997|Tm20r!B^=q=a!*@c&-X&u`LPB_gdaH6Z!J2N^O2A
zbHow-L2oL`ti_wvkTbrhl6aw{nMn8(a*{)m>R{03SlL#`C%F=%uM%}RJvf0pF%sJJ
zY4vLJ3a}4wbs7vw-Q28A7`~s!in)^o+4y`(jJOM~O5Ukl^YMv$851eETcI{W{SIwu
zO{h5gOOeD*-G$Jq<;UCDP7xuH%#He8HPyG0Y`a4vRlPw-YQxF)Fch#}Zn7}yw7Bx>
z4R-qyauWm2b(R1NMDp#n9P%^JH46!IVzjX8bW^+}{qS@P=Yw}xYZbwLXz;{GqGQ+7
zP$$}usB3j@7`qE~cS+~NG(|7uhd;r#HZs<`5{<kTn}Q3E6$XQS&-7q#ly;?@C2zqR
zWMGyk0Q(dR#QWc_%J0@DE!Sk{jC)G{1o3}eHkRkf$~6H5GR$Xp8y+|=_J!ZOOoPp>
zU+OPpH7=hT?d~t?oLYZwOJfk*Xe+;eS6s%MjEqtK3sF)3GTKXXFLR9_X=(m8h@_Ev
z(}Ga)b)tOFHx0?01FlCm^wsug8TcrAS^1{pelRXA)U53PY->7!)efiC#ZaATs%mpp
zxM4%IFvdT~6O-7H@9fUvEstw{`c72Yp{G$h8-4D_<d+qjVi~vT`n=GlUu9jdv!@%5
zJQ+0ImKuAbHt0k7)i#0TwVSdS9m7M4Sglb(i_4kM*SFq7kDu~2ss*~;_CQbLevJ<a
zM!@=^QWm~0YT@#OPxKgb?;CNCBzn+~@Z9u3GqoBklEpOFVrzPt#ri=t8o_^>WIM-1
z@J#MjB2?(J<DhK6SxzSKgJzMC#Ly|M^m75iVGzk|t-h8}GOE7*{-S-GcHF|#42K!*
z<l{Acb`=F?*A4~(45JN=6%{q8(S2A<+Zu^v=epTP!|UIyO;{<uM5>H>XHM7~*vvZH
z;~aPFQN2dUq;E_x<j0#YgfeM_Ym|?y1a46UnV5N+sx7s?VtY8>k6CF4{Q<yaW(i<(
z*?xCVLocK}Ef+jqLtVE_e@Nab_o%F^3lMd1Ra(Z48k-?4OkTjgA9i9SNG43E@pu+d
z0}m&R9q^6U<!&;$H|trDeIlXktAGM9+rWTMI4wrvH7$gb8d&YyKqge*Z|Y5)C<uEE
zuEd#kBr92JhbfS+qJ@nz8aMgRM0$^PWrpf8_6UbtfPaH;*8Ftu43cVI+tBve>4nDH
ztIkrx=Dvyr)E4ktAB!m;r&%~aQ@<x@m4{i^WJXFiM#2Y-eR@AKu_xZ~dx!!i>XG;y
z1;}2eB3Ni0n`g0F00V)1kdnmBLE~~?4Wyb((pzE*=+q;x3Tr}ZilXP=UIZ?4&m!pg
zja|~k!!M)|LQ#6Lon9+pG+)XijYE4_`6SVpKM-%FVXU++9)xd!&$n2_dw~cFjf=*u
z1p`S5kyG!f$qBvj_WrS~IN5d961A8;{s`J)Iojg5{jP^!ZiUA#sW%QE58H^^y7l{<
zuaC`S^60$H?tg7Sl2l{8SKKTqI=Vb0Xj^SNISxQ#H-+}L+lpFo>QxT4lf%<ad3x|z
zhut9h8L%^ByMt_MoERJ$I4%vnn*gMKEBi1LxnLTYU*h?$fXDLls#ltTy5Xxi2H`+I
z{?n$$1Rr;AqhN96%!x;h($+bugw}^z&#{zU_7>Zy+D>Np_squI?;pJgXcuQJm~xV#
zsQqNP*8em?Psk-Up>*VH=W%XsaOkJIi8p-fpA6ge%ZQ|xJpQR%U97JZYS9lBz76Gh
z%(eAl9QiP2pE9`V9Xyp^5l!Np_IAFPkC9a0F-MEI1PTD(QXOWRSqiQt^A2)%U)K0(
z_y>(~ez@0+J4hp;Ptzv4h>?mO#6@V9@X3DloIJWk<Y|2@-2Bw}=gnaSuIkQ+hfAvt
zy3*jguJBdE;$2mRa!IZ}ipFnuE&MHdZ$20q;9Z4x4`%xMQ$V8QI`$>J8AtHB3g>3n
k-ka_*rsmwsbzyn6CQN(#OI<+9k6Mz*0)&EhF>3t30g>tSH~;_u

diff --git a/app/res/drawable-nodpi/test_recipe_image_5.jpg b/app/res/drawable-nodpi/test_recipe_image_5.jpg
deleted file mode 100644
index 15fd219e23e706f52de50425ed71fc55d63366ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7119
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

diff --git a/app/res/drawable-nodpi/test_recipe_image_6.jpg b/app/res/drawable-nodpi/test_recipe_image_6.jpg
deleted file mode 100644
index 973d1868274c31461fa5a7c947752c45d8eebd26..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 28980
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

diff --git a/app/res/layout/fragment_saved_recipes.xml b/app/res/layout/fragment_saved_recipes.xml
index 0cc47de..de04332 100644
--- a/app/res/layout/fragment_saved_recipes.xml
+++ b/app/res/layout/fragment_saved_recipes.xml
@@ -3,12 +3,9 @@
           android:id="@+id/gridview"
           android:layout_width="fill_parent"
           android:layout_height="fill_parent"
-          android:columnWidth="250dp"
-          android:numColumns="auto_fit"
-          android:verticalSpacing="20dp"
-          android:horizontalSpacing="20dp"
-          android:stretchMode="columnWidth"
           android:gravity="center"
-
-
-        />
\ No newline at end of file
+          android:horizontalSpacing="4dip"
+          android:numColumns="3"
+          android:stretchMode="columnWidth"
+          android:verticalSpacing="4dip"
+          android:padding="4dip" />
\ No newline at end of file
diff --git a/app/res/layout/item_recipe_image.xml b/app/res/layout/item_recipe_image.xml
new file mode 100644
index 0000000..be9ec1b
--- /dev/null
+++ b/app/res/layout/item_recipe_image.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+           android:id="@+id/image"
+           android:layout_width="fill_parent"
+           android:layout_height="120dip"
+           android:adjustViewBounds="true"
+           android:contentDescription="@string/descr_image"
+           android:scaleType="centerCrop" />
\ No newline at end of file
diff --git a/app/res/values/strings.xml b/app/res/values/strings.xml
index ca28933..e32d22a 100755
--- a/app/res/values/strings.xml
+++ b/app/res/values/strings.xml
@@ -42,5 +42,6 @@
     <string name="add">Add</string>
     <string name="no_pantry_items">Pantry is Empty!</string>
     <string name="no_saved_recipes">No Saved Recipes</string>
+    <string name="descr_image">Recipe image</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/RecipeBotApplication.java b/app/src/main/java/com/cmput301/recipebot/RecipeBotApplication.java
index e0054e6..acb381e 100755
--- a/app/src/main/java/com/cmput301/recipebot/RecipeBotApplication.java
+++ b/app/src/main/java/com/cmput301/recipebot/RecipeBotApplication.java
@@ -27,8 +27,14 @@
 import com.github.kevinsawicki.http.HttpRequest;
 import com.google.inject.Injector;
 import com.google.inject.Stage;
+import com.nostra13.universalimageloader.core.DisplayImageOptions;
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
+import com.nostra13.universalimageloader.utils.StorageUtils;
 import roboguice.RoboGuice;
 
+import java.io.File;
+
 import static android.os.Build.VERSION.SDK_INT;
 import static android.os.Build.VERSION_CODES.FROYO;
 
@@ -61,6 +67,24 @@ public void onCreate() {
         super.onCreate();
 
         setApplicationInjector(this);
+
+        buildImageCache();
+    }
+
+    private void buildImageCache() {
+        File cacheDir = StorageUtils.getCacheDirectory(getApplicationContext());
+
+        DisplayImageOptions defaultOptions = new DisplayImageOptions.Builder()
+                .cacheInMemory()
+                .cacheOnDisc()
+                .showImageForEmptyUri(android.R.drawable.ic_menu_report_image)
+                .build();
+
+        ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(getApplicationContext())
+                .defaultDisplayImageOptions(defaultOptions)
+                .build();
+
+        ImageLoader.getInstance().init(config);
     }
 
     /**
diff --git a/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java b/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java
index 11ce8c9..fe03882 100644
--- a/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java
+++ b/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java
@@ -18,6 +18,7 @@
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
+import android.net.Uri;
 import android.provider.BaseColumns;
 import android.util.Log;
 
@@ -149,7 +150,7 @@ public ArrayList<Recipe> loadRecipes() {
 
         ArrayList<Recipe> logList = new ArrayList<Recipe>();
         ArrayList<Ingredient> ingredients = new ArrayList<Ingredient>();
-        ArrayList<String> photos = new ArrayList<String>();
+        ArrayList<Uri> photos = new ArrayList<Uri>();
         ArrayList<String> directions = new ArrayList<String>();
         SQLiteDatabase db = this.getReadableDatabase();
 
@@ -158,12 +159,12 @@ public ArrayList<Recipe> loadRecipes() {
             try {
                 do {
                     //SET RECIPE INFO
-                    Recipe recipe = new Recipe();
-                    recipe.setId(cursor.getInt(0));
-                    recipe.setUser(cursor.getString(1));
-                    recipe.setName(cursor.getString(2));
+                    Recipe.Builder recipeBuilder = new Recipe.Builder();
+                    recipeBuilder.setId(cursor.getInt(0));
+                    recipeBuilder.setUser(cursor.getString(1));
+                    recipeBuilder.setName(cursor.getString(2));
                     directions.add(cursor.getString(3));
-                    recipe.setDirections(directions);
+                    recipeBuilder.setDirections(directions);
 
                     //SET INGREDIENTS
                     Cursor cursor2 = db.rawQuery("SELECT " + INGREDIENT + " FROM " + INGREDIENTS_TABLE + " WHERE " +
@@ -179,7 +180,7 @@ public ArrayList<Recipe> loadRecipes() {
                         }
                     }
                     cursor2.close();
-                    recipe.setIngredients(ingredients);
+                    recipeBuilder.setIngredients(ingredients);
 
                     //SET PHOTOS
                     Cursor cursor3 = db.rawQuery("SELECT " + IMAGE_PATH + " FROM " + HASIMAGES_TABLE + " WHERE " +
@@ -187,16 +188,17 @@ public ArrayList<Recipe> loadRecipes() {
                     if (cursor3.moveToFirst()) {
                         try {
                             do {
-                                photos.add(cursor3.getString(0));
+                                photos.add(Uri.parse(cursor3.getString(0)));
                             } while (cursor3.moveToNext());
                         } catch (Exception e) {
                             Log.e(TAG, "failed to load IMAGES from: " + HASIMAGES_TABLE);
                         }
                     }
                     cursor3.close();
-                    recipe.setPhotos(photos);
+                    recipeBuilder.setPhotos(photos);
 
-                    logList.add(recipe);
+
+                    logList.add(recipeBuilder.build());
                 } while (cursor.moveToNext());
             } catch (Exception e) {
                 Log.e(TAG, "failed to load all Recipes from: " + RECIPES_TABLE);
@@ -327,20 +329,19 @@ public void editRecipeIngredients(Recipe recipe, ArrayList<String> ingredients)
     }
 
     //edits the recipe's pictures
-    public void editRecipePictures(Recipe recipe, ArrayList<String> pictures) {
+    public void editRecipePictures(Recipe recipe, ArrayList<Uri> photos) {
         SQLiteDatabase db = this.getWritableDatabase();
         ContentValues values = new ContentValues(0);
         db.delete(HASIMAGES_TABLE, RECIPE + " = ?", new String[]{String.valueOf(recipe.getId())});
 
-        for (int x = 0; x < pictures.size(); x++) {
-
+        for (int x = 0; x < photos.size(); x++) {
             values.put(RECIPE, recipe.getId());
-            values.put(IMAGE_PATH, pictures.get(x));
+            values.put(IMAGE_PATH, photos.get(x).toString());
             try {
                 db.insertOrThrow(HASIMAGES_TABLE, null, values);
-                recipe.setPhotos(pictures);
+                recipe.setPhotos(photos);
             } catch (Exception e) {
-                Log.e(TAG, "FAILED TO UPDATE A PICTURE: " + pictures.get(x));
+                Log.e(TAG, "FAILED TO UPDATE A PICTURE: " + photos.get(x).toString());
             }
         }
 
diff --git a/app/src/main/java/com/cmput301/recipebot/model/Recipe.java b/app/src/main/java/com/cmput301/recipebot/model/Recipe.java
index 7fb4433..16e4719 100644
--- a/app/src/main/java/com/cmput301/recipebot/model/Recipe.java
+++ b/app/src/main/java/com/cmput301/recipebot/model/Recipe.java
@@ -19,7 +19,7 @@
 
 package com.cmput301.recipebot.model;
 
-import android.graphics.Bitmap;
+import android.net.Uri;
 
 import java.util.ArrayList;
 
@@ -34,27 +34,16 @@ public class Recipe {
     private String name;
     private ArrayList<Ingredient> ingredients;
     private ArrayList<String> directions;
-    private ArrayList<Bitmap> images;
-    private ArrayList<String> photos;
+    private ArrayList<Uri> photos;
 
     public Recipe(int id, String user, String name, ArrayList<Ingredient> ingredients,
-                  ArrayList<String> directions, ArrayList<Bitmap> images) {
+                  ArrayList<String> directions, ArrayList<Uri> photos) {
         this.id = id;
         this.user = user;
         this.name = name;
         this.ingredients = ingredients;
         this.directions = directions;
-        this.images = images;
-    }
-
-
-    //Another constructor added for db support
-    public Recipe() {
-        this.id = 0;
-        this.user = "";
-        this.name = "";
-        this.ingredients = new ArrayList<Ingredient>();
-        this.directions = new ArrayList<String>();
+        this.photos = photos;
     }
 
     /**
@@ -123,20 +112,16 @@ public void setDirections(ArrayList<String> directions) {
     }
 
     /**
-     * Get all images for this recipe.
+     * Get all photoes for this recipe.
      * TODO: consider using a custom Bitmap class, with a boolean unpublished.*
      *
-     * @return Images for this recipe.
+     * @return `photos for this recipe.
      */
-    public ArrayList<Bitmap> getImages() {
-        return images;
-    }
-
-    public void setImage(ArrayList<Bitmap> images) {
-        this.images = images;
+    public ArrayList<Uri> getPhotos() {
+        return photos;
     }
 
-    public void setPhotos(ArrayList<String> photos) {
+    public void setPhotos(ArrayList<Uri> photos) {
         this.photos = photos;
     }
 
@@ -152,7 +137,7 @@ public static class Builder {
         private String name;
         private ArrayList<Ingredient> ingredients;
         private ArrayList<String> directions;
-        private ArrayList<Bitmap> images;
+        private ArrayList<Uri> photos;
 
         public Builder setId(int id) {
             this.id = id;
@@ -179,13 +164,13 @@ public Builder setDirections(ArrayList<String> directions) {
             return this;
         }
 
-        public Builder setImages(ArrayList<Bitmap> images) {
-            this.images = images;
+        public Builder setPhotos(ArrayList<Uri> photos) {
+            this.photos = photos;
             return this;
         }
 
         public Recipe build() {
-            return new Recipe(id, user, name, ingredients, directions, images);
+            return new Recipe(id, user, name, ingredients, directions, photos);
         }
     }
 
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/adapters/RecipeGridAdapter.java b/app/src/main/java/com/cmput301/recipebot/ui/adapters/RecipeGridAdapter.java
index 97b7d5e..e12f972 100644
--- a/app/src/main/java/com/cmput301/recipebot/ui/adapters/RecipeGridAdapter.java
+++ b/app/src/main/java/com/cmput301/recipebot/ui/adapters/RecipeGridAdapter.java
@@ -20,12 +20,14 @@
 package com.cmput301.recipebot.ui.adapters;
 
 import android.content.Context;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import android.widget.GridView;
 import android.widget.ImageView;
+import com.cmput301.recipebot.R;
 import com.cmput301.recipebot.model.Recipe;
+import com.nostra13.universalimageloader.core.ImageLoader;
 
 import java.util.List;
 
@@ -62,17 +64,16 @@ public long getItemId(int position) {
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
-        // TODO: don;t use this in production code, do on a background thread
-        ImageView imageView;
+        final ImageView imageView;
         if (convertView == null) {
-            imageView = new ImageView(mContext);
-            imageView.setLayoutParams(new GridView.LayoutParams(300, 300));
-            imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
+            LayoutInflater layoutInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            imageView = (ImageView) layoutInflater.inflate(R.layout.item_recipe_image, parent, false);
         } else {
             imageView = (ImageView) convertView;
         }
 
-        imageView.setImageBitmap(mRecipes.get(position).getImages().get(0));
+        ImageLoader.getInstance().displayImage(mRecipes.get(position).getPhotos().get(0).toString(), imageView);
+
         return imageView;
     }
 }
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java b/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java
index 5639a89..0ebc668 100644
--- a/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java
+++ b/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java
@@ -21,7 +21,9 @@
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.net.Uri;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -43,6 +45,8 @@
  */
 public class SavedRecipesFragment extends RoboSherlockFragment implements AdapterView.OnItemClickListener {
 
+    private static final String LOGTAG = "SavedRecipesFragment";
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
@@ -90,21 +94,39 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
         Toast.makeText(getSherlockActivity(), "clicked recipe # " + position, Toast.LENGTH_SHORT).show();
     }
 
-    private ArrayList<Recipe> getTestRecipes() {
+    private static ArrayList<Recipe> getTestRecipes() {
 
-        // TODO : this is just a test, should also do on a background thread, check for recycled views etc.
-        int[] bitmapIDs = {R.drawable.test_recipe_image_1, R.drawable.test_recipe_image_2,
-                R.drawable.test_recipe_image_3, R.drawable.test_recipe_image_4, R.drawable.test_recipe_image_5,
-                R.drawable.test_recipe_image_6};
+        final String[] IMAGES = new String[] {
+                "https://lh6.googleusercontent.com/-jZgveEqb6pg/T3R4kXScycI/AAAAAAAAAE0/xQ7CvpfXDzc/s1024/sample_image_01.jpg",
+                "https://lh4.googleusercontent.com/-K2FMuOozxU0/T3R4lRAiBTI/AAAAAAAAAE8/a3Eh9JvnnzI/s1024/sample_image_02.jpg",
+                "https://lh5.googleusercontent.com/-SCS5C646rxM/T3R4l7QB6xI/AAAAAAAAAFE/xLcuVv3CUyA/s1024/sample_image_03.jpg",
+                "https://lh6.googleusercontent.com/-f0NJR6-_Thg/T3R4mNex2wI/AAAAAAAAAFI/45oug4VE8MI/s1024/sample_image_04.jpg",
+                "https://lh3.googleusercontent.com/-n-xcJmiI0pg/T3R4mkSchHI/AAAAAAAAAFU/EoiNNb7kk3A/s1024/sample_image_05.jpg",
+                "https://lh3.googleusercontent.com/-X43vAudm7f4/T3R4nGSChJI/AAAAAAAAAFk/3bna6D-2EE8/s1024/sample_image_06.jpg",
+                "https://lh5.googleusercontent.com/-MpZneqIyjXU/T3R4nuGO1aI/AAAAAAAAAFg/r09OPjLx1ZY/s1024/sample_image_07.jpg",
+                "https://lh6.googleusercontent.com/-ql3YNfdClJo/T3XvW9apmFI/AAAAAAAAAL4/_6HFDzbahc4/s1024/sample_image_08.jpg",
+                "https://lh5.googleusercontent.com/-Pxa7eqF4cyc/T3R4oasvPEI/AAAAAAAAAF0/-uYDH92h8LA/s1024/sample_image_09.jpg",
+                "https://lh4.googleusercontent.com/-Li-rjhFEuaI/T3R4o-VUl4I/AAAAAAAAAF8/5E5XdMnP1oE/s1024/sample_image_10.jpg",
+                "https://lh5.googleusercontent.com/-_HU4fImgFhA/T3R4pPVIwWI/AAAAAAAAAGA/0RfK_Vkgth4/s1024/sample_image_11.jpg",
+                "https://lh6.googleusercontent.com/-0gnNrVjwa0Y/T3R4peGYJwI/AAAAAAAAAGU/uX_9wvRPM9I/s1024/sample_image_12.jpg",
+                "https://lh3.googleusercontent.com/-HBxuzALS_Zs/T3R4qERykaI/AAAAAAAAAGQ/_qQ16FaZ1q0/s1024/sample_image_13.jpg",
+                "https://lh4.googleusercontent.com/-cKojDrARNjQ/T3R4qfWSGPI/AAAAAAAAAGY/MR5dnbNaPyY/s1024/sample_image_14.jpg",
+                "https://lh3.googleusercontent.com/-WujkdYfcyZ8/T3R4qrIMGUI/AAAAAAAAAGk/277LIdgvnjg/s1024/sample_image_15.jpg",
+                "https://lh6.googleusercontent.com/-FMHR7Vy3PgI/T3R4rOXlEKI/AAAAAAAAAGs/VeXrDNDBkaw/s1024/sample_image_16.jpg",
+                "https://lh4.googleusercontent.com/-mrR0AJyNTH0/T3R4rZs6CuI/AAAAAAAAAG0/UE1wQqCOqLA/s1024/sample_image_17.jpg",
+                "https://lh6.googleusercontent.com/-z77w0eh3cow/T3R4rnLn05I/AAAAAAAAAG4/BaerfWoNucU/s1024/sample_image_18.jpg",
+                "https://lh5.googleusercontent.com/-aWVwh1OU5Bk/T3R4sAWw0yI/AAAAAAAAAHE/4_KAvJttFwA/s1024/sample_image_19.jpg",
+                "https://lh6.googleusercontent.com/-q-js52DMnWQ/T3R4tZhY2sI/AAAAAAAAAHM/A8kjp2Ivdqg/s1024/sample_image_20.jpg",
+                "https://lh5.googleusercontent.com/-_jIzvvzXKn4/T3R4t7xpdVI/AAAAAAAAAHU/7QC6eZ10jgs/s1024/sample_image_21.jpg",
+                "https://lh3.googleusercontent.com/-lnGi4IMLpwU/T3R4uCMa7vI/AAAAAAAAAHc/1zgzzz6qTpk/s1024/sample_image_22.jpg",
+        };
 
         ArrayList<Recipe> recipes = new ArrayList<Recipe>();
-        for (int i = 0; i < 15; i++) {
-            Bitmap test = BitmapFactory.decodeResource(getSherlockActivity().getResources(),
-                    bitmapIDs[i % bitmapIDs.length]);
-            ArrayList<Bitmap> bitmaps = new ArrayList<Bitmap>();
-            bitmaps.add(test);
+        for (int i = 0; i < 25; i++) {
+            ArrayList<Uri> photos = new ArrayList<Uri>();
+            photos.add(Uri.parse(IMAGES[i%IMAGES.length]));
             Recipe r = new Recipe.Builder().setDirections(null).setId(0).setIngredients(null).setName("hi").
-                    setUser("bob").setImages(bitmaps).build();
+                    setUser("bob").setPhotos(photos).build();
             recipes.add(r);
         }
 
diff --git a/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java b/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
index 152e4c4..7b88094 100644
--- a/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
+++ b/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
@@ -33,7 +33,7 @@ public void testInsert() throws Exception {
         ArrayList<String> directions = new ArrayList<String>();
         directions.add("mix and bake");
         builder.setDirections(directions);
-        builder.setImages(null);
+        builder.setPhotos(null);
         Recipe recipe = builder.build();
         boolean response = ESClient.insertRecipe(recipe);
 
diff --git a/integration-tests/AndroidManifest.xml b/integration-tests/AndroidManifest.xml
index c627c50..b816e3b 100755
--- a/integration-tests/AndroidManifest.xml
+++ b/integration-tests/AndroidManifest.xml
@@ -7,6 +7,7 @@
 
     <application android:debuggable="true">
         <uses-library android:name="android.test.runner"/>
+
     </application>
 
     <instrumentation android:label="RecipeBot - Integration Tests" android:name="android.test.InstrumentationTestRunner"
diff --git a/test-cli-lab.sh b/test-cli-lab.sh
new file mode 100755
index 0000000..03b1aba
--- /dev/null
+++ b/test-cli-lab.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+#
+# Simple script to test Java-based execution of Spoon. You must have assembled
+# the jar prior to running this script (i.e., mvn clean verify).
+mvn clean verify -DskipTests=true
+
+set -e
+
+APK=`\ls app/target/*.apk`
+TEST_APK=`\ls integration-tests/target/*.apk`
+
+java -jar spoon-*-jar-with-dependencies.jar --apk "$APK" --test-apk "$TEST_APK" --output target
+
+nautilus target/index.html

From 2d9b3c64fc83ddef7c1d6dea3b99f99b60e74ba5 Mon Sep 17 00:00:00 2001
From: Prateek Srivastava <f2prateek@gmail.com>
Date: Thu, 14 Mar 2013 14:25:57 -0600
Subject: [PATCH 09/18] Add Pantry list - by @ethanmykytiuk

by Ethan, just refactored from
https://github.com/ethanmykytiuk/classproject/blob/pantry-fragment/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java

Couldn't figure out the rebasing.
---
 app/AndroidManifest.xml                       |  5 --
 app/res/layout/fragment_pantry_header.xml     | 22 ++++++
 app/res/layout/item_pantry.xml                |  7 ++
 .../recipebot/ui/AddPantryItemActivity.java   | 29 -------
 .../ui/adapters/PantryListAdapter.java        | 78 +++++++++++++++++++
 .../ui/fragments/PantryFragment.java          | 47 ++++++++---
 6 files changed, 142 insertions(+), 46 deletions(-)
 create mode 100644 app/res/layout/fragment_pantry_header.xml
 create mode 100644 app/res/layout/item_pantry.xml
 delete mode 100644 app/src/main/java/com/cmput301/recipebot/ui/AddPantryItemActivity.java
 create mode 100644 app/src/main/java/com/cmput301/recipebot/ui/adapters/PantryListAdapter.java

diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
index 9d3413b..4c5056b 100755
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -32,11 +32,6 @@
             </intent-filter>
         </activity>
 
-        <activity
-                android:name=".ui.AddPantryItemActivity"
-                android:configChanges="orientation|keyboardHidden|screenSize"
-                android:label="@string/activity_add_pantry_item_title"/>
-
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/res/layout/fragment_pantry_header.xml b/app/res/layout/fragment_pantry_header.xml
new file mode 100644
index 0000000..c73b139
--- /dev/null
+++ b/app/res/layout/fragment_pantry_header.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content">
+
+
+    <EditText
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="New EditText"
+            android:id="@+id/editText_pantry" android:layout_gravity="left|center_vertical"/>
+
+    <ImageButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@android:drawable/ic_input_add"
+            android:id="@+id/button_add_pantry" android:layout_gravity="right|center_vertical"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/res/layout/item_pantry.xml b/app/res/layout/item_pantry.xml
new file mode 100644
index 0000000..30acb90
--- /dev/null
+++ b/app/res/layout/item_pantry.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:text="New CheckBox"
+          android:id="@+id/checkBox" android:layout_gravity="left|center_vertical"/>
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/AddPantryItemActivity.java b/app/src/main/java/com/cmput301/recipebot/ui/AddPantryItemActivity.java
deleted file mode 100644
index 127df5c..0000000
--- a/app/src/main/java/com/cmput301/recipebot/ui/AddPantryItemActivity.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cmput301.recipebot.ui;
-
-import com.github.rtyley.android.sherlock.roboguice.activity.RoboSherlockActivity;
-
-/**
- * An activity that adds items to the Pantry.
- * TODO : Unimplemented.
- */
-public class AddPantryItemActivity extends RoboSherlockActivity {
-}
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/adapters/PantryListAdapter.java b/app/src/main/java/com/cmput301/recipebot/ui/adapters/PantryListAdapter.java
new file mode 100644
index 0000000..965f0a0
--- /dev/null
+++ b/app/src/main/java/com/cmput301/recipebot/ui/adapters/PantryListAdapter.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2013 Adam Saturna
+ * Copyright 2013 Brian Trinh
+ * Copyright 2013 Ethan Mykytiuk
+ * Copyright 2013 Prateek Srivastava (@f2prateek)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.cmput301.recipebot.ui.adapters;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.CheckBox;
+import com.cmput301.recipebot.R;
+import com.cmput301.recipebot.model.PantryItem;
+
+import java.util.ArrayList;
+
+public class PantryListAdapter extends BaseAdapter {
+
+    private Context mContext;
+    private ArrayList<PantryItem> mItems;
+
+    public PantryListAdapter(Context context, ArrayList<PantryItem> items) {
+        mContext = context;
+        mItems = items;
+    }
+
+    @Override
+    public int getCount() {
+        return mItems.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return mItems.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        final View view;
+        if (convertView == null) {
+            LayoutInflater layoutInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            view = layoutInflater.inflate(R.layout.item_pantry, parent, false);
+        } else {
+            view = (convertView);
+        }
+
+        CheckBox box = (CheckBox) view.findViewById(R.id.checkBox);
+        box.setText(((PantryItem) getItem(position)).getName());
+
+        return view;
+    }
+
+    public void swapData(ArrayList<PantryItem> items) {
+        mItems = items;
+        notifyDataSetChanged();
+    }
+}
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java b/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java
index 021ade9..5042774 100644
--- a/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java
+++ b/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java
@@ -19,20 +19,28 @@
 
 package com.cmput301.recipebot.ui.fragments;
 
-import android.content.Intent;
 import android.os.Bundle;
-import android.widget.ArrayAdapter;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.cmput301.recipebot.R;
-import com.cmput301.recipebot.ui.AddPantryItemActivity;
+import com.cmput301.recipebot.model.PantryItem;
+import com.cmput301.recipebot.ui.adapters.PantryListAdapter;
 import com.github.rtyley.android.sherlock.roboguice.fragment.RoboSherlockListFragment;
 
+import java.util.ArrayList;
+
 /**
  * A fragment that shows a list of items in the pantry.
  */
-public class PantryFragment extends RoboSherlockListFragment {
+public class PantryFragment extends RoboSherlockListFragment implements View.OnClickListener {
+
+    private EditText mEdiText;
+    ArrayList<PantryItem> mItems;
+    PantryListAdapter mAdapter;
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
@@ -48,15 +56,22 @@ private void fillView() {
 
         setEmptyText(getSherlockActivity().getResources().getString(R.string.no_pantry_items));
 
-        String[] values = new String[]{"Android", "iPhone", "WindowsMobile",
-                "Blackberry", "WebOS", "Ubuntu", "Windows7", "Max OS X",
-                "Linux", "OS/2"};
+        LayoutInflater layoutInflater = getSherlockActivity().getLayoutInflater();
 
-        ArrayAdapter<String> adapter = new ArrayAdapter<String>(getSherlockActivity(),
-                android.R.layout.simple_list_item_1, android.R.id.text1, values);
+        View header = layoutInflater.inflate(R.layout.fragment_pantry_header, null);
+        header.findViewById(R.id.button_add_pantry).setOnClickListener(this);
+        mEdiText = (EditText) header.findViewById(R.id.editText_pantry);
+        getListView().addHeaderView(header);
 
-        setListAdapter(adapter);
+        mItems = new ArrayList<PantryItem>();
+        mItems.add(new PantryItem("Eggs"));
+        mItems.add(new PantryItem("Milk"));
+        mItems.add(new PantryItem("Butter"));
+        mItems.add(new PantryItem("Toast"));
+        mItems.add(new PantryItem("Crouton"));
 
+        mAdapter = new PantryListAdapter(getSherlockActivity(), mItems);
+        setListAdapter(mAdapter);
         setListShown(true);
 
     }
@@ -78,8 +93,16 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     private void addEntry() {
-        Intent i = new Intent(getSherlockActivity(), AddPantryItemActivity.class);
-        startActivity(i);
+        PantryItem item = new PantryItem(mEdiText.getText().toString());
+        mItems.add(item);
+        mAdapter.swapData(mItems);
     }
 
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.button_add_pantry:
+                addEntry();
+        }
+    }
 }
\ No newline at end of file

From 9bc0a2b00ffe070bea9274cab7306e99cdd5c4c3 Mon Sep 17 00:00:00 2001
From: Prateek Srivastava <f2prateek@gmail.com>
Date: Fri, 15 Mar 2013 00:43:17 -0600
Subject: [PATCH 10/18] Recipe Activity

---
 app/AndroidManifest.xml                       |  28 ++-
 app/res/layout/activity_recipe.xml            |  95 ++++++++++
 app/res/layout/fragment_pantry_header.xml     |  27 ++-
 app/res/layout/item_pantry.xml                |  23 ++-
 app/res/layout/item_recipe_image.xml          |  24 ++-
 app/res/layout/pager_item_recipe_image.xml    |  26 +++
 app/res/values/strings.xml                    |  28 +--
 .../recipebot/RecipeBotApplication.java       |  29 +--
 .../cmput301/recipebot/client/ESClient.java   |  24 +--
 .../cmput301/recipebot/model/DbHelper.java    |  35 +++-
 .../cmput301/recipebot/model/Ingredient.java  |  95 ++++++++--
 .../cmput301/recipebot/model/PantryItem.java  |  59 ------
 .../com/cmput301/recipebot/model/Recipe.java  | 105 ++++++-----
 .../cmput301/recipebot/ui/BaseActivity.java   |  24 +--
 .../cmput301/recipebot/ui/MainActivity.java   |  24 +--
 .../cmput301/recipebot/ui/RecipeActivity.java | 168 ++++++++++++++++++
 .../ui/adapters/PantryListAdapter.java        |  78 --------
 .../ui/adapters/TextViewListAdapter.java      |  81 +++++++++
 .../ui/fragments/PantryFragment.java          |  88 ++++++---
 .../ui/fragments/SavedRecipesFragment.java    |  64 ++++---
 .../ui/views/VerticalScrollView.java          |  80 +++++++++
 .../recipebot/core/core/ClientTest.java       |  36 +++-
 .../cmput301/recipebot/test/ActivityTest.java |  41 +++++
 .../recipebot/test/MainActivityTest.java      |  40 ++---
 .../recipebot/test/RecipeActivityTest.java    | 112 ++++++++++++
 25 files changed, 1070 insertions(+), 364 deletions(-)
 create mode 100644 app/res/layout/activity_recipe.xml
 create mode 100644 app/res/layout/pager_item_recipe_image.xml
 delete mode 100644 app/src/main/java/com/cmput301/recipebot/model/PantryItem.java
 create mode 100644 app/src/main/java/com/cmput301/recipebot/ui/RecipeActivity.java
 delete mode 100644 app/src/main/java/com/cmput301/recipebot/ui/adapters/PantryListAdapter.java
 create mode 100644 app/src/main/java/com/cmput301/recipebot/ui/adapters/TextViewListAdapter.java
 create mode 100644 app/src/main/java/com/cmput301/recipebot/ui/views/VerticalScrollView.java
 create mode 100644 integration-tests/src/main/java/com/cmput301/recipebot/test/ActivityTest.java
 create mode 100644 integration-tests/src/main/java/com/cmput301/recipebot/test/RecipeActivityTest.java

diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
index 4c5056b..49299cf 100755
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 
+<!--
+  ~ Copyright 2013 Adam Saturna
+  ~  Copyright 2013 Brian Trinh
+  ~  Copyright 2013 Ethan Mykytiuk
+  ~  Copyright 2013 Prateek Srivastava (@f2prateek)
+  ~
+  ~  Licensed under the Apache License, Version 2.0 (the "License");
+  ~  you may not use this file except in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing, software
+  ~  distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~  See the License for the specific language governing permissions and
+  ~  limitations under the License.
+  -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.cmput301.recipebot"
           android:versionCode="100"
@@ -9,8 +28,8 @@
             android:minSdkVersion="8"
             android:targetSdkVersion="16"/>
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application
             android:name=".RecipeBotApplication"
@@ -32,6 +51,11 @@
             </intent-filter>
         </activity>
 
+        <activity
+                android:name=".ui.RecipeActivity"
+                android:configChanges="orientation|keyboardHidden|screenSize" android:label="@string/app_name">
+        </activity>
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/res/layout/activity_recipe.xml b/app/res/layout/activity_recipe.xml
new file mode 100644
index 0000000..6b827e6
--- /dev/null
+++ b/app/res/layout/activity_recipe.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 Adam Saturna
+  ~  Copyright 2013 Brian Trinh
+  ~  Copyright 2013 Ethan Mykytiuk
+  ~  Copyright 2013 Prateek Srivastava (@f2prateek)
+  ~
+  ~  Licensed under the Apache License, Version 2.0 (the "License");
+  ~  you may not use this file except in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing, software
+  ~  distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~  See the License for the specific language governing permissions and
+  ~  limitations under the License.
+  -->
+
+<com.cmput301.recipebot.ui.views.VerticalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+                                                    android:orientation="vertical"
+                                                    android:layout_width="match_parent"
+                                                    android:layout_height="match_parent">
+
+    <LinearLayout android:orientation="vertical"
+                  android:layout_width="match_parent"
+                  android:layout_height="match_parent">
+
+        <android.support.v4.view.ViewPager
+                android:id="@+id/pager_recipe_images"
+                android:layout_width="fill_parent"
+                android:layout_height="100dp"
+                />
+
+        <EditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/editText_recipe_title"
+                android:layout_gravity="left|center_vertical"/>
+
+        <LinearLayout android:orientation="horizontal"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content">
+
+            <EditText
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/editText_ingredients"
+                    android:layout_gravity="left|center_vertical"/>
+
+            <ImageButton
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@android:drawable/ic_input_add"
+                    android:id="@+id/button_add_ingredient"
+                    android:layout_gravity="right|center_vertical"/>
+
+        </LinearLayout>
+
+        <ListView android:layout_width="match_parent"
+                  android:id="@+id/list_ingredients"
+                  android:layout_weight="1"
+                  android:layout_height="0dp"/>
+
+        <LinearLayout android:orientation="horizontal"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content">
+
+            <EditText
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/editText_directions"
+                    android:layout_gravity="left|center_vertical"/>
+
+            <ImageButton
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@android:drawable/ic_input_add"
+                    android:id="@+id/button_add_direction"
+                    android:layout_gravity="right|center_vertical"/>
+
+        </LinearLayout>
+
+        <ListView android:layout_width="match_parent"
+                  android:id="@+id/list_directions"
+                  android:layout_weight="1"
+                  android:layout_height="0dp"/>
+
+    </LinearLayout>
+
+</com.cmput301.recipebot.ui.views.VerticalScrollView>
\ No newline at end of file
diff --git a/app/res/layout/fragment_pantry_header.xml b/app/res/layout/fragment_pantry_header.xml
index c73b139..1f5ec3b 100644
--- a/app/res/layout/fragment_pantry_header.xml
+++ b/app/res/layout/fragment_pantry_header.xml
@@ -1,22 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 
+<!--
+  ~ Copyright 2013 Adam Saturna
+  ~  Copyright 2013 Brian Trinh
+  ~  Copyright 2013 Ethan Mykytiuk
+  ~  Copyright 2013 Prateek Srivastava (@f2prateek)
+  ~
+  ~  Licensed under the Apache License, Version 2.0 (the "License");
+  ~  you may not use this file except in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing, software
+  ~  distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~  See the License for the specific language governing permissions and
+  ~  limitations under the License.
+  -->
+
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:orientation="horizontal"
               android:layout_width="match_parent"
               android:layout_height="wrap_content">
 
-
     <EditText
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="wrap_content"
-            android:text="New EditText"
-            android:id="@+id/editText_pantry" android:layout_gravity="left|center_vertical"/>
+            android:id="@+id/editText_pantry"
+            android:layout_gravity="left|center_vertical"/>
 
     <ImageButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@android:drawable/ic_input_add"
-            android:id="@+id/button_add_pantry" android:layout_gravity="right|center_vertical"/>
+            android:id="@+id/button_add_pantry"
+            android:layout_gravity="right|center_vertical"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/res/layout/item_pantry.xml b/app/res/layout/item_pantry.xml
index 30acb90..02fdda5 100644
--- a/app/res/layout/item_pantry.xml
+++ b/app/res/layout/item_pantry.xml
@@ -1,7 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 
+<!--
+  ~ Copyright 2013 Adam Saturna
+  ~  Copyright 2013 Brian Trinh
+  ~  Copyright 2013 Ethan Mykytiuk
+  ~  Copyright 2013 Prateek Srivastava (@f2prateek)
+  ~
+  ~  Licensed under the Apache License, Version 2.0 (the "License");
+  ~  you may not use this file except in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing, software
+  ~  distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~  See the License for the specific language governing permissions and
+  ~  limitations under the License.
+  -->
+
 <CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:text="New CheckBox"
-          android:id="@+id/checkBox" android:layout_gravity="left|center_vertical"/>
\ No newline at end of file
+          android:id="@+id/checkBox"
+          android:layout_gravity="left|center_vertical"/>
\ No newline at end of file
diff --git a/app/res/layout/item_recipe_image.xml b/app/res/layout/item_recipe_image.xml
index be9ec1b..8e515b0 100644
--- a/app/res/layout/item_recipe_image.xml
+++ b/app/res/layout/item_recipe_image.xml
@@ -1,8 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2013 Adam Saturna
+  ~  Copyright 2013 Brian Trinh
+  ~  Copyright 2013 Ethan Mykytiuk
+  ~  Copyright 2013 Prateek Srivastava (@f2prateek)
+  ~
+  ~  Licensed under the Apache License, Version 2.0 (the "License");
+  ~  you may not use this file except in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing, software
+  ~  distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~  See the License for the specific language governing permissions and
+  ~  limitations under the License.
+  -->
+
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-           android:id="@+id/image"
+           android:id="@+id/recipe_image"
            android:layout_width="fill_parent"
            android:layout_height="120dip"
            android:adjustViewBounds="true"
-           android:contentDescription="@string/descr_image"
-           android:scaleType="centerCrop" />
\ No newline at end of file
+           android:scaleType="centerCrop"/>
\ No newline at end of file
diff --git a/app/res/layout/pager_item_recipe_image.xml b/app/res/layout/pager_item_recipe_image.xml
new file mode 100644
index 0000000..86ad7f4
--- /dev/null
+++ b/app/res/layout/pager_item_recipe_image.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2013 Adam Saturna
+  ~  Copyright 2013 Brian Trinh
+  ~  Copyright 2013 Ethan Mykytiuk
+  ~  Copyright 2013 Prateek Srivastava (@f2prateek)
+  ~
+  ~  Licensed under the Apache License, Version 2.0 (the "License");
+  ~  you may not use this file except in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing, software
+  ~  distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~  See the License for the specific language governing permissions and
+  ~  limitations under the License.
+  -->
+
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+           android:id="@+id/recipe_image"
+           android:layout_width="match_parent"
+           android:layout_height="match_parent"
+           android:adjustViewBounds="true"
+           android:scaleType="centerCrop"/>
\ No newline at end of file
diff --git a/app/res/values/strings.xml b/app/res/values/strings.xml
index e32d22a..689b3b5 100755
--- a/app/res/values/strings.xml
+++ b/app/res/values/strings.xml
@@ -2,21 +2,21 @@
 
 <!--
   ~ Copyright 2013 Adam Saturna
-  ~ Copyright 2013 Brian Trinh
-  ~ Copyright 2013 Ethan Mykytiuk
-  ~ Copyright 2013 Prateek Srivastava (@f2prateek)
+  ~  Copyright 2013 Brian Trinh
+  ~  Copyright 2013 Ethan Mykytiuk
+  ~  Copyright 2013 Prateek Srivastava (@f2prateek)
   ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
+  ~  Licensed under the Apache License, Version 2.0 (the "License");
+  ~  you may not use this file except in compliance with the License.
+  ~  You may obtain a copy of the License at
   ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~      http://www.apache.org/licenses/LICENSE-2.0
   ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
+  ~  Unless required by applicable law or agreed to in writing, software
+  ~  distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~  See the License for the specific language governing permissions and
+  ~  limitations under the License.
   -->
 
 <resources>
@@ -43,5 +43,9 @@
     <string name="no_pantry_items">Pantry is Empty!</string>
     <string name="no_saved_recipes">No Saved Recipes</string>
     <string name="descr_image">Recipe image</string>
+    <string name="recipe_title_hint">Recipe Title</string>
+    <string name="hint_edit_text_pantry">Add Pantry Item</string>
+    <string name="description_button">Button</string>
+    <string name="recipe_title">Recipe Title</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/RecipeBotApplication.java b/app/src/main/java/com/cmput301/recipebot/RecipeBotApplication.java
index acb381e..f2eb801 100755
--- a/app/src/main/java/com/cmput301/recipebot/RecipeBotApplication.java
+++ b/app/src/main/java/com/cmput301/recipebot/RecipeBotApplication.java
@@ -1,22 +1,20 @@
 /*
  * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
  *
- * Copyright 2012 Donn Felker
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 
 package com.cmput301.recipebot;
@@ -27,6 +25,7 @@
 import com.github.kevinsawicki.http.HttpRequest;
 import com.google.inject.Injector;
 import com.google.inject.Stage;
+import com.nostra13.universalimageloader.cache.disc.impl.UnlimitedDiscCache;
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
@@ -82,6 +81,8 @@ private void buildImageCache() {
 
         ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(getApplicationContext())
                 .defaultDisplayImageOptions(defaultOptions)
+                .discCache(new UnlimitedDiscCache(cacheDir))
+                .memoryCacheExtraOptions(250, 300)
                 .build();
 
         ImageLoader.getInstance().init(config);
diff --git a/app/src/main/java/com/cmput301/recipebot/client/ESClient.java b/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
index db1f2e5..e7fd2d2 100644
--- a/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
+++ b/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
@@ -1,20 +1,20 @@
 /*
  * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 
 package com.cmput301.recipebot.client;
diff --git a/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java b/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java
index fe03882..ddf1008 100644
--- a/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java
+++ b/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright 2013 Adam Saturna
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
 package com.cmput301.recipebot.model;
 //code from: http://www.youtube.com/watch?v=v61A90qlK9s
 
@@ -159,12 +178,12 @@ public ArrayList<Recipe> loadRecipes() {
             try {
                 do {
                     //SET RECIPE INFO
-                    Recipe.Builder recipeBuilder = new Recipe.Builder();
-                    recipeBuilder.setId(cursor.getInt(0));
-                    recipeBuilder.setUser(cursor.getString(1));
-                    recipeBuilder.setName(cursor.getString(2));
+                    Recipe recipe = new Recipe();
+                    recipe.setId(cursor.getInt(0));
+                    recipe.setUser(cursor.getString(1));
+                    recipe.setName(cursor.getString(2));
                     directions.add(cursor.getString(3));
-                    recipeBuilder.setDirections(directions);
+                    recipe.setDirections(directions);
 
                     //SET INGREDIENTS
                     Cursor cursor2 = db.rawQuery("SELECT " + INGREDIENT + " FROM " + INGREDIENTS_TABLE + " WHERE " +
@@ -180,7 +199,7 @@ public ArrayList<Recipe> loadRecipes() {
                         }
                     }
                     cursor2.close();
-                    recipeBuilder.setIngredients(ingredients);
+                    recipe.setIngredients(ingredients);
 
                     //SET PHOTOS
                     Cursor cursor3 = db.rawQuery("SELECT " + IMAGE_PATH + " FROM " + HASIMAGES_TABLE + " WHERE " +
@@ -195,10 +214,10 @@ public ArrayList<Recipe> loadRecipes() {
                         }
                     }
                     cursor3.close();
-                    recipeBuilder.setPhotos(photos);
+                    recipe.setPhotos(photos);
 
 
-                    logList.add(recipeBuilder.build());
+                    logList.add(recipe);
                 } while (cursor.moveToNext());
             } catch (Exception e) {
                 Log.e(TAG, "failed to load all Recipes from: " + RECIPES_TABLE);
diff --git a/app/src/main/java/com/cmput301/recipebot/model/Ingredient.java b/app/src/main/java/com/cmput301/recipebot/model/Ingredient.java
index 10d031f..de523c7 100644
--- a/app/src/main/java/com/cmput301/recipebot/model/Ingredient.java
+++ b/app/src/main/java/com/cmput301/recipebot/model/Ingredient.java
@@ -1,38 +1,66 @@
 /*
  * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 
 package com.cmput301.recipebot.model;
 
+import android.os.Parcel;
+import android.os.Parcelable;
+
 /**
  * An ingredient class. This is used by the {@link Recipe} object to show all ingredients required.
  */
-public class Ingredient extends PantryItem {
+public class Ingredient implements Parcelable {
 
+    private String name;
     private String unit;
     private float quantity;
 
+    public Ingredient() {
+        this.name = null;
+        this.unit = null;
+        this.quantity = 0f;
+    }
+
     public Ingredient(String name, String unit, float quantity) {
-        super(name);
+        this.name = name;
         this.unit = unit;
         this.quantity = quantity;
     }
 
+    /**
+     * Get the name of the item
+     *
+     * @return Name of item.
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Set the name of the item.
+     *
+     * @param name Name of item.
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
     /**
      * Returns unit associated with this Ingredient (e.g. 'ml', or 'oz.' or 'nos')
      *
@@ -61,10 +89,39 @@ public void setQuantity(float quantity) {
 
     @Override
     public String toString() {
-        return "Ingredient{" +
-                "name='" + name + '\'' +
-                ", unit='" + unit + '\'' +
-                ", quantity=" + quantity +
-                '}';
+        if (quantity == (int) quantity)
+            return String.format("%d %s of %s", (int) quantity, unit, name);
+        else
+            return String.format("%s %s of %s", quantity, unit, name);
+    }
+
+    //Parcel code
+    protected Ingredient(Parcel in) {
+        this();
+        name = in.readString();
+        unit = in.readString();
+        quantity = in.readFloat();
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
     }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(name);
+        dest.writeString(unit);
+        dest.writeFloat(quantity);
+    }
+
+    public static final Parcelable.Creator<Ingredient> CREATOR = new Parcelable.Creator<Ingredient>() {
+        public Ingredient createFromParcel(Parcel in) {
+            return new Ingredient(in);
+        }
+
+        public Ingredient[] newArray(int size) {
+            return new Ingredient[size];
+        }
+    };
 }
diff --git a/app/src/main/java/com/cmput301/recipebot/model/PantryItem.java b/app/src/main/java/com/cmput301/recipebot/model/PantryItem.java
deleted file mode 100644
index 2b2c502..0000000
--- a/app/src/main/java/com/cmput301/recipebot/model/PantryItem.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cmput301.recipebot.model;
-
-/**
- * A class that represents items in the Pantry.
- * For ingredients, use {@link Ingredient}.
- * Match it to an ingredient with its name.
- */
-public class PantryItem {
-
-    protected String name;
-
-    public PantryItem(String name) {
-        this.name = name;
-    }
-
-    /**
-     * Get the name of the item
-     *
-     * @return Name of item.
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Set the name of the item.
-     *
-     * @param name Name of item.
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String toString() {
-        return "PantryItem{" +
-                "name='" + name + '\'' +
-                '}';
-    }
-}
diff --git a/app/src/main/java/com/cmput301/recipebot/model/Recipe.java b/app/src/main/java/com/cmput301/recipebot/model/Recipe.java
index 16e4719..31ae739 100644
--- a/app/src/main/java/com/cmput301/recipebot/model/Recipe.java
+++ b/app/src/main/java/com/cmput301/recipebot/model/Recipe.java
@@ -1,25 +1,27 @@
 /*
  * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 
 package com.cmput301.recipebot.model;
 
 import android.net.Uri;
+import android.os.Parcel;
+import android.os.Parcelable;
 
 import java.util.ArrayList;
 
@@ -27,7 +29,7 @@
  * A recipe class.
  * Setter methods undocumented - use {@link Builder} to build objects of this class.
  */
-public class Recipe {
+public class Recipe implements Parcelable {
 
     private int id;
     private String user;
@@ -36,6 +38,15 @@ public class Recipe {
     private ArrayList<String> directions;
     private ArrayList<Uri> photos;
 
+    public Recipe() {
+        this.id = 0;
+        this.user = null;
+        this.name = null;
+        this.directions = new ArrayList<String>();
+        this.ingredients = new ArrayList<Ingredient>();
+        this.photos = new ArrayList<Uri>();
+    }
+
     public Recipe(int id, String user, String name, ArrayList<Ingredient> ingredients,
                   ArrayList<String> directions, ArrayList<Uri> photos) {
         this.id = id;
@@ -125,53 +136,49 @@ public void setPhotos(ArrayList<Uri> photos) {
         this.photos = photos;
     }
 
+    public void addPhoto(Uri photo) {
+        photos.add(photo);
+    }
+
     @Override
     public String toString() {
         return "Recipe [id=" + id + ", user=" + user + ", name=" + name + ", ingredients="
                 + ingredients + ", directions=" + directions + "]";
     }
 
-    public static class Builder {
-        private int id;
-        private String user;
-        private String name;
-        private ArrayList<Ingredient> ingredients;
-        private ArrayList<String> directions;
-        private ArrayList<Uri> photos;
-
-        public Builder setId(int id) {
-            this.id = id;
-            return this;
-        }
-
-        public Builder setUser(String user) {
-            this.user = user;
-            return this;
-        }
-
-        public Builder setName(String name) {
-            this.name = name;
-            return this;
-        }
+    @Override
+    public int describeContents() {
+        return 0;
+    }
 
-        public Builder setIngredients(ArrayList<Ingredient> ingredients) {
-            this.ingredients = ingredients;
-            return this;
-        }
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeInt(id);
+        dest.writeString(user);
+        dest.writeString(name);
+        dest.writeStringList(directions);
+        dest.writeTypedList(ingredients);
+        dest.writeTypedList(photos);
+    }
 
-        public Builder setDirections(ArrayList<String> directions) {
-            this.directions = directions;
-            return this;
-        }
+    protected Recipe(Parcel in) {
+        this();
+        id = in.readInt();
+        user = in.readString();
+        name = in.readString();
+        in.readStringList(directions);
+        in.readTypedList(ingredients, Ingredient.CREATOR);
+        in.readTypedList(photos, Uri.CREATOR);
+    }
 
-        public Builder setPhotos(ArrayList<Uri> photos) {
-            this.photos = photos;
-            return this;
+    public static final Parcelable.Creator<Recipe> CREATOR = new Parcelable.Creator<Recipe>() {
+        public Recipe createFromParcel(Parcel in) {
+            return new Recipe(in);
         }
 
-        public Recipe build() {
-            return new Recipe(id, user, name, ingredients, directions, photos);
+        public Recipe[] newArray(int size) {
+            return new Recipe[size];
         }
-    }
+    };
 
 }
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/BaseActivity.java b/app/src/main/java/com/cmput301/recipebot/ui/BaseActivity.java
index ae0cfff..a601310 100644
--- a/app/src/main/java/com/cmput301/recipebot/ui/BaseActivity.java
+++ b/app/src/main/java/com/cmput301/recipebot/ui/BaseActivity.java
@@ -1,20 +1,20 @@
 /*
  * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 
 package com.cmput301.recipebot.ui;
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/MainActivity.java b/app/src/main/java/com/cmput301/recipebot/ui/MainActivity.java
index 2174183..3daa5f7 100644
--- a/app/src/main/java/com/cmput301/recipebot/ui/MainActivity.java
+++ b/app/src/main/java/com/cmput301/recipebot/ui/MainActivity.java
@@ -1,20 +1,20 @@
 /*
  * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 
 package com.cmput301.recipebot.ui;
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/RecipeActivity.java b/app/src/main/java/com/cmput301/recipebot/ui/RecipeActivity.java
new file mode 100644
index 0000000..5a76463
--- /dev/null
+++ b/app/src/main/java/com/cmput301/recipebot/ui/RecipeActivity.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright 2013 Adam Saturna
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.cmput301.recipebot.ui;
+
+import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.MediaStore;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.ListView;
+import com.cmput301.recipebot.R;
+import com.cmput301.recipebot.model.Ingredient;
+import com.cmput301.recipebot.model.Recipe;
+import com.cmput301.recipebot.ui.adapters.TextViewListAdapter;
+import com.nostra13.universalimageloader.core.ImageLoader;
+import roboguice.inject.InjectExtra;
+import roboguice.inject.InjectView;
+
+import java.util.ArrayList;
+
+/**
+ * An Activity that allows user to add a recipe.
+ */
+public class RecipeActivity extends BaseActivity {
+
+    public static final String EXTRA_RECIPE = "EXTRA_RECIPE";
+    private static final int RESULT_LOAD_IMAGE = 458;
+
+    @InjectView(R.id.pager_recipe_images)
+    ViewPager mRecipePhotos;
+    @InjectView(R.id.list_directions)
+    ListView mListDirections;
+    @InjectView(R.id.list_ingredients)
+    ListView mListIngredient;
+
+    @InjectView(R.id.editText_recipe_title)
+    EditText mEditTextRecipeTitle;
+    @InjectView(R.id.editText_directions)
+    EditText mEditTextDirections;
+    @InjectView(R.id.button_add_direction)
+    ImageButton mButtonAddDirection;
+    @InjectView(R.id.editText_ingredients)
+    EditText mEditTextIngredients;
+    @InjectView(R.id.button_add_ingredient)
+    ImageButton mButtonAddIngredient;
+
+    @InjectExtra(EXTRA_RECIPE)
+    public Recipe mRecipe;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_recipe);
+        fillView();
+    }
+
+    private void fillView() {
+        mRecipePhotos.setAdapter(new ImagePagerAdapter(mRecipe.getPhotos()));
+        mListDirections.setAdapter(new TextViewListAdapter<String>(this, mRecipe.getDirections()));
+        mListIngredient.setAdapter(new TextViewListAdapter<Ingredient>(this, mRecipe.getIngredients()));
+        mEditTextRecipeTitle.setText(mRecipe.getUser());
+    }
+
+    private class ImagePagerAdapter extends PagerAdapter {
+
+        private ArrayList<Uri> images;
+        private LayoutInflater inflater;
+
+        ImagePagerAdapter(ArrayList<Uri> images) {
+            this.images = images;
+            this.inflater = getLayoutInflater();
+        }
+
+        @Override
+        public void destroyItem(ViewGroup container, int position, Object object) {
+            ((ViewPager) container).removeView((View) object);
+        }
+
+        @Override
+        public int getCount() {
+            return images.size() + 1;
+        }
+
+        @Override
+        public Object instantiateItem(ViewGroup view, int position) {
+            final ImageView imageView = (ImageView) inflater.inflate(R.layout.pager_item_recipe_image, view, false);
+            if (position < images.size()) {
+                ImageLoader.getInstance().displayImage(images.get(position).toString(), imageView);
+            } else {
+                // Set up an add button
+                imageView.setImageResource(R.drawable.ic_action_add);
+                imageView.setOnClickListener(addImageListener);
+            }
+            ((ViewPager) view).addView(imageView, 0);
+            return imageView;
+        }
+
+        @Override
+        public boolean isViewFromObject(View view, Object object) {
+            return view.equals(object);
+        }
+
+        private View.OnClickListener addImageListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent i = new Intent(
+                        Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
+                startActivityForResult(i, RESULT_LOAD_IMAGE);
+            }
+        };
+
+        public void swapData(ArrayList<Uri> images) {
+            this.images = images;
+            notifyDataSetChanged();
+        }
+    }
+
+    /**
+     * Allows for an image to be selected from the phone's Gallery
+     */
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode == RESULT_LOAD_IMAGE && resultCode == RESULT_OK && null != data) {
+            Uri selectedImage = data.getData();
+
+            String[] filePathColumn = {MediaStore.Images.Media.DATA};
+            Cursor cursor = getContentResolver().query(selectedImage, filePathColumn, null, null, null);
+            cursor.moveToFirst();
+            int columnIndex = cursor.getColumnIndex(filePathColumn[0]);
+            String picturePath = cursor.getString(columnIndex);
+            cursor.close();
+
+            Uri uri = Uri.parse("file:///" + picturePath);
+            mRecipe.addPhoto(uri);
+
+            ((ImagePagerAdapter) mRecipePhotos.getAdapter()).swapData(mRecipe.getPhotos());
+        }
+
+    }
+
+}
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/adapters/PantryListAdapter.java b/app/src/main/java/com/cmput301/recipebot/ui/adapters/PantryListAdapter.java
deleted file mode 100644
index 965f0a0..0000000
--- a/app/src/main/java/com/cmput301/recipebot/ui/adapters/PantryListAdapter.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cmput301.recipebot.ui.adapters;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.CheckBox;
-import com.cmput301.recipebot.R;
-import com.cmput301.recipebot.model.PantryItem;
-
-import java.util.ArrayList;
-
-public class PantryListAdapter extends BaseAdapter {
-
-    private Context mContext;
-    private ArrayList<PantryItem> mItems;
-
-    public PantryListAdapter(Context context, ArrayList<PantryItem> items) {
-        mContext = context;
-        mItems = items;
-    }
-
-    @Override
-    public int getCount() {
-        return mItems.size();
-    }
-
-    @Override
-    public Object getItem(int position) {
-        return mItems.get(position);
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        final View view;
-        if (convertView == null) {
-            LayoutInflater layoutInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            view = layoutInflater.inflate(R.layout.item_pantry, parent, false);
-        } else {
-            view = (convertView);
-        }
-
-        CheckBox box = (CheckBox) view.findViewById(R.id.checkBox);
-        box.setText(((PantryItem) getItem(position)).getName());
-
-        return view;
-    }
-
-    public void swapData(ArrayList<PantryItem> items) {
-        mItems = items;
-        notifyDataSetChanged();
-    }
-}
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/adapters/TextViewListAdapter.java b/app/src/main/java/com/cmput301/recipebot/ui/adapters/TextViewListAdapter.java
new file mode 100644
index 0000000..6b935ff
--- /dev/null
+++ b/app/src/main/java/com/cmput301/recipebot/ui/adapters/TextViewListAdapter.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2013 Adam Saturna
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.cmput301.recipebot.ui.adapters;
+
+import android.R;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import java.util.List;
+
+/**
+ * A generic list adapter that displays T.toString in it's TextView
+ *
+ * @param <T>
+ */
+public class TextViewListAdapter<T> extends BaseAdapter {
+
+    List<T> data;
+    Context context;
+
+    public TextViewListAdapter(Context context, List<T> data) {
+        this.data = data;
+        this.context = context;
+    }
+
+    @Override
+    public int getCount() {
+        return data.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return data.get(0);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        final TextView textView;
+        if (convertView == null) {
+            LayoutInflater layoutInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            textView = (TextView) layoutInflater.inflate(R.layout.simple_list_item_1, null);
+        } else {
+            textView = (TextView) convertView;
+        }
+
+        textView.setText(data.get(position).toString());
+
+        return textView;
+    }
+
+    public void swapData(List<T> data) {
+        this.data = data;
+        notifyDataSetChanged();
+    }
+}
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java b/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java
index 5042774..32ca4a4 100644
--- a/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java
+++ b/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java
@@ -1,34 +1,37 @@
 /*
  * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 
 package com.cmput301.recipebot.ui.fragments;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.CheckBox;
 import android.widget.EditText;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.cmput301.recipebot.R;
-import com.cmput301.recipebot.model.PantryItem;
-import com.cmput301.recipebot.ui.adapters.PantryListAdapter;
+import com.cmput301.recipebot.model.Ingredient;
 import com.github.rtyley.android.sherlock.roboguice.fragment.RoboSherlockListFragment;
 
 import java.util.ArrayList;
@@ -39,7 +42,7 @@
 public class PantryFragment extends RoboSherlockListFragment implements View.OnClickListener {
 
     private EditText mEdiText;
-    ArrayList<PantryItem> mItems;
+    ArrayList<Ingredient> mItems;
     PantryListAdapter mAdapter;
 
     @Override
@@ -63,14 +66,11 @@ private void fillView() {
         mEdiText = (EditText) header.findViewById(R.id.editText_pantry);
         getListView().addHeaderView(header);
 
-        mItems = new ArrayList<PantryItem>();
-        mItems.add(new PantryItem("Eggs"));
-        mItems.add(new PantryItem("Milk"));
-        mItems.add(new PantryItem("Butter"));
-        mItems.add(new PantryItem("Toast"));
-        mItems.add(new PantryItem("Crouton"));
+        mItems = new ArrayList<Ingredient>();
+        mItems.add(new Ingredient("Eggs", "nos.", 2f));
+        mItems.add(new Ingredient("Milk", "ml", 500f));
 
-        mAdapter = new PantryListAdapter(getSherlockActivity(), mItems);
+        mAdapter = new PantryListAdapter();
         setListAdapter(mAdapter);
         setListShown(true);
 
@@ -93,7 +93,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     private void addEntry() {
-        PantryItem item = new PantryItem(mEdiText.getText().toString());
+        Ingredient item = new Ingredient();
+        item.setName(mEdiText.getText().toString());
         mItems.add(item);
         mAdapter.swapData(mItems);
     }
@@ -105,4 +106,45 @@ public void onClick(View v) {
                 addEntry();
         }
     }
+
+    public class PantryListAdapter extends BaseAdapter {
+
+        @Override
+        public int getCount() {
+            return mItems.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return mItems.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            final View view;
+            if (convertView == null) {
+                LayoutInflater layoutInflater = (LayoutInflater) getSherlockActivity().
+                        getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                view = layoutInflater.inflate(R.layout.item_pantry, parent, false);
+            } else {
+                view = (convertView);
+            }
+
+            CheckBox box = (CheckBox) view.findViewById(R.id.checkBox);
+            box.setText(((Ingredient) getItem(position)).getName());
+
+            return view;
+        }
+
+        public void swapData(ArrayList<Ingredient> items) {
+            mItems = items;
+            notifyDataSetChanged();
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java b/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java
index 0ebc668..39f4aea 100644
--- a/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java
+++ b/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java
@@ -1,29 +1,27 @@
 /*
  * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 
 package com.cmput301.recipebot.ui.fragments;
 
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
+import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -34,7 +32,9 @@
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.cmput301.recipebot.R;
+import com.cmput301.recipebot.model.Ingredient;
 import com.cmput301.recipebot.model.Recipe;
+import com.cmput301.recipebot.ui.RecipeActivity;
 import com.cmput301.recipebot.ui.adapters.RecipeGridAdapter;
 import com.github.rtyley.android.sherlock.roboguice.fragment.RoboSherlockFragment;
 
@@ -86,7 +86,26 @@ public boolean onOptionsItemSelected(MenuItem item) {
      * Start an activity to add a new Recipe
      */
     private void addRecipe() {
-        Toast.makeText(getSherlockActivity(), "TODO : Add New Recipe ", Toast.LENGTH_SHORT).show();
+        Recipe recipe = new Recipe();
+        recipe.setId(89);
+        recipe.setName("Shake and Bake Chicken");
+        recipe.setUser("Colonel Sanders");
+        ArrayList<String> directions = new ArrayList<String>();
+        directions.add("1. First Shake");
+        directions.add("2. Then Bake");
+        recipe.setDirections(directions);
+        ArrayList<Ingredient> ingredients = new ArrayList<Ingredient>();
+        ingredients.add(new Ingredient("Chicken", "g", 500f));
+        ingredients.add(new Ingredient("Shake and Bake mix", "packet", 1f));
+        ingredients.add(new Ingredient("Tequila", "bottle", 1f));
+        recipe.setIngredients(ingredients);
+        ArrayList<Uri> photos = new ArrayList<Uri>();
+        photos.add(Uri.parse("http://www.kraftrecipes.com/assets/recipe_images/SHAKE_N_BAKE_Honey_Drummies.jpg"));
+        photos.add(Uri.parse("http://images.media-allrecipes.com/userphotos/250x250/00/68/33/683349.jpg"));
+        recipe.setPhotos(photos);
+        Intent intent = new Intent(getSherlockActivity(), RecipeActivity.class);
+        intent.putExtra(RecipeActivity.EXTRA_RECIPE, recipe);
+        startActivity(intent);
     }
 
     @Override
@@ -96,7 +115,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
 
     private static ArrayList<Recipe> getTestRecipes() {
 
-        final String[] IMAGES = new String[] {
+        final String[] IMAGES = new String[]{
                 "https://lh6.googleusercontent.com/-jZgveEqb6pg/T3R4kXScycI/AAAAAAAAAE0/xQ7CvpfXDzc/s1024/sample_image_01.jpg",
                 "https://lh4.googleusercontent.com/-K2FMuOozxU0/T3R4lRAiBTI/AAAAAAAAAE8/a3Eh9JvnnzI/s1024/sample_image_02.jpg",
                 "https://lh5.googleusercontent.com/-SCS5C646rxM/T3R4l7QB6xI/AAAAAAAAAFE/xLcuVv3CUyA/s1024/sample_image_03.jpg",
@@ -122,11 +141,14 @@ private static ArrayList<Recipe> getTestRecipes() {
         };
 
         ArrayList<Recipe> recipes = new ArrayList<Recipe>();
-        for (int i = 0; i < 25; i++) {
+        for (int i = 0; i < 5; i++) {
             ArrayList<Uri> photos = new ArrayList<Uri>();
-            photos.add(Uri.parse(IMAGES[i%IMAGES.length]));
-            Recipe r = new Recipe.Builder().setDirections(null).setId(0).setIngredients(null).setName("hi").
-                    setUser("bob").setPhotos(photos).build();
+            photos.add(Uri.parse(IMAGES[i % IMAGES.length]));
+            Recipe r = new Recipe();
+            r.setId(0);
+            r.setName("hi");
+            r.setUser("bob");
+            r.setPhotos(photos);
             recipes.add(r);
         }
 
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/views/VerticalScrollView.java b/app/src/main/java/com/cmput301/recipebot/ui/views/VerticalScrollView.java
new file mode 100644
index 0000000..78b7f74
--- /dev/null
+++ b/app/src/main/java/com/cmput301/recipebot/ui/views/VerticalScrollView.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2013 Adam Saturna
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.cmput301.recipebot.ui.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.widget.ScrollView;
+
+/**
+ * http://stackoverflow.com/questions/6210895/listview-inside-scrollview-is-not-scrolling-on-android
+ */
+public class VerticalScrollView extends ScrollView {
+
+    public VerticalScrollView(Context context) {
+        super(context);
+    }
+
+    public VerticalScrollView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public VerticalScrollView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        final int action = ev.getAction();
+        switch (action) {
+            case MotionEvent.ACTION_DOWN:
+                Log.i("VerticalScrollview", "onInterceptTouchEvent: DOWN super false");
+                super.onTouchEvent(ev);
+                break;
+
+            case MotionEvent.ACTION_MOVE:
+                return false; // redirect MotionEvents to ourself
+
+            case MotionEvent.ACTION_CANCEL:
+                Log.i("VerticalScrollview", "onInterceptTouchEvent: CANCEL super false");
+                super.onTouchEvent(ev);
+                break;
+
+            case MotionEvent.ACTION_UP:
+                Log.i("VerticalScrollview", "onInterceptTouchEvent: UP super false");
+                return false;
+
+            default:
+                Log.i("VerticalScrollview", "onInterceptTouchEvent: " + action);
+                break;
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        super.onTouchEvent(ev);
+        Log.i("VerticalScrollview", "onTouchEvent. action: " + ev.getAction());
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java b/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
index 7b88094..8f07894 100644
--- a/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
+++ b/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright 2013 Adam Saturna
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
 package com.cmput301.recipebot.core.core;
 
 import com.cmput301.recipebot.client.ESClient;
@@ -17,24 +36,24 @@ public class ClientTest {
 
     /**
      * Test that a {@link Recipe} object can be created.
+     *
      * @throws Exception
      */
     @Test
     public void testInsert() throws Exception {
-        Recipe.Builder builder = new Recipe.Builder();
-        builder.setId(999);
-        builder.setUser("Emily");
-        builder.setName("Cheese Cake");
+        Recipe recipe = new Recipe();
+        recipe.setId(999);
+        recipe.setUser("Emily");
+        recipe.setName("Cheese Cake");
         ArrayList<Ingredient> ingredients = new ArrayList<Ingredient>();
         ingredients.add(new Ingredient("egg", "nos", 2f));
         ingredients.add(new Ingredient("cheese", "slices", 2f));
         ingredients.add(new Ingredient("milk", "ml", 500f));
-        builder.setIngredients(ingredients);
+        recipe.setIngredients(ingredients);
         ArrayList<String> directions = new ArrayList<String>();
         directions.add("mix and bake");
-        builder.setDirections(directions);
-        builder.setPhotos(null);
-        Recipe recipe = builder.build();
+        recipe.setDirections(directions);
+        recipe.setPhotos(null);
         boolean response = ESClient.insertRecipe(recipe);
 
         assertTrue(response);
@@ -46,6 +65,7 @@ public void testInsert() throws Exception {
 
     /**
      * Test that a {@link Recipe} object can be retrieved.
+     *
      * @throws Exception
      */
     @Test
diff --git a/integration-tests/src/main/java/com/cmput301/recipebot/test/ActivityTest.java b/integration-tests/src/main/java/com/cmput301/recipebot/test/ActivityTest.java
new file mode 100644
index 0000000..ef4c4fb
--- /dev/null
+++ b/integration-tests/src/main/java/com/cmput301/recipebot/test/ActivityTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2013 Adam Saturna
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.cmput301.recipebot.test;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.test.ActivityInstrumentationTestCase2;
+
+public abstract class ActivityTest<T extends Activity> extends ActivityInstrumentationTestCase2<T> {
+
+    protected Instrumentation instrumentation;
+    protected T activity;
+
+    public ActivityTest(Class<T> activityClass) {
+        super(activityClass);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        instrumentation = getInstrumentation();
+        activity = getActivity();
+    }
+}
diff --git a/integration-tests/src/main/java/com/cmput301/recipebot/test/MainActivityTest.java b/integration-tests/src/main/java/com/cmput301/recipebot/test/MainActivityTest.java
index 03dfa4b..afb0a02 100755
--- a/integration-tests/src/main/java/com/cmput301/recipebot/test/MainActivityTest.java
+++ b/integration-tests/src/main/java/com/cmput301/recipebot/test/MainActivityTest.java
@@ -1,27 +1,25 @@
 /*
  * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 
 package com.cmput301.recipebot.test;
 
-import android.app.Instrumentation;
 import android.support.v4.view.ViewPager;
-import android.test.ActivityInstrumentationTestCase2;
 import com.cmput301.recipebot.R;
 import com.cmput301.recipebot.ui.MainActivity;
 import com.squareup.spoon.Spoon;
@@ -31,10 +29,7 @@
 /**
  * Tests of displaying the authenticator activity
  */
-public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActivity> {
-
-    private MainActivity activity;
-    private Instrumentation instrumentation;
+public class MainActivityTest extends ActivityTest<MainActivity> {
 
     /**
      * Create test for {@link com.cmput301.recipebot.ui.MainActivity}
@@ -43,18 +38,11 @@ public MainActivityTest() {
         super(MainActivity.class);
     }
 
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        activity = getActivity();
-        instrumentation = getInstrumentation();
-    }
-
     /**
      * Verify that {@link MainActivity} exists
      * TODO: might not be required - {@link org.fest.assertions.api.ANDROID} checks for null with every test.
      */
-    public void testActivityExists() {
+    public void testMainActivityExists() {
         assertThat(activity).isNotNull();
         Spoon.screenshot(activity, "initial_state");
     }
diff --git a/integration-tests/src/main/java/com/cmput301/recipebot/test/RecipeActivityTest.java b/integration-tests/src/main/java/com/cmput301/recipebot/test/RecipeActivityTest.java
new file mode 100644
index 0000000..ab9209e
--- /dev/null
+++ b/integration-tests/src/main/java/com/cmput301/recipebot/test/RecipeActivityTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2013 Adam Saturna
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.cmput301.recipebot.test;
+
+import android.app.Instrumentation;
+import android.content.Intent;
+import android.net.Uri;
+import android.support.v4.view.ViewPager;
+import android.test.ActivityInstrumentationTestCase2;
+import com.cmput301.recipebot.R;
+import com.cmput301.recipebot.model.Ingredient;
+import com.cmput301.recipebot.model.Recipe;
+import com.cmput301.recipebot.ui.RecipeActivity;
+import com.squareup.spoon.Spoon;
+
+import java.util.ArrayList;
+
+import static org.fest.assertions.api.ANDROID.assertThat;
+
+public class RecipeActivityTest extends ActivityInstrumentationTestCase2<RecipeActivity> {
+
+    protected Instrumentation instrumentation;
+    protected RecipeActivity activity;
+
+    /**
+     * Create test for {@link com.cmput301.recipebot.ui.RecipeActivity}
+     */
+    public RecipeActivityTest() {
+        super(RecipeActivity.class);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        instrumentation = getInstrumentation();
+        setActivityIntent(getTestIntent()); // Set intent first
+        activity = getActivity();
+    }
+
+    private Intent getTestIntent() {
+        Recipe recipe = new Recipe();
+        recipe.setId(89);
+        recipe.setName("Shake and Bake Chicken");
+        recipe.setUser("Colonel Sanders");
+        ArrayList<String> directions = new ArrayList<String>();
+        directions.add("1. First Shake");
+        directions.add("2. Then Bake");
+        recipe.setDirections(directions);
+        ArrayList<Ingredient> ingredients = new ArrayList<Ingredient>();
+        ingredients.add(new Ingredient("Chicken", "g", 500f));
+        ingredients.add(new Ingredient("Shake and Bake mix", "packet", 1f));
+        ingredients.add(new Ingredient("Tequila", "bottle", 1f));
+        recipe.setIngredients(ingredients);
+        ArrayList<Uri> photos = new ArrayList<Uri>();
+        photos.add(Uri.parse("http://www.kraftrecipes.com/assets/recipe_images/SHAKE_N_BAKE_Honey_Drummies.jpg"));
+        photos.add(Uri.parse("http://images.media-allrecipes.com/userphotos/250x250/00/68/33/683349.jpg"));
+        recipe.setPhotos(photos);
+
+        Intent intent = new Intent(instrumentation.getContext(), RecipeActivity.class);
+        intent.putExtra(RecipeActivity.EXTRA_RECIPE, recipe);
+        return intent;
+    }
+
+    /**
+     * Verify that {@link RecipeActivity} exists
+     */
+    public void testRecipeActivityExists() {
+        assertThat(activity).isNotNull();
+        Spoon.screenshot(activity, "initial_state");
+    }
+
+    /**
+     * Verify that {@link RecipeActivity} exists
+     */
+    public void testVPShowsAllContent() {
+        assertThat(activity).isNotNull();
+        Spoon.screenshot(activity, "initial_state");
+
+        final ViewPager viewPager = (ViewPager) activity.findViewById(R.id.pager_recipe_images);
+
+        assertThat(viewPager.getAdapter()).hasCount(activity.mRecipe.getPhotos().size() + 1);
+
+        for (int i = 0; i < viewPager.getAdapter().getCount(); i++) {
+            final int count = i;
+            instrumentation.runOnMainSync(new Runnable() {
+                @Override
+                public void run() {
+                    viewPager.setCurrentItem(count);
+                }
+            });
+            instrumentation.waitForIdleSync();
+            Spoon.screenshot(activity, "image_" + count);
+        }
+    }
+}

From daaa6fb456d6153cec695bf14d65adba85e7d783 Mon Sep 17 00:00:00 2001
From: Prateek Srivastava <f2prateek@gmail.com>
Date: Fri, 15 Mar 2013 01:40:07 -0600
Subject: [PATCH 11/18] Fix a bug, stress test

---
 app/src/main/java/com/cmput301/recipebot/ui/MainActivity.java   | 2 +-
 .../cmput301/recipebot/ui/fragments/SavedRecipesFragment.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/cmput301/recipebot/ui/MainActivity.java b/app/src/main/java/com/cmput301/recipebot/ui/MainActivity.java
index 3daa5f7..fd8733b 100644
--- a/app/src/main/java/com/cmput301/recipebot/ui/MainActivity.java
+++ b/app/src/main/java/com/cmput301/recipebot/ui/MainActivity.java
@@ -163,7 +163,7 @@ public void onTabReselected(ActionBar.Tab tab, FragmentTransaction ft) {
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putInt("tab", getActionBar().getSelectedNavigationIndex());
+        outState.putInt("tab", getSupportActionBar().getSelectedNavigationIndex());
     }
 
 }
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java b/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java
index 39f4aea..c42eaf2 100644
--- a/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java
+++ b/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java
@@ -141,7 +141,7 @@ private static ArrayList<Recipe> getTestRecipes() {
         };
 
         ArrayList<Recipe> recipes = new ArrayList<Recipe>();
-        for (int i = 0; i < 5; i++) {
+        for (int i = 0; i < 150; i++) {
             ArrayList<Uri> photos = new ArrayList<Uri>();
             photos.add(Uri.parse(IMAGES[i % IMAGES.length]));
             Recipe r = new Recipe();

From 3a68b723e4d80be70389b4b8551635db367a47bc Mon Sep 17 00:00:00 2001
From: Prateek Srivastava <f2prateek@gmail.com>
Date: Wed, 20 Mar 2013 20:59:43 -0600
Subject: [PATCH 12/18] Enable email notifications for Travis

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bf0e628..7846173 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,5 @@
 language: java
 jdk: oraclejdk7
-notifications:
-  email: false
 branches:
   excludes:
       - gh-pages

From f0871604ec16d2640ffe3882ae295384b2d01759 Mon Sep 17 00:00:00 2001
From: Prateek Srivastava <f2prateek@gmail.com>
Date: Wed, 20 Mar 2013 21:15:35 -0600
Subject: [PATCH 13/18] Add String ids for Recipes, Add description. Also adds
 fest assertions.

---
 app/pom.xml                                   |  6 ++
 .../cmput301/recipebot/client/ESClient.java   | 29 ++++--
 .../cmput301/recipebot/model/DbHelper.java    | 12 +--
 .../com/cmput301/recipebot/model/Recipe.java  | 45 ++++++---
 .../ui/fragments/SavedRecipesFragment.java    |  5 +-
 .../com/cmput301/recipebot/util/LogUtils.java | 41 ++++++++
 .../recipebot/core/core/ClientTest.java       | 97 +++++++++++++-----
 .../recipebot/core/core/RecipeAssert.java     | 98 +++++++++++++++++++
 .../recipebot/test/RecipeActivityTest.java    |  3 +-
 9 files changed, 280 insertions(+), 56 deletions(-)
 create mode 100644 app/src/main/java/com/cmput301/recipebot/util/LogUtils.java
 create mode 100644 app/src/test/java/com/cmput301/recipebot/core/core/RecipeAssert.java

diff --git a/app/pom.xml b/app/pom.xml
index da790a8..c45ab8a 100755
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -86,6 +86,12 @@
             <version>4.11</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.easytesting</groupId>
+            <artifactId>fest-assert-core</artifactId>
+            <version>2.0M10</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
diff --git a/app/src/main/java/com/cmput301/recipebot/client/ESClient.java b/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
index e7fd2d2..4103898 100644
--- a/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
+++ b/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
@@ -27,16 +27,23 @@
 import java.lang.reflect.Type;
 import java.net.HttpURLConnection;
 
+import static com.cmput301.recipebot.util.LogUtils.makeLogTag;
+
 /**
  * The client class that communicates with our server.
  */
 public class ESClient {
 
+    private static final String LOGTAG = makeLogTag(ESClient.class);
     private static final String SERVER_URL = "http://cmput301.softwareprocess.es:8080";
-    private static final String TEAM_URL = "/cmput301w13t06";
-    private static final String LAB_URL = "/lab01";
-    private static final String BASE_URL = SERVER_URL + TEAM_URL + LAB_URL;
-    private static final String GET_RECIPE_BASE_URL = BASE_URL + "/%d";
+    private static final String CLIENT_INDEX = "test-cmput301w13t06";// "cmput301w13t06";
+    private static final String TYPE_RECIPE = "recipe";
+
+    private final Gson gson;
+
+    public ESClient() {
+        gson = new Gson();
+    }
 
     /**
      * Get the recipe from the server
@@ -44,10 +51,9 @@ public class ESClient {
      * @param id The id of the recipe to retrieve.
      * @return Recipe with the given id
      */
-    public static Recipe getRecipe(int id) {
-        String response = HttpRequest.get(String.format(GET_RECIPE_BASE_URL, id)).
+    public Recipe getRecipe(String id) {
+        String response = HttpRequest.get(getRecipeUrl(id)).
                 accept("application/json").body();
-        Gson gson = new Gson();
         Type elasticSearchResponseType = new TypeToken<ESResponse<Recipe>>() {
         }.getType();
         ESResponse<Recipe> esResponse = gson.fromJson(response, elasticSearchResponseType);
@@ -61,10 +67,13 @@ public static Recipe getRecipe(int id) {
      * @param recipe The recipe to insert.
      * @return True if operation was successful, false otherwise.
      */
-    public static boolean insertRecipe(Recipe recipe) {
-        Gson gson = new Gson();
-        HttpRequest httpPost = HttpRequest.post(String.format(GET_RECIPE_BASE_URL, recipe.getId())).send(gson.toJson(recipe));
+    public boolean insertRecipe(Recipe recipe) {
+        HttpRequest httpPost = HttpRequest.post(getRecipeUrl(recipe.getId())).send(gson.toJson(recipe));
         return httpPost.code() == HttpURLConnection.HTTP_OK;
     }
 
+    public static String getRecipeUrl(String id) {
+        return SERVER_URL + "/" + CLIENT_INDEX + "/" + TYPE_RECIPE + "/" + id;
+    }
+
 }
diff --git a/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java b/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java
index ddf1008..e3eeaa7 100644
--- a/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java
+++ b/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java
@@ -179,7 +179,7 @@ public ArrayList<Recipe> loadRecipes() {
                 do {
                     //SET RECIPE INFO
                     Recipe recipe = new Recipe();
-                    recipe.setId(cursor.getInt(0));
+                    recipe.setId(cursor.getString(0));
                     recipe.setUser(cursor.getString(1));
                     recipe.setName(cursor.getString(2));
                     directions.add(cursor.getString(3));
@@ -231,7 +231,7 @@ public ArrayList<Recipe> loadRecipes() {
     /*
     * Adds a recipe to the database
     * */
-    public void addRecipe(int id, String writer, String recipe_name, String prep, ArrayList<String> ingr, ArrayList<String> pics) {
+    public void addRecipe(String id, String writer, String recipe_name, String prep, ArrayList<String> ingr, ArrayList<String> pics) {
         SQLiteDatabase db = this.getWritableDatabase();
 
         ContentValues values = new ContentValues();
@@ -371,13 +371,13 @@ public void editRecipePictures(Recipe recipe, ArrayList<Uri> photos) {
     *  Given the recipe id, it removes the recipe and all
     *  corresponding pictures and ingredients
     * */
-    public void removeRecipe(int r_id) {
+    public void removeRecipe(String r_id) {
         SQLiteDatabase db = this.getWritableDatabase();
         try {
             Log.d(TAG, "removing recipe and depenencies");
-            db.delete(RECIPES_TABLE, R_ID + " = ?", new String[]{String.valueOf(r_id)});
-            db.delete(INGREDIENTS_TABLE, REC_ID + " = ?", new String[]{String.valueOf(r_id)});
-            db.delete(HASIMAGES_TABLE, RECIPE + " = ?", new String[]{String.valueOf(r_id)});
+            db.delete(RECIPES_TABLE, R_ID + " = ?", new String[]{r_id});
+            db.delete(INGREDIENTS_TABLE, REC_ID + " = ?", new String[]{r_id});
+            db.delete(HASIMAGES_TABLE, RECIPE + " = ?", new String[]{r_id});
         } catch (Exception e) {
             Log.e(TAG, "Couldn't remove a recipe and all db sub trees");
         }
diff --git a/app/src/main/java/com/cmput301/recipebot/model/Recipe.java b/app/src/main/java/com/cmput301/recipebot/model/Recipe.java
index 31ae739..85ddfef 100644
--- a/app/src/main/java/com/cmput301/recipebot/model/Recipe.java
+++ b/app/src/main/java/com/cmput301/recipebot/model/Recipe.java
@@ -27,11 +27,11 @@
 
 /**
  * A recipe class.
- * Setter methods undocumented - use {@link Builder} to build objects of this class.
  */
 public class Recipe implements Parcelable {
 
-    private int id;
+    private String id;
+    private String description;
     private String user;
     private String name;
     private ArrayList<Ingredient> ingredients;
@@ -39,7 +39,8 @@ public class Recipe implements Parcelable {
     private ArrayList<Uri> photos;
 
     public Recipe() {
-        this.id = 0;
+        this.id = null;
+        this.description = null;
         this.user = null;
         this.name = null;
         this.directions = new ArrayList<String>();
@@ -47,9 +48,10 @@ public Recipe() {
         this.photos = new ArrayList<Uri>();
     }
 
-    public Recipe(int id, String user, String name, ArrayList<Ingredient> ingredients,
+    public Recipe(String id, String description, String user, String name, ArrayList<Ingredient> ingredients,
                   ArrayList<String> directions, ArrayList<Uri> photos) {
         this.id = id;
+        this.description = description;
         this.user = user;
         this.name = name;
         this.ingredients = ingredients;
@@ -57,16 +59,29 @@ public Recipe(int id, String user, String name, ArrayList<Ingredient> ingredient
         this.photos = photos;
     }
 
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Get the description for this Recipe
+     *
+     * @param description
+     */
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
     /**
      * Get the unique id for this recipe.
      *
      * @return id of this recipe.
      */
-    public int getId() {
+    public String getId() {
         return id;
     }
 
-    public void setId(int id) {
+    public void setId(String id) {
         this.id = id;
     }
 
@@ -142,8 +157,14 @@ public void addPhoto(Uri photo) {
 
     @Override
     public String toString() {
-        return "Recipe [id=" + id + ", user=" + user + ", name=" + name + ", ingredients="
-                + ingredients + ", directions=" + directions + "]";
+        return "Recipe{" +
+                "directions=" + directions +
+                ", id='" + id + '\'' +
+                ", description='" + description + '\'' +
+                ", user='" + user + '\'' +
+                ", name='" + name + '\'' +
+                ", ingredients=" + ingredients +
+                '}';
     }
 
     @Override
@@ -153,7 +174,8 @@ public int describeContents() {
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
-        dest.writeInt(id);
+        dest.writeString(id);
+        dest.writeString(description);
         dest.writeString(user);
         dest.writeString(name);
         dest.writeStringList(directions);
@@ -163,7 +185,8 @@ public void writeToParcel(Parcel dest, int flags) {
 
     protected Recipe(Parcel in) {
         this();
-        id = in.readInt();
+        id = in.readString();
+        description = in.readString();
         user = in.readString();
         name = in.readString();
         in.readStringList(directions);
@@ -181,4 +204,4 @@ public Recipe[] newArray(int size) {
         }
     };
 
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java b/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java
index c42eaf2..fee8a20 100644
--- a/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java
+++ b/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java
@@ -39,6 +39,7 @@
 import com.github.rtyley.android.sherlock.roboguice.fragment.RoboSherlockFragment;
 
 import java.util.ArrayList;
+import java.util.UUID;
 
 /**
  * A simple fragment that shows a list of {@link Recipe} items.
@@ -87,7 +88,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
      */
     private void addRecipe() {
         Recipe recipe = new Recipe();
-        recipe.setId(89);
+        recipe.setId(UUID.randomUUID().toString());
         recipe.setName("Shake and Bake Chicken");
         recipe.setUser("Colonel Sanders");
         ArrayList<String> directions = new ArrayList<String>();
@@ -145,7 +146,7 @@ private static ArrayList<Recipe> getTestRecipes() {
             ArrayList<Uri> photos = new ArrayList<Uri>();
             photos.add(Uri.parse(IMAGES[i % IMAGES.length]));
             Recipe r = new Recipe();
-            r.setId(0);
+            r.setId(UUID.randomUUID().toString());
             r.setName("hi");
             r.setUser("bob");
             r.setPhotos(photos);
diff --git a/app/src/main/java/com/cmput301/recipebot/util/LogUtils.java b/app/src/main/java/com/cmput301/recipebot/util/LogUtils.java
new file mode 100644
index 0000000..3a8a384
--- /dev/null
+++ b/app/src/main/java/com/cmput301/recipebot/util/LogUtils.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.cmput301.recipebot.util;
+
+/**
+ * Helper methods that make logging more consistent throughout the app.
+ */
+public class LogUtils {
+    private static final String LOG_PREFIX = "rbot_";
+    private static final int LOG_PREFIX_LENGTH = LOG_PREFIX.length();
+    private static final int MAX_LOG_TAG_LENGTH = 23;
+
+    public static String makeLogTag(String str) {
+        if (str.length() > MAX_LOG_TAG_LENGTH - LOG_PREFIX_LENGTH) {
+            return LOG_PREFIX + str.substring(0, MAX_LOG_TAG_LENGTH - LOG_PREFIX_LENGTH - 1);
+        }
+
+        return LOG_PREFIX + str;
+    }
+
+    /**
+     * WARNING: Don't use this when obfuscating class names with Proguard!
+     */
+    public static String makeLogTag(Class cls) {
+        return makeLogTag(cls.getSimpleName());
+    }
+}
diff --git a/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java b/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
index 8f07894..c307e6c 100644
--- a/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
+++ b/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
@@ -22,45 +22,43 @@
 import com.cmput301.recipebot.client.ESClient;
 import com.cmput301.recipebot.model.Ingredient;
 import com.cmput301.recipebot.model.Recipe;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static com.cmput301.recipebot.core.core.RecipeAssert.assertThat;
+import static org.fest.assertions.api.Assertions.assertThat;
 
 /**
  * Unit tests of client API
  */
 public class ClientTest {
 
+    private ESClient mClient;
+    private Comparator<Recipe> recipeComparator;
+
+    @Before
+    public void setUp() throws Exception {
+        mClient = new ESClient();
+        // insertRecipesToServer();
+        recipeComparator = new RecipeComparator();
+    }
+
     /**
-     * Test that a {@link Recipe} object can be created.
+     * Test that a {@link Recipe} object can be inserted.
+     * It also retrieves the object for testing.
      *
      * @throws Exception
      */
     @Test
     public void testInsert() throws Exception {
-        Recipe recipe = new Recipe();
-        recipe.setId(999);
-        recipe.setUser("Emily");
-        recipe.setName("Cheese Cake");
-        ArrayList<Ingredient> ingredients = new ArrayList<Ingredient>();
-        ingredients.add(new Ingredient("egg", "nos", 2f));
-        ingredients.add(new Ingredient("cheese", "slices", 2f));
-        ingredients.add(new Ingredient("milk", "ml", 500f));
-        recipe.setIngredients(ingredients);
-        ArrayList<String> directions = new ArrayList<String>();
-        directions.add("mix and bake");
-        recipe.setDirections(directions);
-        recipe.setPhotos(null);
-        boolean response = ESClient.insertRecipe(recipe);
-
-        assertTrue(response);
-
-        Recipe recipe2 = ESClient.getRecipe(999);
-        assertEquals("Emily", recipe2.getUser());
-        assertEquals("Cheese Cake", recipe2.getName());
+        Recipe r = getTestRecipe();
+        boolean response = mClient.insertRecipe(r);
+        assertThat(response).isTrue();
+        Recipe actual = mClient.getRecipe(r.getId());
+        assertThat(r).usingComparator(recipeComparator).isEqualTo(actual);
     }
 
     /**
@@ -70,8 +68,55 @@ public void testInsert() throws Exception {
      */
     @Test
     public void testRetrieval() throws Exception {
-        Recipe recipe = ESClient.getRecipe(999);
-        assertEquals("Emily", recipe.getUser());
-        assertEquals("Cheese Cake", recipe.getName());
+        Recipe recipe1 = mClient.getRecipe("63ed5a87-3402-4148-8602-10cc8ff63fa7");
+        assertThat(recipe1).hasName("Stir Fry").hasUser("Spiderman").hasDirection("Stir")
+                .hasIngredient(new Ingredient("Lamb", "testing", 2f)).hasDescription("Not so healthy!");
+
+        Recipe recipe2 = mClient.getRecipe("1d859b92-c1e3-4b48-9c23-f5472937403d");
+        assertThat(recipe2).hasName("Omlette").hasUser("Bruce").hasDirection("Whip")
+                .hasIngredient(new Ingredient("Milk", "dsa", 2f))
+                .hasIngredient(new Ingredient("Oil", "sdsa", 2f)).hasDescription("Very Healthy");
+    }
+
+    /**
+     * Make a new Recipe
+     *
+     * @return A test recipe.
+     */
+    private Recipe getTestRecipe() {
+        Recipe recipe = new Recipe();
+        recipe.setId("testing_id");
+        recipe.setUser("Colonel Sanders");
+        recipe.setName("Kentucky Fried Chicken");
+        ArrayList<Ingredient> ingredients = new ArrayList<Ingredient>();
+        ingredients.add(new Ingredient("Chicken", "lb", 2f));
+        ingredients.add(new Ingredient("Secret Spice #1", "tbsp.", 1f));
+        ingredients.add(new Ingredient("Secret Spice #2", "tsp.", 1f));
+        ingredients.add(new Ingredient("Buttermilk", "ml", 50f));
+        recipe.setIngredients(ingredients);
+        ArrayList<String> directions = new ArrayList<String>();
+        directions.add("1. Mix");
+        directions.add("2. Bake");
+        directions.add("3. Eat");
+        recipe.setDirections(directions);
+        recipe.setPhotos(null);
+        return recipe;
+    }
+
+    private class RecipeComparator implements Comparator<Recipe> {
+
+        @Override
+        public int compare(Recipe lhs, Recipe rhs) {
+            if (lhs.getId().compareToIgnoreCase(rhs.getId()) != 0) {
+                return 1;
+            }
+            if (lhs.getUser().compareToIgnoreCase(rhs.getUser()) != 0) {
+                return 1;
+            }
+            if (lhs.getName().compareToIgnoreCase(rhs.getName()) != 0) {
+                return 1;
+            }
+            return 0;
+        }
     }
 }
diff --git a/app/src/test/java/com/cmput301/recipebot/core/core/RecipeAssert.java b/app/src/test/java/com/cmput301/recipebot/core/core/RecipeAssert.java
new file mode 100644
index 0000000..1e3c33f
--- /dev/null
+++ b/app/src/test/java/com/cmput301/recipebot/core/core/RecipeAssert.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2013 Adam Saturna
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.cmput301.recipebot.core.core;
+
+import com.cmput301.recipebot.model.Ingredient;
+import com.cmput301.recipebot.model.Recipe;
+import org.fest.assertions.api.AbstractAssert;
+import org.fest.assertions.api.Assertions;
+
+import java.util.Comparator;
+
+public class RecipeAssert extends AbstractAssert<RecipeAssert, Recipe> {
+
+    public RecipeAssert(Recipe actual) {
+        super(actual, RecipeAssert.class);
+    }
+
+    public static RecipeAssert assertThat(Recipe actual) {
+        return new RecipeAssert(actual);
+    }
+
+    public RecipeAssert hasId(String id) {
+        isNotNull();
+        Assertions.assertThat(actual.getId())
+                .overridingErrorMessage("Expected recipe's id to be <%s> but was <%s>", id, actual.getId())
+                .isEqualTo(id);
+        return this;
+    }
+
+    public RecipeAssert hasDescription(String description) {
+        isNotNull();
+        Assertions.assertThat(actual.getDescription())
+                .overridingErrorMessage("Expected recipe's description to be <%s> but was <%s>", description, actual.getDescription())
+                .isEqualTo(description);
+        return this;
+    }
+
+    public RecipeAssert hasUser(String user) {
+        isNotNull();
+        Assertions.assertThat(actual.getUser())
+                .overridingErrorMessage("Expected recipe's user to be <%s> but was <%s>", user, actual.getUser())
+                .isEqualTo(user);
+        return this;
+    }
+
+    public RecipeAssert hasName(String name) {
+        isNotNull();
+        Assertions.assertThat(actual.getName())
+                .overridingErrorMessage("Expected recipe's name to be <%s> but was <%s>", name, actual.getName())
+                .isEqualTo(name);
+        return this;
+    }
+
+    public RecipeAssert hasDirection(String direction) {
+        isNotNull();
+        Assertions.assertThat(actual.getDirections())
+                .overridingErrorMessage("Expected recipe's directions to have <%s> but had <%s>", direction, actual.getDirections())
+                .contains(direction);
+        return this;
+    }
+
+    public RecipeAssert hasIngredient(Ingredient ingredient) {
+        isNotNull();
+        Assertions.assertThat(actual.getIngredients())
+                .overridingErrorMessage("Expected recipe's ingredients to have <%s> but had <%s>", ingredient, actual.getIngredients())
+                .usingElementComparator(new IngredientComparator()).contains(ingredient);
+        return this;
+    }
+
+    private class IngredientComparator implements Comparator<Ingredient> {
+
+        @Override
+        public int compare(Ingredient lhs, Ingredient rhs) {
+            if (lhs.getName().compareToIgnoreCase(rhs.getName()) != 0) {
+                return 1;
+            }
+            return 0;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/src/main/java/com/cmput301/recipebot/test/RecipeActivityTest.java b/integration-tests/src/main/java/com/cmput301/recipebot/test/RecipeActivityTest.java
index ab9209e..242edf8 100644
--- a/integration-tests/src/main/java/com/cmput301/recipebot/test/RecipeActivityTest.java
+++ b/integration-tests/src/main/java/com/cmput301/recipebot/test/RecipeActivityTest.java
@@ -31,6 +31,7 @@
 import com.squareup.spoon.Spoon;
 
 import java.util.ArrayList;
+import java.util.UUID;
 
 import static org.fest.assertions.api.ANDROID.assertThat;
 
@@ -56,7 +57,7 @@ protected void setUp() throws Exception {
 
     private Intent getTestIntent() {
         Recipe recipe = new Recipe();
-        recipe.setId(89);
+        recipe.setId(UUID.randomUUID().toString());
         recipe.setName("Shake and Bake Chicken");
         recipe.setUser("Colonel Sanders");
         ArrayList<String> directions = new ArrayList<String>();

From 687c70b238fe6fd5baf0f31297bd1e9237549cad Mon Sep 17 00:00:00 2001
From: Prateek Srivastava <f2prateek@gmail.com>
Date: Wed, 20 Mar 2013 21:20:57 -0600
Subject: [PATCH 14/18] Add Random Data Generator Add Update Recipe

---
 .../cmput301/recipebot/client/ESClient.java   | 11 +++
 .../recipebot/core/core/ClientTest.java       | 94 ++++++++++++++++++-
 2 files changed, 103 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/cmput301/recipebot/client/ESClient.java b/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
index 4103898..3746e4e 100644
--- a/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
+++ b/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
@@ -72,6 +72,17 @@ public boolean insertRecipe(Recipe recipe) {
         return httpPost.code() == HttpURLConnection.HTTP_OK;
     }
 
+    /**
+     * Update a recipe to the server.
+     * TODO : Actually do an update, right now it just does a force pushe.
+     *
+     * @param recipe The recipe to insert.
+     * @return True if operation was successful, false otherwise.
+     */
+    public boolean updateRecipe(Recipe recipe) {
+        return insertRecipe(recipe);
+    }
+
     public static String getRecipeUrl(String id) {
         return SERVER_URL + "/" + CLIENT_INDEX + "/" + TYPE_RECIPE + "/" + id;
     }
diff --git a/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java b/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
index c307e6c..5d2c18f 100644
--- a/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
+++ b/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
@@ -25,8 +25,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import java.util.ArrayList;
-import java.util.Comparator;
+import java.util.*;
 
 import static com.cmput301.recipebot.core.core.RecipeAssert.assertThat;
 import static org.fest.assertions.api.Assertions.assertThat;
@@ -36,6 +35,19 @@
  */
 public class ClientTest {
 
+    private static final String[] RECIPE_NAMES = {"Chicken Parmesan", "Kentucky Fried Chicken", "Green Salad", "Kahlua",
+            "Stir Fry", "Fried Rice", "Hamburger", "Mocha", "Cream Soda", "Omelette's", "Chicken Wings", "Caesar Salad",
+            "Steak", "Chilli", "Baked Rice", "Roasted Potatoes", "Chicken Satay", "Ravioli", "Corn on the Cob"};
+    private static final String[] RECIPE_DESCRIPTIONS = {"Very Healthy", "Not so healthy!", "Unhealthy"};
+    private static final String[] RECIPE_INGREDIENTS = {"Chicken", "Butter", "Water", "Fresh Vegetables",
+            "Fresh Greens", "Vodka", "Oil", "Bun", "Salt", "Lamb", "Peas", "Fish", "Beans", "Tofu", "Cream",
+            "Sugar", "Rhubarb", "Milk", "Eggs", "Strawberry", "Honey Garlic", "Corn", "Beans", "Kale", "Bacon"};
+    private static final String[] RECIPE_DIRECTIONS = {"Bake", "Mix", "Shake", "Blend", "Eat", "Heat",
+            "Fry", "Saute", "Mash", "Steam", "Stir", "Whip", "Chop", "Blend", "Boil", "Grill"};
+    private static final String[] RECIPE_USERS = {"Prateek", "Adam", "Ethan", "Brian", "Batman", "Superman",
+            "Spiderman", "Green Lantern", "Bruce", "Clark"};
+    private static final int TEST_SIZES = 50;
+
     private ESClient mClient;
     private Comparator<Recipe> recipeComparator;
 
@@ -61,6 +73,37 @@ public void testInsert() throws Exception {
         assertThat(r).usingComparator(recipeComparator).isEqualTo(actual);
     }
 
+    /**
+     * Test that a {@link Recipe} object can be updated.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testUpdate() throws Exception {
+        // Test the inital conditions. The user is randomised between runs.
+        Recipe recipe = mClient.getRecipe("ab3fa2b0-7c52-43b3-9e27-76a7b8959751");
+        assertThat(recipe).hasName("Stir Fry").hasDirection("Boil").hasDirection("Bake")
+                .hasIngredient(new Ingredient("Peas", "testing", 2f)).hasDescription("Not so healthy!");
+
+        // make a new_user that is not the same as the old one.
+        String original_user = recipe.getUser();
+        String new_user = new String(original_user);
+        while (new_user.compareToIgnoreCase(original_user) == 0) {
+            new_user = RECIPE_USERS[new Random().nextInt(RECIPE_USERS.length)];
+        }
+
+        // Change some attribute
+        recipe.setUser(new_user);
+        assertThat(recipe).hasUser(new_user);
+        boolean response = mClient.updateRecipe(recipe);
+        assertThat(response).isTrue();
+
+        //Verify only that attribute has changed in server, other remain same
+        Recipe recipe2 = mClient.getRecipe("ab3fa2b0-7c52-43b3-9e27-76a7b8959751");
+        assertThat(recipe2).hasName("Stir Fry").hasUser(new_user).hasDirection("Boil").hasDirection("Bake")
+                .hasIngredient(new Ingredient("Peas", "testing", 2f)).hasDescription("Not so healthy!");
+    }
+
     /**
      * Test that a {@link Recipe} object can be retrieved.
      *
@@ -103,6 +146,53 @@ private Recipe getTestRecipe() {
         return recipe;
     }
 
+    /**
+     * A method that generates a dataset that can be pushed to the server.
+     * Our tests are reliant on this dataset.
+     */
+    private void insertRecipesToServer() {
+        List<Recipe> mRecipeList;
+
+        mRecipeList = generateTestRecipes();
+
+        for (Recipe recipe : mRecipeList) {
+            mClient.insertRecipe(recipe);
+        }
+    }
+
+    /**
+     * Generate some random recipes.
+     */
+    private List<Recipe> generateTestRecipes() {
+        List<Recipe> recipeList = new ArrayList<Recipe>();
+
+        Random random = new Random();
+
+        for (int i = 0; i < TEST_SIZES; i++) {
+            Recipe r = new Recipe();
+            r.setId(UUID.randomUUID().toString());
+            r.setDescription(RECIPE_DESCRIPTIONS[random.nextInt(RECIPE_DESCRIPTIONS.length)]);
+            r.setUser(RECIPE_USERS[random.nextInt(RECIPE_USERS.length)]);
+            r.setName(RECIPE_NAMES[random.nextInt(RECIPE_NAMES.length)]);
+            ArrayList<String> directions = new ArrayList<String>();
+            for (int j = 0; j < random.nextInt(3) + 1; j++) {
+                directions.add(RECIPE_DIRECTIONS[random.nextInt(RECIPE_DIRECTIONS.length)]);
+            }
+            r.setDirections(directions);
+            ArrayList<Ingredient> ingredients = new ArrayList<Ingredient>();
+            for (int j = 0; j < random.nextInt(6) + 1; j++) {
+                String name = RECIPE_INGREDIENTS[random.nextInt(RECIPE_INGREDIENTS.length)];
+                Ingredient ingredient = new Ingredient(name, "testing", 4f);
+                ingredients.add(ingredient);
+            }
+            r.setIngredients(ingredients);
+            r.setPhotos(null);
+            recipeList.add(r);
+        }
+
+        return recipeList;
+    }
+
     private class RecipeComparator implements Comparator<Recipe> {
 
         @Override

From 238b4fb78e4feddf2756811bb325c9c32d3d98c5 Mon Sep 17 00:00:00 2001
From: Prateek Srivastava <f2prateek@gmail.com>
Date: Wed, 20 Mar 2013 21:43:43 -0600
Subject: [PATCH 15/18] Add delete

---
 .../com/cmput301/recipebot/client/ESClient.java | 10 ++++++++++
 .../recipebot/core/core/ClientTest.java         | 17 +++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/app/src/main/java/com/cmput301/recipebot/client/ESClient.java b/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
index 3746e4e..4d8ba28 100644
--- a/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
+++ b/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
@@ -83,6 +83,16 @@ public boolean updateRecipe(Recipe recipe) {
         return insertRecipe(recipe);
     }
 
+    /**
+     * Delete a recipe from the server
+     *
+     * @return True if operation was successful, false otherwise.
+     */
+    public boolean deleteRecipe(String id) {
+        HttpRequest httpPost = HttpRequest.delete(getRecipeUrl(id));
+        return httpPost.code() == HttpURLConnection.HTTP_OK;
+    }
+
     public static String getRecipeUrl(String id) {
         return SERVER_URL + "/" + CLIENT_INDEX + "/" + TYPE_RECIPE + "/" + id;
     }
diff --git a/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java b/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
index 5d2c18f..395315d 100644
--- a/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
+++ b/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
@@ -121,6 +121,23 @@ public void testRetrieval() throws Exception {
                 .hasIngredient(new Ingredient("Oil", "sdsa", 2f)).hasDescription("Very Healthy");
     }
 
+    /**
+     * Test that a {@link Recipe} object can be inserted.
+     * It also retrieves the object for testing.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testDelete() throws Exception {
+        Recipe r = getTestRecipe();
+        boolean response = mClient.insertRecipe(r);
+        assertThat(response).isTrue();
+        boolean deleteResponse = mClient.deleteRecipe(r.getId());
+        assertThat(deleteResponse).isTrue();
+        Recipe recipe1 = mClient.getRecipe(r.getId());
+        assertThat(recipe1).isNull();
+    }
+
     /**
      * Make a new Recipe
      *

From 67b55b724f51736e7b328bc14cb6cc2ef6d41c85 Mon Sep 17 00:00:00 2001
From: Prateek Srivastava <f2prateek@gmail.com>
Date: Wed, 20 Mar 2013 22:47:03 -0600
Subject: [PATCH 16/18] Add search by name for recipes

Refactor search by name
---
 .../cmput301/recipebot/client/ESClient.java   | 64 +++++++++++++++++--
 .../recipebot/client/ESSearchResponse.java    | 28 ++++++++
 .../com/cmput301/recipebot/client/Hits.java   | 17 +++++
 .../recipebot/core/core/ClientTest.java       | 24 ++++++-
 4 files changed, 127 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/java/com/cmput301/recipebot/client/ESSearchResponse.java
 create mode 100644 app/src/main/java/com/cmput301/recipebot/client/Hits.java

diff --git a/app/src/main/java/com/cmput301/recipebot/client/ESClient.java b/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
index 4d8ba28..a5d0d9a 100644
--- a/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
+++ b/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
@@ -24,8 +24,10 @@
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
+import java.io.IOException;
 import java.lang.reflect.Type;
-import java.net.HttpURLConnection;
+import java.util.ArrayList;
+import java.util.List;
 
 import static com.cmput301.recipebot.util.LogUtils.makeLogTag;
 
@@ -38,6 +40,7 @@ public class ESClient {
     private static final String SERVER_URL = "http://cmput301.softwareprocess.es:8080";
     private static final String CLIENT_INDEX = "test-cmput301w13t06";// "cmput301w13t06";
     private static final String TYPE_RECIPE = "recipe";
+    private static final String METHOD_SEARCH = "_search";
 
     private final Gson gson;
 
@@ -69,7 +72,7 @@ public Recipe getRecipe(String id) {
      */
     public boolean insertRecipe(Recipe recipe) {
         HttpRequest httpPost = HttpRequest.post(getRecipeUrl(recipe.getId())).send(gson.toJson(recipe));
-        return httpPost.code() == HttpURLConnection.HTTP_OK;
+        return httpPost.ok();
     }
 
     /**
@@ -89,12 +92,63 @@ public boolean updateRecipe(Recipe recipe) {
      * @return True if operation was successful, false otherwise.
      */
     public boolean deleteRecipe(String id) {
-        HttpRequest httpPost = HttpRequest.delete(getRecipeUrl(id));
-        return httpPost.code() == HttpURLConnection.HTTP_OK;
+        HttpRequest httpDelete = HttpRequest.delete(getRecipeUrl(id));
+        return httpDelete.ok();
     }
 
+    /**
+     * Search for all recipes with the given name.
+     *
+     * @param name The name of the recipe to search for.
+     * @return List of recipes that have these ingredients.
+     */
+    public List<Recipe> searchRecipes(String name) throws IOException {
+        HttpRequest httpSearch = HttpRequest.get(getRecipeSearchUrl(), true, "q", name).accept("application/json");
+        return getRecipesFromResponse(httpSearch.body());
+    }
+
+    private List<Recipe> getRecipesFromResponse(String response) {
+        Type esSearchResponseType = new TypeToken<ESSearchResponse<Recipe>>() {
+        }.getType();
+        ESSearchResponse<Recipe> esSearchResponse = gson.fromJson(response, esSearchResponseType);
+        List<Recipe> recipes = new ArrayList<Recipe>();
+        for (ESResponse<Recipe> r : esSearchResponse.getHits()) {
+            Recipe recipe = r.getSource();
+            recipes.add(recipe);
+        }
+        return recipes;
+    }
+
+    /**
+     * URL for a specific URL
+     *
+     * @param id ID whose recipe we need
+     * @return the Recipe's url
+     */
     public static String getRecipeUrl(String id) {
-        return SERVER_URL + "/" + CLIENT_INDEX + "/" + TYPE_RECIPE + "/" + id;
+        return getRecipesUrl() + "/" + id;
+    }
+
+    /**
+     * Get the Recipe URL
+     *
+     * @return Recipe URL
+     */
+    public static String getRecipesUrl() {
+        return getIndexUrl() + "/" + TYPE_RECIPE;
+    }
+
+    public static String getRecipeSearchUrl() {
+        return getRecipesUrl() + "/" + METHOD_SEARCH;
+    }
+
+    /**
+     * Get the url for our index.
+     *
+     * @return Index URL
+     */
+    public static String getIndexUrl() {
+        return SERVER_URL + "/" + CLIENT_INDEX;
     }
 
 }
diff --git a/app/src/main/java/com/cmput301/recipebot/client/ESSearchResponse.java b/app/src/main/java/com/cmput301/recipebot/client/ESSearchResponse.java
new file mode 100644
index 0000000..a6773f6
--- /dev/null
+++ b/app/src/main/java/com/cmput301/recipebot/client/ESSearchResponse.java
@@ -0,0 +1,28 @@
+package com.cmput301.recipebot.client;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+public class ESSearchResponse<T> {
+    int took;
+    boolean timed_out;
+    transient Object _shards;
+    Hits<T> hits;
+    boolean exists;
+
+    public Collection<ESResponse<T>> getHits() {
+        return hits.getHits();
+    }
+
+    public Collection<T> getSources() {
+        Collection<T> out = new ArrayList<T>();
+        for (ESResponse<T> essrt : getHits()) {
+            out.add(essrt.getSource());
+        }
+        return out;
+    }
+
+    public String toString() {
+        return (super.toString() + ":" + took + "," + _shards + "," + exists + "," + hits);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/client/Hits.java b/app/src/main/java/com/cmput301/recipebot/client/Hits.java
new file mode 100644
index 0000000..b4d8f0e
--- /dev/null
+++ b/app/src/main/java/com/cmput301/recipebot/client/Hits.java
@@ -0,0 +1,17 @@
+package com.cmput301.recipebot.client;
+
+import java.util.Collection;
+
+public class Hits<T> {
+    int total;
+    double max_score;
+    Collection<ESResponse<T>> hits;
+
+    public Collection<ESResponse<T>> getHits() {
+        return hits;
+    }
+
+    public String toString() {
+        return (super.toString() + "," + total + "," + max_score + "," + hits);
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java b/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
index 395315d..951240a 100644
--- a/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
+++ b/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
@@ -138,6 +138,27 @@ public void testDelete() throws Exception {
         assertThat(recipe1).isNull();
     }
 
+    /**
+     * Test that a {@link Recipe} can be searched by its name.
+     * TODO : add a unique recipe (that will return only one).
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testSearchByName() throws Exception {
+        // Test the initial conditions, verify that the recipe exists on the server.
+        Recipe recipe = mClient.getRecipe("ac864659-9f55-480c-b744-8dbf0c180911");
+        assertThat(recipe).hasName("Cream Soda").hasUser("Batman").hasDirection("Mix").hasDirection("Grill")
+                .hasIngredient(new Ingredient("Butter", "testing", 2f)).hasDescription("Very Healthy");
+
+        List<Recipe> recipes = mClient.searchRecipes("Cream Soda");
+        assertThat(recipes.size()).isGreaterThan(0); // We know this exists, but could be multiple (random).
+        assertThat(recipes).usingElementComparator(recipeComparator).contains(recipe); // confirm that it contains our expected recipe
+
+        recipes = mClient.searchRecipes("dsadssadasdas");
+        assertThat(recipes.size()).isEqualTo(0); // We know this doesn't exist.
+    }
+
     /**
      * Make a new Recipe
      *
@@ -165,7 +186,8 @@ private Recipe getTestRecipe() {
 
     /**
      * A method that generates a dataset that can be pushed to the server.
-     * Our tests are reliant on this dataset.
+     * Our tests are reliant on this dataset. Everytime this function is used to generate a new dataset,
+     * update our expected values.
      */
     private void insertRecipesToServer() {
         List<Recipe> mRecipeList;

From a7d8ccba3cdae08cc420e92277da298e82c82e54 Mon Sep 17 00:00:00 2001
From: Prateek Srivastava <f2prateek@gmail.com>
Date: Wed, 20 Mar 2013 23:06:59 -0600
Subject: [PATCH 17/18] Add search for recipes with just one Ingredient

Add another test, making sure we get only results we want

Test case for searching by multiple Ingredients
---
 .../cmput301/recipebot/client/ESClient.java   | 21 +++++-
 .../recipebot/core/core/ClientTest.java       | 69 +++++++++++++++++++
 2 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/cmput301/recipebot/client/ESClient.java b/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
index a5d0d9a..817b8f9 100644
--- a/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
+++ b/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
@@ -19,6 +19,7 @@
 
 package com.cmput301.recipebot.client;
 
+import com.cmput301.recipebot.model.Ingredient;
 import com.cmput301.recipebot.model.Recipe;
 import com.github.kevinsawicki.http.HttpRequest;
 import com.google.gson.Gson;
@@ -103,7 +104,7 @@ public boolean deleteRecipe(String id) {
      * @return List of recipes that have these ingredients.
      */
     public List<Recipe> searchRecipes(String name) throws IOException {
-        HttpRequest httpSearch = HttpRequest.get(getRecipeSearchUrl(), true, "q", name).accept("application/json");
+        HttpRequest httpSearch = HttpRequest.get(getRecipeSearchUrl(), true, "q", "name:" + name).accept("application/json");
         return getRecipesFromResponse(httpSearch.body());
     }
 
@@ -119,6 +120,24 @@ private List<Recipe> getRecipesFromResponse(String response) {
         return recipes;
     }
 
+    /**
+     * Search for all recipes with the given Ingredients.
+     * It only searches by the name of the ingredient, not its units or quantity.
+     *
+     * @param ingredients The ingredients to search for.
+     * @return List of recipes that have these ingredients.
+     */
+    public List<Recipe> searchRecipes(List<Ingredient> ingredients) {
+        String query = "ingredients.name:";
+        for (Ingredient i : ingredients) {
+            query = query + i.getName() + " OR ";
+        }
+        query = query.substring(0, query.length() - 4);
+        HttpRequest httpSearch = HttpRequest.get(getRecipeSearchUrl(), true, "q", query).accept("application/json");
+        System.out.println(httpSearch.toString());
+        return getRecipesFromResponse(httpSearch.body());
+    }
+
     /**
      * URL for a specific URL
      *
diff --git a/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java b/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
index 951240a..e403c24 100644
--- a/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
+++ b/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
@@ -159,6 +159,75 @@ public void testSearchByName() throws Exception {
         assertThat(recipes.size()).isEqualTo(0); // We know this doesn't exist.
     }
 
+    /**
+     * Test that a {@link Recipe} can be searched by any one of its ingredients.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testSearchByIndividualIngredient() throws Exception {
+        Recipe recipe = mClient.getRecipe("3df532d5-f141-493b-9cec-dab02d2b3210");
+
+        // Search with the every ingredient individually.
+        for (Ingredient i : recipe.getIngredients()) {
+            ArrayList<Ingredient> ingredients = new ArrayList<Ingredient>();
+            ingredients.add(i);
+            List<Recipe> recipes = mClient.searchRecipes(ingredients);
+            assertThat(recipes.size()).isGreaterThan(0); // We know this exists, but could be multiple (random).
+            assertThat(recipes).usingElementComparator(recipeComparator).contains(recipe);
+        }
+
+        ArrayList<Ingredient> ingredients = new ArrayList<Ingredient>();
+        ingredients.add(new Ingredient("dsadsadasdasdasdada", "lb", 2f));
+        List<Recipe> recipes = mClient.searchRecipes(ingredients);
+        recipes = mClient.searchRecipes(ingredients);
+        assertThat(recipes.size()).isEqualTo(0); // We know this doesn't exist.
+    }
+
+    /**
+     * Test that mulitple {@link Recipe} is given by a search.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testSearchByIngredientsReturnsMultipleRecipes() throws Exception {
+        Recipe recipe1 = mClient.getRecipe("3df532d5-f141-493b-9cec-dab02d2b3210");
+        Recipe recipe2 = mClient.getRecipe("e5bb4189-5e5b-4659-9030-ec99983b69b5");
+        Ingredient ingredient = new Ingredient("Bacon", "testing", 2f);
+        assertThat(recipe1).hasIngredient(ingredient);
+        assertThat(recipe2).hasIngredient(ingredient);
+
+        List<Ingredient> ingredients = new ArrayList<Ingredient>();
+        ingredients.add(ingredient);
+        List<Recipe> recipes = mClient.searchRecipes(ingredients);
+        assertThat(recipes.size()).isGreaterThan(1); // We know at least two exist.
+        assertThat(recipes).usingElementComparator(recipeComparator).contains(recipe1);
+        assertThat(recipes).usingElementComparator(recipeComparator).contains(recipe2);
+    }
+
+    /**
+     * Test that mulitple {@link Recipe} is given by a search.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testSearchByMultipleIngredients() throws Exception {
+        Recipe recipe = mClient.getRecipe("268d295f-2829-4d8c-b0fa-d3ffedad03e7");
+        Ingredient vodka = new Ingredient("Vodka", "testing", 2f);
+        Ingredient butter = new Ingredient("Butter", "testing", 2f);
+        Ingredient peas = new Ingredient("Peas", "testing", 2f);
+        Ingredient fish = new Ingredient("Fish", "testing", 2f);
+        assertThat(recipe).hasIngredient(vodka).hasIngredient(butter).hasIngredient(peas).hasIngredient(fish);
+
+        List<Ingredient> ingredients = new ArrayList<Ingredient>();
+        ingredients.add(vodka);
+        ingredients.add(butter);
+        ingredients.add(peas);
+        ingredients.add(fish);
+        List<Recipe> recipes = mClient.searchRecipes(ingredients);
+        assertThat(recipes).usingElementComparator(recipeComparator).contains(recipe);
+    }
+
     /**
      * Make a new Recipe
      *

From e3e521a00b44e1ed9bd8263d42e19b87855e9fe5 Mon Sep 17 00:00:00 2001
From: Prateek Srivastava <f2prateek@gmail.com>
Date: Wed, 20 Mar 2013 23:21:59 -0600
Subject: [PATCH 18/18] Serch recipe by ANY or ALL ingredients (refactor might
 be required).

This lets us search recipes from ingredients in two ways :
1. Recipes that have ALL of the ingredients.
2. Recipes that have ANY of the ingredients.
---
 .../com/cmput301/recipebot/client/ESClient.java   |  8 +++++---
 .../cmput301/recipebot/core/core/ClientTest.java  | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/cmput301/recipebot/client/ESClient.java b/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
index 817b8f9..716754b 100644
--- a/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
+++ b/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
@@ -125,14 +125,16 @@ private List<Recipe> getRecipesFromResponse(String response) {
      * It only searches by the name of the ingredient, not its units or quantity.
      *
      * @param ingredients The ingredients to search for.
+     * @param matchAll    Whether to only show recipes that have every ingredient.
      * @return List of recipes that have these ingredients.
      */
-    public List<Recipe> searchRecipes(List<Ingredient> ingredients) {
+    public List<Recipe> searchRecipes(List<Ingredient> ingredients, boolean matchAll) {
+        String operator = matchAll ? " AND " : " OR ";
         String query = "ingredients.name:";
         for (Ingredient i : ingredients) {
-            query = query + i.getName() + " OR ";
+            query = query + i.getName() + operator;
         }
-        query = query.substring(0, query.length() - 4);
+        query = query.substring(0, query.length() - operator.length());
         HttpRequest httpSearch = HttpRequest.get(getRecipeSearchUrl(), true, "q", query).accept("application/json");
         System.out.println(httpSearch.toString());
         return getRecipesFromResponse(httpSearch.body());
diff --git a/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java b/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
index e403c24..98ad895 100644
--- a/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
+++ b/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
@@ -172,15 +172,14 @@ public void testSearchByIndividualIngredient() throws Exception {
         for (Ingredient i : recipe.getIngredients()) {
             ArrayList<Ingredient> ingredients = new ArrayList<Ingredient>();
             ingredients.add(i);
-            List<Recipe> recipes = mClient.searchRecipes(ingredients);
+            List<Recipe> recipes = mClient.searchRecipes(ingredients, false);
             assertThat(recipes.size()).isGreaterThan(0); // We know this exists, but could be multiple (random).
             assertThat(recipes).usingElementComparator(recipeComparator).contains(recipe);
         }
 
         ArrayList<Ingredient> ingredients = new ArrayList<Ingredient>();
         ingredients.add(new Ingredient("dsadsadasdasdasdada", "lb", 2f));
-        List<Recipe> recipes = mClient.searchRecipes(ingredients);
-        recipes = mClient.searchRecipes(ingredients);
+        List<Recipe> recipes = mClient.searchRecipes(ingredients, false);
         assertThat(recipes.size()).isEqualTo(0); // We know this doesn't exist.
     }
 
@@ -199,7 +198,7 @@ public void testSearchByIngredientsReturnsMultipleRecipes() throws Exception {
 
         List<Ingredient> ingredients = new ArrayList<Ingredient>();
         ingredients.add(ingredient);
-        List<Recipe> recipes = mClient.searchRecipes(ingredients);
+        List<Recipe> recipes = mClient.searchRecipes(ingredients, false);
         assertThat(recipes.size()).isGreaterThan(1); // We know at least two exist.
         assertThat(recipes).usingElementComparator(recipeComparator).contains(recipe1);
         assertThat(recipes).usingElementComparator(recipeComparator).contains(recipe2);
@@ -224,8 +223,14 @@ public void testSearchByMultipleIngredients() throws Exception {
         ingredients.add(butter);
         ingredients.add(peas);
         ingredients.add(fish);
-        List<Recipe> recipes = mClient.searchRecipes(ingredients);
+
+        // Test that we get at least this one (many recipes with one or more of these ingredients.
+        List<Recipe> recipes = mClient.searchRecipes(ingredients, false);
         assertThat(recipes).usingElementComparator(recipeComparator).contains(recipe);
+
+        // Test that we get only this one (only recipe with all ingredients)
+        recipes = mClient.searchRecipes(ingredients, true);
+        assertThat(recipes).usingElementComparator(recipeComparator).contains(recipe).hasSize(1);
     }
 
     /**