Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
ddee2535
Commit
ddee2535
authored
Apr 10, 2018
by
Lucio Maciel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add CharSequence?.isNotNullNorEmpty
parent
78f102ce
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
ViewModelMapper.kt
...chat/rocket/android/chatroom/viewmodel/ViewModelMapper.kt
+3
-2
CharSequence.kt
.../java/chat/rocket/android/util/extensions/CharSequence.kt
+8
-0
No files found.
app/src/main/java/chat/rocket/android/chatroom/viewmodel/ViewModelMapper.kt
View file @
ddee2535
...
@@ -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
)
{
...
...
app/src/main/java/chat/rocket/android/util/extensions/CharSequence.kt
0 → 100644
View file @
ddee2535
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment