Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

More cleanup

Browse source
This commit is contained in:
Benoit Marty 2025-09-23 21:56:03 +02:00
parent f1a9a2200b
commit e5cc4938ad
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/MessagesViewTopBar.kt
View file

@ -50,6 +50,7 @@ import io.element.android.libraries.matrix.ui.components.aMatrixUserList
import io.element.android.libraries.matrix.ui.model.getAvatarData import io.element.android.libraries.matrix.ui.model.getAvatarData
import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.libraries.ui.strings.CommonStrings
import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.ImmutableList
import kotlinx.collections.immutable.persistentListOf
import kotlinx.collections.immutable.toImmutableList import kotlinx.collections.immutable.toImmutableList
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@ -164,14 +165,14 @@ internal fun MessagesViewTopBarPreview() = ElementPreview {
size = AvatarSize.TimelineRoom, size = AvatarSize.TimelineRoom,
), ),
isTombstoned: Boolean = false, isTombstoned: Boolean = false,
heroes: List<AvatarData> = emptyList(), heroes: ImmutableList<AvatarData> = persistentListOf(),
roomCallState: RoomCallState = RoomCallState.Unavailable, roomCallState: RoomCallState = RoomCallState.Unavailable,
dmUserIdentityState: IdentityState? = null, dmUserIdentityState: IdentityState? = null,
) = MessagesViewTopBar( ) = MessagesViewTopBar(
roomName = roomName, roomName = roomName,
roomAvatar = roomAvatar, roomAvatar = roomAvatar,
isTombstoned = isTombstoned, isTombstoned = isTombstoned,
heroes = heroes.toImmutableList(), heroes = heroes,
roomCallState = roomCallState, roomCallState = roomCallState,
dmUserIdentityState = dmUserIdentityState, dmUserIdentityState = dmUserIdentityState,
onRoomDetailsClick = {}, onRoomDetailsClick = {},
@ -182,7 +183,7 @@ internal fun MessagesViewTopBarPreview() = ElementPreview {
AMessagesViewTopBar() AMessagesViewTopBar()
HorizontalDivider() HorizontalDivider()
AMessagesViewTopBar( AMessagesViewTopBar(
heroes = aMatrixUserList().map { it.getAvatarData(AvatarSize.TimelineRoom) }, heroes = aMatrixUserList().map { it.getAvatarData(AvatarSize.TimelineRoom) }.toImmutableList(),
roomCallState = anOngoingCallState(), roomCallState = anOngoingCallState(),
) )
HorizontalDivider() HorizontalDivider()

5
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/ThreadTopBar.kt
View file

@ -37,6 +37,7 @@ import io.element.android.libraries.matrix.ui.components.aMatrixUserList
import io.element.android.libraries.matrix.ui.model.getAvatarData import io.element.android.libraries.matrix.ui.model.getAvatarData
import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.libraries.ui.strings.CommonStrings
import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.ImmutableList
import kotlinx.collections.immutable.persistentListOf
import kotlinx.collections.immutable.toImmutableList import kotlinx.collections.immutable.toImmutableList
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@ -100,12 +101,12 @@ internal fun ThreadTopBarPreview() = ElementPreview {
size = AvatarSize.TimelineRoom, size = AvatarSize.TimelineRoom,
), ),
isTombstoned: Boolean = false, isTombstoned: Boolean = false,
heroes: List<AvatarData> = emptyList(), heroes: ImmutableList<AvatarData> = persistentListOf(),
) = ThreadTopBar( ) = ThreadTopBar(
roomName = roomName, roomName = roomName,
roomAvatarData = roomAvatarData, roomAvatarData = roomAvatarData,
isTombstoned = isTombstoned, isTombstoned = isTombstoned,
heroes = heroes.toImmutableList(), heroes = heroes,
onBackClick = {}, onBackClick = {},
) )
Column { Column {