Merge pull request #5827 from element-hq/feature/fga/space_feature_flags

Space feature flags

features/space/impl/build.gradle.kts

@@ -40,6 +40,8 @@ dependencies {
     implementation(projects.libraries.featureflag.api)
     implementation(projects.features.invite.api)
     implementation(projects.libraries.previewutils)
+    implementation(projects.features.securityandprivacy.api)
+    implementation(projects.features.rolesandpermissions.api)
     api(projects.features.space.api)
 
     testCommonDependencies(libs, true)

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceFlowNode.kt

@@ -28,7 +28,7 @@ import io.element.android.features.space.api.SpaceEntryPoint
 import io.element.android.features.space.impl.di.SpaceFlowGraph
 import io.element.android.features.space.impl.leave.LeaveSpaceNode
 import io.element.android.features.space.impl.root.SpaceNode
-import io.element.android.features.space.impl.settings.SpaceSettingsNode
+import io.element.android.features.space.impl.settings.SpaceSettingsFlowNode
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.callback
@@ -115,32 +115,20 @@ class SpaceFlowNode(
                 createNode<SpaceNode>(buildContext, listOf(callback))
             }
             NavTarget.Settings -> {
-                val callback = object : SpaceSettingsNode.Callback {
+                val callback = object : SpaceSettingsFlowNode.Callback {
-                    override fun closeSettings() {
-                        backstack.pop()
-                    }
-
-                    override fun navigateToSpaceInfo() {
-                        // TODO
-                    }
-
                     override fun navigateToSpaceMembers() {
                         callback.navigateToRoomMemberList()
                     }
 
-                    override fun navigateToRolesAndPermissions() {
-                        // TODO
-                    }
-
-                    override fun navigateToSecurityAndPrivacy() {
-                        // TODO
-                    }
-
                     override fun startLeaveSpaceFlow() {
                         backstack.push(NavTarget.Leave)
                     }
+
+                    override fun closeSettings() {
+                        backstack.pop()
+                    }
                 }
-                createNode<SpaceSettingsNode>(buildContext, listOf(callback))
+                createNode<SpaceSettingsFlowNode>(buildContext, listOf(callback))
             }
         }
     }

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpacePresenter.kt

@@ -26,6 +26,8 @@ import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.coroutine.mapState
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
+import io.element.android.libraries.featureflag.api.FeatureFlagService
+import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
@@ -53,6 +55,7 @@ class SpacePresenter(
     private val joinRoom: JoinRoom,
     private val acceptDeclineInvitePresenter: Presenter<AcceptDeclineInviteState>,
     @SessionCoroutineScope private val sessionCoroutineScope: CoroutineScope,
+    private val featureFlagService: FeatureFlagService,
 ) : Presenter<SpaceState> {
     private var children by mutableStateOf<ImmutableList<SpaceRoom>>(persistentListOf())
 
@@ -79,6 +82,10 @@ class SpacePresenter(
             }
         }.collectAsState()
 
+        val isSpaceSettingsEnabled by remember {
+            featureFlagService.isFeatureEnabledFlow(FeatureFlags.SpaceSettings)
+        }.collectAsState(false)
+
         val currentSpace by spaceRoomList.currentSpaceFlow.collectAsState()
         val (joinActions, setJoinActions) = remember { mutableStateOf(emptyMap<RoomId, AsyncAction<Unit>>()) }
 
@@ -129,6 +136,7 @@ class SpacePresenter(
             joinActions = joinActions.toImmutableMap(),
             acceptDeclineInviteState = acceptDeclineInviteState,
             topicViewerState = topicViewerState,
+            canAccessSpaceSettings = isSpaceSettingsEnabled,
             eventSink = ::handleEvent,
         )
     }

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceState.kt

@@ -26,6 +26,7 @@ data class SpaceState(
     val joinActions: ImmutableMap<RoomId, AsyncAction<Unit>>,
     val acceptDeclineInviteState: AcceptDeclineInviteState,
     val topicViewerState: TopicViewerState,
+    val canAccessSpaceSettings: Boolean,
     val eventSink: (SpaceEvents) -> Unit
 ) {
     fun isJoining(spaceId: RoomId): Boolean = joinActions[spaceId] == AsyncAction.Loading

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt

@@ -53,6 +53,7 @@ fun aSpaceState(
     hasMoreToLoad: Boolean = true,
     acceptDeclineInviteState: AcceptDeclineInviteState = anAcceptDeclineInviteState(),
     topicViewerState: TopicViewerState = TopicViewerState.Hidden,
+    canAccessSpaceSettings: Boolean = true,
     eventSink: (SpaceEvents) -> Unit = { },
 ) = SpaceState(
     currentSpace = parentSpace,
@@ -63,6 +64,7 @@ fun aSpaceState(
     joinActions = joinActions.toImmutableMap(),
     acceptDeclineInviteState = acceptDeclineInviteState,
     topicViewerState = topicViewerState,
+    canAccessSpaceSettings = canAccessSpaceSettings,
     eventSink = eventSink,
 )
 

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt

@@ -88,6 +88,7 @@ fun SpaceView(
         topBar = {
             SpaceViewTopBar(
                 currentSpace = state.currentSpace,
+                canAccessSpaceSettings = state.canAccessSpaceSettings,
                 onBackClick = onBackClick,
                 onLeaveSpaceClick = onLeaveSpaceClick,
                 onShareSpace = onShareSpace,
@@ -255,6 +256,7 @@ private fun LoadingMoreIndicator(
 @Composable
 private fun SpaceViewTopBar(
     currentSpace: SpaceRoom?,
+    canAccessSpaceSettings: Boolean,
     onBackClick: () -> Unit,
     onLeaveSpaceClick: () -> Unit,
     onDetailsClick: () -> Unit,
@@ -275,8 +277,7 @@ private fun SpaceViewTopBar(
                     avatarData = currentSpace.getAvatarData(AvatarSize.TimelineRoom),
                     modifier = Modifier
                         .clip(roundedCornerShape)
-                        // TODO enable when screen ready for space
+                        .clickable(enabled = canAccessSpaceSettings, onClick = onDetailsClick)
-                        .clickable(enabled = false, onClick = onDetailsClick)
                 )
             }
         },

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsFlowNode.kt

@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.space.impl.settings
+
+import android.os.Parcelable
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import com.bumble.appyx.core.plugin.Plugin
+import com.bumble.appyx.navmodel.backstack.BackStack
+import com.bumble.appyx.navmodel.backstack.operation.push
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
+import io.element.android.features.rolesandpermissions.api.RolesAndPermissionsEntryPoint
+import io.element.android.features.securityandprivacy.api.SecurityAndPrivacyEntryPoint
+import io.element.android.features.space.impl.di.SpaceFlowScope
+import io.element.android.libraries.architecture.BackstackView
+import io.element.android.libraries.architecture.BaseFlowNode
+import io.element.android.libraries.architecture.callback
+import io.element.android.libraries.architecture.createNode
+import kotlinx.parcelize.Parcelize
+
+@ContributesNode(SpaceFlowScope::class)
+@AssistedInject
+class SpaceSettingsFlowNode(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+    private val securityAndPrivacyEntryPoint: SecurityAndPrivacyEntryPoint,
+    private val rolesAndPermissionsEntryPoint: RolesAndPermissionsEntryPoint,
+) : BaseFlowNode<SpaceSettingsFlowNode.NavTarget>(
+    backstack = BackStack(
+        initialElement = NavTarget.Root,
+        savedStateMap = buildContext.savedStateMap,
+    ),
+    buildContext = buildContext,
+    plugins = plugins,
+) {
+    interface Callback : Plugin {
+        fun navigateToSpaceMembers()
+        fun startLeaveSpaceFlow()
+        fun closeSettings()
+    }
+
+    sealed interface NavTarget : Parcelable {
+        @Parcelize
+        data object Root : NavTarget
+
+        @Parcelize
+        data object SecurityAndPrivacy : NavTarget
+
+        @Parcelize
+        data object RolesAndPermissions : NavTarget
+    }
+
+    private val callback: Callback = callback()
+
+    override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
+        return when (navTarget) {
+            is NavTarget.Root -> {
+                val callback = object : SpaceSettingsNode.Callback {
+                    override fun closeSettings() {
+                        callback.closeSettings()
+                    }
+
+                    override fun navigateToEditDetails() {
+                        // TODO
+                    }
+
+                    override fun navigateToSpaceMembers() {
+                        callback.navigateToSpaceMembers()
+                    }
+
+                    override fun navigateToRolesAndPermissions() {
+                        backstack.push(NavTarget.RolesAndPermissions)
+                    }
+
+                    override fun navigateToSecurityAndPrivacy() {
+                        backstack.push(NavTarget.SecurityAndPrivacy)
+                    }
+
+                    override fun startLeaveSpaceFlow() {
+                        callback.startLeaveSpaceFlow()
+                    }
+                }
+                createNode<SpaceSettingsNode>(
+                    buildContext = buildContext,
+                    plugins = listOf(callback),
+                )
+            }
+            is NavTarget.SecurityAndPrivacy -> {
+                securityAndPrivacyEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                )
+            }
+            is NavTarget.RolesAndPermissions -> {
+                rolesAndPermissionsEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                )
+            }
+        }
+    }
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        BackstackView(modifier)
+    }
+}

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsNode.kt

@@ -32,7 +32,7 @@ class SpaceSettingsNode(
     interface Callback : Plugin {
         fun closeSettings()
 
-        fun navigateToSpaceInfo()
+        fun navigateToEditDetails()
         fun navigateToSpaceMembers()
         fun navigateToRolesAndPermissions()
         fun navigateToSecurityAndPrivacy()
@@ -48,7 +48,7 @@ class SpaceSettingsNode(
         SpaceSettingsView(
             state = state,
             modifier = modifier,
-            onSpaceInfoClick = callback::navigateToSpaceInfo,
+            onSpaceInfoClick = callback::navigateToEditDetails,
             onBackClick = callback::closeSettings,
             onMembersClick = callback::navigateToSpaceMembers,
             onRolesAndPermissionsClick = callback::navigateToRolesAndPermissions,

features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpacePresenterTest.kt

@@ -19,6 +19,8 @@ import io.element.android.features.invite.api.toInviteData
 import io.element.android.features.invite.test.InMemorySeenInvitesStore
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.featureflag.api.FeatureFlags
+import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
 import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
@@ -62,11 +64,22 @@ class SpacePresenterTest {
             assertThat(state.joinActions).isEmpty()
             assertThat(state.acceptDeclineInviteState).isEqualTo(anAcceptDeclineInviteState())
             assertThat(state.topicViewerState).isEqualTo(TopicViewerState.Hidden)
+            assertThat(state.canAccessSpaceSettings).isFalse()
             advanceUntilIdle()
             paginateResult.assertions().isCalledOnce()
         }
     }
 
+    @Test
+    fun `present - canAccessSpaceSettings when space settings ff is enabled`() = runTest {
+        val presenter = createSpacePresenter(spaceSettingsEnabled = true)
+        presenter.test {
+            skipItems(1)
+            val state = awaitItem()
+            assertThat(state.canAccessSpaceSettings).isTrue()
+        }
+    }
+
     @Test
     fun `present - load more`() = runTest {
         val paginateResult = lambdaRecorder<Result<Unit>> {
@@ -328,6 +341,7 @@ class SpacePresenterTest {
             lambda = { _, _, _ -> Result.success(Unit) },
         ),
         acceptDeclineInvitePresenter: Presenter<AcceptDeclineInviteState> = Presenter { anAcceptDeclineInviteState() },
+        spaceSettingsEnabled: Boolean = false,
     ): SpacePresenter {
         return SpacePresenter(
             client = client,
@@ -336,6 +350,11 @@ class SpacePresenterTest {
             joinRoom = joinRoom,
             acceptDeclineInvitePresenter = acceptDeclineInvitePresenter,
             sessionCoroutineScope = backgroundScope,
+            featureFlagService = FakeFeatureFlagService(
+                initialState = mapOf(
+                    FeatureFlags.SpaceSettings.key to spaceSettingsEnabled,
+                )
+            ),
         )
     }
 }

libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt

@@ -74,6 +74,13 @@ enum class FeatureFlags(
         key = "feature.space",
         title = "Spaces",
         defaultValue = { true },
+        isFinished = true,
+    ),
+    SpaceSettings(
+        key = "feature.spaceSettings",
+        title = "Space settings",
+        description = "Allow managing space settings such as details, permissions and privacy.",
+        defaultValue = { false },
         isFinished = false,
     ),
     PrintLogsToLogcat(