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 15d2b50..8d50104 100644 --- a/app/src/main/java/com/capstone/foodify/Activity/FoodDetailActivity.java +++ b/app/src/main/java/com/capstone/foodify/Activity/FoodDetailActivity.java @@ -356,7 +356,7 @@ public class FoodDetailActivity extends AppCompatActivity { } } else if(response.code() == 404){ //Don't have user comment - user_comment_layout.setVisibility(View.INVISIBLE); + user_comment_layout.setVisibility(View.GONE); showUI(); } else { Toast.makeText(FoodDetailActivity.this, "Có lỗi từ hệ thống! Mã lỗi: " + response.code(), Toast.LENGTH_SHORT).show(); @@ -689,7 +689,7 @@ public class FoodDetailActivity extends AppCompatActivity { //Remove layout comment rating_button.setVisibility(View.VISIBLE); - user_comment_layout.setVisibility(View.INVISIBLE); + user_comment_layout.setVisibility(View.GONE); //Update information food progressLayout.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/com/capstone/foodify/Fragment/Order/CancelOrderFragment.java b/app/src/main/java/com/capstone/foodify/Fragment/Order/CancelOrderFragment.java index 254ad82..5bb74fe 100644 --- a/app/src/main/java/com/capstone/foodify/Fragment/Order/CancelOrderFragment.java +++ b/app/src/main/java/com/capstone/foodify/Fragment/Order/CancelOrderFragment.java @@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; @@ -42,6 +43,7 @@ public class CancelOrderFragment extends Fragment { NestedScrollView nestedScrollView; private ProgressBar progressBar; private TextView endOfListText; + private LinearLayout empty_layout; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -79,6 +81,7 @@ public class CancelOrderFragment extends Fragment { nestedScrollView = view.findViewById(R.id.root_view); progressBar = view.findViewById(R.id.progress_bar); endOfListText = view.findViewById(R.id.end_of_list_text); + empty_layout = view.findViewById(R.id.empty_layout); } private void getOrderUser(int page){ @@ -96,6 +99,17 @@ public class CancelOrderFragment extends Fragment { if(LAST_PAGE) hideProgressBarAndShowEndOfList(); + //If don't have order + if(listOrders.size() == 0){ + nestedScrollView.setVisibility(View.GONE); + + empty_layout.setVisibility(View.VISIBLE); + } else { + nestedScrollView.setVisibility(View.VISIBLE); + + empty_layout.setVisibility(View.GONE); + } + orderAdapter.setData(listOrders); recyclerView.setAdapter(orderAdapter); } else { diff --git a/app/src/main/java/com/capstone/foodify/Fragment/Order/CompleteOrderFragment.java b/app/src/main/java/com/capstone/foodify/Fragment/Order/CompleteOrderFragment.java index 24e2431..69f500f 100644 --- a/app/src/main/java/com/capstone/foodify/Fragment/Order/CompleteOrderFragment.java +++ b/app/src/main/java/com/capstone/foodify/Fragment/Order/CompleteOrderFragment.java @@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; @@ -43,6 +44,7 @@ public class CompleteOrderFragment extends Fragment { NestedScrollView nestedScrollView; private ProgressBar progressBar; private TextView endOfListText; + private LinearLayout empty_layout; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, @@ -81,6 +83,7 @@ public class CompleteOrderFragment extends Fragment { nestedScrollView = view.findViewById(R.id.root_view); progressBar = view.findViewById(R.id.progress_bar); endOfListText = view.findViewById(R.id.end_of_list_text); + empty_layout = view.findViewById(R.id.empty_layout); } private void getOrderUser(int page){ @@ -98,6 +101,17 @@ public class CompleteOrderFragment extends Fragment { if(LAST_PAGE) hideProgressBarAndShowEndOfList(); + //If don't have order + if(listOrders.size() == 0){ + nestedScrollView.setVisibility(View.GONE); + + empty_layout.setVisibility(View.VISIBLE); + } else { + nestedScrollView.setVisibility(View.VISIBLE); + + empty_layout.setVisibility(View.GONE); + } + orderAdapter.setData(listOrders); recyclerView.setAdapter(orderAdapter); } else { diff --git a/app/src/main/java/com/capstone/foodify/Fragment/Order/PreparingFragment.java b/app/src/main/java/com/capstone/foodify/Fragment/Order/PreparingFragment.java index b4c2913..1c3feee 100644 --- a/app/src/main/java/com/capstone/foodify/Fragment/Order/PreparingFragment.java +++ b/app/src/main/java/com/capstone/foodify/Fragment/Order/PreparingFragment.java @@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; @@ -42,6 +43,7 @@ public class PreparingFragment extends Fragment { NestedScrollView nestedScrollView; private ProgressBar progressBar; private TextView endOfListText; + private LinearLayout empty_layout; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, @@ -80,6 +82,7 @@ public class PreparingFragment extends Fragment { nestedScrollView = view.findViewById(R.id.root_view); progressBar = view.findViewById(R.id.progress_bar); endOfListText = view.findViewById(R.id.end_of_list_text); + empty_layout = view.findViewById(R.id.empty_layout); } private void getOrderUser(int page){ @@ -97,6 +100,17 @@ public class PreparingFragment extends Fragment { if(LAST_PAGE) hideProgressBarAndShowEndOfList(); + //If don't have order + if(listOrders.size() == 0){ + nestedScrollView.setVisibility(View.GONE); + + empty_layout.setVisibility(View.VISIBLE); + } else { + nestedScrollView.setVisibility(View.VISIBLE); + + empty_layout.setVisibility(View.GONE); + } + orderAdapter.setData(listOrders); recyclerView.setAdapter(orderAdapter); } else { diff --git a/app/src/main/java/com/capstone/foodify/Fragment/Order/ProcessOderFragment.java b/app/src/main/java/com/capstone/foodify/Fragment/Order/ProcessOderFragment.java index 8a7669d..3613095 100644 --- a/app/src/main/java/com/capstone/foodify/Fragment/Order/ProcessOderFragment.java +++ b/app/src/main/java/com/capstone/foodify/Fragment/Order/ProcessOderFragment.java @@ -5,6 +5,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; @@ -42,6 +43,7 @@ public class ProcessOderFragment extends Fragment { NestedScrollView nestedScrollView; private ProgressBar progressBar; private TextView endOfListText; + private LinearLayout empty_layout; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, @@ -82,6 +84,7 @@ public class ProcessOderFragment extends Fragment { nestedScrollView = view.findViewById(R.id.root_view); progressBar = view.findViewById(R.id.progress_bar); endOfListText = view.findViewById(R.id.end_of_list_text); + empty_layout = view.findViewById(R.id.empty_layout); } private void getOrderUser(int page){ @@ -99,6 +102,17 @@ public class ProcessOderFragment extends Fragment { if(LAST_PAGE) hideProgressBarAndShowEndOfList(); + //If don't have order + if(listOrders.size() == 0){ + nestedScrollView.setVisibility(View.GONE); + + empty_layout.setVisibility(View.VISIBLE); + } else { + nestedScrollView.setVisibility(View.VISIBLE); + + empty_layout.setVisibility(View.GONE); + } + orderAdapter.setData(listOrders); recyclerView.setAdapter(orderAdapter); } else { diff --git a/app/src/main/java/com/capstone/foodify/Fragment/Order/ShipOrderFragment.java b/app/src/main/java/com/capstone/foodify/Fragment/Order/ShipOrderFragment.java index 60a42ab..ec8bfda 100644 --- a/app/src/main/java/com/capstone/foodify/Fragment/Order/ShipOrderFragment.java +++ b/app/src/main/java/com/capstone/foodify/Fragment/Order/ShipOrderFragment.java @@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; @@ -43,6 +44,7 @@ public class ShipOrderFragment extends Fragment { NestedScrollView nestedScrollView; private ProgressBar progressBar; private TextView endOfListText; + private LinearLayout empty_layout; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, @@ -80,6 +82,7 @@ public class ShipOrderFragment extends Fragment { nestedScrollView = view.findViewById(R.id.root_view); progressBar = view.findViewById(R.id.progress_bar); endOfListText = view.findViewById(R.id.end_of_list_text); + empty_layout = view.findViewById(R.id.empty_layout); } private void getOrderUser(int page){ @@ -97,6 +100,17 @@ public class ShipOrderFragment extends Fragment { if(LAST_PAGE) hideProgressBarAndShowEndOfList(); + //If don't have order + if(listOrders.size() == 0){ + nestedScrollView.setVisibility(View.GONE); + + empty_layout.setVisibility(View.VISIBLE); + } else { + nestedScrollView.setVisibility(View.VISIBLE); + + empty_layout.setVisibility(View.GONE); + } + orderAdapter.setData(listOrders); recyclerView.setAdapter(orderAdapter); } else { diff --git a/app/src/main/res/drawable/empty_order.png b/app/src/main/res/drawable/empty_order.png new file mode 100644 index 0000000..8cc6f71 Binary files /dev/null and b/app/src/main/res/drawable/empty_order.png differ diff --git a/app/src/main/res/layout/fragment_cancel_order.xml b/app/src/main/res/layout/fragment_cancel_order.xml index f438a0b..d0d80da 100644 --- a/app/src/main/res/layout/fragment_cancel_order.xml +++ b/app/src/main/res/layout/fragment_cancel_order.xml @@ -1,47 +1,85 @@ - + > - - - + + android:layout_height="wrap_content"> - + + + + + + + + + - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_complete_order.xml b/app/src/main/res/layout/fragment_complete_order.xml index b44dd5a..7ccdb76 100644 --- a/app/src/main/res/layout/fragment_complete_order.xml +++ b/app/src/main/res/layout/fragment_complete_order.xml @@ -1,48 +1,85 @@ - - - - + + android:layout_height="wrap_content"> - + + + + + + + + + - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_preparing.xml b/app/src/main/res/layout/fragment_preparing.xml index 1c01b38..b454bf5 100644 --- a/app/src/main/res/layout/fragment_preparing.xml +++ b/app/src/main/res/layout/fragment_preparing.xml @@ -1,48 +1,85 @@ - - - - + + android:layout_height="wrap_content"> - + + + + + + + + + - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_process_order.xml b/app/src/main/res/layout/fragment_process_order.xml index 4841319..50dabb1 100644 --- a/app/src/main/res/layout/fragment_process_order.xml +++ b/app/src/main/res/layout/fragment_process_order.xml @@ -1,47 +1,85 @@ - + > - - - + + android:layout_height="wrap_content"> - + + + + + + + + + - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_ship_order.xml b/app/src/main/res/layout/fragment_ship_order.xml index 27a6f4b..bedc4ba 100644 --- a/app/src/main/res/layout/fragment_ship_order.xml +++ b/app/src/main/res/layout/fragment_ship_order.xml @@ -1,47 +1,85 @@ - + > - - - + + android:layout_height="wrap_content"> - + + + + + + + + + - - \ No newline at end of file + + + + \ No newline at end of file