Fix: Keep the order right after updating the list

machiav3lli · Jul 14, 2021 · 31d539c · 31d539c
1 parent 10253a0
commit 31d539c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/app/src/main/java/com/machiav3lli/derdiedas/data/Noun.kt b/app/src/main/java/com/machiav3lli/derdiedas/data/Noun.kt
@@ -7,4 +7,9 @@ import androidx.room.PrimaryKey
 class Noun(val noun: String, val gender: String, var timesAnswered: Int) {
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
+
+    fun withID(id: Long): Noun {
+        this.id = id
+        return this
+    }
 }
diff --git a/app/src/main/java/com/machiav3lli/derdiedas/ui/WordFragment.kt b/app/src/main/java/com/machiav3lli/derdiedas/ui/WordFragment.kt
@@ -13,6 +13,7 @@ import com.machiav3lli.derdiedas.databinding.FragmentWordBinding
 import com.machiav3lli.derdiedas.utils.AnimationUtil.animateButtonDrawable
 import com.machiav3lli.derdiedas.utils.AnimationUtil.animateJumpAndSlide
 import com.machiav3lli.derdiedas.utils.getStringByName
+import com.machiav3lli.derdiedas.utils.updateIds
 
 class WordFragment : Fragment(), View.OnClickListener {
     private var currentNounList: MutableList<Noun> = mutableListOf()
@@ -66,7 +67,7 @@ class WordFragment : Fragment(), View.OnClickListener {
     }
 
     private fun updateList(isCorrect: Boolean) {
-        val newList = currentNounList.getUpdatedNounList(currentNoun, isCorrect)
+        val newList = currentNounList.getUpdatedNounList(currentNoun, isCorrect).updateIds()
         (requireActivity() as WordActivity).updateNounList(newList)
     }
 }
diff --git a/app/src/main/java/com/machiav3lli/derdiedas/utils/NounUtils.kt b/app/src/main/java/com/machiav3lli/derdiedas/utils/NounUtils.kt
@@ -2,10 +2,15 @@ package com.machiav3lli.derdiedas.utils
 
 import android.content.Context
 import android.content.res.Resources
+import com.machiav3lli.derdiedas.data.Noun
 
 fun Context.getStringByName(name: String) = try {
     val resId = resources.getIdentifier(name, "string", packageName)
     getString(resId)
 } catch (e: Resources.NotFoundException) {
     null
-}
+}
+
+fun MutableList<Noun>.updateIds() = mapIndexed { index, noun ->
+    noun.withID(index + 1L)
+}.toMutableList()