Merge pull request #5597 from element-hq/feature/fga/space_room_update_divider

design(space): let SpaceRoomItemView divider be full width

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt

@@ -9,6 +9,7 @@ package io.element.android.features.home.impl.spaces
 
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -57,20 +58,24 @@ fun HomeSpacesView(
         item {
             HorizontalDivider()
         }
-        state.spaceRooms.forEach { spaceRoom ->
-            item(spaceRoom.roomId) {
-                val isInvitation = spaceRoom.state == CurrentUserMembership.INVITED
-                SpaceRoomItemView(
-                    spaceRoom = spaceRoom,
-                    showUnreadIndicator = isInvitation && spaceRoom.roomId !in state.seenSpaceInvites,
-                    hideAvatars = isInvitation && state.hideInvitesAvatar,
-                    onClick = {
-                        onSpaceClick(spaceRoom.roomId)
-                    },
-                    onLongClick = {
-                        // TODO
-                    },
-                )
+        itemsIndexed(
+            items = state.spaceRooms,
+            key = { _, spaceRoom -> spaceRoom.roomId }
+        ) { index, spaceRoom ->
+            val isInvitation = spaceRoom.state == CurrentUserMembership.INVITED
+            SpaceRoomItemView(
+                spaceRoom = spaceRoom,
+                showUnreadIndicator = isInvitation && spaceRoom.roomId !in state.seenSpaceInvites,
+                hideAvatars = isInvitation && state.hideInvitesAvatar,
+                onClick = {
+                    onSpaceClick(spaceRoom.roomId)
+                },
+                onLongClick = {
+                    // TODO
+                },
+            )
+            if (index != state.spaceRooms.lastIndex) {
+                HorizontalDivider()
             }
         }
     }

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

@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -182,32 +183,36 @@ private fun SpaceViewContent(
                 HorizontalDivider()
             }
         }
-        state.children.forEach { spaceRoom ->
-            item {
-                val isInvitation = spaceRoom.state == CurrentUserMembership.INVITED
-                val isCurrentlyJoining = state.isJoining(spaceRoom.roomId)
-                SpaceRoomItemView(
-                    spaceRoom = spaceRoom,
-                    showUnreadIndicator = isInvitation && spaceRoom.roomId !in state.seenSpaceInvites,
-                    hideAvatars = isInvitation && state.hideInvitesAvatar,
-                    onClick = {
-                        onRoomClick(spaceRoom)
+        itemsIndexed(
+            items = state.children,
+            key = { _, spaceRoom -> spaceRoom.roomId }
+        ) { index, spaceRoom ->
+            val isInvitation = spaceRoom.state == CurrentUserMembership.INVITED
+            val isCurrentlyJoining = state.isJoining(spaceRoom.roomId)
+            SpaceRoomItemView(
+                spaceRoom = spaceRoom,
+                showUnreadIndicator = isInvitation && spaceRoom.roomId !in state.seenSpaceInvites,
+                hideAvatars = isInvitation && state.hideInvitesAvatar,
+                onClick = {
+                    onRoomClick(spaceRoom)
+                },
+                onLongClick = {
+                    // TODO
+                },
+                trailingAction = spaceRoom.trailingAction(isCurrentlyJoining = isCurrentlyJoining) {
+                    state.eventSink(SpaceEvents.Join(spaceRoom))
+                },
+                bottomAction = spaceRoom.inviteButtons(
+                    onAcceptClick = {
+                        state.eventSink(SpaceEvents.AcceptInvite(spaceRoom))
                     },
-                    onLongClick = {
-                        // TODO
-                    },
-                    trailingAction = spaceRoom.trailingAction(isCurrentlyJoining = isCurrentlyJoining) {
-                        state.eventSink(SpaceEvents.Join(spaceRoom))
-                    },
-                    bottomAction = spaceRoom.inviteButtons(
-                        onAcceptClick = {
-                            state.eventSink(SpaceEvents.AcceptInvite(spaceRoom))
-                        },
-                        onDeclineClick = {
-                            state.eventSink(SpaceEvents.DeclineInvite(spaceRoom))
-                        }
-                    )
+                    onDeclineClick = {
+                        state.eventSink(SpaceEvents.DeclineInvite(spaceRoom))
+                    }
                 )
+            )
+            if (index != state.children.lastIndex) {
+                HorizontalDivider()
             }
         }
         if (state.hasMoreToLoad) {
@@ -328,10 +333,10 @@ private fun SpaceAvatarAndNameRow(
         )
         Text(
             modifier = Modifier
-                .padding(horizontal = 8.dp)
-                .semantics {
-                    heading()
-                },
+                    .padding(horizontal = 8.dp)
+                    .semantics {
+                        heading()
+                    },
             text = name ?: stringResource(CommonStrings.common_no_space_name),
             style = ElementTheme.typography.fontBodyLgMedium,
             fontStyle = FontStyle.Italic.takeIf { name == null },

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomItemView.kt

@@ -43,7 +43,6 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarType
 import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenuAction
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.unreadIndicator
@@ -81,56 +80,50 @@ fun SpaceRoomItemView(
             interactionSource = remember { MutableInteractionSource() }
         )
         .onKeyboardContextMenuAction { onLongClick }
-    Box(modifier = modifier.then(clickModifier)) {
-        Column(
-            modifier = Modifier.padding(horizontal = 16.dp, vertical = 12.dp),
+    Column(
+        modifier = modifier
+            .then(clickModifier)
+            .padding(horizontal = 16.dp, vertical = 12.dp),
+    ) {
+        SpaceRoomItemScaffold(
+            avatarData = spaceRoom.getAvatarData(AvatarSize.SpaceListItem),
+            isSpace = spaceRoom.isSpace,
+            hideAvatars = hideAvatars,
+            heroes = spaceRoom.heroes
+                .map { hero -> hero.getAvatarData(AvatarSize.SpaceListItem) }
+                .toImmutableList(),
+            trailingAction = trailingAction,
         ) {
-            SpaceRoomItemScaffold(
-                avatarData = spaceRoom.getAvatarData(AvatarSize.SpaceListItem),
-                isSpace = spaceRoom.isSpace,
-                hideAvatars = hideAvatars,
-                heroes = spaceRoom.heroes
-                    .map { hero -> hero.getAvatarData(AvatarSize.SpaceListItem) }
-                    .toImmutableList(),
-                trailingAction = trailingAction,
-            ) {
-                NameAndIndicatorRow(
-                    name = spaceRoom.displayName,
-                    showIndicator = showUnreadIndicator
+            NameAndIndicatorRow(
+                name = spaceRoom.displayName,
+                showIndicator = showUnreadIndicator
+            )
+            Spacer(modifier = Modifier.height(1.dp))
+            SubtitleRow(
+                visibilityIcon = spaceRoom.visibilityIcon(),
+                subtitle = spaceRoom.subtitle()
+            )
+            Spacer(modifier = Modifier.height(1.dp))
+            val info = spaceRoom.info()
+            if (info.isNotBlank()) {
+                Text(
+                    modifier = Modifier.weight(1f),
+                    style = ElementTheme.typography.fontBodyMdRegular,
+                    text = info,
+                    color = ElementTheme.colors.textSecondary,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
                 )
-                Spacer(modifier = Modifier.height(1.dp))
-                SubtitleRow(
-                    visibilityIcon = spaceRoom.visibilityIcon(),
-                    subtitle = spaceRoom.subtitle()
-                )
-                Spacer(modifier = Modifier.height(1.dp))
-                val info = spaceRoom.info()
-                if (info.isNotBlank()) {
-                    Text(
-                        modifier = Modifier.weight(1f),
-                        style = ElementTheme.typography.fontBodyMdRegular,
-                        text = info,
-                        color = ElementTheme.colors.textSecondary,
-                        maxLines = 1,
-                        overflow = TextOverflow.Ellipsis
-                    )
-                }
-            }
-            if (bottomAction != null) {
-                Spacer(modifier = Modifier.height(12.dp))
-                // Match the padding of the text content (avatar + spacer)
-                Box(modifier = Modifier.padding(start = AvatarSize.SpaceListItem.dp + 16.dp)) {
-                    bottomAction()
-                }
-                Spacer(modifier = Modifier.height(4.dp))
             }
         }
-        HorizontalDivider(
-            modifier = Modifier
-            // Match the padding of the text content (padding + avatar + spacer)
-            .padding(start = AvatarSize.SpaceListItem.dp + 16.dp + 16.dp)
-            .align(Alignment.BottomCenter)
-        )
+        if (bottomAction != null) {
+            Spacer(modifier = Modifier.height(12.dp))
+            // Match the padding of the text content (avatar + spacer)
+            Box(modifier = Modifier.padding(start = AvatarSize.SpaceListItem.dp + 16.dp)) {
+                bottomAction()
+            }
+            Spacer(modifier = Modifier.height(4.dp))
+        }
     }
 }
 
@@ -264,7 +257,6 @@ internal fun SpaceRoomItemViewPreview(@PreviewParameter(SpaceRoomProvider::class
         hideAvatars = false,
         onClick = {},
         onLongClick = {},
-        modifier = Modifier.fillMaxWidth().padding(8.dp),
         bottomAction = if (spaceRoom.state == CurrentUserMembership.INVITED) {
             { InviteButtonsRowMolecule({}, {}) }
         } else {