From fb4860d441e9c2c460d639b166702640a478a8da Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@thelen.space>
Date: Fri, 5 Jun 2020 16:56:04 +0200
Subject: [PATCH] Fix achievement sorting

---
 .../habitica/ui/fragments/AchievementsFragment.kt      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt
index 47cb45422..a21cbe23b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt
@@ -86,7 +86,15 @@ class AchievementsFragment: BaseMainFragment(), SwipeRefreshLayout.OnRefreshList
 
         refreshLayout.setOnRefreshListener(this)
 
-        compositeSubscription.add(userRepository.getAchievements().subscribe(Consumer<RealmResults<Achievement>> {
+        compositeSubscription.add(userRepository.getAchievements().map { achievements ->
+            achievements.sortedBy {
+                if (it.category == "onboarding") {
+                    it.index
+                } else {
+                    (it.category?.first()?.toInt() ?: 2) * it.index
+                }
+            }
+        }.subscribe(Consumer {
             val entries = mutableListOf<Any>()
             var lastCategory = ""
             it.forEach { achievement ->