From d89e4ccfdffea20deefc0f64d47412290b095ee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Sat, 11 Dec 2021 11:54:07 +0100
Subject: [PATCH] Fix grade sorting by date (#1717)

---
 .../ui/modules/grade/details/GradeDetailsPresenter.kt  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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 ce36f8ac..9141e043 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
@@ -230,10 +230,14 @@ class GradeDetailsPresenter @Inject constructor(
                     gradesWithAverages.filter { it.grades.isNotEmpty() }
                 } else gradesWithAverages
             }
-            .let {
+            .let { gradeSubjects ->
                 when (preferencesRepository.gradeSortingMode) {
-                    DATE -> it.sortedByDescending { gradeDetailsWithAverage -> gradeDetailsWithAverage.grades.firstOrNull()?.date }
-                    ALPHABETIC -> it.sortedBy { gradeDetailsWithAverage -> gradeDetailsWithAverage.subject.lowercase() }
+                    DATE -> gradeSubjects.sortedByDescending { gradeDetailsWithAverage ->
+                        gradeDetailsWithAverage.grades.maxByOrNull { it.date }?.date
+                    }
+                    ALPHABETIC -> gradeSubjects.sortedBy { gradeDetailsWithAverage ->
+                        gradeDetailsWithAverage.subject.lowercase()
+                    }
                 }
             }
             .map { (subject, average, points, _, grades) ->