From 9e5dcb168100516fec50bd99b3929deb638a3ca6 Mon Sep 17 00:00:00 2001
From: emkartal1 <emre.kartal@etu.uca.fr>
Date: Sat, 8 Apr 2023 19:10:01 +0200
Subject: [PATCH] Clean code :recycler:

---
 src/app/src/main/java/uca/iut/clermont/api/ApiManager.kt   | 6 ++----
 .../api/response/competitionResponse/CurrentSeason.kt      | 7 ++++---
 .../iut/clermont/api/response/matchResponse/MatchResult.kt | 2 +-
 .../clermont/api/response/playerResponse/PlayerResponse.kt | 6 +++---
 .../src/main/java/uca/iut/clermont/view/DetailFragment.kt  | 3 +--
 .../uca/iut/clermont/view/viewModel/DetailViewModel.kt     | 5 ++---
 6 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/app/src/main/java/uca/iut/clermont/api/ApiManager.kt b/src/app/src/main/java/uca/iut/clermont/api/ApiManager.kt
index 48b9d2e..a028163 100644
--- a/src/app/src/main/java/uca/iut/clermont/api/ApiManager.kt
+++ b/src/app/src/main/java/uca/iut/clermont/api/ApiManager.kt
@@ -50,10 +50,8 @@ class ApiManager : DataManager() {
 
         override suspend fun getItemById(id: Int): Personne? = coroutineScope {
             val personne = footballApi.getPlayer(id)
-            personne?.let {
-                return@coroutineScope personne.toModel()
-            }
-            return@coroutineScope null
+            return@coroutineScope personne.toModel()
+
         }
     }
 
diff --git a/src/app/src/main/java/uca/iut/clermont/api/response/competitionResponse/CurrentSeason.kt b/src/app/src/main/java/uca/iut/clermont/api/response/competitionResponse/CurrentSeason.kt
index 7422f9a..7094bc3 100644
--- a/src/app/src/main/java/uca/iut/clermont/api/response/competitionResponse/CurrentSeason.kt
+++ b/src/app/src/main/java/uca/iut/clermont/api/response/competitionResponse/CurrentSeason.kt
@@ -13,13 +13,14 @@ data class CurrentSeason(
 ) {
     fun toModel(): Season {
         val calendar = Calendar.getInstance()
+        val calendar2 = Calendar.getInstance()
         return Season(
             id,
             calendar.apply {
-                time = SimpleDateFormat("yyyy-MM-dd", Locale.US).parse(startDate)
+                time = SimpleDateFormat("yyyy-MM-dd", Locale.US).parse(startDate) as Date
             },
-             calendar.apply {
-                time = SimpleDateFormat("yyyy-MM-dd", Locale.US).parse(endDate)
+             calendar2.apply {
+                time = SimpleDateFormat("yyyy-MM-dd", Locale.US).parse(endDate) as Date
             },
              currentMatchday,
              if (winner is Int) winner else null
diff --git a/src/app/src/main/java/uca/iut/clermont/api/response/matchResponse/MatchResult.kt b/src/app/src/main/java/uca/iut/clermont/api/response/matchResponse/MatchResult.kt
index a2f80d9..04821f4 100644
--- a/src/app/src/main/java/uca/iut/clermont/api/response/matchResponse/MatchResult.kt
+++ b/src/app/src/main/java/uca/iut/clermont/api/response/matchResponse/MatchResult.kt
@@ -22,7 +22,7 @@ class MatchResult(
         homeTeam.toModel(),
         awayTeam.toModel(),
         Calendar.getInstance().apply {
-            time = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US).parse(utcDate)
+            time = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US).parse(utcDate) as Date
         },
         status,
         score.toModel(),
diff --git a/src/app/src/main/java/uca/iut/clermont/api/response/playerResponse/PlayerResponse.kt b/src/app/src/main/java/uca/iut/clermont/api/response/playerResponse/PlayerResponse.kt
index 4933fc3..87c010e 100644
--- a/src/app/src/main/java/uca/iut/clermont/api/response/playerResponse/PlayerResponse.kt
+++ b/src/app/src/main/java/uca/iut/clermont/api/response/playerResponse/PlayerResponse.kt
@@ -22,15 +22,15 @@ data class PlayerResponse(
         lastName,
         name,
         Calendar.getInstance().apply {
-            time = SimpleDateFormat("yyyy-MM-dd", Locale.US).parse(dateOfBirth)
+            time = SimpleDateFormat("yyyy-MM-dd", Locale.US).parse(dateOfBirth) as Date
         },
         nationality,
         Contract(
             Calendar.getInstance().apply {
-                time = SimpleDateFormat("yyyy-MM", Locale.US).parse(currentTeam.contract.start)
+                time = SimpleDateFormat("yyyy-MM", Locale.US).parse(currentTeam.contract.start) as Date
             },
             Calendar.getInstance().apply {
-                time = SimpleDateFormat("yyyy-MM", Locale.US).parse(currentTeam.contract.until)
+                time = SimpleDateFormat("yyyy-MM", Locale.US).parse(currentTeam.contract.until) as Date
             }
         )
     )
diff --git a/src/app/src/main/java/uca/iut/clermont/view/DetailFragment.kt b/src/app/src/main/java/uca/iut/clermont/view/DetailFragment.kt
index 41ca7fc..77e588b 100644
--- a/src/app/src/main/java/uca/iut/clermont/view/DetailFragment.kt
+++ b/src/app/src/main/java/uca/iut/clermont/view/DetailFragment.kt
@@ -55,11 +55,10 @@ class DetailFragment : Fragment() {
             }
         })
 
-        viewModel.loadNumberMatches(id)
-
         viewModel.competitionMatches.observe(viewLifecycleOwner, Observer { competitions ->
             competitions?.let {
                 initRecyclerView(view)
+                viewModel.loadNumberMatches()
             }
         })
 
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 2e531fc..13e5961 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
@@ -30,8 +30,7 @@ class DetailViewModel : ViewModel() {
             .sortedByDescending { it.date }
     }
 
-    fun loadNumberMatches(id: Int) = viewModelScope.launch {
-        val nb = manager.matchesMgr.getNbItemsByCompetition(id)
-        nbCompetitionMatches.value = nb
+    fun loadNumberMatches() = viewModelScope.launch {
+        nbCompetitionMatches.value = competitionMatches.value?.size
     }
 }
\ No newline at end of file