mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-03-16 19:28:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

MessageComposerViewModel format

Browse source
This commit is contained in:
ariskotsomitopoulos 2022-01-31 13:53:49 +02:00
parent d91f3d2de6
commit 14e56b8f7d
2 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
View file

@ -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()
}

2
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
View file

@ -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