From 14e56b8f7d27288d0b58c8486f99b860fd2c6bbb Mon Sep 17 00:00:00 2001
From: ariskotsomitopoulos <aris.kotsomitopoulos@gmail.com>
Date: Mon, 31 Jan 2022 13:53:49 +0200
Subject: [PATCH] MessageComposerViewModel format
---
.../composer/MessageComposerViewModel.kt | 37 +++++++++++--------
.../composer/MessageComposerViewState.kt | 2 +-
2 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
index e62a32a7e0..21b7abe425 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
@@ -277,36 +277,42 @@ class MessageComposerViewModel @AssistedInject constructor(
handlePartSlashCommand(slashCommandResult)
}
is ParsedCommand.SendEmote -> {
- state.rootThreadEventId?.let {
+ if (state.rootThreadEventId != null) {
room.replyInThread(
- rootThreadEventId = it,
+ rootThreadEventId = state.rootThreadEventId,
replyInThreadText = slashCommandResult.message,
msgType = MessageType.MSGTYPE_EMOTE,
autoMarkdown = action.autoMarkdown)
- } ?: room.sendTextMessage(slashCommandResult.message, msgType = MessageType.MSGTYPE_EMOTE, autoMarkdown = action.autoMarkdown)
+ }else{
+ room.sendTextMessage(slashCommandResult.message, msgType = MessageType.MSGTYPE_EMOTE, autoMarkdown = action.autoMarkdown)
+ }
_viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
popDraft()
}
is ParsedCommand.SendRainbow -> {
val message = slashCommandResult.message.toString()
- state.rootThreadEventId?.let {
+ if (state.rootThreadEventId != null) {
room.replyInThread(
- rootThreadEventId = it,
+ rootThreadEventId = state.rootThreadEventId,
replyInThreadText = slashCommandResult.message,
formattedText = rainbowGenerator.generate(message))
- } ?: room.sendFormattedTextMessage(message, rainbowGenerator.generate(message))
+ } else {
+ room.sendFormattedTextMessage(message, rainbowGenerator.generate(message))
+ }
_viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
popDraft()
}
is ParsedCommand.SendRainbowEmote -> {
val message = slashCommandResult.message.toString()
- state.rootThreadEventId?.let {
+ if (state.rootThreadEventId != null) {
room.replyInThread(
- rootThreadEventId = it,
+ rootThreadEventId = state.rootThreadEventId,
replyInThreadText = slashCommandResult.message,
msgType = MessageType.MSGTYPE_EMOTE,
formattedText = rainbowGenerator.generate(message))
- } ?: room.sendFormattedTextMessage(message, rainbowGenerator.generate(message), MessageType.MSGTYPE_EMOTE)
+ } else {
+ room.sendFormattedTextMessage(message, rainbowGenerator.generate(message), MessageType.MSGTYPE_EMOTE)
+ }
_viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
popDraft()
@@ -314,15 +320,16 @@ class MessageComposerViewModel @AssistedInject constructor(
is ParsedCommand.SendSpoiler -> {
val text = "[${stringProvider.getString(R.string.spoiler)}](${slashCommandResult.message})"
val formattedText = "<span data-mx-spoiler>${slashCommandResult.message}</span>"
- state.rootThreadEventId?.let {
+ if (state.rootThreadEventId != null) {
room.replyInThread(
- rootThreadEventId = it,
+ rootThreadEventId = state.rootThreadEventId,
replyInThreadText = text,
formattedText = formattedText)
- } ?: room.sendFormattedTextMessage(
- text,
- formattedText
- )
+ } else {
+ room.sendFormattedTextMessage(
+ text,
+ formattedText)
+ }
_viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk())
popDraft()
}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
index aae1678cca..f90f3975c6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
@@ -67,7 +67,7 @@ data class MessageComposerViewState(
) : MavericksState {
val isVoiceRecording = when (voiceRecordingUiState) {
- VoiceMessageRecorderView.RecordingUiState.Idle -> false
+ VoiceMessageRecorderView.RecordingUiState.Idle -> false
is VoiceMessageRecorderView.RecordingUiState.Locked,
VoiceMessageRecorderView.RecordingUiState.Draft,
is VoiceMessageRecorderView.RecordingUiState.Recording -> true