From 19983d5bd1cedfb8271aff4307c538ead2df91f4 Mon Sep 17 00:00:00 2001 From: Nezumi <123229563+Nez27@users.noreply.github.com> Date: Thu, 30 Mar 2023 18:02:26 +0700 Subject: [PATCH] Fix some layout and bug --- .../foodify/Activity/FoodDetailActivity.java | 4 +- .../Fragment/Order/CancelOrderFragment.java | 14 +++ .../Fragment/Order/CompleteOrderFragment.java | 14 +++ .../Fragment/Order/PreparingFragment.java | 14 +++ .../Fragment/Order/ProcessOderFragment.java | 14 +++ .../Fragment/Order/ShipOrderFragment.java | 14 +++ app/src/main/res/drawable/empty_order.png | Bin 0 -> 5091 bytes .../main/res/layout/fragment_cancel_order.xml | 98 +++++++++++------ .../res/layout/fragment_complete_order.xml | 97 +++++++++++------ .../main/res/layout/fragment_preparing.xml | 97 +++++++++++------ .../res/layout/fragment_process_order.xml | 100 ++++++++++++------ .../main/res/layout/fragment_ship_order.xml | 98 +++++++++++------ 12 files changed, 411 insertions(+), 153 deletions(-) create mode 100644 app/src/main/res/drawable/empty_order.png 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 0000000000000000000000000000000000000000..8cc6f71f71030fb6ea5e855a5f1db25419d1ff8a GIT binary patch literal 5091 zcmeHL`8(8I*e49WW~^U~ZETepp|K>1GGiobvq+4k8C$k$LS@hPotbPELXnKULL*C3 zicu;{q`{Dirw5@T)FUOY-hbnL&vl*aKKJK*&gY!_KKFHgI2Vbo_6R@~5E2qXI2Ogk)U*c46l+^z0U>5@qKR zML8W5b)Fs(D0Ke(d83e1VUhlHMxfE@h!aI$tyG1Cw*5zRcC*{u+}z^-fBXLo{GZCe zG0d~`TLJ%$BD+$Agtv)^iowJsBmpTnLRv;vPF?|2R8mH&sH&-Jpft6#b#%Ay*r|un z-(_HEv>R(|VrsU>e6Phm%l%f?2M*fc@U{fIL-vOq9G#q9T#pb*WQyBS_hTNOR4;EI z-{Um8pMOAL(23xX(6I26r%p4@L_|iNJ$F7jCN?fUA@M>|a!P6%#ALBAre|bkWna2{ zB_}uUYJNfCwd+O2H%e}na>~jpDyyn%Zr#39TUURV+iD?_Izp(~K2-O1`p6zO>DZTP<6Wk*8K~(aKmH?pevppq$&m}A zehuX6$%S>3%U@+78}q2`a{fIvXJ!1Ht(yTke>AAwO+@1}Im9%iEl0wb$)m81!ICXt z3G{ey?UDk3^frCx77W@1Rx!j3AYwzl2{2OwQGE@UazfB?i6w(p8v7et{mNG>%XNz zEfAXhv{=3+qH0S=sZK2uk6l!A9r|Ez{a)QHg=h6CGN$IvQ^bk6EzW7_RZ^k2kCDvT ztF2RJ8wvc6{mDi^B(b#2lU-INKaWr;svBBt; zY`6qCW7E6EAnz?U{0kTalL|!;1*|ql%4F1o1M}a4aH%|X(Z8oP6MI##P>DLNl%i2O z0*apbU&sZQT@Wk%pWWqVew#clpL{F?xXx7H{r&UFWY{Irojt0VrS%9*uztiNexn3p zo%~V5%;MqoSo4a~xfkEa1Jl7v@YJ=3oMhHt2=np>`8mPNVk6SLFh%P)@i`MD_%@c5 zE7hCai}~6kC?+)XS7p9}5i|B1?Q@zV39>&gd=h8agJKKTV*Hx-aij!)) z!Wmq{z6UpPTcDZuQ*QHf$xmLLAEkX|a=m-kausi})9LWH62H_*GL!yLs5<9^ak&2(N6&6X zT{mV&f@xROAVf(I%eguAQ_693Ot|2;Io9_d9q1A0Fa)WXkzzz6^RIO|XoFAhux)cuu#a zbpy22X$ddI$~Oe+Lj|&4u@s9(w=f>o4d>-`biT!zlUOWmo%FGQezv`+GwsbZPSpG9 z&d>PbN39#-ZTVW;{;*s|UpJmvKGYz&kd-@n%|%ejPTDPq+K`vy7P^c+U?=S#3pm=X zy=}bVB{iEZcv+>dDc6wXa#WA-lxR+hlT}d>25yF*Ez<`EwDBz@7T*mKH4;F$<2#zb3z-&iM5UKDIJEnlguoz&0FkL@X6<0L-jipW9dOo|* z08nHUYlAIX5jhE9TSrJbx{n}QSI*d5Tvd#}Ko}GOeUrPIDj8;Ca#8!B+tC)i3_wlJ zp*|Ii?eJ8h6f)VdS-b>BJ^&okD(fb#iK|yiL0$c_BxQ1qLz=_aPN(xHso$dG(zL&J z&wdbm>r7SdsC^BNXx;lqAG4ag@5!AhnQWyXUhSQh<-(k(!W96z$mRxuRlLmBgW}N> zC+cXgzWjb!Uys%ODg-&n(seQ6Nh%*zDz?i7{q7!s{VM88LxGR8?9*;IbuKa+nnd8{ zVmr5M(ztV2`Zh?B-8z8zw^MNZRs&)uy!252HLSbylnlFd7TuTBV91{r@*g0ENx*j` z9+`?KO!R~ASq%w%RfK`XOsXr zN~FV3veI`x5TK>MjQ-5LLINXb0fx=eoiCcf7H!LkL_mX1lZB?R_fn~WSd&Y+ z=J|g(=E?ZoHD^mFoeuF=ONn1n#^ZsLr9ZYq=ZFt8c$S1C6T(0N?xZ|aLi9RRXJcB^ zewc1j_DK=QEj2IZY1N#paNhxscbSSHybcC7rJB`&a!yMI)r)gZ7_yaQml=VN9Eg@T zc~Lb#Yrb3ZyUEcA(oq~oGj9lOC0>~i{(&_QgWbBfw@OpGSv7P+!BLsGCY9$s47Tas zW>TWXL#O%U(v?=gPhwjpK2W{vwjnhBhSO9+{eYj721ae>5`kX1z?FE3|g}cZ3nLM zslW;Cc^DDRa%>c8&c|^O(6$R>Gb;|Zx^xkIu8n-SmEol z@LqsDg?7;ih5rK(}5SXWK#|i$JuSL`~gho4E~f&RSVo%iEi)`p( z22B}wRIR%+9d59?cdPyzo-SgFWu)F6o=Whj-3ujf$uMYLi93=CT5EacgEoHEgU7kFdL0D zkIs5^1)-K%?XT{@M6|szcBHXd9W9>)2>kZlC{qrDQG}=e_RTtHHz*9Wr{%9_(dUY&ud@gr^cK=OW*6$UwIA_&(U#r9) zjW;*?JST3f`+lhQH__SE{_Cp9?pK+t#vQ9g4>$IsDBq|0jz8CxA7b5|NJu+av$33I zJlk=r-ji%scUO6}%OTXbzA2lk=^P>@zWybSPl-@*#Sf+F&oA|di?QbZSgNf=C>NKm zO~nb=i(d~STunG7S^F*J^(u}^Dju+w$$tGg=63%%?fBWnilO^s40h)I;EL9Lygidz z2!1wGw_>rP!4M-caAEk3V7rBlAEw_!j>YhfD%>dw>q;CLEVh?rnm#GT?6IcZH#S>P zD$HLscUd=4_z}8T?a6wTd2E$Wcmwzj@;KJZ=oDy)z1x2Nhm4JURGYzSbIMGu;$}|LfK7(?a%jyttVgjFWkQM zQC%=&%3QNjdk$Yu*M6TOnSh)hhX0;y(pymRgMS{%(k?lm@w{?(x!X-)|4S50EO_vN zpK@h0w>Q8sLoOUqDTn=`0@)~~6noiD1xpD65Ky|3#7N6^o({67!c8KJl(*is^DV|3 zQ6~qE@CJ8)=c;YO459tBT>Vgu%vASK>*jMEgEqj5)`Z=Zut4`3Ub5oSt)mFra`Xgj z$`26Z+S>!B+J>A-<`ot?3L5;3ZuVtb8O zm{X!bY6kkZ2D6R4be?tS&Rz6`M3F%?@w`fkk4uOVymEvj$VsB@Ce4c#O}K{GN1DA5 zIL$dCcU78c;7(OVb%+&JjFQH4Ss!7?$d&?lcenA=9_QaLd}K?TBw8?mHDbzo+YYy_ z+A*mxg>h52qlx=}zf~Ds45(S46`kQn2CPVVWs?W8u>QNgyD2?sW5qr?C721<>>{1D z>}xHcdu~&+?q)bAVP3`|VHe^AHFk>qZ*xT>PX!`_I^92pyk``Go7yhF>J`I>Ym0+6 zcADZI5sJ|9VE@&3}Ix~dyTca zXfXT^Y50|gYM$?O_~-OS@%n)W!g`-GA0*BL28-}&hqnKOY`^p$>3I2R4WGmr`H`lu z1L3ixnEK^f!PTVP;UNCO-*EEgNWzUtk2CE%l{Yq06aJ+4-vKtGjCCr04%#c<-Dq8B i#LQ(}`fx2-;rphCtDl1YFzM~zuN4P7S3*6WmhwNGU9vL( literal 0 HcmV?d00001 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