From 91d8ee2a81348e5a25b9e9bd0a8cdaaea57a1f5f Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 11 May 2021 14:45:30 +0200
Subject: [PATCH] Space panel room ordering

---
 .../vector/app/features/spaces/SpaceSummaryController.kt  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index 6bd56c9d81..bd190519aa 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -43,6 +43,8 @@ class SpaceSummaryController @Inject constructor(
     var callback: Callback? = null
     private var viewState: SpaceListViewState? = null
 
+    private val subSpaceComparator: Comparator<SpaceChildInfo> = compareBy<SpaceChildInfo> { it.order }.thenBy { it.childRoomId }
+
     init {
         requestModelBuild()
     }
@@ -132,13 +134,13 @@ class SpaceSummaryController @Inject constructor(
         }
 
         rootSpaces
-                ?.sortedBy { it.displayName }
+                ?.sortedBy { it.roomId }
                 ?.forEach { groupSummary ->
                     val isSelected = selected is RoomGroupingMethod.BySpace && groupSummary.roomId == selected.space()?.roomId
                     // does it have children?
                     val subSpaces = groupSummary.spaceChildren?.filter { childInfo ->
                         summaries?.indexOfFirst { it.roomId == childInfo.childRoomId } != -1
-                    }
+                    }?.sortedWith(subSpaceComparator)
                     val hasChildren = (subSpaces?.size ?: 0) > 0
                     val expanded = expandedStates[groupSummary.roomId] == true
 
@@ -183,7 +185,7 @@ class SpaceSummaryController @Inject constructor(
         // does it have children?
         val subSpaces = childSum.spaceChildren?.filter { childInfo ->
             summaries.indexOfFirst { it.roomId == childInfo.childRoomId } != -1
-        }
+        }?.sortedWith(subSpaceComparator)
         val expanded = expandedStates[childSum.roomId] == true
         val isSelected = selected is RoomGroupingMethod.BySpace && childSum.roomId == selected.space()?.roomId