From 31d8f6d0cf0a66ac4248e1f83f79bd849ce72905 Mon Sep 17 00:00:00 2001 From: emkartal1 Date: Sat, 8 Apr 2023 16:21:57 +0200 Subject: [PATCH] Correct error Date Matches :bug: --- .../java/uca/iut/clermont/view/HomeFragment.kt | 16 ++++++++++++---- .../clermont/view/adapter/MatchesAdapter.kt | 2 -- .../clermont/view/viewModel/HomeViewModel.kt | 8 ++++++-- src/app/src/main/res/drawable/restart.png | Bin 0 -> 8877 bytes src/app/src/main/res/layout/fragment_home.xml | 17 +++++++++++++++-- 5 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 src/app/src/main/res/drawable/restart.png diff --git a/src/app/src/main/java/uca/iut/clermont/view/HomeFragment.kt b/src/app/src/main/java/uca/iut/clermont/view/HomeFragment.kt index e32d365..da0288a 100644 --- a/src/app/src/main/java/uca/iut/clermont/view/HomeFragment.kt +++ b/src/app/src/main/java/uca/iut/clermont/view/HomeFragment.kt @@ -29,8 +29,10 @@ class HomeFragment : Fragment() { val view = inflater.inflate(R.layout.fragment_home, container, false) - val text = view.findViewById(R.id.textEmpty) + val buttonFavorite = view.findViewById(R.id.buttonFavorite) + val restartMatches = view.findViewById(R.id.restartMatches) + val text = view.findViewById(R.id.textEmpty) viewModel.matches.observe(viewLifecycleOwner, Observer { matches -> matches?.let { if (it.isNotEmpty()) { @@ -41,14 +43,16 @@ class HomeFragment : Fragment() { } }) - viewModel.loadMatches() - - val buttonFavorite = view.findViewById(R.id.buttonFavorite) + displayMatches(view) buttonFavorite.setOnClickListener { findNavController().navigate(R.id.favoriteFragment) } + restartMatches.setOnClickListener { + displayMatches(view) + } + return view } @@ -62,5 +66,9 @@ class HomeFragment : Fragment() { } + private fun displayMatches(view: View) { + viewModel.loadMatches() + } + } \ No newline at end of file diff --git a/src/app/src/main/java/uca/iut/clermont/view/adapter/MatchesAdapter.kt b/src/app/src/main/java/uca/iut/clermont/view/adapter/MatchesAdapter.kt index c3ad4b5..acf8f04 100644 --- a/src/app/src/main/java/uca/iut/clermont/view/adapter/MatchesAdapter.kt +++ b/src/app/src/main/java/uca/iut/clermont/view/adapter/MatchesAdapter.kt @@ -2,7 +2,6 @@ package uca.iut.clermont.view.adapter import android.view.LayoutInflater import android.view.ViewGroup -import androidx.core.view.marginTop import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide import uca.iut.clermont.R @@ -34,7 +33,6 @@ class MatchesAdapter(private val recentMatches: Array) : } val date = recentMatches[position].date - date.add(Calendar.HOUR_OF_DAY, 2) val formatter = SimpleDateFormat("dd/MM/yyyy' 'HH:mm", Locale.US) val formattedDate = formatter.format(date.time) diff --git a/src/app/src/main/java/uca/iut/clermont/view/viewModel/HomeViewModel.kt b/src/app/src/main/java/uca/iut/clermont/view/viewModel/HomeViewModel.kt index 4176542..454642f 100644 --- a/src/app/src/main/java/uca/iut/clermont/view/viewModel/HomeViewModel.kt +++ b/src/app/src/main/java/uca/iut/clermont/view/viewModel/HomeViewModel.kt @@ -6,6 +6,7 @@ import androidx.lifecycle.viewModelScope import kotlinx.coroutines.launch import uca.iut.clermont.api.ApiManager import uca.iut.clermont.model.Match +import java.util.* class HomeViewModel : ViewModel() { @@ -13,8 +14,11 @@ class HomeViewModel : ViewModel() { val matches = MutableLiveData?>() fun loadMatches() = viewModelScope.launch { - val matchResult = manager.matchesMgr.getItems() - matches.value = matchResult.filter { it.status != "TIMED" }.sortedByDescending { it.date } + val matchResults = manager.matchesMgr.getItems() + matches.value = matchResults.filter { it.status != "TIMED" } + .apply { forEach { it.date.add(Calendar.HOUR_OF_DAY, 2) } } + .sortedBy { it.competition.name } + .sortedByDescending { it.date } } } \ No newline at end of file diff --git a/src/app/src/main/res/drawable/restart.png b/src/app/src/main/res/drawable/restart.png new file mode 100644 index 0000000000000000000000000000000000000000..e5510247f95b42b9c50a6860425470f0ed542e87 GIT binary patch literal 8877 zcmX9^bwHEf*Wbp7(Tr}K1L;x;DWyY7q-%hbv@|0I5~II>gn}Tg(u#!CXaxyDVM>h# zsiDM#0q^|1e?0#@_ndRjIrnqoMzV>K4jnZYH2?sh)6>;_0002*{`;sXNPouut9%Op z2mtgn?>!7F+FOW9vp7mpa|X*t_}*Tfgi<=Z-!%*Xd7t?3_B}f zOlF`X7l^;)3D!_XjbPTC%FGE}hwi(AbwE7adw< zmEeMmXc`vJIZB@KtsX%rogikdS=6Mq{z9=vb9OxE?rnc=&3RMM?h@4rSK-507>#kf zFAA-rkLvQYd{r=DS?0A4#yf9mqr)n|VHSb0D|WT+t$9KJMACG!eq@62vC05L#7yox zCrcl-**|cgq)+sXN9$PF8+8rBbx|_x z!td}wTNIx_F4(mo$ZpXj-Il2XiBAbg6t^MU9dk!rQAd)8F{Xc|SgoV9Y9=v0Mq$r(Mz*7Io<8S_2iOO&cj9qx@e>{@3yL z%^$3tKMG=oK!Z}>qZ>e4JRxNo|NSnD3%=C?$OOo{B%7>0)p&d3F01fw9b3e@F=rbU zQuRs-Z;sOuW}>g9jpRb++K>ORv=;nG*rQqi=#44(3+B;Y@rgb2`1J*#k1?}?MDtpF zF#nypRO3Nxpc0Dh0TuV&kzI8vWG;cuBwSv9=roeEutkf5JqP=Ox-){^z9ny)LJFnN zsqjc)$VLMFJ*i?-?|obs_S^HO#<66LiyK<3glqWoEg}{>2AC*~JuI_{ONT6Guo@_f zhX&U))z}?CE`cxHS>7{a#Tr>=sqiwmIn0g6F?nn+hN*w4^e(BZ^jd8*2EDOO^l3i^ z{Gx05=G*u%AuFsaBLe@#0%FB5546i1qFAc72R(FxI~bR$tUoIC^cGpD!@h_r4Q#hd z$WrhmM>m@R>-&Z%Q(Vnk6u)1yOy3SAy;03|}}fw@JL=k^{b#UP+?Amkh~r$L`x?j>xi^M5Lc#_mosiK!#L~Q zW^)d`37Rch1jHT8&D{Bds`}HT?+8}ysd6w!$%56os+3Sucw9cSHI(><_R97THrdsf zj2)1Aljyhkownt9Wr{#RIHZlA0KoszbkKeMmjTlN^mBd>-RPGaZa9;PN@`54;80!! z%AEus59S2yem^wqTQblaS;^wL?JVF{zrA}RXnd_xX~mV-3CwX#dYkhw&#sw zhlUARm#Ydh$ULG=vX5>=BK~yl)giO@=c1##30aG)iikl(zBTMYpB!IUGX8Y_RR9Y? zfvaKvE!Zw0oj?9^s&lxDWsA@kC+0$#ucqDE)vJQ}Ss`_QQJi95h?vi+5lMcbDe*!C zC%3XEpq#j9^HbD?A(*cU@QA69^5Y1!BLLTc4(yDiZ(|lq)6E$*{k?NzoO@T+fc{w% zKT4)v;CcVht>cp^#Pyc9*N*a;4T$l&t^C=Vb)XieC9%UfY=vL%(Cz5E1S!EP?48Nn zJY}2YE{h=xo*yY=0piW3D}3MRSZ#o?bT+ajcs)FfqAeGcNtuW8nrvGVkRJ~wv-A7h z8X#WEbAzbz)2nD;NR~#CuZ_C!3-_4;T7n)}NYS>K9g~VGq>9NrVZLHekWWutw&rY0 z!n3Olh0$9rUJ2%d{_?b(!H&9qdMQ(+RX!2qdE0X~bjx8`gs%#-Dm0a2x{Lo^!gv|I zce@+)=cP;b6TW~3FIrwvl&+L0RtVgb2H`6Mn7Is1K4^7v3G89Fr>+4-=7l*V@e2;` z%o$*ApkvC1CreocrZP=&f8u-mkjc}SV^TGXyl)PSF zsj#>zc3~f#Rj-fjRGQGrTGg~-d_E8%UMl5Kyz-*E8<@42=JcLM`9^P@l~MB02SS7F zAj@#m%^a<%Mvf)kJVn?qfH+yPAW_SUof3T@{oMU4n^m^tLE$syr|Wr|l`^j{19po* znQl#j_j(w1>E@nwcV-wmGU|;Q;Zm_TSH6nkQYO>4+<1B_j}>wB-VUUiimI!lTc~$X zCujUT!bYTb>`Go;a2~ju+M}I^N=3Wm>fc)Bhjw}HT0^2HT2m)hgPt5c z*;P?FB7e+!0O0rix)EWF|L>_>2=%{=^pUE^>ojyZ2)&mY-=k2saw|kzy}E>p8$ZYV z?b=rM2U$EPai1s9Ac8+idYVut;8T9iQ+Bq4=cC;7p(o|JYvO$eHFz(~uOronm=O#e zp-4BJrLA*#!nDsJr%Ui2>s|OWL&E$(7(D@Mw3wFX?2b(A7Oq>VIcm+Av~^mem3w0c zkEf1KYKcx;FUH9+UphCZXwZhlDzj?SBOuoBXAmO2ANc`Kn7w)+Pn++jiH%ZeQneU- zI*R{#%_E}@ya?NGJ+zkWDO?WCIX2<=dTnc^SGXlNdTaBeVurJ#Z~@ZhmS_-9pPaLy z`c@yBT3}_6I?~rS()b1c$DG@Q8e;K~=u|FP&HYo~rwy=L(kJN=Y^04}AlU?>UD(VO zw{eZTSXjXqpE(I_w>|raLiuyl~Y`wix=JBIeJ!k@K)$mB?t{Cq7akA-v~| z>B6YcVrh7SlxkD;oc!vqsX&yof5)sQVX8m5iPbG&_55MQL?!&iWV**Y+BSI2l@)nd z9NxM|v0nd=hWw|u|Ff_r6>`-nKl~nha`|Qsy;l!CBa@FIz-jmwD(wGfrZs2G&AS=0 zccmJaEOD}UZtPIC!xup7O!SyOD}fK6RPo;I4+NLMa@hsbD;O+pzh25cg`gz_KZy2v z0Vn=KZxDb^?oX>t|0isL%Kyf4$<+`+MueSSs&{t2N3pL*w5rKj(-xseD>>+>s$0kL zpl_Up>f#!=i;`-Dz8<@FGf309ktz&@4}T@oeeX_ER}-~kj({RyQd zAhpnwGxntU-uF$&W$2mTrf=j}19aO>>g0ZejDFlX*a9_2Rq}l&fJ^6wda#VHlO{Q1 za#ri!VYi{W!D`;J*WN+7UgT@qV_ObI`TIAu5>Ggm|7fT{xrOH9OAdQhAGL1Zn~D%g z+hPn#{t--gF7kweVAV=-Doa6NBBot+rS;T>MSLH%uu*CX&V$LEsYVZNjA9ZNE+4dl zt%UlcS|adN_{Uq?w6F8~KIK^7)`pXJG$H3x4Qbm=Rw9W-v@sO6zHA*K|1&+j5vbPC z>o;AA_$i^}fGVkLZ~zoDETF;7bNV|}(GL8Y6vrUBXREymGs#{xW*{D5bgs8Nmrpe{ zk^Ap+e#^ljgG(Cs(~G&x^njFsT`Ii&E+2yrn48kOu>X!AMh3(qKRYDjJ)7LgO2tKU z{XDicu0{J%*n8~551|_J6>bt_-GlW56G!>(hi1t}Hc?`A6Y;)iUG<^E_krI$?*y&g zIR?zG+}NIHD573KKl|pGbR`+2p$UCL8zvoe{jn%kQClKdAJvl`W=3%{wd-=jnw2+J zN$I7%rNueEU6BP zgGHuYnK#j~X~7+A51Yh&6Mxja!qN2W(bW7dlrY&g zYvOKDcU;xY)tx~`fYC{y;=fc@!0bm3c>_qWTo+3KasZNCJw}T7FPBV1@3Q|aLh}HV-rZ&?K z@u4lGC+k!LN>=qlesSJOE78c+f^!bzW!{&o_ZRvGg2deyixQ5`#In`QBkw0lPMhrD zv1CW@5?avk(f&ybPL77FQW>BTuAGvzvLt`7@zncfl7STNG$rQ3sj@ zz#TY-DH4u(O4`xG-r%J>&C8r#H^?lTn}Ardj=~BSzP3(;alh zHAJ9b*{o73cUvL;Y{vkt-y=RCu;5)LJxf-8zc88&U>=nkxwhu-2@T54u1HJc2=mAw z!%<(LZ}9tk}_i1mWS`w%wo-`sut=5vS_uWZg^gzG24MI8kYAvLWBb*8QL>F&Ok3 z!$b(Hg2R=D3rIOJa~8qCu18XQ`A2c3)5O;ya2S{$f+zcbFX6o>ru^|QhWT(SlXQ$( z55vM*7ES>wc5o)W;w1MDABIT-kR8`YAS|1jVd6wQZwJuRfGIEKz6ML?8Z>5TTo=PT zk$lb+NvvSZS`!}}ZsPWFj5S_f)g7U3ga=*Mgqs@Ro0$4!xH2}qi*vi=r>mMRfK}@9 z>YC8o37O!w)!CzSN7b;4_oyR}Wk9tWK+VmFZI6 z3ePHo8gSTucu~x+e^IGfJEQ|#lU9LaE}q}6zDWXbB>uPfLA3!$Ij%(gQxe|vHZ-d@ zx5@p-(|k`WN?ICb1S>YzI`B@Rw!w;~b1MrnPX((rU4L44vbmIHX#4R+pYgVxCdGSd zH5zWVwU!XbWd9F=RMdxmUed5m&E(`YkGPMbJT#+fmnI?jk+4JY@1WA&7e z!Gvm>MLc@oF$*$L#pC((PeIJ4nYXT*HY)g^1TyQS5>|VOK${M58*hPLgGAKd<9|yP z8+j{;?6F&8QOjM@2zQv+hmE7n$Vl3<6x{=5R+&>5MW5IZ2;P;*qHa;fTc+jw9*hi8 z!5SBm^O4f26Y&dWk@g=T={L0+^Q+KFx19VC2qVJlj?cC&M6EK2X?rXoXk5xV!u!9g zX)YYC^npMz`4GilMp$;c%*IGQryF^rHou+$i~$U*E~*Gf8&3i40wdG5 z2NY?cl6E!bthlS$(KA_>l{tM4>E@2nlOf&;U zvv*OXhMD&kn=*8%p`tL;FE7X{rwUXsY`)PM)f$6A=R^87lOlG@k}AWxjsQ!26DL-P z1#i+sgq6MaNIq_|-PieGf+YTBX<<&0Y&V6CR!Y6YtD~Tl)lgl3icz?KHh$sf&@67d zLbV7@>&oTW&~sxuVBEi<>-7bO0ZHtzwj#6RA)Um5uEY|1x-3P1aieRaM+lu%32ai$J@? zVQVU7Lh6clIcZ-~a;-|92@f4jBVUm3Z>=72h2^L^4xjU?%~29>wtN{#J;u0_AoxH!f7vUvN)#{k$fUXr zte{WuUgBU_^@3LE7L&q6@+feLLnk(~@^9&mHp+)Hrp;lc?3P+Hy3_soa>?lib_md6 z!XTTl#)7Ad?4lqeLhjtPhx??W)aVw_Lgok>-jHacpIkWBKKF|aNqnVev|wW$V6vSg zI8$HP$q(xx0wef4Is^$t&_I?p*x-c31Gpuw0WXuecaMWeHEs;ORBujE@hAspIT<1* z9&By4n@8RmoLG48iphk;$k+_BPb&7op1ws)m~3sf*;BgT`Cz=5B#YO=(Jo8r2X-bm z9H+o!tTTJYj5nG_4$>7~>@`srrg5D0HK!ms5Xot}z3I*qMq8V$=AFP=ql0pW4YoeV z0*e5i8Wzt@kF3RKjqXFMw3*?!nQy9p87-DW#qo?0tZdugBX*xdF6LWO^8K;rWJvxi z=(3baM;MhD7OjgMZFCnr`twuLw=cjc5Za@rxPgk%Jt$9I>r=z|C3~qX_HOWXY~ws;%t_uxCxqtc3RcQIa_=M6XsSMWHQJsnU|FpnTX@?hG7HjP(4hmnF&duu9oz2#X&q@ z(~~*6dhnaZ+?D}T_`+hh3_X*7>n8jmst^)$tz)nplk%)S7A-H@@AwXgGc|3ZPK34N|W35`g|x z2+2g&6UJTISI(Z*-(yTgDM4bKka}^gui(OeZ)RL=OCGn;jB>WWqrW203a{Ob)*#7+ zKjX%$NYwEiAlhM}BUo?WiNFl5)d-kmPwKZc#Oaf*%{Tc9bVPDRhZ;2?k#z3yF<&8G z?m=$bcX_$=U%#fzZ@=nDB^VLEB^U_(O*y0vhO)HKD^HnAKhIr zwiRr(BBO4n(i85T_D*^N%W)Z6;$almE;?#ZZ*Oe(*-weQD7=a7YKPJG;+g0?yWm%j z;r*|Z6MAY*NktY>9U{P(`^x6a;oe-mmL^b^n4u=*&BQm7#|m_jFL*4YIylL?ldoJA z(*vqzHs&pB;9RLqNZCZa@#6xr?u2!ex-Gr30YR!_2_7c@^X|Pq+t`Iv8Nr_L-RF+Q zeaGl2R*Y$1jL5|Rk6g8>?T&%4K_gPSO8#~Du5}MAVTY+sR*sEvj$M&KnbPhVQIKhS z3%0vR6LrM^P2fBAatF6PRmj2d;cSA2&=r0x9kVBlm)!^Q8z?`sSAU}~UI-OeJ{b$( zs_EO#wVIMmSa6XUEAmLI!`_tSttEH3M$EshThwdRZ=3p&kXlDNT*n-G7UkBdvP)jGClz!yP`Lby1DcA znDF7=+LR=p`lxnN3pA_%@3_$zz@sD_t)i&#%NT0eyPu9klhQw5Ca4D5rB2?G5hm6@ zb|{1=Ke7>UH$s2gbP-sF$sU_^5Brd zhBG$>O1c)2Tkct_SP}MD@|S!8Gl9GAD)qc1%wR%O$hLT1KFn<@DUdPF^knrTD3F#E4Sr(3xlQ?3S#Dun^ysN_@NxRXKPG}+-Lb_$Nx`Hfb(+-1gA>jb`;i&R#e3X5 zkKTfaoB_s+KI}TNO0nr%i6c*CPwW@UsEZJsx$++ih#Oz5#O779G06^hpwLJai2=F$Jgag^zTHVig-df4d($oajAQ zZ*f1?yj{tGMd~0a@gQn~4sIegl&n=Sm~{V#XizMnxP+!B1wR2}la8S=0A)8GP zP)~AG+VQS-;{h^QLN)$)ziLvO`DGE{l8yUZnWs(Sx$px}Z3l&|YW4Kb2zjzj>dv%d zddJ@EHC1o%!{B!@34DVQ!3K>3a^#VWJL?j|-HzrM;>o_5=>XWOm6n^GsK7-qvQ^ps?ozdU>Myr!&K2!woS0oq zYG*K41BuEN2yK+H^A5MhMC$|LcWLDw*4%2WAAzxB&I_0PE>G7}MM4^^em77nQ%163 zlgHT#Ul4xMF>w-JVn6Tr>0!ZxKb|-;g??+Too$!N zel07P@!RKj)X#j_xB_H8Vb8z3NtJXBDHq%9F}E*990GdRMEe{GJb&JoH?{r2ib<5- ziThGg3yz|0gtT#Yv5CD)UBwPu7Eg_n{1P&kWEyxjPX{L)F0^+~)Jy6jTCJp}-O zJpR1}Fo=)&k0oHxz-pyX9q!EP9hlJIOnIOEZ<@8%W_XH>3IM4=7XRoTG?nIA$?_eNU;_6;WWXFmCH~Kl` zwA;7{!g3)B2|kN&={OT_((v?W&p*YGVHKy&8$n5$_aV|HqNL!d`K{9!(7!IsdGa>J z+&2`!;L^}yT>i^vUl_QtB + +