nezumi/Foodify
1
0
Fork 0
mirror of https://github.com/Nezumi-2711/Foodify.git synced 2026-09-23 04:09:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some layout and bug

Browse Source
This commit is contained in:
Nezumi
2023-03-30 18:02:26 +07:00
parent bedfc013ba
commit 19983d5bd1
12 changed files with 411 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/capstone/foodify/Activity/FoodDetailActivity.java
+2 -2
View File
@@ -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);
app/src/main/java/com/capstone/foodify/Fragment/Order/CancelOrderFragment.java
+14
View File
@@ -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 {
app/src/main/java/com/capstone/foodify/Fragment/Order/CompleteOrderFragment.java
+14
View File
@@ -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 {
app/src/main/java/com/capstone/foodify/Fragment/Order/PreparingFragment.java
+14
View File
@@ -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 {
app/src/main/java/com/capstone/foodify/Fragment/Order/ProcessOderFragment.java
+14
View File
@@ -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 {
app/src/main/java/com/capstone/foodify/Fragment/Order/ShipOrderFragment.java
+14
View File
@@ -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 {