aditmodhvadia · aditmodhvadia · Jun 9, 2019 · Jun 9, 2019 · Jun 9, 2019 · Jun 9, 2019
diff --git a/app/src/main/java/com/example/getfood/models/FullOrder.java b/app/src/main/java/com/example/getfood/models/FullOrder.java
@@ -1,5 +1,7 @@
 package com.example.getfood.models;
 
+import android.support.annotation.NonNull;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 
@@ -51,4 +53,21 @@ public String getTimeToDeliver() {
     public String getRollNo() {
         return rollNo;
     }
+
+    @NonNull
+    @Override
+    public String toString() {
+        String itemData = "";
+        for (CartItem item : orderItems) {
+            itemData = itemData.concat("\n\t\t\t Item Name: " + item.getItemName() + " Item Quantity: " + item.getItemQuantity()
+                    + " Item Category: " + item.getItemCategory() + " Item Price: " + item.getItemPrice()
+                    + " Item Status: " + item.getItemStatus() + " Item Rating: " + item.getItemRating());
+        }
+        return "\n Display ID: " + displayID + " Order ID: " + orderId
+                + "\n Order Amount: " + orderAmount + " Time to Deliver: " + timeToDeliver
+                + "\n Roll No: " + rollNo + " Order Status: " + orderStatus
+                + "\n Order Items Size: " + orderItems.size() + " Order Status: " + orderStatus
+                + "\n Item Data : " + itemData;
+
+    }
 }
diff --git a/app/src/main/java/com/example/getfood/ui/cart/CartActivity.java b/app/src/main/java/com/example/getfood/ui/cart/CartActivity.java
@@ -10,6 +10,7 @@
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
@@ -114,12 +115,12 @@ public void initViews() {
         cartRecyclerView = findViewById(R.id.cartRecyclerView);
         cartRecyclerView.setHasFixedSize(true);
         cartRecyclerView.setLayoutManager(new LinearLayoutManager(this));
+        cartRecyclerView.addItemDecoration(new DividerItemDecoration(cartRecyclerView.getContext(), LinearLayoutManager.VERTICAL));
 
 
         totalPriceTV = findViewById(R.id.totalPriceTV);
         orderButton = findViewById(R.id.orderButton);
 
-//        setDisplayListView(getApplicationContext());
         CartRecyclerViewDisplayAdapter adapter = new CartRecyclerViewDisplayAdapter(FoodMenuDisplayActivity.cartItems, this);
         cartRecyclerDisplayAdapter = adapter;
         cartRecyclerView.setAdapter(cartRecyclerDisplayAdapter);

diff --git a/app/src/main/java/com/example/getfood/ui/cart/CartRecyclerViewDisplayAdapter.java b/app/src/main/java/com/example/getfood/ui/cart/CartRecyclerViewDisplayAdapter.java
@@ -37,7 +37,7 @@ public CartRecyclerViewDisplayAdapter(ArrayList<CartItem> cartItems, Context con
     public CartRecyclerViewDisplayAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 
         View v = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.cart_display_customlistview, parent, false);
+                .inflate(R.layout.cart_display_view_item, parent, false);
 
         return new ViewHolder(v);
 

diff --git a/app/src/main/java/com/example/getfood/ui/foodmenu/FoodCategoryFragment.java b/app/src/main/java/com/example/getfood/ui/foodmenu/FoodCategoryFragment.java
@@ -5,19 +5,16 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
+import android.support.v7.widget.DividerItemDecoration;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ListView;
 import android.widget.Toast;
 
 import com.example.getfood.R;
-import com.example.getfood.models.CartItem;
 import com.example.getfood.models.FoodItem;
-import com.example.getfood.utils.AlertUtils;
-import com.example.getfood.utils.AppUtils;
-import com.example.getfood.utils.DialogAddToCart;
 import com.facebook.shimmer.ShimmerFrameLayout;
 import com.google.firebase.database.DataSnapshot;
 import com.google.firebase.database.DatabaseError;
@@ -32,9 +29,9 @@ public class FoodCategoryFragment extends Fragment {
 
     List<FoodItem> foodItem;
     String CATEGORY = null;
-    ListView foodDisplayListView;
-    MenuDisplayAdapter displayAdapter;
     ShimmerFrameLayout shimmerLayout;
+    private RecyclerView foodRecyclerView;
+    private FoodMenuRecyclerViewDisplayAdapter mAdapter;
 
     public FoodCategoryFragment() {
         // Required empty public constructor
@@ -44,11 +41,15 @@ public FoodCategoryFragment() {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
-        View v = inflater.inflate(R.layout.fragment_chinese, container, false);
+        View v = inflater.inflate(R.layout.fragment_food_category, container, false);
         shimmerLayout = v.findViewById(R.id.shimmerLayout);
-        foodDisplayListView = v.findViewById(R.id.chineseDisplayListView);
+        foodRecyclerView = v.findViewById(R.id.foodDisplayRecyclerView);
+        foodRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        foodRecyclerView.addItemDecoration(new DividerItemDecoration(foodRecyclerView.getContext(), LinearLayoutManager.VERTICAL));
+
         foodItem = new ArrayList<>();
 
+//        Log.d("##DebugData", AppUtils.getInstance(getContext()).generateString());
         Bundle args = this.getArguments();
 
         if (args != null) {
@@ -82,12 +83,12 @@ public void onDataChange(DataSnapshot dataSnapshot) {
                 handler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
-                        displayAdapter = new MenuDisplayAdapter(foodItem, getContext());
-                        foodDisplayListView.setAdapter(displayAdapter);
+                        mAdapter = new FoodMenuRecyclerViewDisplayAdapter(foodItem, getContext());
+                        foodRecyclerView.setAdapter(mAdapter);
                         shimmerLayout.stopShimmer();
                         shimmerLayout.setVisibility(View.GONE);
                     }
-                }, 1000);
+                }, 500);
 
 
 //                progressDialog.hide();
@@ -97,58 +98,11 @@ public void run() {
             public void onCancelled(DatabaseError databaseError) {
             }
         });
-
-        foodDisplayListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> adapterView, View view, final int position, long l) {
-
-                if (AppUtils.isItemInCart(FoodMenuDisplayActivity.cartItems, foodItem.get(position)) != -1) {
-                    Toast.makeText(getContext(), getString(R.string.item_in_cart), Toast.LENGTH_SHORT).show();
-                } else {
-                    AlertUtils.showAddToCartDialog(getContext(), foodItem.get(position), new DialogAddToCart.AddToCartDialogListener() {
-
-                        @Override
-                        public void onAddToCartClicked(int quantity) {
-                            if (quantity != 0) {
-                                int probablePosition = AppUtils.isItemInCart(FoodMenuDisplayActivity.cartItems, foodItem.get(position));
-                                if (probablePosition != -1) {
-                                    FoodMenuDisplayActivity.cartItems.get(probablePosition)
-                                            .setItemQuantity(FoodMenuDisplayActivity.cartItems
-                                                    .get(probablePosition).getItemQuantity() + quantity);
-                                } else {
-                                    FoodMenuDisplayActivity.cartItems.add(new CartItem(foodItem.get(position),
-                                            "Order-Placed", quantity));
-                                }
-                                Toast.makeText(getContext(), getString(R.string.add_to_cart), Toast.LENGTH_LONG).show();
-                            }
-                        }
-
-                        @Override
-                        public void onCancelClicked() {
-
-                        }
-
-                        @Override
-                        public void onIncreaseQuantityClicked() {
-
-                        }
-
-                        @Override
-                        public void onDecreaseQuantityClicked() {
-
-                        }
-                    });
-                }
-            }
-        });
-
         return v;
     }
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-
-
     }
 }
diff --git a/app/src/main/java/com/example/getfood/ui/foodmenu/FoodMenuRecyclerViewDisplayAdapter.java b/app/src/main/java/com/example/getfood/ui/foodmenu/FoodMenuRecyclerViewDisplayAdapter.java
@@ -0,0 +1,126 @@
+package com.example.getfood.ui.foodmenu;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.example.getfood.R;
+import com.example.getfood.models.CartItem;
+import com.example.getfood.models.FoodItem;
+import com.example.getfood.utils.AlertUtils;
+import com.example.getfood.utils.AppUtils;
+import com.example.getfood.utils.DialogAddToCart;
+
+import java.util.List;
+
+public class FoodMenuRecyclerViewDisplayAdapter extends RecyclerView.Adapter<FoodMenuRecyclerViewDisplayAdapter.ViewHolder> {
+
+    private List<FoodItem> foodItemList;
+    private Context context;
+
+    public FoodMenuRecyclerViewDisplayAdapter(List<FoodItem> foodItemList, Context context) {
+        this.foodItemList = foodItemList;
+        this.context = context;
+    }
+
+    @NonNull
+    @Override
+    public FoodMenuRecyclerViewDisplayAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+        View v = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.food_menu_display_view_item, parent, false);
+
+        return new ViewHolder(v);
+
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull final FoodMenuRecyclerViewDisplayAdapter.ViewHolder holder, final int position) {
+
+
+        holder.itemNameTextView.setText(foodItemList.get(position).getItemName());
+        holder.itemPriceTextView.setText(String.format("%s %s", context.getString(R.string.rupee_symbol), foodItemList.get(position).getItemPrice()));
+        if (foodItemList.get(position).getItemRating() != null) {
+            holder.itemRatingTextView.setText(foodItemList.get(position).getItemRating());
+            holder.itemRatingTextView.setTextColor(AppUtils.getColorForRating(context, foodItemList.get(position).getItemRating()));
+
+        } else {
+            holder.itemRatingTextView.setVisibility(View.INVISIBLE);
+            holder.ivRatingStar.setVisibility(View.INVISIBLE);
+        }
+
+        holder.itemView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (AppUtils.isItemInCart(FoodMenuDisplayActivity.cartItems, foodItemList.get(position)) != -1) {
+                    Toast.makeText(context, context.getString(R.string.item_in_cart), Toast.LENGTH_SHORT).show();
+                } else {
+                    AlertUtils.showAddToCartDialog(context, foodItemList.get(position), new DialogAddToCart.AddToCartDialogListener() {
+
+                        @Override
+                        public void onAddToCartClicked(int quantity) {
+                            if (quantity != 0) {
+                                int probablePosition = AppUtils.isItemInCart(FoodMenuDisplayActivity.cartItems, foodItemList.get(position));
+                                if (probablePosition != -1) {
+                                    FoodMenuDisplayActivity.cartItems.get(probablePosition)
+                                            .setItemQuantity(FoodMenuDisplayActivity.cartItems
+                                                    .get(probablePosition).getItemQuantity() + quantity);
+                                } else {
+                                    FoodMenuDisplayActivity.cartItems.add(new CartItem(foodItemList.get(position),
+                                            "Order-Placed", quantity));
+                                }
+                                Toast.makeText(context, context.getString(R.string.add_to_cart), Toast.LENGTH_LONG).show();
+                            }
+                        }
+
+                        @Override
+                        public void onCancelClicked() {
+
+                        }
+
+                        @Override
+                        public void onIncreaseQuantityClicked() {
+
+                        }
+
+                        @Override
+                        public void onDecreaseQuantityClicked() {
+
+                        }
+                    });
+                }
+            }
+        });
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return foodItemList.size();
+    }
+
+    public Context getContext() {
+        return context;
+    }
+
+
+    class ViewHolder extends RecyclerView.ViewHolder {
+
+        TextView itemNameTextView, itemPriceTextView, itemRatingTextView;
+        ImageView ivRatingStar;
+
+        ViewHolder(View itemView) {
+            super(itemView);
+            itemNameTextView = itemView.findViewById(R.id.itemNameTextView);
+            itemPriceTextView = itemView.findViewById(R.id.itemPriceTextView);
+            itemRatingTextView = itemView.findViewById(R.id.itemRatingTextView);
+            ivRatingStar = itemView.findViewById(R.id.ivRatingStar);
+        }
+    }
+}
diff --git a/app/src/main/java/com/example/getfood/ui/foodmenu/MenuDisplayAdapter.java b/app/src/main/java/com/example/getfood/ui/foodmenu/MenuDisplayAdapter.java