diff --git a/doc/Images/DetailCompetitionPage.jpg b/doc/Images/DetailCompetitionPage.jpg new file mode 100644 index 0000000..c9b38f8 Binary files /dev/null and b/doc/Images/DetailCompetitionPage.jpg differ diff --git a/doc/Images/FavoritePage.jpg b/doc/Images/FavoritePage.jpg new file mode 100644 index 0000000..5d3e26d Binary files /dev/null and b/doc/Images/FavoritePage.jpg differ diff --git a/doc/Images/HomePage.jpg b/doc/Images/HomePage.jpg new file mode 100644 index 0000000..501414d Binary files /dev/null and b/doc/Images/HomePage.jpg differ diff --git a/doc/Images/StartPage.jpg b/doc/Images/StartPage.jpg new file mode 100644 index 0000000..da9abee Binary files /dev/null and b/doc/Images/StartPage.jpg differ diff --git a/src/app/src/main/java/uca/iut/clermont/view/viewModel/DetailViewModel.kt b/src/app/src/main/java/uca/iut/clermont/view/viewModel/DetailViewModel.kt index 2c94601..cb2092f 100644 --- a/src/app/src/main/java/uca/iut/clermont/view/viewModel/DetailViewModel.kt +++ b/src/app/src/main/java/uca/iut/clermont/view/viewModel/DetailViewModel.kt @@ -33,7 +33,7 @@ class DetailViewModel( val matchResults = manager.matchesMgr.getItemsByCompetition(id) competitionMatches.value = - matchResults.filter { it.status != "TIMED" && it.status != "SCHEDULED" } + matchResults.filter { it.status != "TIMED" && it.status != "SCHEDULED" && it.status != "POSTPONED" } .apply { forEach { it.date.add(Calendar.HOUR_OF_DAY, 2) } } .sortedBy { it.competition.name } .sortedByDescending { it.date } diff --git a/src/app/src/main/res/layout/fragment_detail.xml b/src/app/src/main/res/layout/fragment_detail.xml index ff3a33c..fba8794 100644 --- a/src/app/src/main/res/layout/fragment_detail.xml +++ b/src/app/src/main/res/layout/fragment_detail.xml @@ -199,9 +199,10 @@