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 0000000..e551024 Binary files /dev/null and b/src/app/src/main/res/drawable/restart.png differ diff --git a/src/app/src/main/res/layout/fragment_home.xml b/src/app/src/main/res/layout/fragment_home.xml index 06f19aa..73c52fe 100644 --- a/src/app/src/main/res/layout/fragment_home.xml +++ b/src/app/src/main/res/layout/fragment_home.xml @@ -95,21 +95,34 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/searchBarContainer" /> + +