├── FooDelivery_client ├── app │ ├── .gitignore │ ├── hs_err_pid6620.log │ ├── src │ │ ├── main │ │ │ ├── res │ │ │ │ ├── drawable │ │ │ │ │ ├── login.jpg │ │ │ │ │ ├── back_pic.png │ │ │ │ │ ├── mapotofu.jpg │ │ │ │ │ ├── shuizhubeef.jpg │ │ │ │ │ ├── sichuanfood.jpg │ │ │ │ │ ├── sichuanpic.png │ │ │ │ │ ├── kongpaojiding.jpg │ │ │ │ │ └── edit_text_selector.xml │ │ │ │ ├── mipmap-hdpi │ │ │ │ │ └── ic_launcher.png │ │ │ │ ├── mipmap-mdpi │ │ │ │ │ └── ic_launcher.png │ │ │ │ ├── mipmap-xhdpi │ │ │ │ │ └── ic_launcher.png │ │ │ │ ├── mipmap-xxhdpi │ │ │ │ │ └── ic_launcher.png │ │ │ │ ├── mipmap-xxxhdpi │ │ │ │ │ └── ic_launcher.png │ │ │ │ ├── values │ │ │ │ │ ├── colors.xml │ │ │ │ │ ├── dimens.xml │ │ │ │ │ ├── styles.xml │ │ │ │ │ └── strings.xml │ │ │ │ ├── values-v21 │ │ │ │ │ └── styles.xml │ │ │ │ ├── values-w820dp │ │ │ │ │ └── dimens.xml │ │ │ │ ├── menu │ │ │ │ │ └── menu_main.xml │ │ │ │ └── layout │ │ │ │ │ ├── customerui_fragment_customer.xml │ │ │ │ │ ├── login_activity_login.xml │ │ │ │ │ ├── customerui_activity_place_order.xml │ │ │ │ │ ├── login_activity_customer_register.xml │ │ │ │ │ ├── login_activity_restaurant_register.xml │ │ │ │ │ ├── customerui_fragment_myorderitem.xml │ │ │ │ │ ├── customerui_fragment_searchitem.xml │ │ │ │ │ ├── restaurantui_fragment_menuitem.xml │ │ │ │ │ ├── restaurantui_fragment_orderitem.xml │ │ │ │ │ ├── restaurantui_activity_restaurant.xml │ │ │ │ │ ├── customerui_activity_customer.xml │ │ │ │ │ ├── customerui_placeorderitem.xml │ │ │ │ │ ├── customerui_fragment_myorder.xml │ │ │ │ │ ├── restaurantui_fragment_order.xml │ │ │ │ │ ├── login_content_login.xml │ │ │ │ │ ├── customerui_fragment_search.xml │ │ │ │ │ ├── login_content_customer_register.xml │ │ │ │ │ ├── customerui_fragment_profile.xml │ │ │ │ │ ├── customerui_content_place_order.xml │ │ │ │ │ └── restaurantui_fragment_menu.xml │ │ │ ├── java │ │ │ │ └── foodeliver │ │ │ │ │ ├── utility │ │ │ │ │ ├── ShowToast.java │ │ │ │ │ ├── Transition.java │ │ │ │ │ ├── PictureSearch.java │ │ │ │ │ └── DataSearch.java │ │ │ │ │ ├── entities │ │ │ │ │ ├── Menu.java │ │ │ │ │ ├── User.java │ │ │ │ │ ├── FoodMenu.java │ │ │ │ │ ├── Food.java │ │ │ │ │ ├── Order.java │ │ │ │ │ ├── Customer.java │ │ │ │ │ ├── Restaurant.java │ │ │ │ │ └── FoodOrder.java │ │ │ │ │ ├── remote │ │ │ │ │ ├── DBTask.java │ │ │ │ │ ├── GetPicture.java │ │ │ │ │ └── Client.java │ │ │ │ │ ├── login │ │ │ │ │ ├── CustomerRegisterActivity.java │ │ │ │ │ ├── RestaurantRegisterActivity.java │ │ │ │ │ └── LoginActivity.java │ │ │ │ │ ├── exception │ │ │ │ │ └── ConnectionException.java │ │ │ │ │ ├── restaurantui │ │ │ │ │ ├── RestaurantActivity.java │ │ │ │ │ └── RestaurantProfileFragment.java │ │ │ │ │ └── customerui │ │ │ │ │ ├── CustomerProfileFragment.java │ │ │ │ │ ├── CustomerActivity.java │ │ │ │ │ ├── PlaceOrderActivity.java │ │ │ │ │ └── SearchFragment.java │ │ │ └── AndroidManifest.xml │ │ ├── test │ │ │ └── java │ │ │ │ └── jiaqiz │ │ │ │ └── cmu │ │ │ │ └── edu │ │ │ │ └── foodeliver │ │ │ │ └── ExampleUnitTest.java │ │ └── androidTest │ │ │ └── java │ │ │ └── jiaqiz │ │ │ └── cmu │ │ │ └── edu │ │ │ └── foodeliver │ │ │ └── ApplicationTest.java │ ├── proguard-rules.pro │ └── build.gradle ├── settings.gradle ├── .gitignore ├── gradle │ └── wrapper │ │ ├── gradle-wrapper.jar │ │ └── gradle-wrapper.properties ├── build.gradle ├── gradle.properties ├── gradlew.bat └── gradlew ├── FooDelivery_server ├── build │ └── web │ │ ├── WEB-INF │ │ ├── classes │ │ │ ├── .netbeans_automatic_build │ │ │ ├── .netbeans_update_resources │ │ │ └── remote │ │ │ │ └── ServerServlet.class │ │ ├── lib │ │ │ └── mysql-connector-java-5.1.38-bin.jar │ │ └── web.xml │ │ ├── META-INF │ │ ├── MANIFEST.MF │ │ └── context.xml │ │ └── index.html ├── src │ ├── conf │ │ └── MANIFEST.MF │ └── java │ │ └── remote │ │ └── ServerServlet.java ├── web │ ├── META-INF │ │ └── context.xml │ ├── index.html │ └── WEB-INF │ │ └── web.xml ├── dist │ └── FooDelivery.war ├── nbproject │ ├── genfiles.properties │ ├── private │ │ ├── private.xml │ │ └── private.properties │ ├── project.xml │ ├── ant-deploy.xml │ └── project.properties └── build.xml └── README.md /FooDelivery_client/app/.gitignore: -------------------------------------------------------------------------------- 1 | /build 2 | -------------------------------------------------------------------------------- /FooDelivery_client/settings.gradle: -------------------------------------------------------------------------------- 1 | include ':app' 2 | -------------------------------------------------------------------------------- /FooDelivery_server/build/web/WEB-INF/classes/.netbeans_automatic_build: -------------------------------------------------------------------------------- 1 | -------------------------------------------------------------------------------- /FooDelivery_server/build/web/WEB-INF/classes/.netbeans_update_resources: -------------------------------------------------------------------------------- 1 | -------------------------------------------------------------------------------- /FooDelivery_server/src/conf/MANIFEST.MF: -------------------------------------------------------------------------------- 1 | Manifest-Version: 1.0 2 | 3 | -------------------------------------------------------------------------------- /FooDelivery_server/build/web/META-INF/MANIFEST.MF: -------------------------------------------------------------------------------- 1 | Manifest-Version: 1.0 2 | 3 | -------------------------------------------------------------------------------- /FooDelivery_server/web/META-INF/context.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | -------------------------------------------------------------------------------- /FooDelivery_server/build/web/META-INF/context.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | -------------------------------------------------------------------------------- /FooDelivery_server/dist/FooDelivery.war: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/catherine629/Android-App-FooDelivery/HEAD/FooDelivery_server/dist/FooDelivery.war -------------------------------------------------------------------------------- /FooDelivery_client/.gitignore: -------------------------------------------------------------------------------- 1 | *.iml 2 | .gradle 3 | /local.properties 4 | /.idea/workspace.xml 5 | /.idea/libraries 6 | .DS_Store 7 | /build 8 | /captures 9 | -------------------------------------------------------------------------------- /FooDelivery_client/app/hs_err_pid6620.log: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/catherine629/Android-App-FooDelivery/HEAD/FooDelivery_client/app/hs_err_pid6620.log -------------------------------------------------------------------------------- /FooDelivery_client/gradle/wrapper/gradle-wrapper.jar: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/catherine629/Android-App-FooDelivery/HEAD/FooDelivery_client/gradle/wrapper/gradle-wrapper.jar -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/res/drawable/login.jpg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/catherine629/Android-App-FooDelivery/HEAD/FooDelivery_client/app/src/main/res/drawable/login.jpg -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/res/drawable/back_pic.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/catherine629/Android-App-FooDelivery/HEAD/FooDelivery_client/app/src/main/res/drawable/back_pic.png -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/res/drawable/mapotofu.jpg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/catherine629/Android-App-FooDelivery/HEAD/FooDelivery_client/app/src/main/res/drawable/mapotofu.jpg -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/res/drawable/shuizhubeef.jpg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/catherine629/Android-App-FooDelivery/HEAD/FooDelivery_client/app/src/main/res/drawable/shuizhubeef.jpg -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/res/drawable/sichuanfood.jpg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/catherine629/Android-App-FooDelivery/HEAD/FooDelivery_client/app/src/main/res/drawable/sichuanfood.jpg -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/res/drawable/sichuanpic.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/catherine629/Android-App-FooDelivery/HEAD/FooDelivery_client/app/src/main/res/drawable/sichuanpic.png -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/res/drawable/kongpaojiding.jpg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/catherine629/Android-App-FooDelivery/HEAD/FooDelivery_client/app/src/main/res/drawable/kongpaojiding.jpg -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/res/mipmap-hdpi/ic_launcher.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/catherine629/Android-App-FooDelivery/HEAD/FooDelivery_client/app/src/main/res/mipmap-hdpi/ic_launcher.png -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/res/mipmap-mdpi/ic_launcher.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/catherine629/Android-App-FooDelivery/HEAD/FooDelivery_client/app/src/main/res/mipmap-mdpi/ic_launcher.png -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/res/mipmap-xhdpi/ic_launcher.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/catherine629/Android-App-FooDelivery/HEAD/FooDelivery_client/app/src/main/res/mipmap-xhdpi/ic_launcher.png -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/res/mipmap-xxhdpi/ic_launcher.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/catherine629/Android-App-FooDelivery/HEAD/FooDelivery_client/app/src/main/res/mipmap-xxhdpi/ic_launcher.png -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/catherine629/Android-App-FooDelivery/HEAD/FooDelivery_client/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png -------------------------------------------------------------------------------- /FooDelivery_server/build/web/WEB-INF/classes/remote/ServerServlet.class: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/catherine629/Android-App-FooDelivery/HEAD/FooDelivery_server/build/web/WEB-INF/classes/remote/ServerServlet.class -------------------------------------------------------------------------------- /FooDelivery_server/build/web/WEB-INF/lib/mysql-connector-java-5.1.38-bin.jar: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/catherine629/Android-App-FooDelivery/HEAD/FooDelivery_server/build/web/WEB-INF/lib/mysql-connector-java-5.1.38-bin.jar -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/java/foodeliver/utility/ShowToast.java: -------------------------------------------------------------------------------- 1 | package foodeliver.utility; 2 | 3 | /** 4 | * Show Toast interface. 5 | * @author Jiaqi Zhang 6 | */ 7 | public interface ShowToast { 8 | 9 | public void setToast(String str); 10 | } 11 | -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/java/foodeliver/utility/Transition.java: -------------------------------------------------------------------------------- 1 | package foodeliver.utility; 2 | 3 | /** 4 | * Transition interface. 5 | * @author Jiaqi Zhang 6 | */ 7 | public interface Transition { 8 | 9 | public void transit(); 10 | public void setToast(String str); 11 | } 12 | -------------------------------------------------------------------------------- /FooDelivery_client/gradle/wrapper/gradle-wrapper.properties: -------------------------------------------------------------------------------- 1 | #Wed Oct 21 11:34:03 PDT 2015 2 | distributionBase=GRADLE_USER_HOME 3 | distributionPath=wrapper/dists 4 | zipStoreBase=GRADLE_USER_HOME 5 | zipStorePath=wrapper/dists 6 | distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip 7 | -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/res/drawable/edit_text_selector.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/java/foodeliver/utility/PictureSearch.java: -------------------------------------------------------------------------------- 1 | package foodeliver.utility; 2 | 3 | import android.graphics.Bitmap; 4 | 5 | import java.util.ArrayList; 6 | 7 | /** 8 | * Picture Search Interface. 9 | * @author Jiaqi Zhang 10 | */ 11 | public interface PictureSearch { 12 | 13 | public void pictureReady(ArrayList pictures); 14 | } 15 | -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/res/values/colors.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | #2E7D32 4 | #2E7D32 5 | #FF4081 6 | #000000 7 | #000010 8 | 9 | -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/res/values-v21/styles.xml: -------------------------------------------------------------------------------- 1 | > 2 | 3 | 9 | 10 | -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/res/values/dimens.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 16dp 4 | 16dp 5 | 16dp 6 | 8dp 7 | 16dp 8 | 9 | -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/java/foodeliver/utility/DataSearch.java: -------------------------------------------------------------------------------- 1 | package foodeliver.utility; 2 | 3 | /** 4 | * Data search interface. 5 | * @author Jiaqi Zhang 6 | */ 7 | public interface DataSearch { 8 | 9 | public void dbResultReady(String result); 10 | public void updateReady(String result); 11 | public void dbDetailReady(String result); 12 | public void deleteReady(String result); 13 | 14 | } 15 | -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/res/values-w820dp/dimens.xml: -------------------------------------------------------------------------------- 1 | 2 | 5 | 64dp 6 | 7 | -------------------------------------------------------------------------------- /FooDelivery_client/app/src/test/java/jiaqiz/cmu/edu/foodeliver/ExampleUnitTest.java: -------------------------------------------------------------------------------- 1 | package foodeliver; 2 | 3 | import org.junit.Test; 4 | 5 | import static org.junit.Assert.*; 6 | 7 | /** 8 | * To work on unit tests, switch the Test Artifact in the Build Variants view. 9 | */ 10 | public class ExampleUnitTest { 11 | @Test 12 | public void addition_isCorrect() throws Exception { 13 | assertEquals(4, 2 + 2); 14 | } 15 | } 16 | -------------------------------------------------------------------------------- /FooDelivery_client/app/src/androidTest/java/jiaqiz/cmu/edu/foodeliver/ApplicationTest.java: -------------------------------------------------------------------------------- 1 | package jiaqiz.cmu.edu.foodeliver; 2 | 3 | import android.app.Application; 4 | import android.test.ApplicationTestCase; 5 | 6 | /** 7 | * Testing Fundamentals 8 | */ 9 | public class ApplicationTest extends ApplicationTestCase { 10 | public ApplicationTest() { 11 | super(Application.class); 12 | } 13 | } -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/res/menu/menu_main.xml: -------------------------------------------------------------------------------- 1 | 5 | 10 | 11 | -------------------------------------------------------------------------------- /FooDelivery_server/nbproject/genfiles.properties: -------------------------------------------------------------------------------- 1 | build.xml.data.CRC32=51df08d1 2 | build.xml.script.CRC32=a025eff8 3 | build.xml.stylesheet.CRC32=651128d4@1.75.1.1 4 | # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. 5 | # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. 6 | nbproject/build-impl.xml.data.CRC32=51df08d1 7 | nbproject/build-impl.xml.script.CRC32=bccb6365 8 | nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1 9 | -------------------------------------------------------------------------------- /FooDelivery_server/web/index.html: -------------------------------------------------------------------------------- 1 | 2 | 7 | 8 | 9 | TODO supply a title 10 | 11 | 12 | 13 | 14 |
TODO write content
15 | 16 | 17 | -------------------------------------------------------------------------------- /FooDelivery_server/build/web/index.html: -------------------------------------------------------------------------------- 1 | 2 | 7 | 8 | 9 | TODO supply a title 10 | 11 | 12 | 13 | 14 |
TODO write content
15 | 16 | 17 | -------------------------------------------------------------------------------- /FooDelivery_server/nbproject/private/private.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | 6 | file:/C:/Users/cathe/Documents/NetBeansProjects/FooDelivery/src/java/remote/ServerServlet.java 7 | 8 | 9 | 10 | -------------------------------------------------------------------------------- /FooDelivery_client/build.gradle: -------------------------------------------------------------------------------- 1 | // Top-level build file where you can add configuration options common to all sub-projects/modules. 2 | 3 | buildscript { 4 | repositories { 5 | jcenter() 6 | } 7 | dependencies { 8 | classpath 'com.android.tools.build:gradle:1.5.0' 9 | 10 | // NOTE: Do not place your application dependencies here; they belong 11 | // in the individual module build.gradle files 12 | } 13 | } 14 | 15 | allprojects { 16 | repositories { 17 | jcenter() 18 | } 19 | } 20 | 21 | task clean(type: Delete) { 22 | delete rootProject.buildDir 23 | } 24 | -------------------------------------------------------------------------------- /FooDelivery_server/nbproject/private/private.properties: -------------------------------------------------------------------------------- 1 | deploy.ant.properties.file=C:\\Users\\cathe\\AppData\\Roaming\\NetBeans\\8.1\\tomcat80.properties 2 | j2ee.server.domain=C:/Users/cathe/AppData/Roaming/NetBeans/8.1/apache-tomcat-8.0.27.0_base 3 | j2ee.server.home=C:/Program Files/Apache Software Foundation/Apache Tomcat 8.0.27 4 | j2ee.server.instance=tomcat80:home=C:\\Program Files\\Apache Software Foundation\\Apache Tomcat 8.0.27:base=apache-tomcat-8.0.27.0_base 5 | javac.debug=true 6 | javadoc.preview=true 7 | selected.browser=default 8 | user.properties.file=C:\\Users\\cathe\\AppData\\Roaming\\NetBeans\\8.1\\build.properties 9 | -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- 1 | #FooDelivery - Android App 2 | 3 | Developed by Shuhui Yang, Jiaqi Zhang, and Yu Qiu 4 | 5 | ##Overview 6 | 7 | FooDelivery is an O2O platform that provides connection between online/physical restaurants and offline consumers. FooDelivery offers both restaurant and consumer interfaces. Restaurant owners can manage menu, receive orders and process delivery while consumers are able to browse or search restaurants, scan the menu and place orders. 8 | 9 | ## Directory 10 | 11 | 1. Server Code (Netbeans Project) 12 | 2. Client Code (Android Studio Project) 13 | - Login Package 14 | - Customer Package 15 | - Resturant Package 16 | -------------------------------------------------------------------------------- /FooDelivery_client/app/proguard-rules.pro: -------------------------------------------------------------------------------- 1 | # Add project specific ProGuard rules here. 2 | # By default, the flags in this file are appended to flags specified 3 | # in /Users/jacie/Library/Android/sdk/tools/proguard/proguard-android.txt 4 | # You can edit the include path and order by changing the proguardFiles 5 | # directive in build.gradle. 6 | # 7 | # For more details, see 8 | # http://developer.android.com/guide/developing/tools/proguard.html 9 | 10 | # Add any project specific keep options here: 11 | 12 | # If your project uses WebView with JS, uncomment the following 13 | # and specify the fully qualified class name to the JavaScript interface 14 | # class: 15 | #-keepclassmembers class fqcn.of.javascript.interface.for.webview { 16 | # public *; 17 | #} 18 | -------------------------------------------------------------------------------- /FooDelivery_server/web/WEB-INF/web.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | ServerServlet 5 | remote.ServerServlet 6 | 7 | 8 | ServerServlet 9 | /ServerServlet 10 | 11 | 12 | 13 | 30 14 | 15 | 16 | 17 | -------------------------------------------------------------------------------- /FooDelivery_server/build/web/WEB-INF/web.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | ServerServlet 5 | remote.ServerServlet 6 | 7 | 8 | ServerServlet 9 | /ServerServlet 10 | 11 | 12 | 13 | 30 14 | 15 | 16 | 17 | -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/res/layout/customerui_fragment_customer.xml: -------------------------------------------------------------------------------- 1 | 10 | 11 | 15 | 16 | 17 | -------------------------------------------------------------------------------- /FooDelivery_client/app/src/main/res/values/styles.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 10 | 11 | 15 | 16 |