Clarify sent text.

This commit is contained in:
Benoit Marty 2022-11-09 11:14:01 +01:00
parent dccb83fe76
commit dc39d061b8
4 changed files with 12 additions and 6 deletions

View file

@ -88,7 +88,7 @@ fun MessagesContent(
hasMoreToLoad: Boolean, hasMoreToLoad: Boolean,
onReachedLoadMore: () -> Unit, onReachedLoadMore: () -> Unit,
onBackPressed: () -> Unit, onBackPressed: () -> Unit,
onSendMessage: (CharSequence) -> Unit, onSendMessage: (String) -> Unit,
composerFullScreen: Boolean, composerFullScreen: Boolean,
onComposerFullScreenChange: () -> Unit, onComposerFullScreenChange: () -> Unit,
onComposerTextChange: (CharSequence) -> Unit, onComposerTextChange: (CharSequence) -> Unit,

View file

@ -60,9 +60,9 @@ class MessagesViewModel(
} }
} }
fun sendMessage(text: CharSequence) { fun sendMessage(text: String) {
viewModelScope.launch { viewModelScope.launch {
timeline.sendMessage(text.toString()) timeline.sendMessage(text)
} }
} }

View file

@ -115,9 +115,13 @@ class MatrixTimeline(
room.removeTimeline() room.removeTimeline()
} }
/**
* @param message markdown message
*/
suspend fun sendMessage(message: String): Result<Unit> { suspend fun sendMessage(message: String): Result<Unit> {
val transactionId = genTransactionId()
val content = messageEventContentFromMarkdown(message) val content = messageEventContentFromMarkdown(message)
room.send(content, null) room.send(content, transactionId)
return Result.success(Unit) return Result.success(Unit)
} }

View file

@ -10,7 +10,7 @@ import io.element.android.x.element.resources.R as ElementR
@Composable @Composable
fun TextComposer( fun TextComposer(
onSendMessage: (CharSequence) -> Unit, onSendMessage: (String) -> Unit,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
fullscreen: Boolean, fullscreen: Boolean,
onFullscreenToggle: () -> Unit, onFullscreenToggle: () -> Unit,
@ -36,7 +36,9 @@ fun TextComposer(
} }
override fun onSendMessage(text: CharSequence) { 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() { override fun onAddAttachment() {