From 7259ab0d59ace16f0a0858b56381509de0d7148e Mon Sep 17 00:00:00 2001
From: Nezumi <123229563+Nez27@users.noreply.github.com>
Date: Sat, 11 Mar 2023 12:02:23 +0700
Subject: [PATCH] Refactor Code

---
 app/src/main/AndroidManifest.xml              |  4 +++-
 .../foodify/Activity/FoodDetailActivity.java  |  2 +-
 .../java/com/capstone/foodify/Common.java     | 13 +++++++++-
 .../foodify/Fragment/HomeFragment.java        | 24 +++----------------
 4 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4b265cd..5df1573 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -37,7 +37,9 @@
             android:exported="false" />
         <activity
             android:name=".Activity.FoodDetailActivity"
-            android:exported="false" />
+            android:exported="false"
+            android:noHistory="true"
+            />
         <activity
             android:name=".Activity.ResetPasswordActivity"
             android:exported="false"
diff --git a/app/src/main/java/com/capstone/foodify/Activity/FoodDetailActivity.java b/app/src/main/java/com/capstone/foodify/Activity/FoodDetailActivity.java
index 0b47f23..9a1abe4 100644
--- a/app/src/main/java/com/capstone/foodify/Activity/FoodDetailActivity.java
+++ b/app/src/main/java/com/capstone/foodify/Activity/FoodDetailActivity.java
@@ -266,7 +266,7 @@ public class FoodDetailActivity extends AppCompatActivity {
 
             @Override
             public void onFailure(Call<Food> call, Throwable t) {
-                Toast.makeText(FoodDetailActivity.this, "Lỗi Food" + t, Toast.LENGTH_SHORT).show();
+                Common.showNotificationError(t, getBaseContext(), FoodDetailActivity.this);
             }
         });
     }
diff --git a/app/src/main/java/com/capstone/foodify/Common.java b/app/src/main/java/com/capstone/foodify/Common.java
index b2b747e..2cea49e 100644
--- a/app/src/main/java/com/capstone/foodify/Common.java
+++ b/app/src/main/java/com/capstone/foodify/Common.java
@@ -9,6 +9,7 @@ import android.net.Network;
 import android.net.NetworkCapabilities;
 import android.net.NetworkInfo;
 import android.os.Build;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 
@@ -63,13 +64,23 @@ public class Common {
                 .setOnClickListener(new OnDialogClickListener() {
                     @Override
                     public void onClick(@NonNull AestheticDialog.Builder builder) {
-                        activity.finish();
+                        activity.finishAffinity();
                         System.exit(0);
                     }
                 })
                 .show();
     }
 
+    public static void showNotificationError(Throwable t, Context context, Activity activity) {
+        if(checkInternetConnection(context)){
+            //Has internet connection
+            Toast.makeText(context, "Error: " + t, Toast.LENGTH_SHORT).show();
+        } else {
+            //No internet, show notification
+            showErrorInternetConnectionNotification(activity);
+        }
+    }
+
     public static Basket getFoodExistInBasket(String foodId) {
         return Common.LIST_BASKET_FOOD.stream().filter(food -> foodId.equals(food.getId())).findFirst().orElse(null);
     }
diff --git a/app/src/main/java/com/capstone/foodify/Fragment/HomeFragment.java b/app/src/main/java/com/capstone/foodify/Fragment/HomeFragment.java
index 5eac56b..be89330 100644
--- a/app/src/main/java/com/capstone/foodify/Fragment/HomeFragment.java
+++ b/app/src/main/java/com/capstone/foodify/Fragment/HomeFragment.java
@@ -113,13 +113,7 @@ public class HomeFragment extends Fragment {
             @Override
             public void onFailure(Call<Foods> call, Throwable t) {
                 //Check internet connection
-                if(Common.checkInternetConnection(getContext())){
-                    //Has internet connection
-                    Toast.makeText(getContext(), "Error: " + t, Toast.LENGTH_SHORT).show();
-                } else {
-                    //No internet, show notification
-                    Common.showErrorInternetConnectionNotification(getActivity());
-                }
+                Common.showNotificationError(t, getContext(), getActivity());
             }
         });
     }
@@ -143,13 +137,7 @@ public class HomeFragment extends Fragment {
             @Override
             public void onFailure(Call<Foods> call, Throwable t) {
                 //Check internet connection
-                if(Common.checkInternetConnection(getContext())){
-                    //Has internet connection
-                    Toast.makeText(getContext(), "Error: " + t, Toast.LENGTH_SHORT).show();
-                } else {
-                    //No internet, show notification
-                    Common.showErrorInternetConnectionNotification(getActivity());
-                }
+                Common.showNotificationError(t,getContext(), getActivity());
             }
         });
     }
@@ -172,13 +160,7 @@ public class HomeFragment extends Fragment {
             @Override
             public void onFailure(Call<Shops> call, Throwable t) {
                 //Check internet connection
-                if(Common.checkInternetConnection(getContext())){
-                    //Has internet connection
-                    Toast.makeText(getContext(), "Error: " + t, Toast.LENGTH_SHORT).show();
-                } else {
-                    //No internet, show notification
-                    Common.showErrorInternetConnectionNotification(getActivity());
-                }
+                Common.showNotificationError(t, getContext(), getActivity());
             }
         });
     }