Various fixes on spaces explore

+ MxTo bottom sheet Fix regression when using state button

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt

@@ -127,24 +127,29 @@ internal class DefaultSpaceService @Inject constructor(
                     ),
                     second = response.rooms
                             ?.filter { it.roomId != spaceId }
-                            ?.map { childSummary ->
+                            ?.flatMap { childSummary ->
-                                val childStateEv = response.events
+                                response.events
-                                        ?.firstOrNull { it.stateKey == childSummary.roomId && it.type == EventType.STATE_SPACE_CHILD }
+                                        ?.filter { it.stateKey == childSummary.roomId && it.type == EventType.STATE_SPACE_CHILD }
-                                val childStateEvContent = childStateEv?.content.toModel<SpaceChildContent>()
+                                        ?.map { childStateEv ->
-                                SpaceChildInfo(
+                                            // create a child entry for everytime this room is the child of a space
-                                        childRoomId = childSummary.roomId,
+                                            // beware that a room could appear then twice in this list
-                                        isKnown = true,
+                                            val childStateEvContent = childStateEv.content.toModel<SpaceChildContent>()
-                                        roomType = childSummary.roomType,
+                                            SpaceChildInfo(
-                                        name = childSummary.name,
+                                                    childRoomId = childSummary.roomId,
-                                        topic = childSummary.topic,
+                                                    isKnown = true,
-                                        avatarUrl = childSummary.avatarUrl,
+                                                    roomType = childSummary.roomType,
-                                        order = childStateEvContent?.order,
+                                                    name = childSummary.name,
-                                        autoJoin = childStateEvContent?.autoJoin ?: false,
+                                                    topic = childSummary.topic,
-                                        viaServers = childStateEvContent?.via ?: emptyList(),
+                                                    avatarUrl = childSummary.avatarUrl,
-                                        activeMemberCount = childSummary.numJoinedMembers,
+                                                    order = childStateEvContent?.order,
-                                        parentRoomId = childStateEv?.roomId
+                                                    autoJoin = childStateEvContent?.autoJoin ?: false,
-                                )
+                                                    viaServers = childStateEvContent?.via ?: emptyList(),
-                            }.orEmpty()
+                                                    activeMemberCount = childSummary.numJoinedMembers,
+                                                    parentRoomId = childStateEv.roomId
+                                            )
+                                        }.orEmpty()
+                            }
+                            .orEmpty()
             )
         }
     }

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

@@ -194,7 +194,7 @@ class SpaceRoomListSectionBuilder(
                             } else {
                                 liveData(context = viewModelScope.coroutineContext + Dispatchers.IO) {
                                     val spaceSum = tryOrNull { session.spaceService().querySpaceChildren(selectedSpace.roomId, suggestedOnly = true) }
-                                    val value = spaceSum?.second ?: emptyList()
+                                    val value = spaceSum?.second.orEmpty().distinctBy { it.childRoomId }
                                     // i need to check if it's already joined.
                                     val filtered = value.filter {
                                         session.getRoomSummary(it.childRoomId)?.membership?.isActive() != true

vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt

@@ -56,7 +56,7 @@ class MatrixToBottomSheet :
         injector.inject(this)
     }
 
-    private var interactionListener: InteractionListener? = null
+    var interactionListener: InteractionListener? = null
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetMatrixToCardBinding {
         return BottomSheetMatrixToCardBinding.inflate(inflater, container, false)

vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt

@@ -120,6 +120,7 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
                         ?.roomSummary()
                         // don't take if not active, as it could be outdated
                         ?.takeIf { it.membership.isActive() }
+                // XXX fix that
                 val forceRefresh = true
                 if (!forceRefresh && knownRoom != null) {
                     setState {
@@ -147,7 +148,7 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
                                     topic = peekResult.topic ?: "",
                                     memberCount = peekResult.numJoinedMembers,
                                     alias = peekResult.alias,
-                                    membership = Membership.NONE,
+                                    membership = knownRoom?.membership ?: Membership.NONE,
                                     roomType = peekResult.roomType,
                                     viaServers = peekResult.viaServers.takeIf { it.isNotEmpty() } ?: permalinkData.viaParameters
                             ).also {

vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt

@@ -21,7 +21,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isGone
-import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
@@ -31,6 +30,7 @@ import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
 import im.vector.app.R
 import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.platform.ButtonStateView
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentMatrixToRoomSpaceCardBinding
 import im.vector.app.features.home.AvatarRenderer
@@ -50,11 +50,18 @@ class MatrixToRoomSpaceFragment @Inject constructor(
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        views.matrixToCardMainButton.debouncedClicks {
+        views.matrixToCardMainButton.callback = object : ButtonStateView.Callback {
-            mainButtonClicked()
+            override fun onButtonClicked() {
+                mainButtonClicked()
+            }
+
+            override fun onRetryClicked() = onButtonClicked()
         }
-        views.matrixToCardSecondaryButton.debouncedClicks {
+        views.matrixToCardSecondaryButton.callback = object : ButtonStateView.Callback {
-            secondaryButtonClicked()
+            override fun onButtonClicked() {
+                secondaryButtonClicked()
+            }
+            override fun onRetryClicked() = onButtonClicked()
         }
     }
 
@@ -182,21 +189,17 @@ class MatrixToRoomSpaceFragment @Inject constructor(
 
         when (state.startChattingState) {
             Uninitialized -> {
-                views.matrixToCardButtonLoading.isVisible = false
+                views.matrixToCardMainButton.render(ButtonStateView.State.Button)
-//                views.matrixToCardMainButton.isVisible = false
             }
             is Success -> {
-                views.matrixToCardButtonLoading.isVisible = false
+                views.matrixToCardMainButton.render(ButtonStateView.State.Button)
-                views.matrixToCardMainButton.isVisible = true
             }
             is Fail -> {
-                views.matrixToCardButtonLoading.isVisible = false
+                views.matrixToCardMainButton.render(ButtonStateView.State.Error)
-                views.matrixToCardMainButton.isVisible = true
                 // TODO display some error copy?
             }
             is Loading -> {
-                views.matrixToCardButtonLoading.isVisible = true
+                views.matrixToCardMainButton.render(ButtonStateView.State.Loading)
-                views.matrixToCardMainButton.isInvisible = true
             }
         }
     }

vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt

@@ -38,6 +38,7 @@ class SpaceDirectoryController @Inject constructor(
     interface InteractionListener {
         fun onButtonClick(spaceChildInfo: SpaceChildInfo)
         fun onSpaceChildClick(spaceChildInfo: SpaceChildInfo)
+        fun onRoomClick(spaceChildInfo: SpaceChildInfo)
     }
 
     var listener: InteractionListener? = null
@@ -81,6 +82,8 @@ class SpaceDirectoryController @Inject constructor(
                         apply {
                             if (isSpace) {
                                 itemClickListener(View.OnClickListener { listener?.onSpaceChildClick(info) })
+                            } else {
+                                itemClickListener(View.OnClickListener { listener?.onRoomClick(info) })
                             }
                         }
                         buttonClickListener(View.OnClickListener { listener?.onButtonClick(info) })

vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt

@@ -21,15 +21,17 @@ import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.FragmentOnAttachListener
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
+import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentRoomDirectoryPickerBinding
+import im.vector.app.features.matrixto.MatrixToBottomSheet
 import kotlinx.parcelize.Parcelize
-import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import javax.inject.Inject
 
@@ -42,13 +44,19 @@ class SpaceDirectoryFragment @Inject constructor(
         private val epoxyController: SpaceDirectoryController
 ) : VectorBaseFragment<FragmentRoomDirectoryPickerBinding>(),
         SpaceDirectoryController.InteractionListener,
-        OnBackPressed {
+        OnBackPressed, MatrixToBottomSheet.InteractionListener {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
             FragmentRoomDirectoryPickerBinding.inflate(layoutInflater, container, false)
 
     private val viewModel by activityViewModel(SpaceDirectoryViewModel::class)
 
+    private var fragmentOnAttachListener = FragmentOnAttachListener { _, fragment ->
+        if (fragment is MatrixToBottomSheet) {
+            fragment.interactionListener = this
+        }
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -60,16 +68,24 @@ class SpaceDirectoryFragment @Inject constructor(
         }
         epoxyController.listener = this
         views.roomDirectoryPickerList.configureWith(epoxyController)
+
+        childFragmentManager.addFragmentOnAttachListener(fragmentOnAttachListener)
     }
 
     override fun onDestroyView() {
+        childFragmentManager.removeFragmentOnAttachListener(fragmentOnAttachListener)
         epoxyController.listener = null
         views.roomDirectoryPickerList.cleanup()
         super.onDestroyView()
     }
 
-    override fun invalidate() = withState(viewModel) {
+    override fun invalidate() = withState(viewModel) { state ->
-        epoxyController.setData(it)
+        epoxyController.setData(state)
+
+        val title = state.hierarchyStack.lastOrNull()?.let { currentParent ->
+            state.spaceSummaryApiResult.invoke()?.firstOrNull { it.childRoomId == currentParent }
+        }?.name ?: getString(R.string.space_explore_activity_title)
+        views.toolbar.title = title
     }
 
     override fun onButtonClick(spaceChildInfo: SpaceChildInfo) {
@@ -77,8 +93,14 @@ class SpaceDirectoryFragment @Inject constructor(
     }
 
     override fun onSpaceChildClick(spaceChildInfo: SpaceChildInfo) {
-        if (spaceChildInfo.roomType == RoomType.SPACE) {
+        viewModel.handle(SpaceDirectoryViewAction.ExploreSubSpace(spaceChildInfo))
-            viewModel.handle(SpaceDirectoryViewAction.ExploreSubSpace(spaceChildInfo))
+    }
+
+    override fun onRoomClick(spaceChildInfo: SpaceChildInfo) {
+        // This is temporary for now to at least display something for the space beta
+        // It's not ideal as it's doing some peeking that is not needed.
+        viewModel.session.permalinkService().createRoomPermalink(spaceChildInfo.childRoomId)?.let {
+            MatrixToBottomSheet.withLink(it, this).show(childFragmentManager, "ShowChild")
         }
     }
 
@@ -86,4 +108,8 @@ class SpaceDirectoryFragment @Inject constructor(
         viewModel.handle(SpaceDirectoryViewAction.HandleBack)
         return true
     }
+
+    override fun navigateToRoom(roomId: String) {
+        viewModel.handle(SpaceDirectoryViewAction.NavigateToRoom(roomId))
+    }
 }

vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt

@@ -22,5 +22,6 @@ import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 sealed class SpaceDirectoryViewAction : VectorViewModelAction {
     data class ExploreSubSpace(val spaceChildInfo: SpaceChildInfo) : SpaceDirectoryViewAction()
     data class JoinOrOpen(val spaceChildInfo: SpaceChildInfo) : SpaceDirectoryViewAction()
+    data class NavigateToRoom(val roomId: String) : SpaceDirectoryViewAction()
     object HandleBack : SpaceDirectoryViewAction()
 }

vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt

@@ -40,7 +40,7 @@ import timber.log.Timber
 
 class SpaceDirectoryViewModel @AssistedInject constructor(
         @Assisted initialState: SpaceDirectoryState,
-        private val session: Session
+        val session: Session
 ) : VectorViewModel<SpaceDirectoryState, SpaceDirectoryViewAction, SpaceDirectoryViewEvents>(initialState) {
 
     @AssistedFactory
@@ -91,6 +91,7 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
     private fun observeJoinedRooms() {
         val queryParams = roomSummaryQueryParams {
             memberships = listOf(Membership.JOIN)
+            excludeType = null
         }
         session
                 .rx()
@@ -135,6 +136,9 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
             is SpaceDirectoryViewAction.JoinOrOpen -> {
                 handleJoinOrOpen(action.spaceChildInfo)
             }
+            is SpaceDirectoryViewAction.NavigateToRoom -> {
+                _viewEvents.post(SpaceDirectoryViewEvents.NavigateToRoom(action.roomId))
+            }
         }
     }