|
|
@ -83,9 +83,9 @@ import io.element.android.libraries.androidutils.ui.hideKeyboard |
|
|
|
import io.element.android.libraries.designsystem.atomic.molecules.IconTitlePlaceholdersRowMolecule |
|
|
|
import io.element.android.libraries.designsystem.atomic.molecules.IconTitlePlaceholdersRowMolecule |
|
|
|
import io.element.android.libraries.designsystem.components.ProgressDialog |
|
|
|
import io.element.android.libraries.designsystem.components.ProgressDialog |
|
|
|
import io.element.android.libraries.designsystem.components.ProgressDialogType |
|
|
|
import io.element.android.libraries.designsystem.components.ProgressDialogType |
|
|
|
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.CompositeAvatar |
|
|
|
import io.element.android.libraries.designsystem.components.button.BackButton |
|
|
|
import io.element.android.libraries.designsystem.components.button.BackButton |
|
|
|
import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog |
|
|
|
import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog |
|
|
|
import io.element.android.libraries.designsystem.preview.ElementPreview |
|
|
|
import io.element.android.libraries.designsystem.preview.ElementPreview |
|
|
@ -187,6 +187,7 @@ fun MessagesView( |
|
|
|
MessagesViewTopBar( |
|
|
|
MessagesViewTopBar( |
|
|
|
roomName = state.roomName.dataOrNull(), |
|
|
|
roomName = state.roomName.dataOrNull(), |
|
|
|
roomAvatar = state.roomAvatar.dataOrNull(), |
|
|
|
roomAvatar = state.roomAvatar.dataOrNull(), |
|
|
|
|
|
|
|
heroes = state.heroes, |
|
|
|
callState = state.callState, |
|
|
|
callState = state.callState, |
|
|
|
onBackClick = { |
|
|
|
onBackClick = { |
|
|
|
// Since the textfield is now based on an Android view, this is no longer done automatically. |
|
|
|
// Since the textfield is now based on an Android view, this is no longer done automatically. |
|
|
@ -442,6 +443,7 @@ private fun MessagesViewComposerBottomSheetContents( |
|
|
|
private fun MessagesViewTopBar( |
|
|
|
private fun MessagesViewTopBar( |
|
|
|
roomName: String?, |
|
|
|
roomName: String?, |
|
|
|
roomAvatar: AvatarData?, |
|
|
|
roomAvatar: AvatarData?, |
|
|
|
|
|
|
|
heroes: List<AvatarData>, |
|
|
|
callState: RoomCallState, |
|
|
|
callState: RoomCallState, |
|
|
|
onRoomDetailsClick: () -> Unit, |
|
|
|
onRoomDetailsClick: () -> Unit, |
|
|
|
onJoinCallClick: () -> Unit, |
|
|
|
onJoinCallClick: () -> Unit, |
|
|
@ -457,6 +459,7 @@ private fun MessagesViewTopBar( |
|
|
|
RoomAvatarAndNameRow( |
|
|
|
RoomAvatarAndNameRow( |
|
|
|
roomName = roomName, |
|
|
|
roomName = roomName, |
|
|
|
roomAvatar = roomAvatar, |
|
|
|
roomAvatar = roomAvatar, |
|
|
|
|
|
|
|
heroes = heroes, |
|
|
|
modifier = titleModifier |
|
|
|
modifier = titleModifier |
|
|
|
) |
|
|
|
) |
|
|
|
} else { |
|
|
|
} else { |
|
|
@ -500,13 +503,17 @@ private fun CallMenuItem( |
|
|
|
private fun RoomAvatarAndNameRow( |
|
|
|
private fun RoomAvatarAndNameRow( |
|
|
|
roomName: String, |
|
|
|
roomName: String, |
|
|
|
roomAvatar: AvatarData, |
|
|
|
roomAvatar: AvatarData, |
|
|
|
|
|
|
|
heroes: List<AvatarData>, |
|
|
|
modifier: Modifier = Modifier |
|
|
|
modifier: Modifier = Modifier |
|
|
|
) { |
|
|
|
) { |
|
|
|
Row( |
|
|
|
Row( |
|
|
|
modifier = modifier, |
|
|
|
modifier = modifier, |
|
|
|
verticalAlignment = Alignment.CenterVertically |
|
|
|
verticalAlignment = Alignment.CenterVertically |
|
|
|
) { |
|
|
|
) { |
|
|
|
Avatar(roomAvatar) |
|
|
|
CompositeAvatar( |
|
|
|
|
|
|
|
avatarData = roomAvatar, |
|
|
|
|
|
|
|
heroes = heroes, |
|
|
|
|
|
|
|
) |
|
|
|
Spacer(modifier = Modifier.width(8.dp)) |
|
|
|
Spacer(modifier = Modifier.width(8.dp)) |
|
|
|
Text( |
|
|
|
Text( |
|
|
|
text = roomName, |
|
|
|
text = roomName, |
|
|
|