Correct error Date Matches 🐛

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<TextView>(R.id.textEmpty)
+        val buttonFavorite = view.findViewById<ImageButton>(R.id.buttonFavorite)
+        val restartMatches = view.findViewById<ImageButton>(R.id.restartMatches)
 
+        val text = view.findViewById<TextView>(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<ImageButton>(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()
+    }
+
 
 }

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<Match>) :
         }
 
         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)
 

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<List<Match>?>()
 
     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 }
     }
 
 }

src/app/src/main/res/layout/fragment_home.xml

@@ -95,21 +95,34 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/searchBarContainer" />
 
+    <ImageButton
+        android:id="@+id/restartMatches"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_marginTop="20dp"
+        android:background="@android:color/transparent"
+        android:scaleType="fitCenter"
+        android:src="@drawable/restart"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/searchBarContainer" />
+
     <TextView
         android:id="@+id/textEmpty"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@color/title"
         android:textSize="20dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textViewRecentMatches" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/listRecentsMatches"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:paddingBottom="200dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textViewRecentMatches"