From 995eba2c11551d2f9371efd741905ad237026834 Mon Sep 17 00:00:00 2001
From: Aditya Wasan <adityawasan55@gmail.com>
Date: Wed, 31 Mar 2021 02:29:36 +0530
Subject: [PATCH 1/2] gradle: fix incorrect sha256

Signed-off-by: Aditya Wasan <adityawasan55@gmail.com>
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
(cherry picked from commit 59dbf417a57b0e7cda8aa5b0efbec68f58da0e05)
---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b4ba05aa..79f1ffc3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9af5c8e7e2cd1a3b0f694a4ac262b9f38c75262e74a9e8b5101af302a6beadd7
+distributionSha256Sum=a52ad940d4dd2abdee5c7f4486788b6b3859daa7e260c08c1c18eec8cba297e6
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 314aba6d657cacda103c6460a0758c55d4159fac Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sat, 3 Apr 2021 14:38:16 +0530
Subject: [PATCH 2/2] app: revise saved posts sorting logic again

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 .../msfjarvis/lobsters/ui/posts/SavedPosts.kt | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/SavedPosts.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/SavedPosts.kt
index ecc170c1..88e93da1 100644
--- a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/SavedPosts.kt
+++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/SavedPosts.kt
@@ -35,7 +35,7 @@ fun SavedPosts(
 ) {
   val listState = rememberLazyListState()
   val urlLauncher = LocalUrlLauncher.current
-  val sortOrder by sortReversed.collectAsState(false)
+  val reverseSort by sortReversed.collectAsState(false)
 
   if (posts.isEmpty()) {
     Column(
@@ -56,19 +56,16 @@ fun SavedPosts(
       state = listState,
       modifier = Modifier.then(modifier),
     ) {
-      val grouped =
-        posts.groupBy { it.createdAt.asZonedDateTime().month }.apply {
-          if (sortOrder) {
-            toSortedMap(
-              Comparator { first, second ->
-                return@Comparator if (first > second) -1 else if (first < second) 1 else 0
-              }
-            )
-          }
+      val grouped = posts.groupBy { it.createdAt.asZonedDateTime().month }.toMutableMap()
+      if (reverseSort) {
+        val copy = grouped.toMap()
+        grouped.clear()
+        copy.keys.reversed().forEach { month ->
+          grouped[month] = requireNotNull(copy[month]).reversed()
         }
+      }
       grouped.forEach { (month, posts) ->
         stickyHeader { MonthHeader(month = month) }
-        @Suppress("NAME_SHADOWING") val posts = if (sortOrder) posts.reversed() else posts
         items(posts) { item ->
           LobstersItem(
             post = item,