Honor user real name setting on chat listing

app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsAdapter.kt

@@ -3,14 +3,18 @@ package chat.rocket.android.chatrooms.ui
 import DateTimeHelper
 import DrawableHelper
 import android.content.Context
-import android.graphics.drawable.Drawable
+import android.graphics.Color
 import android.support.v4.content.ContextCompat
 import android.support.v7.widget.RecyclerView
+import android.text.SpannableStringBuilder
+import android.text.style.ForegroundColorSpan
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import chat.rocket.android.R
 import chat.rocket.android.helper.UrlHelper
+import chat.rocket.android.infrastructure.LocalRepository
+import chat.rocket.android.infrastructure.checkIfMyself
 import chat.rocket.android.server.domain.PublicSettings
 import chat.rocket.android.server.domain.useRealName
 import chat.rocket.android.util.extensions.content
@@ -26,6 +30,7 @@ import kotlinx.android.synthetic.main.unread_messages_badge.view.*
 
 class ChatRoomsAdapter(private val context: Context,
                        private val settings: PublicSettings,
+                       private val localRepository: LocalRepository,
                        private val listener: (ChatRoom) -> Unit) : RecyclerView.Adapter<ChatRoomsAdapter.ViewHolder>() {
     var dataSet: MutableList<ChatRoom> = ArrayList()
 
@@ -116,21 +121,30 @@ class ChatRoomsAdapter(private val context: Context,
             val lastMessageSender = lastMessage?.sender
             if (lastMessage != null && lastMessageSender != null) {
                 val message = lastMessage.message
-                val senderUsername = lastMessageSender.username
+                val senderUsername = if (settings.useRealName()) {
+                    lastMessageSender.name ?: lastMessageSender.username
+                } else {
+                    lastMessageSender.username
+                }
                 when (senderUsername) {
                     chatRoom.name -> {
                         textView.content = message
                     }
-                // TODO Change to MySelf
-                //                chatRoom.user?.username -> {
-                //                    holder.lastMessage.textContent = context.getString(R.string.msg_you) + ": $message"
-                //                }
                     else -> {
-                        textView.content = "@$senderUsername: $message"
+                        val user = if (localRepository.checkIfMyself(lastMessageSender.username!!)) {
+                            "${context.getString(R.string.msg_you)}: "
+                        } else {
+                            "$senderUsername: "
+                        }
+                        val spannable = SpannableStringBuilder(user)
+                        val len = spannable.length
+                        spannable.setSpan(ForegroundColorSpan(Color.BLACK), 0, len - 1, 0)
+                        spannable.append(message)
+                        textView.content = spannable
                     }
                 }
             } else {
-                textView.content = ""
+                textView.content = context.getText(R.string.msg_no_messages_yet)
             }
         }
 

app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt

@@ -12,6 +12,7 @@ import android.view.*
 import chat.rocket.android.R
 import chat.rocket.android.chatrooms.presentation.ChatRoomsPresenter
 import chat.rocket.android.chatrooms.presentation.ChatRoomsView
+import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.SettingsRepository
 import chat.rocket.android.util.extensions.*
@@ -31,6 +32,7 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
     @Inject lateinit var presenter: ChatRoomsPresenter
     @Inject lateinit var serverInteractor: GetCurrentServerInteractor
     @Inject lateinit var settingsRepository: SettingsRepository
+    @Inject lateinit var localRepository: LocalRepository
     private var searchView: SearchView? = null
     private val handler = Handler()
 
@@ -156,7 +158,7 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
             recycler_view.itemAnimator = DefaultItemAnimator()
             // TODO - use a ViewModel Mapper instead of using settings on the adapter
             recycler_view.adapter = ChatRoomsAdapter(this,
-                    settingsRepository.get(serverInteractor.get()!!)!!) { chatRoom ->
+                    settingsRepository.get(serverInteractor.get()!!), localRepository) { chatRoom ->
                 presenter.loadChatRoom(chatRoom)
             }
         }

app/src/main/java/chat/rocket/android/infrastructure/LocalRepository.kt

@@ -17,3 +17,5 @@ interface LocalRepository {
 
     fun clearAllFromServer(server: String)
 }
+
+fun LocalRepository.checkIfMyself(username: String) = get(LocalRepository.USERNAME_KEY) == username
\ No newline at end of file

app/src/main/res/values-pt-rBR/strings.xml

@@ -72,6 +72,7 @@
     <string name="msg_preview_video">Vídeo</string>
     <string name="msg_preview_audio">Audio</string>
     <string name="msg_preview_photo">Foto</string>
+    <string name="msg_no_messages_yet">Nenhuma mensagem ainda</string>
 
     <!-- System messages -->
     <string name="message_room_name_changed">Nome da sala alterado para: %1$s por %2$s</string>

app/src/main/res/values/strings.xml

@@ -73,6 +73,7 @@
     <string name="msg_preview_video">Video</string>
     <string name="msg_preview_audio">Audio</string>
     <string name="msg_preview_photo">Photo</string>
+    <string name="msg_no_messages_yet">No messages yet</string>
 
     <!-- System messages -->
     <string name="message_room_name_changed">Room name changed to: %1$s by %2$s</string>