|
|
@ -73,7 +73,6 @@ import io.element.android.features.messages.impl.messagecomposer.AttachmentsStat |
|
|
|
import io.element.android.features.messages.impl.messagecomposer.MessageComposerEvents |
|
|
|
import io.element.android.features.messages.impl.messagecomposer.MessageComposerEvents |
|
|
|
import io.element.android.features.messages.impl.messagecomposer.MessageComposerView |
|
|
|
import io.element.android.features.messages.impl.messagecomposer.MessageComposerView |
|
|
|
import io.element.android.features.messages.impl.pinned.banner.PinnedMessagesBannerView |
|
|
|
import io.element.android.features.messages.impl.pinned.banner.PinnedMessagesBannerView |
|
|
|
import io.element.android.features.messages.impl.timeline.TimelineEvents |
|
|
|
|
|
|
|
import io.element.android.features.messages.impl.timeline.TimelineView |
|
|
|
import io.element.android.features.messages.impl.timeline.TimelineView |
|
|
|
import io.element.android.features.messages.impl.timeline.components.JoinCallMenuItem |
|
|
|
import io.element.android.features.messages.impl.timeline.components.JoinCallMenuItem |
|
|
|
import io.element.android.features.messages.impl.timeline.components.customreaction.CustomReactionBottomSheet |
|
|
|
import io.element.android.features.messages.impl.timeline.components.customreaction.CustomReactionBottomSheet |
|
|
@ -127,8 +126,9 @@ fun MessagesView( |
|
|
|
onSendLocationClick: () -> Unit, |
|
|
|
onSendLocationClick: () -> Unit, |
|
|
|
onCreatePollClick: () -> Unit, |
|
|
|
onCreatePollClick: () -> Unit, |
|
|
|
onJoinCallClick: () -> Unit, |
|
|
|
onJoinCallClick: () -> Unit, |
|
|
|
|
|
|
|
onViewAllPinnedMessagesClick: () -> Unit, |
|
|
|
modifier: Modifier = Modifier, |
|
|
|
modifier: Modifier = Modifier, |
|
|
|
forceJumpToBottomVisibility: Boolean = false |
|
|
|
forceJumpToBottomVisibility: Boolean = false, |
|
|
|
) { |
|
|
|
) { |
|
|
|
OnLifecycleEvent { _, event -> |
|
|
|
OnLifecycleEvent { _, event -> |
|
|
|
state.voiceMessageComposerState.eventSink(VoiceMessageComposerEvents.LifecycleEvent(event)) |
|
|
|
state.voiceMessageComposerState.eventSink(VoiceMessageComposerEvents.LifecycleEvent(event)) |
|
|
@ -229,6 +229,7 @@ fun MessagesView( |
|
|
|
}, |
|
|
|
}, |
|
|
|
forceJumpToBottomVisibility = forceJumpToBottomVisibility, |
|
|
|
forceJumpToBottomVisibility = forceJumpToBottomVisibility, |
|
|
|
onJoinCallClick = onJoinCallClick, |
|
|
|
onJoinCallClick = onJoinCallClick, |
|
|
|
|
|
|
|
onViewAllPinnedMessagesClick = onViewAllPinnedMessagesClick, |
|
|
|
) |
|
|
|
) |
|
|
|
}, |
|
|
|
}, |
|
|
|
snackbarHost = { |
|
|
|
snackbarHost = { |
|
|
@ -320,6 +321,7 @@ private fun MessagesViewContent( |
|
|
|
onSendLocationClick: () -> Unit, |
|
|
|
onSendLocationClick: () -> Unit, |
|
|
|
onCreatePollClick: () -> Unit, |
|
|
|
onCreatePollClick: () -> Unit, |
|
|
|
onJoinCallClick: () -> Unit, |
|
|
|
onJoinCallClick: () -> Unit, |
|
|
|
|
|
|
|
onViewAllPinnedMessagesClick: () -> Unit, |
|
|
|
forceJumpToBottomVisibility: Boolean, |
|
|
|
forceJumpToBottomVisibility: Boolean, |
|
|
|
modifier: Modifier = Modifier, |
|
|
|
modifier: Modifier = Modifier, |
|
|
|
onSwipeToReply: (TimelineItem.Event) -> Unit, |
|
|
|
onSwipeToReply: (TimelineItem.Event) -> Unit, |
|
|
@ -405,6 +407,7 @@ private fun MessagesViewContent( |
|
|
|
onClick = { pinnedEventId -> |
|
|
|
onClick = { pinnedEventId -> |
|
|
|
//state.timelineState.eventSink(TimelineEvents.FocusOnEvent(pinnedEventId)) |
|
|
|
//state.timelineState.eventSink(TimelineEvents.FocusOnEvent(pinnedEventId)) |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
onViewAllClick = onViewAllPinnedMessagesClick, |
|
|
|
) |
|
|
|
) |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
@ -576,12 +579,13 @@ internal fun MessagesViewPreview(@PreviewParameter(MessagesStateProvider::class) |
|
|
|
onBackClick = {}, |
|
|
|
onBackClick = {}, |
|
|
|
onRoomDetailsClick = {}, |
|
|
|
onRoomDetailsClick = {}, |
|
|
|
onEventClick = { false }, |
|
|
|
onEventClick = { false }, |
|
|
|
onPreviewAttachments = {}, |
|
|
|
|
|
|
|
onUserDataClick = {}, |
|
|
|
onUserDataClick = {}, |
|
|
|
onLinkClick = {}, |
|
|
|
onLinkClick = {}, |
|
|
|
|
|
|
|
onPreviewAttachments = {}, |
|
|
|
onSendLocationClick = {}, |
|
|
|
onSendLocationClick = {}, |
|
|
|
onCreatePollClick = {}, |
|
|
|
onCreatePollClick = {}, |
|
|
|
onJoinCallClick = {}, |
|
|
|
onJoinCallClick = {}, |
|
|
|
|
|
|
|
onViewAllPinnedMessagesClick = { }, |
|
|
|
forceJumpToBottomVisibility = true, |
|
|
|
forceJumpToBottomVisibility = true, |
|
|
|
) |
|
|
|
) |
|
|
|
} |
|
|
|
} |
|
|
|