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 ->
+        itemsIndexed(
-            item(spaceRoom.roomId) {
+            items = state.spaceRooms,
-                val isInvitation = spaceRoom.state == CurrentUserMembership.INVITED
+            key = { _, spaceRoom -> spaceRoom.roomId }
-                SpaceRoomItemView(
+        ) { index, spaceRoom ->
-                    spaceRoom = spaceRoom,
+            val isInvitation = spaceRoom.state == CurrentUserMembership.INVITED
-                    showUnreadIndicator = isInvitation && spaceRoom.roomId !in state.seenSpaceInvites,
+            SpaceRoomItemView(
-                    hideAvatars = isInvitation && state.hideInvitesAvatar,
+                spaceRoom = spaceRoom,
-                    onClick = {
+                showUnreadIndicator = isInvitation && spaceRoom.roomId !in state.seenSpaceInvites,
-                        onSpaceClick(spaceRoom.roomId)
+                hideAvatars = isInvitation && state.hideInvitesAvatar,
-                    },
+                onClick = {
-                    onLongClick = {
+                    onSpaceClick(spaceRoom.roomId)
-                        // TODO
+                },
-                    },
+                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 ->
+        itemsIndexed(
-            item {
+            items = state.children,
-                val isInvitation = spaceRoom.state == CurrentUserMembership.INVITED
+            key = { _, spaceRoom -> spaceRoom.roomId }
-                val isCurrentlyJoining = state.isJoining(spaceRoom.roomId)
+        ) { index, spaceRoom ->
-                SpaceRoomItemView(
+            val isInvitation = spaceRoom.state == CurrentUserMembership.INVITED
-                    spaceRoom = spaceRoom,
+            val isCurrentlyJoining = state.isJoining(spaceRoom.roomId)
-                    showUnreadIndicator = isInvitation && spaceRoom.roomId !in state.seenSpaceInvites,
+            SpaceRoomItemView(
-                    hideAvatars = isInvitation && state.hideInvitesAvatar,
+                spaceRoom = spaceRoom,
-                    onClick = {
+                showUnreadIndicator = isInvitation && spaceRoom.roomId !in state.seenSpaceInvites,
-                        onRoomClick(spaceRoom)
+                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 = {
+                    onDeclineClick = {
-                        // TODO
+                        state.eventSink(SpaceEvents.DeclineInvite(spaceRoom))
-                    },
+                    }
-                    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))
-                        }
-                    )
                 )
+            )
+            if (index != state.children.lastIndex) {
+                HorizontalDivider()
             }
         }
         if (state.hasMoreToLoad) {
@@ -328,10 +333,10 @@ private fun SpaceAvatarAndNameRow(
         )
         Text(
             modifier = Modifier
-                .padding(horizontal = 8.dp)
+                    .padding(horizontal = 8.dp)
-                .semantics {
+                    .semantics {
-                    heading()
+                        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(
-        Column(
+        modifier = modifier
-            modifier = Modifier.padding(horizontal = 16.dp, vertical = 12.dp),
+            .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(
+            NameAndIndicatorRow(
-                avatarData = spaceRoom.getAvatarData(AvatarSize.SpaceListItem),
+                name = spaceRoom.displayName,
-                isSpace = spaceRoom.isSpace,
+                showIndicator = showUnreadIndicator
-                hideAvatars = hideAvatars,
+            )
-                heroes = spaceRoom.heroes
+            Spacer(modifier = Modifier.height(1.dp))
-                    .map { hero -> hero.getAvatarData(AvatarSize.SpaceListItem) }
+            SubtitleRow(
-                    .toImmutableList(),
+                visibilityIcon = spaceRoom.visibilityIcon(),
-                trailingAction = trailingAction,
+                subtitle = spaceRoom.subtitle()
-            ) {
+            )
-                NameAndIndicatorRow(
+            Spacer(modifier = Modifier.height(1.dp))
-                    name = spaceRoom.displayName,
+            val info = spaceRoom.info()
-                    showIndicator = showUnreadIndicator
+            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(
+        if (bottomAction != null) {
-            modifier = Modifier
+            Spacer(modifier = Modifier.height(12.dp))
-            // Match the padding of the text content (padding + avatar + spacer)
+            // Match the padding of the text content (avatar + spacer)
-            .padding(start = AvatarSize.SpaceListItem.dp + 16.dp + 16.dp)
+            Box(modifier = Modifier.padding(start = AvatarSize.SpaceListItem.dp + 16.dp)) {
-            .align(Alignment.BottomCenter)
+                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 {

tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_0_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:40570506b75d7cb582cee70eb3d6453b673087a17a18d8ef148e3ff5edb6f1b9
+oid sha256:388207cd5b424fbb95f070eac393db9330ae1b641795d1bb815874435ef9f623
-size 89228
+size 89027

tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_1_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:491d0d8f7d7e269b13548c48a6eacb8fa4df5e2798aae5b3938e7eb7368ce3f9
+oid sha256:542d8ba6a6031fe2789cf111f333eef22acf95281f57421ace2c7b5b0a599cc2
-size 41251
+size 41140

tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_0_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3fb98e398abcb465b94d4138eecbccf076e229cb0807f6543d4f77ebb0353499
+oid sha256:134e561fc4082339725c241a79fa55e0b5b1e134c046d4454cb7a9e71ea5e1b7
-size 87390
+size 87174

tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_1_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3bee6454b9fab1a579e86bece32c0d6134d08fed5a63fecf247a58d7acba142d
+oid sha256:c31cd78bc054610be05012cdba7eb0cbc770435b0e12bc065f6eae4a773ca39e
-size 40125
+size 40121

tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_4_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef2b3724cdd28175824554f800019fa663be341f0854751b50321e9b73203b6a
+oid sha256:27c5418d421ca6cf0069e34ca3e22ca807203d252b9c1424eca447f070fbbbdf
-size 54275
+size 54177

tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_4_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b6fc1c78e05737b3231172b2b72b532b769ae9928ddd6674a864bee56566f6e
+oid sha256:fc4c11b4d2c83b179409083ca36fcb95e44b7d8c51abd23e9c07f4d3be8a339c
-size 52623
+size 52626

tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_3_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0534ab33ee18f03d219eb5b1490d41ccd1e3a4eb6bf734f31383a75110e368b3
+oid sha256:7e8b65396dedff81056157620e2390c8d69954ee288266b575ac61aba16c2bec
-size 63084
+size 62590

tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_4_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:85971dfed5e1cb01f5b04f43cc998d9cb69b6f06a24e3ea28f32c74aa3445e94
+oid sha256:b8e1fb3b8b62ea8583a5bc9a18f39dbe71684e7d019bf63b22b873851b219209
-size 63755
+size 63270

tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_3_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5e587b7c669fa8fd02b8202318cd405b6fbb3bc91928d56f4bf2ef12f3bbbcc
+oid sha256:9ff5ca08d441240de9e5adc35e41bceeb0f462979777345da4b2865e9a80012e
-size 61863
+size 61405

tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_4_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a25dcf4e97dddb032713e49e13f46836fd541382aad2a9aa9b683dbcfdd93ccc
+oid sha256:2f35b63ac49c799a5b3b5ad47652fe0f199efbbd2a285f782170c1edcd9ae723
-size 62409
+size 61955

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_0_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed823d5ab8f1e0b1af536c240b2d50ba741de64d443e54d998a4e2d02e373e05
+oid sha256:4d62c0c47ea78b89611244bb6e37ffdf2298b7b161de69ede59871089bd946c1
-size 16202
+size 16617

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_1_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:026c69cb2b201c1d753cd6197cdc124e208a3d3c9290d40e4de840ba0ac41cc0
+oid sha256:efab4a3c85b9f762647c5e577c23a49f8ff40fd754171c90b670313f4790cdcd
-size 13054
+size 13063

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_2_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0da8a3a836e8b3eebb48d00fa2b5080caf80a32579d775bebd7564a525423460
+oid sha256:4a5255962b310c60c62192391f4bf184955827022687f74efa21afda623e0b80
-size 9019
+size 8902

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_3_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a8b5298b33db0c0e74c6a786598b1826767f5ba3bcf9187846b5b9332b81a3e3
+oid sha256:8be1a1667726344d330d52b8b4844d9007d291b8f2a3aaf1e296a16be98c6b2d
-size 23146
+size 23741

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_4_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7607784f41e0e7f6b4b1b4c983ed59aa466b01dd388a149b070a0540f6493d7f
+oid sha256:ba2b344818e0b8d4b9224639be09c06de8585622be8dda20ad2aa1bb28e0e44d
-size 18065
+size 18052

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_5_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d234be8428b62e19b4192a17f1c9c21eeee25c7fc683f1597631b0599fc34b32
+oid sha256:8ab0601bf05f66e91b38774cb77b744bd426a2b083ab43b930a402e3c2b9ddb1
-size 13625
+size 13486

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_6_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a725468cea9dfbf210d7367277b3a4d30438caf4ace60304e9942e4509c71972
+oid sha256:a53eb404b797a91747a92a1fa2ae9ca23cbecda6c8d96991b38c28bb43cb51dc
-size 34014
+size 33603

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_7_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c325ae3939648b0684e3ce2105e46445359748bf5d765593fa5eaca5d7e7082
+oid sha256:aabda293c6a242618e176b402e0d5bf8d84f1c6a75d3537b8e42f3abe2f68212
-size 38852
+size 38567

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_8_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:82ea9e352708d800c28d2651220294c1a12bd09b98cda6676a14680c337f3b6e
+oid sha256:bea4702ff62ea222a2ac4a2801b0fb0dc603b8e9f2ce97843d927b21f98d7994
-size 11094
+size 11136

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_0_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:85f42e6853aac517879a0d0379e655c7a23526e8e8a44f5c806323239df65639
+oid sha256:821e281a6bcbb637e713b31fdb6e8bf3b30eef41507d25adb84d9bed4d6d9be0
-size 15810
+size 16083

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_1_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:288b0d6fbce8b5e90bca734635705217c01bbb2e82f516d66cd0d0cb5f854f94
+oid sha256:4b78de1a677347827c1447cb459c76a20398846f4f96430b97ef3c3024d6b5b4
-size 12568
+size 12519

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_2_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f931739c849cb283722149f9d89286633d7321d78b013281bb3333ae6af9cfd
+oid sha256:8cc0851e3ea07010cebc83ac764239e9ab6e37ab2a2ad74039e542f117bf08b9
-size 9122
+size 9110

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_3_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:35dcf251e3bb3613c1cf5fcc4bfed6b8bb837dd721404ac80b72d804830cd483
+oid sha256:3c41209aa36b563a8cd8c5a6788612d17464524b930ca8591e9e29b581a520de
-size 22375
+size 22747

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_4_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:283a7f62058a6f4d29b94a7a0d35b381a3e5038cb59bf545179b807f005aa3dd
+oid sha256:53cc573decde4598fcc2c02cd6c7a925af464e215e8589bba71923cb54c0c687
-size 17240
+size 17148

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_5_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8fb4b4a6588f44d637f770456ca621e2c47bb9e730a8d24ace74028b74056309
+oid sha256:c8d2611a87e3b9804c0538d4f3d7988f39f37f038b2a4b0c66f0676b4d03a1a9
-size 13032
+size 13017

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_6_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:083774bc84a79daac071eac0fca284ce49af7fb3ae21c141684fb588bd8842ed
+oid sha256:c8f58003ba5ee7357c33a8e8d995f172ee12f50a6d07fadd6dbc3423bc357272
-size 32868
+size 32582

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_7_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4430144e9fb2637619b0fc9cd41ef5a3be7b5a3af7831caaba8bdeb9b96555ae
+oid sha256:f6c3d7f0f259fff0089dd4d9f1b9071f43de8e21d5039fe95ab7b9cc37e69a00
-size 37560
+size 37269

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_8_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e68cc7f49af74626e7019b2a4eeac37877b94f0bcba31a21fa3e20b6fde1244d
+oid sha256:f1f195d869be456f5eeaf9a6395f7d6e16b7449612c75b2493fcf9ff003ef512
-size 10724
+size 10810