🔨 Score fix

AlbatovK · Apr 16, 2022 · c45abdb · c45abdb
1 parent 001a85d
commit c45abdb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 30 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/albatros/kquiz/model/data/info/ClientInfo.kt b/app/src/main/java/com/albatros/kquiz/model/data/info/ClientInfo.kt
@@ -17,6 +17,10 @@ data class ClientInfo(
     @Expose
     var started: Boolean = false,
 
+    @SerializedName("score")
+    @Expose
+    var score: Int = 0,
+
     @SerializedName("questionMap")
     @Expose
     var questionMap: HashMap<Int, QuestionInfo> = HashMap()

diff --git a/app/src/main/java/com/albatros/kquiz/ui/adapter/client/ResultAdapter.kt b/app/src/main/java/com/albatros/kquiz/ui/adapter/client/ResultAdapter.kt
@@ -38,17 +38,11 @@ class ResultAdapter(private val clients: MutableList<ClientInfo>) :
                 with(binding) {
 
                     binding.root.playFadeInAnimation(R.anim.fade_in_animation)
-                    name.text = it.name
-
-                    val scr = it.questionMap.values.filter { item -> item.right }.sumOf {
-                        1200 - it.time * 10
-                    }
 
-                    score.text = scr.toString()
+                    name.text = it.name
+                    score.text = it.score.toString()
 
-                    place.text = root.context.getString(R.string.place, clients.map {
-                            item -> item.questionMap.values.sumOf { q -> if (q.right) 1200 - q.time * 10 else 0 }
-                    }.indexOf(scr) + 1)
+                    place.text = root.context.getString(R.string.place, clients.map(ClientInfo::score).indexOf(it.score) + 1)
 
                     val from = if (it.questionMap.size == 0) 0 else it.questionMap.size - 1
                     val to = if (it.questionMap.size > 2) it.questionMap.size - 3 else 0

diff --git a/app/src/main/java/com/albatros/kquiz/ui/fragments/result/ResultViewModel.kt b/app/src/main/java/com/albatros/kquiz/ui/fragments/result/ResultViewModel.kt
@@ -34,9 +34,7 @@ class ResultViewModel(
 
     private val _usersInfo = MutableLiveData<List<ClientInfo>>().apply {
         viewModelScope.launch(Dispatchers.Main) {
-            value = api.getClientsInfo(repo.sessionId).sortedByDescending {
-                it.questionMap.count { item -> item.value.right }
-            }
+            value = api.getClientsInfo(repo.sessionId).sortedByDescending(ClientInfo::score)
         }
     }