Merge pull request 'Clean code ♻️' (#9) from API_NextStep into master

Reviewed-on: #9

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 personne.toModel()
+
-            }
-            return@coroutineScope null
         }
     }
 

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 {
+             calendar2.apply {
-                time = SimpleDateFormat("yyyy-MM-dd", Locale.US).parse(endDate)
+                time = SimpleDateFormat("yyyy-MM-dd", Locale.US).parse(endDate) as Date
             },
              currentMatchday,
              if (winner is Int) winner else null

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(),

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

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()
             }
         })
 

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 {
+    fun loadNumberMatches() = viewModelScope.launch {
-        val nb = manager.matchesMgr.getNbItemsByCompetition(id)
+        nbCompetitionMatches.value = competitionMatches.value?.size
-        nbCompetitionMatches.value = nb
     }
 }