Elasticsearch

.travis.yml

@@ -1,7 +1,5 @@
 language: java
 jdk: oraclejdk7
-notifications:
-  email: false
 branches:
   excludes:
       - gh-pages

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,6 +28,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"
@@ -30,22 +52,10 @@
         </activity>
 
         <activity
-                android:name=".ui.AddPantryItemActivity"
-                android:configChanges="orientation|keyboardHidden|screenSize"
-                android:label="@string/activity_add_pantry_item_title"/>
-                -->
-        <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>                  -->
+                android:name=".ui.RecipeActivity"
+                android:configChanges="orientation|keyboardHidden|screenSize" android:label="@string/app_name">
         </activity>
+
     </application>
 
 </manifest>

app/pom.xml

@@ -75,12 +75,23 @@
             <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>
             <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>

app/res/layout/activity_main.xml

@@ -1,13 +1,8 @@
 <?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">
+<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">
 
-    <TextView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="hello"/>
-
-</LinearLayout>
+</android.support.v4.view.ViewPager>

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>