Merge pull request #5844 from element-hq/feature/fga/room_edit_details

Change : room details edit

Author: ganfra

features/roomdetails/impl/build.gradle.kts

@@ -59,6 +59,7 @@ dependencies {
     implementation(projects.features.roommembermoderation.api)
     implementation(projects.features.rolesandpermissions.api)
     implementation(projects.features.securityandprivacy.api)
+    implementation(projects.features.roomdetailsedit.api)
     implementation(projects.features.invitepeople.api)
 
     testCommonDependencies(libs, true)
@@ -73,6 +74,7 @@ dependencies {
     testImplementation(projects.features.call.test)
     testImplementation(projects.features.rolesandpermissions.test)
     testImplementation(projects.features.securityandprivacy.test)
+    testImplementation(projects.features.roomdetailsedit.test)
     testImplementation(projects.features.knockrequests.test)
     testImplementation(projects.features.messages.test)
     testImplementation(projects.features.poll.test)

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt

@@ -35,11 +35,11 @@ import io.element.android.features.rolesandpermissions.api.ChangeRoomMemberRoles
 import io.element.android.features.rolesandpermissions.api.ChangeRoomMemberRolesListType
 import io.element.android.features.rolesandpermissions.api.RolesAndPermissionsEntryPoint
 import io.element.android.features.roomdetails.api.RoomDetailsEntryPoint
-import io.element.android.features.roomdetails.impl.edit.RoomDetailsEditNode
 import io.element.android.features.roomdetails.impl.invite.RoomInviteMembersNode
 import io.element.android.features.roomdetails.impl.members.RoomMemberListNode
 import io.element.android.features.roomdetails.impl.members.details.RoomMemberDetailsNode
 import io.element.android.features.roomdetails.impl.notificationsettings.RoomNotificationSettingsNode
+import io.element.android.features.roomdetailsedit.api.RoomDetailsEditEntryPoint
 import io.element.android.features.securityandprivacy.api.SecurityAndPrivacyEntryPoint
 import io.element.android.features.userprofile.shared.UserProfileNodeHelper
 import io.element.android.features.verifysession.api.OutgoingVerificationEntryPoint
@@ -85,6 +85,7 @@ class RoomDetailsFlowNode(
     private val changeRoomMemberRolesEntryPoint: ChangeRoomMemberRolesEntryPoint,
     private val rolesAndPermissionsEntryPoint: RolesAndPermissionsEntryPoint,
     private val securityAndPrivacyEntryPoint: SecurityAndPrivacyEntryPoint,
+    private val roomDetailsEditEntryPoint: RoomDetailsEditEntryPoint,
 ) : BaseFlowNode<RoomDetailsFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = plugins.filterIsInstance<RoomDetailsEntryPoint.Params>().first().initialElement.toNavTarget(),
@@ -256,7 +257,7 @@ class RoomDetailsFlowNode(
             }
 
             NavTarget.RoomDetailsEdit -> {
-                createNode<RoomDetailsEditNode>(buildContext)
+                roomDetailsEditEntryPoint.createNode(this, buildContext)
             }
 
             NavTarget.InviteMembers -> {

features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPointTest.kt

@@ -20,6 +20,7 @@ import io.element.android.features.messages.test.FakeMessagesEntryPoint
 import io.element.android.features.poll.test.history.FakePollHistoryEntryPoint
 import io.element.android.features.reportroom.test.FakeReportRoomEntryPoint
 import io.element.android.features.roomdetails.api.RoomDetailsEntryPoint
+import io.element.android.features.roomdetailsedit.test.FakeRoomDetailsEditEntryPoint
 import io.element.android.features.securityandprivacy.test.FakeSecurityAndPrivacyEntryPoint
 import io.element.android.features.verifysession.test.FakeOutgoingVerificationEntryPoint
 import io.element.android.libraries.matrix.api.core.EventId
@@ -63,6 +64,7 @@ class DefaultRoomDetailsEntryPointTest {
                 changeRoomMemberRolesEntryPoint = FakeChangeRoomMemberRolesEntryPoint(),
                 rolesAndPermissionsEntryPoint = FakeRolesAndPermissionsEntryPoint(),
                 securityAndPrivacyEntryPoint = FakeSecurityAndPrivacyEntryPoint(),
+                roomDetailsEditEntryPoint = FakeRoomDetailsEditEntryPoint(),
             )
         }
         val callback = object : RoomDetailsEntryPoint.Callback {

features/roomdetailsedit/api/build.gradle.kts

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+plugins {
+    id("io.element.android-library")
+    id("kotlin-parcelize")
+}
+
+android {
+    namespace = "io.element.android.features.roomdetailsedit.api"
+}
+
+dependencies {
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.matrix.api)
+}

features/roomdetailsedit/api/src/main/kotlin/io/element/android/features/roomdetailsedit/api/RoomDetailsEditEntryPoint.kt

@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector 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.roomdetailsedit.api
+
+import io.element.android.libraries.architecture.SimpleFeatureEntryPoint
+
+fun interface RoomDetailsEditEntryPoint : SimpleFeatureEntryPoint

features/roomdetailsedit/impl/build.gradle.kts

@@ -0,0 +1,57 @@
+import extension.setupDependencyInjection
+import extension.testCommonDependencies
+
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023, 2024 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+plugins {
+    id("io.element.android-compose-library")
+    id("kotlin-parcelize")
+}
+
+android {
+    namespace = "io.element.android.features.roomdetailsedit.impl"
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
+}
+
+setupDependencyInjection()
+
+dependencies {
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.matrixui)
+    implementation(projects.libraries.designsystem)
+    implementation(projects.libraries.uiStrings)
+    implementation(projects.libraries.androidutils)
+    implementation(projects.libraries.mediapickers.api)
+    implementation(projects.libraries.mediaupload.api)
+    implementation(projects.libraries.mediaviewer.api)
+    implementation(projects.libraries.featureflag.api)
+    implementation(projects.libraries.permissions.api)
+    implementation(projects.libraries.preferences.api)
+    implementation(projects.services.analytics.api)
+    implementation(projects.libraries.testtags)
+    api(projects.features.roomdetailsedit.api)
+    api(projects.services.apperror.api)
+    implementation(libs.coil.compose)
+
+    testCommonDependencies(libs, true)
+    testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.libraries.mediaupload.test)
+    testImplementation(projects.libraries.mediapickers.test)
+    testImplementation(projects.libraries.mediaviewer.test)
+    testImplementation(projects.libraries.permissions.test)
+    testImplementation(projects.libraries.preferences.test)
+    testImplementation(projects.libraries.featureflag.test)
+    testImplementation(projects.services.analytics.test)
+}

features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/DefaultRoomDetailsEditEntryPoint.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector 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.roomdetailsedit.impl
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.features.roomdetailsedit.api.RoomDetailsEditEntryPoint
+import io.element.android.libraries.architecture.createNode
+
+@ContributesBinding(AppScope::class)
+class DefaultRoomDetailsEditEntryPoint : RoomDetailsEditEntryPoint {
+    override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
+        return parentNode.createNode<RoomDetailsEditNode>(buildContext)
+    }
+}

…tails/impl/edit/RoomDetailsEditEvents.kt …etailsedit/impl/RoomDetailsEditEvents.ktfeatures/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditEvents.kt renamed to features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditEvents.kt features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditEvents.kt renamed to features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditEvents.kt

@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.edit
+package io.element.android.features.roomdetailsedit.impl
 
 import io.element.android.libraries.matrix.ui.media.AvatarAction
 

…details/impl/edit/RoomDetailsEditNode.kt …mdetailsedit/impl/RoomDetailsEditNode.ktfeatures/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditNode.kt renamed to features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditNode.kt features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditNode.kt renamed to features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditNode.kt

@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.edit
+package io.element.android.features.roomdetailsedit.impl
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier

…ls/impl/edit/RoomDetailsEditPresenter.kt …ilsedit/impl/RoomDetailsEditPresenter.ktfeatures/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenter.kt renamed to features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditPresenter.kt features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenter.kt renamed to features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditPresenter.kt

@@ -6,8 +6,9 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.roomdetails.impl.edit
+package io.element.android.features.roomdetailsedit.impl
 
+import android.Manifest
 import android.net.Uri
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -32,9 +33,6 @@ import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.StateEventType
 import io.element.android.libraries.matrix.api.room.powerlevels.canSendState
 import io.element.android.libraries.matrix.ui.media.AvatarAction
-import io.element.android.libraries.matrix.ui.room.avatarUrl
-import io.element.android.libraries.matrix.ui.room.rawName
-import io.element.android.libraries.matrix.ui.room.topic
 import io.element.android.libraries.mediapickers.api.PickerProvider
 import io.element.android.libraries.mediaupload.api.MediaOptimizationConfigProvider
 import io.element.android.libraries.mediaupload.api.MediaPreProcessor
@@ -54,29 +52,29 @@ class RoomDetailsEditPresenter(
     permissionsPresenterFactory: PermissionsPresenter.Factory,
     private val mediaOptimizationConfigProvider: MediaOptimizationConfigProvider,
 ) : Presenter<RoomDetailsEditState> {
-    private val cameraPermissionPresenter = permissionsPresenterFactory.create(android.Manifest.permission.CAMERA)
+    private val cameraPermissionPresenter = permissionsPresenterFactory.create(Manifest.permission.CAMERA)
     private var pendingPermissionRequest = false
 
     @Composable
     override fun present(): RoomDetailsEditState {
         val cameraPermissionState = cameraPermissionPresenter.present()
         val roomSyncUpdateFlow = room.syncUpdateFlow.collectAsState()
-
-        val roomAvatarUri = room.avatarUrl()
+        val roomInfo by room.roomInfoFlow.collectAsState()
+        val roomAvatarUri = roomInfo.avatarUrl
         var roomAvatarUriEdited by rememberSaveable { mutableStateOf<String?>(null) }
         LaunchedEffect(roomAvatarUri) {
             // Every time the roomAvatar change (from sync), we can set the new avatar.
             temporaryUriDeleter.delete(roomAvatarUriEdited?.toUri())
             roomAvatarUriEdited = roomAvatarUri
         }
 
-        val roomRawNameTrimmed = room.rawName().orEmpty().trim()
+        val roomRawNameTrimmed = roomInfo.rawName.orEmpty().trim()
         var roomRawNameEdited by rememberSaveable { mutableStateOf("") }
         LaunchedEffect(roomRawNameTrimmed) {
             // Every time the rawName change (from sync), we can set the new name.
             roomRawNameEdited = roomRawNameTrimmed
         }
-        val roomTopicTrimmed = room.topic().orEmpty().trim()
+        val roomTopicTrimmed = roomInfo.topic.orEmpty().trim()
         var roomTopicEdited by rememberSaveable { mutableStateOf("") }
         LaunchedEffect(roomTopicTrimmed) {
             // Every time the topic change (from sync), we can set the new topic.
@@ -192,6 +190,7 @@ class RoomDetailsEditPresenter(
             saveButtonEnabled = saveButtonEnabled,
             saveAction = saveAction.value,
             cameraPermissionState = cameraPermissionState,
+            isSpace = roomInfo.isSpace,
             eventSink = ::handleEvent,
         )
     }