Refactors space controller and items

vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt

@@ -63,96 +63,13 @@ class NewSpaceSummaryController @Inject constructor(
             homeCount: RoomAggregateNotificationCount,
             expandedStates: Map<String, Boolean>,
     ) {
-        println(homeCount)
-        val host = this
         newSpaceListHeaderItem {
             id("space_list_header")
         }
 
-        addHomeItem(false, homeCount)
+        addHomeItem(selectedSpace == null, homeCount)
-
+        addSpaces(spaceSummaries, selectedSpace, rootSpaces, expandedStates)
-        rootSpaces
+        addCreateItem()
-                ?.filter { it.membership != Membership.INVITE }
-                ?.forEach { spaceSummary ->
-
-                    val subSpaces = spaceSummary.spaceChildren?.filter { childInfo ->
-                        spaceSummaries?.any { it.roomId == childInfo.childRoomId }.orFalse()
-                    }
-                    val hasChildren = (subSpaces?.size ?: 0) > 0
-                    val isSelected = spaceSummary.roomId == selectedSpace?.roomId
-                    val expanded = expandedStates[spaceSummary.roomId] == true
-
-                    newSpaceSummaryItem {
-                        avatarRenderer(host.avatarRenderer)
-                        id(spaceSummary.roomId)
-                        matrixItem(spaceSummary.toMatrixItem())
-                        onSpaceSelectedListener { host.callback?.onSpaceSelected(spaceSummary) }
-                        countState(UnreadCounterBadgeView.State(spaceSummary.notificationCount, spaceSummary.highlightCount > 0))
-
-                        expanded(expanded)
-                        hasChildren(hasChildren)
-                        toggleExpand { host.callback?.onToggleExpand(spaceSummary) }
-                        selected(isSelected)
-                        onMore { host.callback?.onSpaceSettings(spaceSummary) }
-                    }
-
-                    if (hasChildren && expanded) {
-                        // it's expanded
-                        subSpaces?.forEach { child ->
-                            buildSubSpace(spaceSummary.roomId, spaceSummaries, expandedStates, selectedSpace, child, 1, 3)
-                        }
-                    }
-                }
-
-        newSpaceAddItem {
-            id("create")
-            listener { host.callback?.onAddSpaceSelected() }
-        }
-    }
-
-    private fun buildSubSpace(
-            idPrefix: String,
-            summaries: List<RoomSummary>?,
-            expandedStates: Map<String, Boolean>,
-            selectedSpace: RoomSummary?,
-            info: SpaceChildInfo, currentDepth: Int, maxDepth: Int
-    ) {
-        val host = this
-        if (currentDepth >= maxDepth) return
-        val childSummary = summaries?.firstOrNull { it.roomId == info.childRoomId } ?: return
-        // does it have children?
-        val subSpaces = childSummary.spaceChildren?.filter { childInfo ->
-            summaries.any { it.roomId == childInfo.childRoomId }
-        }?.sortedWith(subSpaceComparator)
-        val expanded = expandedStates[childSummary.roomId] == true
-        val isSelected = childSummary.roomId == selectedSpace?.roomId
-
-        val id = "$idPrefix:${childSummary.roomId}"
-
-        newSubSpaceSummaryItem {
-            avatarRenderer(host.avatarRenderer)
-            id(id)
-            hasChildren(!subSpaces.isNullOrEmpty())
-            selected(isSelected)
-            expanded(expanded)
-            onMore { host.callback?.onSpaceSettings(childSummary) }
-            matrixItem(childSummary.toMatrixItem())
-            listener { host.callback?.onSpaceSelected(childSummary) }
-            toggleExpand { host.callback?.onToggleExpand(childSummary) }
-            indent(currentDepth)
-            countState(
-                    UnreadCounterBadgeView.State(
-                            childSummary.notificationCount,
-                            childSummary.highlightCount > 0
-                    )
-            )
-        }
-
-        if (expanded) {
-            subSpaces?.forEach {
-                buildSubSpace(id, summaries, expandedStates, selectedSpace, it, currentDepth + 1, maxDepth)
-            }
-        }
     }
 
     private fun addHomeItem(selected: Boolean, homeCount: RoomAggregateNotificationCount) {
@@ -166,38 +83,88 @@ class NewSpaceSummaryController @Inject constructor(
         }
     }
 
-    private fun addSubSpaces(
+    private fun addSpaces(
-            selectedSpace: RoomSummary,
             spaceSummaries: List<RoomSummary>?,
-            homeCount: RoomAggregateNotificationCount,
+            selectedSpace: RoomSummary?,
+            rootSpaces: List<RoomSummary>?,
+            expandedStates: Map<String, Boolean>,
     ) {
         val host = this
-        val spaceChildren = selectedSpace.spaceChildren
-        var subSpacesAdded = false
 
-        spaceChildren?.sortedWith(subSpaceComparator)?.forEach { spaceChild ->
+        rootSpaces?.filter { it.membership != Membership.INVITE }
-            val subSpaceSummary = spaceSummaries?.firstOrNull { it.roomId == spaceChild.childRoomId } ?: return@forEach
+                ?.forEach { spaceSummary ->
+                    val subSpaces = spaceSummary.spaceChildren?.filter { spaceChild -> spaceSummaries.containsSpaceId(spaceChild.childRoomId) }
+                    val hasChildren = (subSpaces?.size ?: 0) > 0
+                    val isSelected = spaceSummary.roomId == selectedSpace?.roomId
+                    val expanded = expandedStates[spaceSummary.roomId] == true
 
-            if (subSpaceSummary.membership != Membership.INVITE) {
+                    newSpaceSummaryItem {
-                subSpacesAdded = true
+                        id(spaceSummary.roomId)
-                newSpaceSummaryItem {
+                        avatarRenderer(host.avatarRenderer)
-                    avatarRenderer(host.avatarRenderer)
+                        countState(UnreadCounterBadgeView.State(spaceSummary.notificationCount, spaceSummary.highlightCount > 0))
-                    id(subSpaceSummary.roomId)
+                        expanded(expanded)
-                    matrixItem(subSpaceSummary.toMatrixItem())
+                        hasChildren(hasChildren)
-                    selected(false)
+                        matrixItem(spaceSummary.toMatrixItem())
-                    onSpaceSelectedListener { host.callback?.onSpaceSelected(subSpaceSummary) }
+                        onLongClickListener { host.callback?.onSpaceSettings(spaceSummary) }
-                    countState(
+                        onSpaceSelectedListener { host.callback?.onSpaceSelected(spaceSummary) }
-                            UnreadCounterBadgeView.State(
+                        onToggleExpandListener { host.callback?.onToggleExpand(spaceSummary) }
-                                    subSpaceSummary.notificationCount,
+                        selected(isSelected)
-                                    subSpaceSummary.highlightCount > 0
+                    }
-                            )
+
-                    )
+                    if (hasChildren && expanded) {
+                        subSpaces?.forEach { child ->
+                            addSubSpace(spaceSummary.roomId, spaceSummaries, expandedStates, selectedSpace, child, 1, 3)
+                        }
+                    }
                 }
-            }
+    }
+
+    private fun List<RoomSummary>?.containsSpaceId(spaceId: String) = this?.any { it.roomId == spaceId }.orFalse()
+
+    private fun addSubSpace(
+            idPrefix: String,
+            spaceSummaries: List<RoomSummary>?,
+            expandedStates: Map<String, Boolean>,
+            selectedSpace: RoomSummary?,
+            info: SpaceChildInfo,
+            currentDepth: Int,
+            maxDepth: Int,
+    ) {
+        val host = this
+        if (currentDepth >= maxDepth) return
+        val childSummary = spaceSummaries?.firstOrNull { it.roomId == info.childRoomId } ?: return
+        val id = "$idPrefix:${childSummary.roomId}"
+        val countState = UnreadCounterBadgeView.State(childSummary.notificationCount, childSummary.highlightCount > 0)
+        val expanded = expandedStates[childSummary.roomId] == true
+        val isSelected = childSummary.roomId == selectedSpace?.roomId
+        val subSpaces = childSummary.spaceChildren?.filter { childSpace -> spaceSummaries.containsSpaceId(childSpace.childRoomId) }?.sortedWith(subSpaceComparator)
+
+        newSubSpaceSummaryItem {
+            id(id)
+            avatarRenderer(host.avatarRenderer)
+            countState(countState)
+            expanded(expanded)
+            hasChildren(!subSpaces.isNullOrEmpty())
+            indent(currentDepth)
+            matrixItem(childSummary.toMatrixItem())
+            onLongClickListener { host.callback?.onSpaceSettings(childSummary) }
+            onSubSpaceSelectedListener { host.callback?.onSpaceSelected(childSummary) }
+            onToggleExpandListener { host.callback?.onToggleExpand(childSummary) }
+            selected(isSelected)
         }
 
-        if (!subSpacesAdded) {
+        if (expanded) {
-            addHomeItem(false, homeCount)
+            subSpaces?.forEach {
+                addSubSpace(id, spaceSummaries, expandedStates, selectedSpace, it, currentDepth + 1, maxDepth)
+            }
+        }
+    }
+
+    private fun addCreateItem() {
+        val host = this
+        newSpaceAddItem {
+            id("create")
+            listener { host.callback?.onAddSpaceSelected() }
         }
     }
 

vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryItem.kt

@@ -35,24 +35,23 @@ import org.matrix.android.sdk.api.util.MatrixItem
 abstract class NewSpaceSummaryItem : VectorEpoxyModel<NewSpaceSummaryItem.Holder>(R.layout.item_new_space) {
 
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) lateinit var avatarRenderer: AvatarRenderer
-    @EpoxyAttribute lateinit var matrixItem: MatrixItem
-    @EpoxyAttribute var selected: Boolean = false
-    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var onSpaceSelectedListener: ClickListener? = null
-    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var onMore: ClickListener? = null
     @EpoxyAttribute var countState: UnreadCounterBadgeView.State = UnreadCounterBadgeView.State(0, false)
-
-    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var toggleExpand: ClickListener? = null
     @EpoxyAttribute var expanded: Boolean = false
     @EpoxyAttribute var hasChildren: Boolean = false
+    @EpoxyAttribute lateinit var matrixItem: MatrixItem
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var onLongClickListener: ClickListener? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var onSpaceSelectedListener: ClickListener? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var onToggleExpandListener: ClickListener? = null
+    @EpoxyAttribute var selected: Boolean = false
 
     override fun bind(holder: Holder) {
         super.bind(holder)
         holder.root.onClick(onSpaceSelectedListener)
-        holder.root.setOnLongClickListener { onMore?.invoke(holder.root).let { true } }
+        holder.root.setOnLongClickListener { onLongClickListener?.invoke(holder.root).let { true } }
         holder.name.text = matrixItem.displayName
         holder.root.isChecked = selected
 
-        holder.chevron.setOnClickListener(toggleExpand)
+        holder.chevron.setOnClickListener(onToggleExpandListener)
         holder.chevron.isVisible = hasChildren
         holder.chevron.setImageResource(if (expanded) R.drawable.ic_expand_more else R.drawable.ic_arrow_right)
 

vector/src/main/java/im/vector/app/features/spaces/NewSubSpaceSummaryItem.kt

@@ -38,22 +38,22 @@ import org.matrix.android.sdk.api.util.MatrixItem
 abstract class NewSubSpaceSummaryItem : VectorEpoxyModel<NewSubSpaceSummaryItem.Holder>(R.layout.item_new_sub_space) {
 
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) lateinit var avatarRenderer: AvatarRenderer
-    @EpoxyAttribute lateinit var matrixItem: MatrixItem
+    @EpoxyAttribute var countState: UnreadCounterBadgeView.State = UnreadCounterBadgeView.State(0, false)
-    @EpoxyAttribute var selected: Boolean = false
-    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var listener: ClickListener? = null
-    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var onMore: ClickListener? = null
-    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var toggleExpand: ClickListener? = null
     @EpoxyAttribute var expanded: Boolean = false
     @EpoxyAttribute var hasChildren: Boolean = false
     @EpoxyAttribute var indent: Int = 0
-    @EpoxyAttribute var countState: UnreadCounterBadgeView.State = UnreadCounterBadgeView.State(0, false)
+    @EpoxyAttribute lateinit var matrixItem: MatrixItem
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var onLongClickListener: ClickListener? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var onSubSpaceSelectedListener: ClickListener? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var onToggleExpandListener: ClickListener? = null
+    @EpoxyAttribute var selected: Boolean = false
 
     override fun bind(holder: Holder) {
         super.bind(holder)
-        holder.root.onClick(listener)
+        holder.root.onClick(onSubSpaceSelectedListener)
         holder.name.text = matrixItem.displayName
         holder.root.isChecked = selected
-        holder.root.setOnLongClickListener { onMore?.invoke(holder.root).let { true } }
+        holder.root.setOnLongClickListener { onLongClickListener?.invoke(holder.root).let { true } }
 
         holder.chevron.setImageDrawable(
                 ContextCompat.getDrawable(
@@ -61,7 +61,7 @@ abstract class NewSubSpaceSummaryItem : VectorEpoxyModel<NewSubSpaceSummaryItem.
                         if (expanded) R.drawable.ic_expand_more else R.drawable.ic_arrow_right
                 )
         )
-        holder.chevron.onClick(toggleExpand)
+        holder.chevron.onClick(onToggleExpandListener)
         holder.chevron.isVisible = hasChildren
 
         holder.indent.isVisible = indent > 0