jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Space panel room ordering

This commit is contained in:
Valere 2021-05-11 14:45:30 +02:00
parent f9820cde58
commit 91d8ee2a81
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
View File

@ -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