Skip to content

Commit dbc0c42

Browse files
authored
Merge pull request #5492 from element-hq/feature/bma/spaceAvatarCluster
Disable avatar cluster for now
2 parents cf6672a + cf79c71 commit dbc0c42

File tree

8 files changed

+30
-28
lines changed

8 files changed

+30
-28
lines changed

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/RoomAvatar.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import androidx.compose.ui.unit.Dp
1313
import io.element.android.libraries.designsystem.components.avatar.AvatarData
1414
import io.element.android.libraries.designsystem.components.avatar.AvatarType
1515
import io.element.android.libraries.designsystem.components.avatar.avatarShape
16+
import kotlinx.collections.immutable.toImmutableList
1617

1718
@Composable
1819
internal fun RoomAvatar(
@@ -44,8 +45,9 @@ internal fun RoomAvatar(
4445
}
4546
else -> {
4647
AvatarCluster(
47-
avatars = avatarType.heroes,
48-
// Note: even for a room avatar, we use UserAvatarType here to display the avatar of heroes
48+
// Keep only the first hero for now
49+
avatars = avatarType.heroes.take(1).toImmutableList(),
50+
// Note: even for a room avatar, we use AvatarType.User here to display the avatar of heroes
4951
avatarType = AvatarType.User,
5052
modifier = modifier,
5153
hideAvatarImages = hideAvatarImage,

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ private fun SubtitleRow(
120120
if (visibilityIcon != null) {
121121
Icon(
122122
modifier = Modifier
123-
.size(16.dp)
124-
.padding(end = 4.dp),
123+
.size(16.dp)
124+
.padding(end = 4.dp),
125125
imageVector = visibilityIcon,
126126
contentDescription = null,
127127
tint = ElementTheme.colors.iconTertiary,
@@ -178,20 +178,20 @@ private fun SpaceRoomItemScaffold(
178178
content: @Composable ColumnScope.() -> Unit,
179179
) {
180180
val clickModifier = Modifier
181-
.combinedClickable(
182-
onClick = onClick,
183-
onLongClick = onLongClick,
184-
onLongClickLabel = stringResource(CommonStrings.action_open_context_menu),
185-
indication = ripple(),
186-
interactionSource = remember { MutableInteractionSource() }
187-
)
188-
.onKeyboardContextMenuAction { onLongClick }
181+
.combinedClickable(
182+
onClick = onClick,
183+
onLongClick = onLongClick,
184+
onLongClickLabel = stringResource(CommonStrings.action_open_context_menu),
185+
indication = ripple(),
186+
interactionSource = remember { MutableInteractionSource() }
187+
)
188+
.onKeyboardContextMenuAction { onLongClick }
189189
Row(
190190
modifier = modifier
191-
.fillMaxWidth()
192-
.then(clickModifier)
193-
.padding(horizontal = 16.dp, vertical = 8.dp)
194-
.height(IntrinsicSize.Min),
191+
.fillMaxWidth()
192+
.then(clickModifier)
193+
.padding(horizontal = 16.dp, vertical = 8.dp)
194+
.height(IntrinsicSize.Min),
195195
) {
196196
Avatar(
197197
avatarData = avatarData,
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading

0 commit comments

Comments
 (0)