better management of collapsing for room controllers

vector/src/main/java/im/vector/app/features/home/room/list/CollapsableControllerExtension.kt

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.list
+
+import com.airbnb.epoxy.EpoxyController
+import timber.log.Timber
+
+fun EpoxyController.setCollapsed(collapsed: Boolean) {
+    if (this is CollapsableControllerExtension) {
+        this.collapsed = collapsed
+    } else {
+        Timber.w("Try to collapse a controller that do not support collapse state")
+    }
+}
+
+interface CollapsableControllerExtension {
+    var collapsed: Boolean
+}

vector/src/main/java/im/vector/app/features/home/room/list/CollapsableTypedEpoxyController.kt

@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.list
+
+import com.airbnb.epoxy.EpoxyController
+
+abstract class CollapsableTypedEpoxyController<T>
+    : EpoxyController(), CollapsableControllerExtension {
+
+    private var currentData: T? = null
+    private var allowModelBuildRequests = false
+
+    override var collapsed: Boolean = false
+        set(value) {
+            if (field != value) {
+                field = value
+                allowModelBuildRequests = true
+                requestModelBuild()
+                allowModelBuildRequests = false
+            }
+        }
+
+    fun setData(data: T?) {
+        currentData = data
+        allowModelBuildRequests = true
+        requestModelBuild()
+        allowModelBuildRequests = false
+    }
+
+    override fun requestModelBuild() {
+        check(allowModelBuildRequests) {
+            ("You cannot call `requestModelBuild` directly. Call `setData` instead to trigger a "
+                    + "model refresh with new data.")
+        }
+        super.requestModelBuild()
+    }
+
+    override fun moveModel(fromPosition: Int, toPosition: Int) {
+        allowModelBuildRequests = true
+        super.moveModel(fromPosition, toPosition)
+        allowModelBuildRequests = false
+    }
+
+    override fun requestDelayedModelBuild(delayMs: Int) {
+        check(allowModelBuildRequests) {
+            ("You cannot call `requestModelBuild` directly. Call `setData` instead to trigger a "
+                    + "model refresh with new data.")
+        }
+        super.requestDelayedModelBuild(delayMs)
+    }
+
+    fun getCurrentData(): T? {
+        return currentData
+    }
+
+    override fun buildModels() {
+        check(isBuildingModels()) {
+            ("You cannot call `buildModels` directly. Call `setData` instead to trigger a model "
+                    + "refresh with new data.")
+        }
+        if (collapsed) {
+            buildModels(null)
+        } else {
+            buildModels(currentData)
+        }
+    }
+
+    protected abstract fun buildModels(data: T?)
+}

vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt

@@ -132,21 +132,15 @@ class RoomListFragment @Inject constructor(
     }
 
     private fun refreshCollapseStates() {
-        var contentInsertIndex = 1
         roomListViewModel.sections.forEachIndexed { index, roomsSection ->
             val actualBlock = adapterInfosList[index]
             val isRoomSectionExpanded = roomsSection.isExpanded.value.orTrue()
             if (actualBlock.section.isExpanded && !isRoomSectionExpanded) {
-                // we have to remove the content adapter
+                // mark controller as collapsed
-                concatAdapter?.removeAdapter(actualBlock.contentAdapter.adapter)
+                actualBlock.contentAdapter.setCollapsed(true)
             } else if (!actualBlock.section.isExpanded && isRoomSectionExpanded) {
-                // we must add it back!
+                // we must expand!
-                concatAdapter?.addAdapter(contentInsertIndex, actualBlock.contentAdapter.adapter)
+                actualBlock.contentAdapter.setCollapsed(false)
-            }
-            contentInsertIndex = if (isRoomSectionExpanded) {
-                contentInsertIndex + 2
-            } else {
-                contentInsertIndex + 1
             }
             actualBlock.section = actualBlock.section.copy(
                     isExpanded = isRoomSectionExpanded

vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryListController.kt

@@ -16,12 +16,11 @@
 
 package im.vector.app.features.home.room.list
 
-import com.airbnb.epoxy.TypedEpoxyController
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 class RoomSummaryListController(
         private val roomSummaryItemFactory: RoomSummaryItemFactory
-) : TypedEpoxyController<List<RoomSummary>>() {
+) : CollapsableTypedEpoxyController<List<RoomSummary>>() {
 
     var listener: RoomListListener? = null
 

vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt

@@ -21,31 +21,13 @@ import com.airbnb.epoxy.paging.PagedListEpoxyController
 import im.vector.app.core.utils.createUIHandler
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import javax.inject.Inject
-
-class RoomSummaryPagedControllerFactory @Inject constructor(
-        private val roomSummaryItemFactory: RoomSummaryItemFactory
-) {
-
-    fun createRoomSummaryPagedController(): RoomSummaryPagedController {
-        return RoomSummaryPagedController(roomSummaryItemFactory)
-    }
-
-    fun createRoomSummaryListController(): RoomSummaryListController {
-        return RoomSummaryListController(roomSummaryItemFactory)
-    }
-
-    fun createSuggestedRoomListController(): SuggestedRoomListController {
-        return SuggestedRoomListController(roomSummaryItemFactory)
-    }
-}
 
 class RoomSummaryPagedController(
         private val roomSummaryItemFactory: RoomSummaryItemFactory
 ) : PagedListEpoxyController<RoomSummary> (
         // Important it must match the PageList builder notify Looper
         modelBuildingHandler = createUIHandler()
-) {
+), CollapsableControllerExtension {
 
     var listener: RoomListListener? = null
 
@@ -56,6 +38,22 @@ class RoomSummaryPagedController(
             requestForcedModelBuild()
         }
 
+    override var collapsed = false
+    set(value) {
+        if (field != value) {
+            field = value
+            requestForcedModelBuild()
+        }
+    }
+
+    override fun addModels(models: List<EpoxyModel<*>>) {
+        if (collapsed) {
+            super.addModels(emptyList())
+        } else {
+            super.addModels(models)
+        }
+    }
+
     override fun buildItemModel(currentPosition: Int, item: RoomSummary?): EpoxyModel<*> {
         // for place holder if enabled
         item ?: return roomSummaryItemFactory.createRoomItem(

vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedControllerFactory.kt

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.list
+
+import javax.inject.Inject
+
+class RoomSummaryPagedControllerFactory @Inject constructor(
+        private val roomSummaryItemFactory: RoomSummaryItemFactory
+) {
+
+    fun createRoomSummaryPagedController(): RoomSummaryPagedController {
+        return RoomSummaryPagedController(roomSummaryItemFactory)
+    }
+
+    fun createRoomSummaryListController(): RoomSummaryListController {
+        return RoomSummaryListController(roomSummaryItemFactory)
+    }
+
+    fun createSuggestedRoomListController(): SuggestedRoomListController {
+        return SuggestedRoomListController(roomSummaryItemFactory)
+    }
+}