Commit c0e9b349 authored by Nina Sanchez's avatar Nina Sanchez

Fixed menu error

Categories work now
(ROS 2)
parent b6b275fb
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry exported="true" kind="lib" path="jackson-annotations-2.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="jackson-core-2.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="jackson-databind-2.2.0.jar"/>
<classpathentry kind="lib" path="libs/bolts-android-1.2.1.jar"/>
<classpathentry kind="lib" path="libs/Parse-1.10.3.jar"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>RestaurantOrderingSystem2</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.source=1.6
<?xml version="1.0" encoding="UTF-8"?>
<manifest android:versionCode="1" android:versionName="1.0"
package="com.cs123grpE.restaurantorderingsystem" xmlns:android="http://schemas.android.com/apk/res/android">
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<application android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:screenOrientation="landscape" android:theme="@style/AppTheme">
<activity android:label="@string/app_name" android:name=".Login"/>
<activity android:label="@string/title_activity_select_account" android:name=".SelectAccount"/>
<activity android:label="@string/title_activity_register" android:name=".Register"/>
<activity android:label="@string/title_activity_settings" android:name=".Settings"/>
<activity android:label="@string/title_activity_admin" android:name=".Admin"/>
<activity android:label="@string/title_activity_customer" android:name=".Customer"/>
<activity android:label="@string/title_activity_edit_bill" android:name=".EditBill"/>
<activity android:label="@string/title_activity_edit_menu" android:name=".EditMenu"/>
<activity
android:label="@string/title_activity_add_edit_profile" android:name=".AddEditProfile"/>
<activity android:label="@string/title_activity_view_profile" android:name=".ViewProfile"/>
<activity android:label="@string/app_name" android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:label="@string/title_activity_cart" android:name=".Cart"/>
<activity android:label="@string/title_activity_kitchen" android:name=".Kitchen"/>
<!--created by ADT ext plugin at 2015-12-02 23:40:55-->
<activity android:name=".KitchenAdapter"/>
<!--created by ADT ext plugin at 2015-12-02 23:42:23-->
<activity android:name=".OrderModel"/>
</application>
</manifest>
<?xml version="1.0" encoding="UTF-8"?>
<manifest android:versionCode="1" android:versionName="1.0"
package="com.cs123grpE.restaurantorderingsystem" xmlns:android="http://schemas.android.com/apk/res/android">
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<application android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:screenOrientation="landscape" android:theme="@style/AppTheme">
<activity android:label="@string/app_name" android:name=".Login"/>
<activity android:label="@string/title_activity_select_account" android:name=".SelectAccount"/>
<activity android:label="@string/title_activity_register" android:name=".Register"/>
<activity android:label="@string/title_activity_settings" android:name=".Settings"/>
<activity android:label="@string/title_activity_admin" android:name=".Admin"/>
<activity android:label="@string/title_activity_customer" android:name=".Customer"/>
<activity android:label="@string/title_activity_edit_bill" android:name=".EditBill"/>
<activity android:label="@string/title_activity_edit_menu" android:name=".EditMenu"/>
<activity
android:label="@string/title_activity_add_edit_profile" android:name=".AddEditProfile"/>
<activity android:label="@string/title_activity_view_profile" android:name=".ViewProfile"/>
<activity android:label="@string/app_name" android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:label="@string/title_activity_cart" android:name=".Cart"/>
<activity android:label="@string/title_activity_kitchen" android:name=".Kitchen"/>
<!--created by ADT ext plugin at 2015-12-02 23:40:55-->
<activity android:name=".KitchenAdapter"/>
<!--created by ADT ext plugin at 2015-12-02 23:42:23-->
<activity android:name=".OrderModel"/>
</application>
</manifest>
# cache for current jar dependency. DO NOT EDIT.
# format is <lastModified> <length> <SHA-1> <path>
# Encoding is UTF-8
/** Automatically generated file. DO NOT MODIFY */
package com.cs123grpE.restaurantorderingsystem;
public final class BuildConfig {
public final static boolean DEBUG = true;
}
\ No newline at end of file
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* aapt tool from the resource data it found. It
* should not be modified by hand.
*/
package com.cs123grpE.restaurantorderingsystem;
public final class R {
public static final class attr {
}
public static final class dimen {
/** Default screen margins, per the Android Design guidelines.
Example customization of dimensions originally defined in res/values/dimens.xml
(such as screen margins) for screens with more than 820dp of available width. This
would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively).
*/
public static final int activity_horizontal_margin=0x7f040000;
public static final int activity_vertical_margin=0x7f040001;
public static final int button_spacing=0x7f040002;
}
public static final class drawable {
public static final int gear=0x7f020000;
public static final int ic_launcher=0x7f020001;
public static final int noimage=0x7f020002;
public static final int prelimlogo=0x7f020003;
}
public static final class id {
public static final int action_settings=0x7f08003c;
public static final int btnAddMenu=0x7f08001b;
public static final int btnAddToCart=0x7f080038;
public static final int btnAdmin=0x7f08002e;
public static final int btnBack=0x7f080037;
public static final int btnCancel=0x7f08002b;
public static final int btnCart=0x7f080017;
public static final int btnConfigure=0x7f08000b;
public static final int btnConfirm=0x7f08002c;
public static final int btnCustomer=0x7f080030;
public static final int btnDelete=0x7f080019;
public static final int btnDeleteMenu=0x7f08001a;
public static final int btnDone=0x7f080005;
public static final int btnEditBill=0x7f08000a;
public static final int btnEditMenu=0x7f080009;
public static final int btnFinalize=0x7f08000e;
public static final int btnKitchen=0x7f08002f;
public static final int btnLogin=0x7f080022;
public static final int btnLogout=0x7f08000c;
public static final int btnOff=0x7f080011;
public static final int btnOn=0x7f080012;
public static final int btnRegister=0x7f080023;
public static final int btnRevert=0x7f080018;
public static final int btnSave=0x7f080006;
public static final int btnSearch=0x7f080015;
public static final int checkRem=0x7f080021;
public static final int list=0x7f080016;
public static final int listCart=0x7f08000d;
public static final int listKitchen=0x7f08001c;
public static final int listview1=0x7f080013;
public static final int logo=0x7f080007;
public static final int logout=0x7f080031;
public static final int priceName=0x7f080033;
public static final int tableName=0x7f08003a;
public static final int textView00=0x7f080039;
public static final int textView01=0x7f08003b;
public static final int textView1=0x7f08001d;
public static final int textView2=0x7f08001f;
public static final int textView3=0x7f08002d;
public static final int textView4=0x7f080024;
public static final int textView5=0x7f080025;
public static final int textView6=0x7f080027;
public static final int textView7=0x7f080029;
public static final int textView8=0x7f080008;
public static final int textView9=0x7f080010;
public static final int totesPrice=0x7f08000f;
public static final int tvDesc=0x7f080035;
public static final int tvName=0x7f080032;
public static final int tvPrice=0x7f080034;
public static final int tvTags=0x7f080036;
public static final int txtCategory=0x7f080002;
public static final int txtDescription=0x7f080003;
public static final int txtIngredients=0x7f080004;
public static final int txtItemName=0x7f080000;
public static final int txtPass=0x7f080020;
public static final int txtPass2=0x7f08002a;
public static final int txtPrice=0x7f080001;
public static final int txtResto=0x7f080026;
public static final int txtSearch=0x7f080014;
public static final int txtUser=0x7f08001e;
public static final int txtUser2=0x7f080028;
}
public static final class layout {
public static final int activity_add_edit_profile=0x7f030000;
public static final int activity_admin=0x7f030001;
public static final int activity_cart=0x7f030002;
public static final int activity_customer=0x7f030003;
public static final int activity_edit_bill=0x7f030004;
public static final int activity_edit_menu=0x7f030005;
public static final int activity_kitchen=0x7f030006;
public static final int activity_login=0x7f030007;
public static final int activity_main=0x7f030008;
public static final int activity_register=0x7f030009;
public static final int activity_select_account=0x7f03000a;
public static final int activity_settings=0x7f03000b;
public static final int activity_view_profile=0x7f03000c;
public static final int group=0x7f03000d;
public static final int menu_item=0x7f03000e;
public static final int row=0x7f03000f;
}
public static final class menu {
public static final int add_edit_profile=0x7f070000;
public static final int admin=0x7f070001;
public static final int cart=0x7f070002;
public static final int customer=0x7f070003;
public static final int edit_bill=0x7f070004;
public static final int edit_menu=0x7f070005;
public static final int kitchen=0x7f070006;
public static final int login=0x7f070007;
public static final int main=0x7f070008;
public static final int register=0x7f070009;
public static final int select_account=0x7f07000a;
public static final int settings=0x7f07000b;
public static final int view_profile=0x7f07000c;
}
public static final class string {
public static final int action_settings=0x7f050001;
public static final int app_name=0x7f050000;
public static final int hello_world=0x7f050008;
public static final int logout=0x7f050006;
public static final int title_activity_add_edit_profile=0x7f05000b;
public static final int title_activity_admin=0x7f050005;
public static final int title_activity_cart=0x7f05000e;
public static final int title_activity_customer=0x7f050007;
public static final int title_activity_edit_bill=0x7f050009;
public static final int title_activity_edit_menu=0x7f05000a;
public static final int title_activity_kitchen=0x7f05000f;
public static final int title_activity_main=0x7f05000d;
public static final int title_activity_register=0x7f050003;
public static final int title_activity_select_account=0x7f050002;
public static final int title_activity_settings=0x7f050004;
public static final int title_activity_view_profile=0x7f05000c;
}
public static final class style {
/**
Base application theme, dependent on API level. This theme is replaced
by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
Theme customizations available in newer API levels can go in
res/values-vXX/styles.xml, while customizations related to
backward-compatibility can go here.
Base application theme for API 11+. This theme completely replaces
AppBaseTheme from res/values/styles.xml on API 11+ devices.
API 11 theme customizations can go here.
Base application theme for API 14+. This theme completely replaces
AppBaseTheme from BOTH res/values/styles.xml and
res/values-v11/styles.xml on API 14+ devices.
API 14 theme customizations can go here.
*/
public static final int AppBaseTheme=0x7f060000;
/** Application theme.
All customizations that are NOT specific to a particular API-level can go here.
*/
public static final int AppTheme=0x7f060001;
}
}
# To enable ProGuard in your project, edit project.properties
# to define the proguard.config property as described in that file.
#
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in ${sdk.dir}/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the ProGuard
# include property in project.properties.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# Add any project specific keep options here:
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system edit
# "ant.properties", and override values to adapt the script to your
# project structure.
#
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-19
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:orientation="vertical"
android:gravity="center"
tools:context="com.cs123grpE.restaurantorderingsystem.AddEditProfile" >
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_vertical_margin" >
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/noimage"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:onClick="changeImage" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center" >
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Name:"
android:ems="3"
android:textAppearance="?android:attr/textAppearanceMedium" />
<EditText
android:id="@+id/txtItemName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="10"
android:inputType="text" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Price:"
android:ems="3"
android:textAppearance="?android:attr/textAppearanceMedium" />
<EditText
android:id="@+id/txtPrice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="10" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Category: "
android:textAppearance="?android:attr/textAppearanceMedium" />
<EditText
android:id="@+id/txtCategory"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="10" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginBottom="@dimen/activity_vertical_margin" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Description:"
android:textAppearance="?android:attr/textAppearanceMedium" />
<EditText
android:id="@+id/txtDescription"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:ems="19"
android:inputType="textMultiLine" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Tags:"
android:textAppearance="?android:attr/textAppearanceMedium" />
<EditText
android:id="@+id/txtIngredients"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textMultiLine" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center" >
<Button
android:id="@+id/btnDone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Cancel"
android:layout_marginRight="@dimen/button_spacing"
android:onClick="cancel" />
<Button
android:id="@+id/btnSave"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Save"
android:layout_marginLeft="@dimen/button_spacing"
android:onClick="save" />
</LinearLayout>
</LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:orientation="vertical"
android:gravity="center"
tools:context="com.cs123grpE.restaurantorderingsystem.Admin" >
<ImageView
android:id="@+id/logo"
android:src="@drawable/prelimlogo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_vertical_margin" />
<TextView
android:id="@+id/textView8"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Admin"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_marginBottom="@dimen/activity_vertical_margin" />
<Button
android:id="@+id/btnEditMenu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="10"
android:text="Edit Menu"
android:onClick="editMenu" />
<Button
android:id="@+id/btnEditBill"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="10"
android:text="Edit Bill"
android:onClick="editBill"
android:layout_marginBottom="@dimen/activity_vertical_margin" />
<Button
android:id="@+id/btnConfigure"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="10"
android:text="Configure"
android:onClick="config"
android:layout_marginBottom="@dimen/activity_vertical_margin" />
<Button
android:id="@+id/btnLogout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="10"
android:text="@string/logout"
android:onClick="logoff" />
</LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:orientation="vertical"
tools:context="com.cs123grpE.restaurantorderingsystem.Cart" >
<ListView
android:id="@+id/listCart"
android:layout_width="match_parent"
android:layout_height="fill_parent"
android:layout_weight="1" ></ListView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right" >
<Button
android:id="@+id/btnFinalize"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Finalize"
android:onClick="finalize"
android:layout_marginRight="@dimen/activity_horizontal_margin" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Total: "
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_marginRight="@dimen/activity_vertical_margin" >
</TextView>
<TextView
android:id="@+id/totesPrice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0.00"
android:ems="3"
android:gravity="right"
android:textAppearance="?android:attr/textAppearanceLarge" ></TextView>
</LinearLayout>
</LinearLayout>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment