From bf92c6b2e97ea161842e21fd826b68beb6e41e57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Sun, 25 Oct 2020 12:16:19 +0100
Subject: [PATCH] Fix grade header item object comparision (#999)

---
 .../ui/modules/grade/details/GradeDetailsAdapter.kt       | 8 --------
 .../ui/modules/grade/details/GradeDetailsItem.kt          | 5 +++--
 .../ui/modules/grade/details/GradeDetailsPresenter.kt     | 5 +++--
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsAdapter.kt
index c129d948..6f932169 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsAdapter.kt
@@ -40,10 +40,6 @@ class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<Recycler
     }
 
     fun updateDetailsItem(position: Int, grade: Grade) {
-        if (items.getOrNull(position)?.viewType != ViewType.ITEM) {
-            Timber.e("Trying to update item $position on list ${items.size} size, expanded position: $expandedPosition")
-            return
-        }
         items[position] = GradeDetailsItem(grade, ViewType.ITEM)
         notifyItemChanged(position)
     }
@@ -62,10 +58,6 @@ class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<Recycler
         val headerPosition = headers.indexOf(item)
         val itemPosition = items.indexOf(item)
 
-        if (headerPosition == NO_POSITION || itemPosition == NO_POSITION) {
-            Timber.e("Invalid update header positions! Header: $headerPosition, item: $itemPosition")
-        }
-
         headers[headerPosition] = item
         items[itemPosition] = item
         notifyItemChanged(itemPosition)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt
index 28197496..479aff80 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt
@@ -14,6 +14,7 @@ data class GradeDetailsHeader(
     val subject: String,
     val average: Double?,
     val pointsSum: String?,
-    var newGrades: Int,
     val grades: List<GradeDetailsItem>
-)
+) {
+    var newGrades = 0
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
index 9f4f8f26..53f5101a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
@@ -213,9 +213,10 @@ class GradeDetailsPresenter @Inject constructor(
                     subject = subject,
                     average = average,
                     pointsSum = points,
-                    newGrades = grades.filter { grade -> !grade.isRead }.size,
                     grades = subItems
-                ), ViewType.HEADER)) + if (preferencesRepository.isGradeExpandable) emptyList() else subItems
+                ).apply {
+                    newGrades = grades.filter { grade -> !grade.isRead }.size
+                }, ViewType.HEADER)) + if (preferencesRepository.isGradeExpandable) emptyList() else subItems
             }.flatten()
     }