filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compact coding

Browse Source
This commit is contained in:
Benoit Marty 2020-05-28 23:35:21 +02:00 committed by Valere
parent 125d61eb68
commit d3f93984d4
1 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
View File

@ -53,45 +53,35 @@ class DisplayableEventFormatter @Inject constructor(
EventType.MESSAGE -> { EventType.MESSAGE -> {
timelineEvent.getLastMessageContent()?.let { messageContent -> timelineEvent.getLastMessageContent()?.let { messageContent ->
when (messageContent.msgType) { when (messageContent.msgType) {
MessageType.MSGTYPE_VERIFICATION_REQUEST -> { MessageType.MSGTYPE_VERIFICATION_REQUEST ->
return simpleFormat(senderName, stringProvider.getString(R.string.verification_request), prependAuthor) simpleFormat(senderName, stringProvider.getString(R.string.verification_request), prependAuthor)
} MessageType.MSGTYPE_IMAGE ->
MessageType.MSGTYPE_IMAGE -> { simpleFormat(senderName, stringProvider.getString(R.string.sent_an_image), prependAuthor)
return simpleFormat(senderName, stringProvider.getString(R.string.sent_an_image), prependAuthor) MessageType.MSGTYPE_AUDIO ->
} simpleFormat(senderName, stringProvider.getString(R.string.sent_an_audio_file), prependAuthor)
MessageType.MSGTYPE_AUDIO -> { MessageType.MSGTYPE_VIDEO ->
return simpleFormat(senderName, stringProvider.getString(R.string.sent_an_audio_file), prependAuthor) simpleFormat(senderName, stringProvider.getString(R.string.sent_a_video), prependAuthor)
} MessageType.MSGTYPE_FILE ->
MessageType.MSGTYPE_VIDEO -> { simpleFormat(senderName, stringProvider.getString(R.string.sent_a_file), prependAuthor)
return simpleFormat(senderName, stringProvider.getString(R.string.sent_a_video), prependAuthor) MessageType.MSGTYPE_TEXT ->
} if (messageContent.isReply()) {
MessageType.MSGTYPE_FILE -> {
return simpleFormat(senderName, stringProvider.getString(R.string.sent_a_file), prependAuthor)
}
MessageType.MSGTYPE_TEXT -> {
return if (messageContent.isReply()) {
// Skip reply prefix, and show important // Skip reply prefix, and show important
// TODO add a reply image span ? // TODO add a reply image span ?
simpleFormat(senderName, timelineEvent.getTextEditableContent() ?: messageContent.body, prependAuthor) simpleFormat(senderName, timelineEvent.getTextEditableContent() ?: messageContent.body, prependAuthor)
} else { } else {
simpleFormat(senderName, messageContent.body, prependAuthor) simpleFormat(senderName, messageContent.body, prependAuthor)
} }
} else ->
else -> { simpleFormat(senderName, messageContent.body, prependAuthor)
return simpleFormat(senderName, messageContent.body, prependAuthor)
}
} }
} } ?: span { }
} }
else -> { else ->
return span { span {
text = noticeEventFormatter.format(timelineEvent) ?: "" text = noticeEventFormatter.format(timelineEvent) ?: ""
textStyle = "italic" textStyle = "italic"
} }
}
} }
return span { }
} }
private fun simpleFormat(senderName: String, body: CharSequence, prependAuthor: Boolean): CharSequence { private fun simpleFormat(senderName: String, body: CharSequence, prependAuthor: Boolean): CharSequence {