diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4a4627d..e01965f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,8 +12,8 @@ - - - - - - - diff --git a/app/src/main/java/madelyntav/c4q/nyc/chipchop/DBObjects/Address.java b/app/src/main/java/madelyntav/c4q/nyc/chipchop/DBObjects/Address.java index 54fed60..7a0c6c7 100644 --- a/app/src/main/java/madelyntav/c4q/nyc/chipchop/DBObjects/Address.java +++ b/app/src/main/java/madelyntav/c4q/nyc/chipchop/DBObjects/Address.java @@ -2,9 +2,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -/** - * Created by c4q-madelyntavarez on 8/11/15. - */ @JsonIgnoreProperties(ignoreUnknown = true) public class Address { String streetAddress; diff --git a/app/src/main/java/madelyntav/c4q/nyc/chipchop/DBObjects/DBHelper.java b/app/src/main/java/madelyntav/c4q/nyc/chipchop/DBObjects/DBHelper.java index f597fc2..247fff0 100644 --- a/app/src/main/java/madelyntav/c4q/nyc/chipchop/DBObjects/DBHelper.java +++ b/app/src/main/java/madelyntav/c4q/nyc/chipchop/DBObjects/DBHelper.java @@ -26,9 +26,6 @@ import madelyntav.c4q.nyc.chipchop.SignupActivity1; import madelyntav.c4q.nyc.chipchop.SignupActivity2; -/** - * Created by c4q-madelyntavarez on 8/12/15. - */ public class DBHelper extends Firebase { static DBHelper fireBaseRef; private static final String URL = "https://chipchop.firebaseio.com/"; @@ -263,7 +260,6 @@ public void onSuccess(Map stringObjectMap) { UID = String.valueOf(stringObjectMap.get("uid")); - SharedPreferences sharedPreferences = mContext.getSharedPreferences("New User", Context.MODE_PRIVATE); SharedPreferences.Editor editor = sharedPreferences.edit(); editor.putString("id", UID); diff --git a/app/src/main/java/madelyntav/c4q/nyc/chipchop/DeliveryDialog.java b/app/src/main/java/madelyntav/c4q/nyc/chipchop/DeliveryDialogFragment.java similarity index 88% rename from app/src/main/java/madelyntav/c4q/nyc/chipchop/DeliveryDialog.java rename to app/src/main/java/madelyntav/c4q/nyc/chipchop/DeliveryDialogFragment.java index fc3fa0c..89ddc9f 100644 --- a/app/src/main/java/madelyntav/c4q/nyc/chipchop/DeliveryDialog.java +++ b/app/src/main/java/madelyntav/c4q/nyc/chipchop/DeliveryDialogFragment.java @@ -7,14 +7,9 @@ import android.view.ViewGroup; import android.view.Window; import android.widget.Button; - -import madelyntav.c4q.nyc.chipchop.DBObjects.Order; import madelyntav.c4q.nyc.chipchop.DBObjects.Seller; -/** - * Created by alvin2 on 9/12/15. - */ -public class DeliveryDialog extends android.support.v4.app.DialogFragment { +public class DeliveryDialogFragment extends android.support.v4.app.DialogFragment { Button deliverButton, pickupButton; Seller seller; @@ -53,7 +48,7 @@ public void onClick(View view) { HelperMethods.getCurrentOrder().setIsPickup(false); getDialog().dismiss(); FragmentManager fm = getActivity().getSupportFragmentManager(); - PaymentDialog alertDialog = new PaymentDialog(); + PaymentDialogFragment alertDialog = new PaymentDialogFragment(); alertDialog.show(fm, "fragment_alert"); } }); @@ -66,7 +61,7 @@ public void onClick(View view) { HelperMethods.getCurrentOrder().setToDeliver(false); getDialog().dismiss(); FragmentManager fm = getActivity().getSupportFragmentManager(); - PaymentDialog alertDialog = new PaymentDialog(); + PaymentDialogFragment alertDialog = new PaymentDialogFragment(); alertDialog.show(fm, "fragment_alert"); } }); diff --git a/app/src/main/java/madelyntav/c4q/nyc/chipchop/FirebaseApplication.java b/app/src/main/java/madelyntav/c4q/nyc/chipchop/FirebaseApplication.java new file mode 100644 index 0000000..22054c4 --- /dev/null +++ b/app/src/main/java/madelyntav/c4q/nyc/chipchop/FirebaseApplication.java @@ -0,0 +1,21 @@ +package madelyntav.c4q.nyc.chipchop; + +import android.app.Application; + +import com.firebase.client.Firebase; + +public class FirebaseApplication extends Application { + + private static FirebaseApplication singletonInstance; + + public static FirebaseApplication getInstance() { + return singletonInstance; + } + + @Override + public void onCreate() { + super.onCreate(); + singletonInstance = this; + Firebase.setAndroidContext(this); + } +} diff --git a/app/src/main/java/madelyntav/c4q/nyc/chipchop/MainActivity.java b/app/src/main/java/madelyntav/c4q/nyc/chipchop/MainActivity.java index 62a488c..8678974 100644 --- a/app/src/main/java/madelyntav/c4q/nyc/chipchop/MainActivity.java +++ b/app/src/main/java/madelyntav/c4q/nyc/chipchop/MainActivity.java @@ -36,30 +36,28 @@ public class MainActivity extends AppCompatActivity { Seller seller; Address address; Address sellerAddress; - String sellerName="BRailyn Torres"; - String sellerPhone="646-777-9087"; - String sellerStreet="256 Wadsworth Avenue"; - String sellerApt="2A"; - String sellerCity="New York"; - String sellerState="NY"; - String sellerZipcode="10033"; - String sellerEmail="JackFinnish@gmail.com"; - Seller seller2; - ArrayList activeSellerList; + private String sellerName="BRailyn Torres"; + private String sellerPhone="646-777-9087"; + private String sellerStreet="256 Wadsworth Avenue"; + private String sellerApt="2A"; + private String sellerCity="New York"; + private String sellerState="NY"; + private String sellerZipcode="10033"; + private String sellerEmail="JackFinnish@gmail.com"; + private Seller seller2; private static DBHelper dbHelper = null; - Item item2; - Item item3; - ArrayList itemsForSale; - ArrayList userList; - User user2; - DBCallback emptyCallback; + private Item item2; + private Item item3; + private ArrayList itemsForSale; + private ArrayList userList; + private User user2; + private DBCallback emptyCallback; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); dbHelper=DBHelper.getDbHelper(this); - activeSellerList=new ArrayList<>(); userList=new ArrayList<>(); emptyCallback = new DBCallback() { diff --git a/app/src/main/java/madelyntav/c4q/nyc/chipchop/PaymentDialog.java b/app/src/main/java/madelyntav/c4q/nyc/chipchop/PaymentDialogFragment.java similarity index 97% rename from app/src/main/java/madelyntav/c4q/nyc/chipchop/PaymentDialog.java rename to app/src/main/java/madelyntav/c4q/nyc/chipchop/PaymentDialogFragment.java index 0f3f39f..c157839 100644 --- a/app/src/main/java/madelyntav/c4q/nyc/chipchop/PaymentDialog.java +++ b/app/src/main/java/madelyntav/c4q/nyc/chipchop/PaymentDialogFragment.java @@ -22,14 +22,11 @@ import madelyntav.c4q.nyc.chipchop.Payments.PaymentsActivity; import madelyntav.c4q.nyc.chipchop.fragments.Fragment_Buyer_Orders; -/** - * Created by alvin2 on 9/10/15. - */ -public class PaymentDialog extends android.support.v4.app.DialogFragment { +public class PaymentDialogFragment extends android.support.v4.app.DialogFragment { View coordinatorLayoutView; - ImageView confirmImage; - Button cardButton, cashButton; + private ImageView confirmImage; + private Button cardButton, cashButton; private BuyActivity activity; private Order order; private DBHelper dbHelper; diff --git a/app/src/main/java/madelyntav/c4q/nyc/chipchop/ReviewDialogFragment.java b/app/src/main/java/madelyntav/c4q/nyc/chipchop/ReviewDialogFragment.java index f4b4be7..3c4b5d6 100644 --- a/app/src/main/java/madelyntav/c4q/nyc/chipchop/ReviewDialogFragment.java +++ b/app/src/main/java/madelyntav/c4q/nyc/chipchop/ReviewDialogFragment.java @@ -13,16 +13,13 @@ import madelyntav.c4q.nyc.chipchop.DBObjects.Order; import madelyntav.c4q.nyc.chipchop.DBObjects.Review; -/** - * Created by alvin2 on 8/22/15. - */ public class ReviewDialogFragment extends android.support.v4.app.DialogFragment implements View.OnClickListener { - Button submitButton; - Order order; - RatingBar ratingBar; - DBHelper dbHelper; - Review review; + private Button submitButton; + private Order order; + private RatingBar ratingBar; + private DBHelper dbHelper; + private Review review; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { diff --git a/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/BuyerOrdersAdapter.java b/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/BuyerOrdersAdapter.java index 47d0421..8574b2f 100644 --- a/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/BuyerOrdersAdapter.java +++ b/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/BuyerOrdersAdapter.java @@ -22,11 +22,7 @@ import madelyntav.c4q.nyc.chipchop.R; import madelyntav.c4q.nyc.chipchop.fragments.Fragment_Buyer_OrderDetails; -/** - * Created by alvin2 on 8/26/15. - */ - -public class BuyerOrdersAdapter extends RecyclerView.Adapter { +public class BuyerOrdersAdapter extends RecyclerView.Adapter { private List orderItems; private Context context; @@ -37,48 +33,14 @@ public BuyerOrdersAdapter(Context context, List orderItems) { this.orderItems = orderItems; } - private class BuyerOrdersViewHolder extends RecyclerView.ViewHolder { - - CardView container; - TextView timeStamp; - TextView total; - TextView nameOfSeller; - TextView deliveryMethod; - TextView sellerAddress; - - - public BuyerOrdersViewHolder(View itemView) { - super(itemView); - - total = (TextView) itemView.findViewById(R.id.order_cost_tv); - container = (CardView) itemView.findViewById(R.id.card_view); - nameOfSeller = (TextView) itemView.findViewById(R.id.seller_name_tv); - timeStamp = (TextView) itemView.findViewById(R.id.order_timestamp_tv); - deliveryMethod = (TextView) itemView.findViewById(R.id.delivery_method_tv); - sellerAddress = (TextView) itemView.findViewById(R.id.seller_address_tv); - - container.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - BuyActivity activity = (BuyActivity) context; - activity.setOrderToView(orderItems.get(getAdapterPosition())); - activity.replaceFragment(new Fragment_Buyer_OrderDetails()); - } - }); - - } - - } - @Override - public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int position) { - - View itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.buyerorder_list_item, parent, false); + public BuyerOrdersViewHolder onCreateViewHolder(ViewGroup parent, int position) { + View itemView = LayoutInflater.from(context).inflate(R.layout.buyerorder_list_item, parent, false); return new BuyerOrdersViewHolder(itemView); } @Override - public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, int position) { + public void onBindViewHolder(BuyerOrdersViewHolder viewHolder, int position) { String deliveryMethod = ""; Order order = orderItems.get(position); @@ -123,4 +85,36 @@ private void setAnimation(View viewToAnimate, int position) { public int getItemCount() { return orderItems.size(); } + + public class BuyerOrdersViewHolder extends RecyclerView.ViewHolder { + + private CardView container; + private TextView timeStamp; + private TextView total; + private TextView nameOfSeller; + private TextView deliveryMethod; + private TextView sellerAddress; + + public BuyerOrdersViewHolder(View itemView) { + super(itemView); + + total = (TextView) itemView.findViewById(R.id.order_cost_tv); + container = (CardView) itemView.findViewById(R.id.card_view); + nameOfSeller = (TextView) itemView.findViewById(R.id.seller_name_tv); + timeStamp = (TextView) itemView.findViewById(R.id.order_timestamp_tv); + deliveryMethod = (TextView) itemView.findViewById(R.id.delivery_method_tv); + sellerAddress = (TextView) itemView.findViewById(R.id.seller_address_tv); + + container.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + BuyActivity activity = (BuyActivity) context; + activity.setOrderToView(orderItems.get(getAdapterPosition())); + activity.replaceFragment(new Fragment_Buyer_OrderDetails()); + } + }); + + } + + } } \ No newline at end of file diff --git a/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/CartListAdapter.java b/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/CartListAdapter.java index ffbfb0e..cf31690 100644 --- a/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/CartListAdapter.java +++ b/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/CartListAdapter.java @@ -29,9 +29,6 @@ import madelyntav.c4q.nyc.chipchop.FoodItemSelectDialog; import madelyntav.c4q.nyc.chipchop.R; -/** - * Created by alvin2 on 8/16/15. - */ public class CartListAdapter extends RecyclerView.Adapter { Button removeItemButton; diff --git a/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/CheckoutListAdapter.java b/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/CheckoutListAdapter.java index b3024c4..ffb206b 100644 --- a/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/CheckoutListAdapter.java +++ b/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/CheckoutListAdapter.java @@ -21,9 +21,6 @@ import madelyntav.c4q.nyc.chipchop.DBObjects.Item; import madelyntav.c4q.nyc.chipchop.R; -/** - * Created by alvin2 on 8/16/15. - */ public class CheckoutListAdapter extends RecyclerView.Adapter { private List checkoutItems; diff --git a/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/FoodListAdapter.java b/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/FoodListAdapter.java index 6af7a41..d7f3cdf 100644 --- a/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/FoodListAdapter.java +++ b/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/FoodListAdapter.java @@ -24,9 +24,6 @@ import madelyntav.c4q.nyc.chipchop.FoodItemSelectDialog; import madelyntav.c4q.nyc.chipchop.R; -/** - * Created by c4q-anthonyf on 8/14/15. - */ public class FoodListAdapter extends RecyclerView.Adapter{ private List foodItems; diff --git a/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/SellerItemsAdapter.java b/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/SellerItemsAdapter.java index 1e4fc80..892f2de 100644 --- a/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/SellerItemsAdapter.java +++ b/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/SellerItemsAdapter.java @@ -30,9 +30,6 @@ import madelyntav.c4q.nyc.chipchop.fragments.Fragment_Seller_CreateItem; import madelyntav.c4q.nyc.chipchop.fragments.Fragment_Seller_Items; -/** - * Created by c4q-anthonyf on 8/14/15. - */ public class SellerItemsAdapter extends RecyclerView.Adapter { private DBCallback itemRemovalCallback; diff --git a/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/SellerListAdapter.java b/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/SellerListAdapter.java index 468609e..4bc1e86 100644 --- a/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/SellerListAdapter.java +++ b/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/SellerListAdapter.java @@ -25,9 +25,6 @@ import madelyntav.c4q.nyc.chipchop.R; import madelyntav.c4q.nyc.chipchop.fragments.Fragment_Buyer_SellerProfile; -/** - * Created by alvin2 on 8/20/15. - */ public class SellerListAdapter extends RecyclerView.Adapter { private List sellers; diff --git a/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/SellerOrdersAdapter.java b/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/SellerOrdersAdapter.java index a6a2729..9f8289a 100644 --- a/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/SellerOrdersAdapter.java +++ b/app/src/main/java/madelyntav/c4q/nyc/chipchop/adapters/SellerOrdersAdapter.java @@ -21,9 +21,6 @@ import madelyntav.c4q.nyc.chipchop.SellActivity; import madelyntav.c4q.nyc.chipchop.fragments.Fragment_Seller_OrderDetails; -/** - * Created by alvin2 on 8/16/15. - */ public class SellerOrdersAdapter extends RecyclerView.Adapter { private List orderItems; diff --git a/app/src/main/java/madelyntav/c4q/nyc/chipchop/fragments/Fragment_Buyer_Checkout.java b/app/src/main/java/madelyntav/c4q/nyc/chipchop/fragments/Fragment_Buyer_Checkout.java index ed0c04f..880aa18 100644 --- a/app/src/main/java/madelyntav/c4q/nyc/chipchop/fragments/Fragment_Buyer_Checkout.java +++ b/app/src/main/java/madelyntav/c4q/nyc/chipchop/fragments/Fragment_Buyer_Checkout.java @@ -20,9 +20,9 @@ import madelyntav.c4q.nyc.chipchop.DBObjects.Item; import madelyntav.c4q.nyc.chipchop.DBObjects.Order; import madelyntav.c4q.nyc.chipchop.DBObjects.Seller; -import madelyntav.c4q.nyc.chipchop.DeliveryDialog; +import madelyntav.c4q.nyc.chipchop.DeliveryDialogFragment; import madelyntav.c4q.nyc.chipchop.HelperMethods; -import madelyntav.c4q.nyc.chipchop.PaymentDialog; +import madelyntav.c4q.nyc.chipchop.PaymentDialogFragment; import madelyntav.c4q.nyc.chipchop.R; import madelyntav.c4q.nyc.chipchop.adapters.CheckoutListAdapter; @@ -73,12 +73,12 @@ public void onClick(View view) { HelperMethods.getCurrentOrder().setToDeliver(false); } FragmentManager fm = getActivity().getSupportFragmentManager(); - PaymentDialog alertDialog = new PaymentDialog(); + PaymentDialogFragment alertDialog = new PaymentDialogFragment(); alertDialog.show(fm, "fragment_alert"); }else { FragmentManager fm = activity.getSupportFragmentManager(); - DeliveryDialog alertDialog = new DeliveryDialog(); + DeliveryDialogFragment alertDialog = new DeliveryDialogFragment(); alertDialog.show(fm, "fragment_alert"); } diff --git a/app/src/main/java/madelyntav/c4q/nyc/chipchop/fragments/Fragment_Buyer_Map.java b/app/src/main/java/madelyntav/c4q/nyc/chipchop/fragments/Fragment_Buyer_Map.java index bf62d5d..4ed61a6 100644 --- a/app/src/main/java/madelyntav/c4q/nyc/chipchop/fragments/Fragment_Buyer_Map.java +++ b/app/src/main/java/madelyntav/c4q/nyc/chipchop/fragments/Fragment_Buyer_Map.java @@ -105,13 +105,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa bindViews(); initializeMap(); setListeners(); - initializeListPanel(); - addSellerMarkers(); - - return root; }