Show default messages for different types of quotes with attachments

app/src/main/java/chat/rocket/android/chatroom/ui/ActionSnackbar.kt

 package chat.rocket.android.chatroom.ui
 
-import android.graphics.drawable.Drawable
 import android.support.design.widget.BaseTransientBottomBar
 import android.support.v4.view.ViewCompat
 import android.text.Spannable
@@ -28,7 +27,6 @@ class ActionSnackbar : BaseTransientBottomBar<ActionSnackbar> {
             actionSnackbar.cancelView = view.findViewById(R.id.image_view_action_cancel_quote) as ImageView
             actionSnackbar.duration = BaseTransientBottomBar.LENGTH_INDEFINITE
             val spannable = Markwon.markdown(context, content).trim()
-            actionSnackbar.marginDrawable = context.getDrawable(R.drawable.quote)
             actionSnackbar.messageTextView.content = spannable
             return actionSnackbar
         }
@@ -38,7 +36,6 @@ class ActionSnackbar : BaseTransientBottomBar<ActionSnackbar> {
     lateinit var cancelView: View
     private lateinit var messageTextView: TextView
     private lateinit var titleTextView: TextView
-    private lateinit var marginDrawable: Drawable
 
     var text: String = ""
         set(value) {

app/src/main/java/chat/rocket/android/chatroom/viewmodel/ViewModelMapper.kt

@@ -23,7 +23,6 @@ import chat.rocket.core.model.url.Url
 import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.withContext
 import okhttp3.HttpUrl
-import timber.log.Timber
 import java.security.InvalidParameterException
 import javax.inject.Inject
 
@@ -96,8 +95,13 @@ class ViewModelMapper @Inject constructor(private val context: Context,
 
     private fun mapMessageAttachment(message: Message, attachment: MessageAttachment): MessageAttachmentViewModel {
         val attachmentAuthor = attachment.author!!
-        val attachmentText = attachment.text ?: ""
         val time = getTime(attachment.timestamp!!)
+        val attachmentText =  when (attachment.attachments.orEmpty().firstOrNull()) {
+            is ImageAttachment -> context.getString(R.string.msg_quote_photo)
+            is VideoAttachment -> context.getString(R.string.msg_quote_video)
+            is AudioAttachment -> context.getString(R.string.msg_quote_audio)
+            else -> attachment.text ?: ""
+        }
 
         return MessageAttachmentViewModel(message = getMessageWithoutQuoteMarkdown(message), rawData = message,
                 messageId = message.id, time = time, senderName = attachmentAuthor,
@@ -159,27 +163,7 @@ class ViewModelMapper @Inject constructor(private val context: Context,
         val time = getTime(message.timestamp)
         val avatar = getUserAvatar(message)
 
-        val baseUrl = settings.baseUrl()
-        var quote: Message? = null
-
-        val urls = ArrayList<Url>()
-        message.urls?.let {
-            if (it.isEmpty()) return@let
-            for (url in it) {
-                urls.add(url)
-                baseUrl?.let {
-                    val quoteUrl = HttpUrl.parse(url.url)
-                    val serverUrl = HttpUrl.parse(baseUrl)
-                    if (quoteUrl != null && serverUrl != null) {
-                        quote = makeQuote(quoteUrl, serverUrl)?.let {
-                            getMessageWithoutQuoteMarkdown(it)
-                        }
-                    }
-                }
-            }
-        }
-
-        val content = getContent(context, getMessageWithoutQuoteMarkdown(message), quote)
+        val content = getContent(context, getMessageWithoutQuoteMarkdown(message))
         MessageViewModel(message = getMessageWithoutQuoteMarkdown(message), rawData = message,
                 messageId = message.id, avatar = avatar!!, time = time, senderName = sender,
                 content = content, isPinned = message.pinned, reactions = getReactions(message),
@@ -236,29 +220,11 @@ class ViewModelMapper @Inject constructor(private val context: Context,
 
     private fun getTime(timestamp: Long) = DateTimeHelper.getTime(DateTimeHelper.getLocalDateTime(timestamp))
 
-    private fun makeQuote(quoteUrl: HttpUrl, serverUrl: HttpUrl): Message? {
-        if (quoteUrl.host() == serverUrl.host()) {
-            val msgIdToQuote = quoteUrl.queryParameter("msg")
-            Timber.d("Will quote message Id: $msgIdToQuote")
-            return if (msgIdToQuote != null) messagesRepository.getById(msgIdToQuote) else null
-        }
-        return null
-    }
-
-    private suspend fun getContent(context: Context, message: Message, quote: Message?): CharSequence {
+    private suspend fun getContent(context: Context, message: Message): CharSequence {
         return when (message.isSystemMessage()) {
             true -> getSystemMessage(message, context)
-            false -> getNormalMessage(message, quote)
-        }
-    }
-
-    private suspend fun getNormalMessage(message: Message, quote: Message?): CharSequence {
-        var quoteViewModel: MessageViewModel? = null
-        if (quote != null) {
-            val quoteMessage: Message = quote
-            quoteViewModel = mapMessage(quoteMessage)
+            false -> parser.renderMarkdown(message, currentUsername)
         }
-        return parser.renderMarkdown(message, quoteViewModel, currentUsername)
     }
 
     private fun getSystemMessage(message: Message, context: Context): CharSequence {

app/src/main/java/chat/rocket/android/helper/MessageParser.kt

@@ -16,7 +16,6 @@ import android.text.style.ReplacementSpan
 import android.util.Patterns
 import android.view.View
 import chat.rocket.android.R
-import chat.rocket.android.chatroom.viewmodel.MessageViewModel
 import chat.rocket.android.widget.emoji.EmojiParser
 import chat.rocket.android.widget.emoji.EmojiRepository
 import chat.rocket.android.widget.emoji.EmojiTypefaceSpan
@@ -40,19 +39,18 @@ class MessageParser @Inject constructor(val context: Application, private val co
      * Render a markdown text message to Spannable.
      *
      * @param message The [Message] object we're interested on rendering.
-     * @param quote An optional [MessageViewModel] to be quoted.
      * @param selfUsername This user username.
      *
      * @return A Spannable with the parsed markdown.
      */
-    fun renderMarkdown(message: Message, quote: MessageViewModel? = null, selfUsername: String? = null): CharSequence {
+    fun renderMarkdown(message: Message, selfUsername: String? = null): CharSequence {
         val text = message.message
         val builder = SpannableBuilder()
         val content = EmojiRepository.shortnameToUnicode(text, true)
         val parentNode = parser.parse(toLenientMarkdown(content))
         parentNode.accept(SpannableMarkdownVisitor(configuration, builder))
         parentNode.accept(LinkVisitor(builder))
-        parentNode.accept(EmojiVisitor(builder, configuration))
+        parentNode.accept(EmojiVisitor(configuration, builder))
         message.mentions?.let {
             parentNode.accept(MentionVisitor(context, builder, it, selfUsername))
         }
@@ -102,15 +100,14 @@ class MessageParser @Inject constructor(val context: Application, private val co
         }
     }
 
-    class EmojiVisitor(private val builder: SpannableBuilder, configuration: SpannableConfiguration)
+    class EmojiVisitor(configuration: SpannableConfiguration, private val builder: SpannableBuilder)
         : SpannableMarkdownVisitor(configuration, builder) {
         override fun visit(document: Document) {
             val spannable = EmojiParser.parse(builder.text())
             if (spannable is Spanned) {
                 val spans = spannable.getSpans(0, spannable.length, EmojiTypefaceSpan::class.java)
                 spans.forEach {
-                    builder.setSpan(it, spannable.getSpanStart(it),
-                            spannable.getSpanEnd(it), 0)
+                    builder.setSpan(it, spannable.getSpanStart(it), spannable.getSpanEnd(it), 0)
                 }
             }
         }

app/src/main/res/drawable/quote.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/darkGray" />
-    <size
-        android:width="4dp"
-        android:height="4dp" />
-
-</shape>
\ No newline at end of file

app/src/main/res/layout/item_message_attachment.xml

@@ -18,7 +18,7 @@
         android:layout_height="0dp"
         android:layout_marginStart="56dp"
         android:background="@drawable/quote_vertical_bar"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/recycler_view_reactions"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -64,14 +64,7 @@
         layout="@layout/layout_reactions"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:layout_constraintStart_toStartOf="@+id/text_content"
+        app:layout_constraintStart_toStartOf="@+id/quote_bar"
         app:layout_constraintTop_toBottomOf="@+id/text_content" />
 
-    <android.support.constraint.Guideline
-        android:id="@+id/guideline"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_begin="20dp" />
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file

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

@@ -69,6 +69,9 @@
     <string name="msg_new_password">Informe a nova senha</string>
     <string name="msg_confirm_password">Confirme a nova senha</string>
     <string name="msg_unread_messages">Mensagens não lidas</string>
+    <string name="msg_quote_video">Vídeo</string>
+    <string name="msg_quote_audio">Audio</string>
+    <string name="msg_quote_photo">Foto</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

@@ -70,6 +70,9 @@
     <string name="msg_new_password">Enter New Password</string>
     <string name="msg_confirm_password">Confirm New Password</string>
     <string name="msg_unread_messages">Unread messages</string>
+    <string name="msg_quote_video">Video</string>
+    <string name="msg_quote_audio">Audio</string>
+    <string name="msg_quote_photo">Photo</string>
 
     <!-- System messages -->
     <string name="message_room_name_changed">Room name changed to: %1$s by %2$s</string>