Commit ddee2535 authored by Lucio Maciel's avatar Lucio Maciel

Add CharSequence?.isNotNullNorEmpty

parent 78f102ce
...@@ -17,6 +17,7 @@ import chat.rocket.android.helper.MessageParser ...@@ -17,6 +17,7 @@ import chat.rocket.android.helper.MessageParser
import chat.rocket.android.infrastructure.LocalRepository import chat.rocket.android.infrastructure.LocalRepository
import chat.rocket.android.server.domain.* import chat.rocket.android.server.domain.*
import chat.rocket.android.util.extensions.avatarUrl import chat.rocket.android.util.extensions.avatarUrl
import chat.rocket.android.util.extensions.isNotNullNorEmpty
import chat.rocket.android.widget.emoji.EmojiParser import chat.rocket.android.widget.emoji.EmojiParser
import chat.rocket.core.model.Message import chat.rocket.core.model.Message
import chat.rocket.core.model.MessageType import chat.rocket.core.model.MessageType
...@@ -254,9 +255,9 @@ class ViewModelMapper @Inject constructor(private val context: Context, ...@@ -254,9 +255,9 @@ class ViewModelMapper @Inject constructor(private val context: Context,
private fun getSenderName(message: Message): CharSequence { private fun getSenderName(message: Message): CharSequence {
val username = message.sender?.username val username = message.sender?.username
if (!message.senderAlias.isNullOrEmpty()) { message.senderAlias.isNotNullNorEmpty { alias ->
return buildSpannedString { return buildSpannedString {
append(message.senderAlias!!) append(alias)
username?.let { username?.let {
append(" ") append(" ")
scale(0.8f) { scale(0.8f) {
......
package chat.rocket.android.util.extensions
inline fun CharSequence?.isNotNullNorEmpty(block: (CharSequence) -> Unit) {
if (this != null && this.isNotEmpty()) {
block(this)
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment