Clarify sent text.
This commit is contained in:
parent
031d1e338d
commit
60c744ca0c
4 changed files with 12 additions and 6 deletions
|
|
@ -88,7 +88,7 @@ fun MessagesContent(
|
|||
hasMoreToLoad: Boolean,
|
||||
onReachedLoadMore: () -> Unit,
|
||||
onBackPressed: () -> Unit,
|
||||
onSendMessage: (CharSequence) -> Unit,
|
||||
onSendMessage: (String) -> Unit,
|
||||
composerFullScreen: Boolean,
|
||||
onComposerFullScreenChange: () -> Unit,
|
||||
onComposerTextChange: (CharSequence) -> Unit,
|
||||
|
|
|
|||
|
|
@ -60,9 +60,9 @@ class MessagesViewModel(
|
|||
}
|
||||
}
|
||||
|
||||
fun sendMessage(text: CharSequence) {
|
||||
fun sendMessage(text: String) {
|
||||
viewModelScope.launch {
|
||||
timeline.sendMessage(text.toString())
|
||||
timeline.sendMessage(text)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -115,9 +115,13 @@ class MatrixTimeline(
|
|||
room.removeTimeline()
|
||||
}
|
||||
|
||||
/**
|
||||
* @param message markdown message
|
||||
*/
|
||||
suspend fun sendMessage(message: String): Result<Unit> {
|
||||
val transactionId = genTransactionId()
|
||||
val content = messageEventContentFromMarkdown(message)
|
||||
room.send(content, null)
|
||||
room.send(content, transactionId)
|
||||
return Result.success(Unit)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ import io.element.android.x.element.resources.R as ElementR
|
|||
|
||||
@Composable
|
||||
fun TextComposer(
|
||||
onSendMessage: (CharSequence) -> Unit,
|
||||
onSendMessage: (String) -> Unit,
|
||||
modifier: Modifier = Modifier,
|
||||
fullscreen: Boolean,
|
||||
onFullscreenToggle: () -> Unit,
|
||||
|
|
@ -36,7 +36,9 @@ fun TextComposer(
|
|||
}
|
||||
|
||||
override fun onSendMessage(text: CharSequence) {
|
||||
onSendMessage(text)
|
||||
// TODO The Wysiwyg team is working to be able to get a markdown version of the text
|
||||
// For now we send only the plain text. `formattedText` is Html.
|
||||
onSendMessage(text.toString())
|
||||
}
|
||||
|
||||
override fun onAddAttachment() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue