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:47:43 +02:00 • committed by Benoit Marty
parent 3c35a457aa
commit 1fcd47f3e8
2 changed files with 31 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,6 +37,7 @@ import io.element.android.libraries.designsystem.components.avatar.Avatar
import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.components.avatar.AvatarData
import io.element.android.libraries.designsystem.components.avatar.AvatarSize import io.element.android.libraries.designsystem.components.avatar.AvatarSize
import io.element.android.libraries.designsystem.components.avatar.AvatarType import io.element.android.libraries.designsystem.components.avatar.AvatarType
import io.element.android.libraries.designsystem.components.avatar.anAvatarData
import io.element.android.libraries.designsystem.components.button.BackButton import io.element.android.libraries.designsystem.components.button.BackButton
import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.ElementPreview
import io.element.android.libraries.designsystem.preview.PreviewsDayNight import io.element.android.libraries.designsystem.preview.PreviewsDayNight
@ -158,10 +159,8 @@ internal fun MessagesViewTopBarPreview() = ElementPreview {
@Composable @Composable
fun AMessagesViewTopBar( fun AMessagesViewTopBar(
roomName: String? = "Room name", roomName: String? = "Room name",
roomAvatar: AvatarData = AvatarData( roomAvatar: AvatarData = anAvatarData(
id = "id",
name = "Room name", name = "Room name",
url = null,
size = AvatarSize.TimelineRoom, size = AvatarSize.TimelineRoom,
), ),
isTombstoned: Boolean = false, isTombstoned: Boolean = false,
@ -194,12 +193,10 @@ internal fun MessagesViewTopBarPreview() = ElementPreview {
HorizontalDivider() HorizontalDivider()
AMessagesViewTopBar( AMessagesViewTopBar(
roomName = "A DM with a very very very long name", roomName = "A DM with a very very very long name",
roomAvatar = AvatarData( roomAvatar = anAvatarData(
id = "id",
name = "Room name",
url = null,
size = AvatarSize.TimelineRoom, size = AvatarSize.TimelineRoom,
).copy(url = "https://some-avatar.jpg"), url = "https://some-avatar.jpg"
),
roomCallState = aStandByCallState(canStartCall = false), roomCallState = aStandByCallState(canStartCall = false),
dmUserIdentityState = IdentityState.Verified dmUserIdentityState = IdentityState.Verified
) )

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

@ -26,6 +26,7 @@ import io.element.android.libraries.designsystem.components.avatar.Avatar
import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.components.avatar.AvatarData
import io.element.android.libraries.designsystem.components.avatar.AvatarSize import io.element.android.libraries.designsystem.components.avatar.AvatarSize
import io.element.android.libraries.designsystem.components.avatar.AvatarType import io.element.android.libraries.designsystem.components.avatar.AvatarType
import io.element.android.libraries.designsystem.components.avatar.anAvatarData
import io.element.android.libraries.designsystem.components.button.BackButton import io.element.android.libraries.designsystem.components.button.BackButton
import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.ElementPreview
import io.element.android.libraries.designsystem.preview.PreviewsDayNight import io.element.android.libraries.designsystem.preview.PreviewsDayNight
@ -36,7 +37,6 @@ 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)
@ -92,52 +92,43 @@ internal fun ThreadTopBar(
@PreviewsDayNight @PreviewsDayNight
@Composable @Composable
internal fun ThreadTopBarPreview() = ElementPreview { internal fun ThreadTopBarPreview() = ElementPreview {
val name = "Room name" @Composable
val initialsAvatarData = AvatarData( fun AThreadTopBar(
id = "id", roomName: String? = "Room name",
name = name, roomAvatarData: AvatarData = anAvatarData(
url = null, name = "Room name",
size = AvatarSize.TimelineRoom, size = AvatarSize.TimelineRoom,
),
isTombstoned: Boolean = false,
heroes: List<AvatarData> = emptyList(),
) = ThreadTopBar(
roomName = roomName,
roomAvatarData = roomAvatarData,
isTombstoned = isTombstoned,
heroes = heroes.toImmutableList(),
onBackClick = {},
) )
Column { Column {
ThreadTopBar( AThreadTopBar()
roomName = name,
roomAvatarData = initialsAvatarData,
heroes = persistentListOf(),
isTombstoned = false,
onBackClick = {},
)
HorizontalDivider() HorizontalDivider()
ThreadTopBar( AThreadTopBar(
roomName = name,
roomAvatarData = initialsAvatarData,
heroes = aMatrixUserList().map { it.getAvatarData(AvatarSize.TimelineRoom) }.toImmutableList(), heroes = aMatrixUserList().map { it.getAvatarData(AvatarSize.TimelineRoom) }.toImmutableList(),
isTombstoned = false,
onBackClick = {},
) )
HorizontalDivider() HorizontalDivider()
ThreadTopBar( AThreadTopBar(
roomName = null, roomName = null,
roomAvatarData = initialsAvatarData,
heroes = persistentListOf(),
isTombstoned = false,
onBackClick = {},
) )
HorizontalDivider() HorizontalDivider()
ThreadTopBar( AThreadTopBar(
roomName = name, roomAvatarData = anAvatarData(
roomAvatarData = initialsAvatarData.copy(url = "https://some-avatar.jpg"), name = "Room name",
heroes = persistentListOf(), url = "https://some-avatar.jpg",
isTombstoned = false, size = AvatarSize.TimelineRoom,
onBackClick = {}, ),
) )
HorizontalDivider() HorizontalDivider()
ThreadTopBar( AThreadTopBar(
roomName = name,
roomAvatarData = initialsAvatarData,
heroes = persistentListOf(),
isTombstoned = true, isTombstoned = true,
onBackClick = {},
) )
} }
} }