From 19e065cbeab9b813be52e088263a4a833c04825c Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Tue, 9 Nov 2021 11:09:25 +0100
Subject: [PATCH] Prefer sorting subspaces alphabetically over roomId

Change-Id: I75217ca1cc27a30d5c4d62da0e4bc277e963073e
---
 .../im/vector/app/features/spaces/SpaceSummaryController.kt    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 8a0a1a7832..547e679ea3 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
@@ -36,6 +36,7 @@ import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 import org.matrix.android.sdk.api.util.toMatrixItem
+import java.util.Locale
 import javax.inject.Inject
 
 class SpaceSummaryController @Inject constructor(
@@ -47,7 +48,7 @@ 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 }
+    private val subSpaceComparator: Comparator<SpaceChildInfo> = compareBy<SpaceChildInfo> { it.order }.thenBy { it.name?.lowercase(Locale.getDefault()) }.thenBy { it.childRoomId }
 
     init {
         requestModelBuild()