feature(space) : iterate on SpaceSettings

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

@@ -31,7 +31,6 @@ class SpaceSettingsPresenter(
             memberCount = roomInfo.activeMembersCount,
             showRolesAndPermissions = isUserAdmin,
             showSecurityAndPrivacy = isUserAdmin,
-            isTombstoned = roomInfo.successorRoom != null,
             eventSink = {},
         )
     }

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

@@ -15,7 +15,6 @@ data class SpaceSettingsState(
     val name: String,
     val canonicalAlias: RoomAlias?,
     val avatarUrl: String?,
-    val isTombstoned: Boolean,
     val memberCount: Long,
     val showRolesAndPermissions: Boolean,
     val showSecurityAndPrivacy: Boolean,

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

@@ -27,7 +27,6 @@ fun aSpaceSettingsState(
     alias: RoomAlias? = RoomAlias("#spacename:element.io"),
     avatarUrl: String? = null,
     memberCount: Long = 100,
-    isTombstoned: Boolean = false,
     showRolesAndPermissions: Boolean = false,
     showSecurityAndPrivacy: Boolean = false,
     eventSink: (SpaceSettingsEvents) -> Unit = {},
@@ -36,7 +35,6 @@ fun aSpaceSettingsState(
     name = name,
     canonicalAlias = alias,
     avatarUrl = avatarUrl,
-    isTombstoned = isTombstoned,
     memberCount = memberCount,
     showRolesAndPermissions = showRolesAndPermissions,
     showSecurityAndPrivacy = showSecurityAndPrivacy,

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

@@ -41,13 +41,14 @@ import io.element.android.libraries.designsystem.theme.components.ListItemStyle
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 fun SpaceSettingsView(
     state: SpaceSettingsState,
     onBackClick: () -> Unit,
-    onSpaceInfoClick: ()->Unit,
+    onSpaceInfoClick: () -> Unit,
     onMembersClick: () -> Unit,
     onRolesAndPermissionsClick: () -> Unit,
     onSecurityAndPrivacyClick: () -> Unit,
@@ -65,59 +66,74 @@ fun SpaceSettingsView(
                 .padding(padding)
                 .verticalScroll(rememberScrollState())
         ) {
-            Row(
+            SpaceInfoSection(
-                modifier = Modifier
+                roomId = state.roomId,
-                    .fillMaxWidth()
+                name = state.name,
-                    .clickable(onClick = onSpaceInfoClick)
+                avatarUrl = state.avatarUrl,
-                    .padding(16.dp),
+                canonicalAlias = state.canonicalAlias?.value,
-                verticalAlignment = Alignment.CenterVertically,
+                onSpaceInfoClick = onSpaceInfoClick,
-            ) {
+            )
-                Avatar(
+            Section(isVisible = state.showSecurityAndPrivacy, content = {
-                    avatarData = AvatarData(state.roomId.value, state.name, state.avatarUrl, AvatarSize.SpaceListItem),
-                    avatarType = AvatarType.Space(
-                        isTombstoned = state.isTombstoned,
-                    ),
-                    contentDescription = state.avatarUrl?.let { stringResource(CommonStrings.a11y_room_avatar) },
-                )
-                Spacer(Modifier.width(16.dp))
-                Column {
-                    Text(
-                        text = state.name,
-                        style = ElementTheme.typography.fontHeadingMdRegular,
-                        color = ElementTheme.colors.textPrimary,
-                    )
-                    if (state.canonicalAlias != null) {
-                        Text(
-                            text = state.canonicalAlias.value,
-                            style = ElementTheme.typography.fontBodyMdRegular,
-                            color = ElementTheme.colors.textSecondary,
-                        )
-                    }
-                }
-            }
-            Section(isVisible = state.showSecurityAndPrivacy) {
                 SecurityAndPrivacyItem(
                     onClick = onSecurityAndPrivacyClick
                 )
-            }
+            })
-            Section {
+            Section(content = {
                 MembersItem(state.memberCount, onClick = onMembersClick)
                 if (state.showRolesAndPermissions) {
                     RolesAndPermissionsItem(onClick = onRolesAndPermissionsClick)
                 }
-            }
+            })
-            Section {
+            Section(content = {
                 LeaveSpaceItem(
                     onClick = onLeaveSpaceClick
                 )
-            }
+            })
 
         }
     }
 }
 
 @Composable
-private fun ColumnScope.Section(
+private fun SpaceInfoSection(
+    roomId: RoomId,
+    name: String,
+    avatarUrl: String?,
+    canonicalAlias: String?,
+    onSpaceInfoClick: () -> Unit,
+) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable(onClick = onSpaceInfoClick)
+            .padding(16.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Avatar(
+            avatarData = AvatarData(roomId.value, name, avatarUrl, AvatarSize.SpaceListItem),
+            avatarType = AvatarType.Space(),
+            contentDescription = avatarUrl?.let { stringResource(CommonStrings.a11y_avatar) },
+        )
+        Spacer(Modifier.width(16.dp))
+        Column {
+            Text(
+                text = name,
+                style = ElementTheme.typography.fontHeadingMdRegular,
+                color = ElementTheme.colors.textPrimary,
+            )
+            if (canonicalAlias != null) {
+                Text(
+                    text = canonicalAlias,
+                    style = ElementTheme.typography.fontBodyMdRegular,
+                    color = ElementTheme.colors.textSecondary,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun Section(
     modifier: Modifier = Modifier,
     isVisible: Boolean = true,
     content: @Composable ColumnScope.() -> Unit,