From 565fb6f745f39e71d395bbea25bb6431a7f769c2 Mon Sep 17 00:00:00 2001
From: phanhuuloi27 <73208452+Nezumi2711@users.noreply.github.com>
Date: Mon, 4 Jul 2022 22:11:21 +0700
Subject: [PATCH] Fix Crash App and add add log out function Server App

---
 .../java/com/waterbase/foodifyServer/Home.java     |  6 ++++++
 .../foodifyServer/ViewHolder/FoodViewHolder.java   | 14 +-------------
 .../app/src/main/res/layout/food_item.xml          |  1 +
 .../app/src/main/res/layout/menu_item.xml          |  1 +
 .../app/src/main/res/menu/activity_main_drawer.xml |  6 +-----
 5 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Home.java b/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Home.java
index c6985cd..9c4c6c8 100644
--- a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Home.java
+++ b/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/Home.java
@@ -304,6 +304,12 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati
         } else if(id == R.id.nav_message) {
             Intent banner = new Intent(Home.this, SendMessage.class);
             startActivity(banner);
+        } else if (id == R.id.nav_log_out) {
+            //Logout
+            Intent signIn = new Intent(Home.this, SignIn.class);
+            signIn.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+            startActivity(signIn);
+            finish();
         }
 
         DrawerLayout drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
diff --git a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/ViewHolder/FoodViewHolder.java b/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/ViewHolder/FoodViewHolder.java
index 306d4f6..1f99baf 100644
--- a/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/ViewHolder/FoodViewHolder.java
+++ b/FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/ViewHolder/FoodViewHolder.java
@@ -11,12 +11,10 @@ import com.waterbase.foodifyServer.Common.Common;
 import com.waterbase.foodifyServer.Interface.ItemClickListener;
 import com.waterbase.foodifyServer.R;
 
-public class FoodViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnCreateContextMenuListener{
+public class FoodViewHolder extends RecyclerView.ViewHolder implements View.OnCreateContextMenuListener{
     public TextView txtFoodName;
     public ImageView imageView;
 
-    private ItemClickListener itemClickListener;
-
     public FoodViewHolder(View itemView) {
         super(itemView);
 
@@ -24,16 +22,6 @@ public class FoodViewHolder extends RecyclerView.ViewHolder implements View.OnCl
         imageView = (ImageView) itemView.findViewById(R.id.food_image);
 
         itemView.setOnCreateContextMenuListener(this);
-        itemView.setOnClickListener(this);
-    }
-
-    public void setItemClickListener(ItemClickListener itemClickListener) {
-        this.itemClickListener = itemClickListener;
-    }
-
-    @Override
-    public void onClick(View v) {
-        itemClickListener.onClick(v, getAdapterPosition(), false);
     }
 
     @Override
diff --git a/FoodifyServer/app/src/main/res/layout/food_item.xml b/FoodifyServer/app/src/main/res/layout/food_item.xml
index 6f5eec8..d8ac51d 100644
--- a/FoodifyServer/app/src/main/res/layout/food_item.xml
+++ b/FoodifyServer/app/src/main/res/layout/food_item.xml
@@ -4,6 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="200dp"
+    android:layout_margin="5dp"
     app:cardElevation="4dp"
     android:layout_marginBottom="8dp"
     >
diff --git a/FoodifyServer/app/src/main/res/layout/menu_item.xml b/FoodifyServer/app/src/main/res/layout/menu_item.xml
index 0210b8c..9326850 100644
--- a/FoodifyServer/app/src/main/res/layout/menu_item.xml
+++ b/FoodifyServer/app/src/main/res/layout/menu_item.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="200dp"
+    android:layout_margin="5dp"
     app:cardElevation="4dp"
     >
 
diff --git a/FoodifyServer/app/src/main/res/menu/activity_main_drawer.xml b/FoodifyServer/app/src/main/res/menu/activity_main_drawer.xml
index 37f5ccc..7a6bde1 100644
--- a/FoodifyServer/app/src/main/res/menu/activity_main_drawer.xml
+++ b/FoodifyServer/app/src/main/res/menu/activity_main_drawer.xml
@@ -12,16 +12,12 @@
             android:id="@+id/nav_message"
             android:icon="@drawable/ic_baseline_message_24"
             android:title="Thông báo" />
-        <item
-            android:id="@+id/nav_cart"
-            android:icon="@drawable/ic_baseline_shopping_cart_24"
-            android:title="Giỏ hàng" />
         <item
             android:id="@+id/nav_orders"
             android:icon="@drawable/ic_baseline_access_time_24"
             android:title="Tình trạng đơn hàng" />
         <item
-            android:id="@+id/nav_sign_out"
+            android:id="@+id/nav_log_out"
             android:icon="@drawable/ic_baseline_exit_to_app_24"
             android:title="Đăng xuất" />
     </group>