Improve long tap area on messages

app/src/main/java/chat/rocket/android/chatroom/adapter/AudioAttachmentViewHolder.kt

@@ -14,10 +14,9 @@ class AudioAttachmentViewHolder(itemView: View,
 
     init {
         with(itemView) {
+            setupActionMenu(attachment_container)
             image_attachment.setVisible(false)
             audio_video_attachment.setVisible(true)
-            setupActionMenu(attachment_container)
-            setupActionMenu(audio_video_attachment)
         }
     }
 

app/src/main/java/chat/rocket/android/chatroom/adapter/AuthorAttachmentViewHolder.kt

@@ -19,12 +19,9 @@ class AuthorAttachmentViewHolder(itemView: View,
     init {
         with(itemView) {
             setupActionMenu(author_attachment_container)
-            setupActionMenu(text_fields)
-            setupActionMenu(text_author_name)
         }
     }
 
-
     override fun bindViews(data: AuthorAttachmentViewModel) {
         with(itemView) {
             data.icon?.let { icon ->

app/src/main/java/chat/rocket/android/chatroom/adapter/BaseViewHolder.kt

@@ -3,6 +3,8 @@ package chat.rocket.android.chatroom.adapter
 import android.support.v7.widget.RecyclerView
 import android.view.MenuItem
 import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.children
 import chat.rocket.android.R
 import chat.rocket.android.chatroom.ui.bottomsheet.BottomSheetMenu
 import chat.rocket.android.chatroom.ui.bottomsheet.adapter.ActionListAdapter
@@ -74,7 +76,7 @@ abstract class BaseViewHolder<T : BaseViewModel<*>>(
         fun onActionSelected(item: MenuItem, message: Message)
     }
 
-    val longClickListener = { view: View ->
+    private val longClickListener = { view: View ->
         if (data?.message?.isSystemMessage() == false) {
             val menuItems = view.context.inflate(R.menu.message_actions).toList()
             menuItems.find { it.itemId == R.id.action_menu_msg_pin_unpin }?.apply {
@@ -90,6 +92,13 @@ abstract class BaseViewHolder<T : BaseViewModel<*>>(
 
     internal fun setupActionMenu(view: View) {
         if (listener.isActionsEnabled()) {
+            if (view is ViewGroup) {
+                for (child in view.children) {
+                    if (child !is RecyclerView && child.id != R.id.recycler_view_reactions) {
+                        setupActionMenu(child)
+                    }
+                }
+            }
             view.setOnLongClickListener(longClickListener)
         }
     }

app/src/main/java/chat/rocket/android/chatroom/adapter/ColorAttachmentViewHolder.kt

@@ -20,7 +20,6 @@ class ColorAttachmentViewHolder(itemView: View,
 
     init {
         with(itemView) {
-            setupActionMenu(attachment_text)
             setupActionMenu(color_attachment_container)
             attachment_text.movementMethod = LinkMovementMethod()
         }

app/src/main/java/chat/rocket/android/chatroom/adapter/GenericFileAttachmentViewHolder.kt

@@ -17,11 +17,9 @@ class GenericFileAttachmentViewHolder(itemView: View,
     init {
         with(itemView) {
             setupActionMenu(file_attachment_container)
-            setupActionMenu(text_file_name)
         }
     }
 
-
     override fun bindViews(data: GenericFileAttachmentViewModel) {
         with(itemView) {
             text_file_name.content = data.attachmentTitle

app/src/main/java/chat/rocket/android/chatroom/adapter/ImageAttachmentViewHolder.kt

@@ -47,7 +47,6 @@ class ImageAttachmentViewHolder(itemView: View,
     init {
         with(itemView) {
             setupActionMenu(attachment_container)
-            setupActionMenu(image_attachment)
         }
     }
 

app/src/main/java/chat/rocket/android/chatroom/adapter/MessageAttachmentViewHolder.kt

@@ -4,7 +4,7 @@ import android.text.method.LinkMovementMethod
 import android.view.View
 import chat.rocket.android.chatroom.viewmodel.MessageAttachmentViewModel
 import chat.rocket.android.widget.emoji.EmojiReactionListener
-import kotlinx.android.synthetic.main.item_message.view.*
+import kotlinx.android.synthetic.main.item_message_attachment.view.*
 
 class MessageAttachmentViewHolder(
         itemView: View,
@@ -14,8 +14,8 @@ class MessageAttachmentViewHolder(
 
     init {
         with(itemView) {
+            setupActionMenu(attachment_container)
             text_content.movementMethod = LinkMovementMethod()
-            setupActionMenu(text_content)
         }
     }
 

app/src/main/java/chat/rocket/android/chatroom/adapter/MessageViewHolder.kt

@@ -16,8 +16,8 @@ class MessageViewHolder(
 
     init {
         with(itemView) {
+            setupActionMenu(message_container)
             text_content.movementMethod = LinkMovementMethod()
-            setupActionMenu(text_content)
         }
     }
 

app/src/main/java/chat/rocket/android/chatroom/adapter/VideoAttachmentViewHolder.kt

@@ -14,10 +14,9 @@ class VideoAttachmentViewHolder(itemView: View,
 
     init {
         with(itemView) {
+            setupActionMenu(attachment_container)
             image_attachment.setVisible(false)
             audio_video_attachment.setVisible(true)
-            setupActionMenu(attachment_container)
-            setupActionMenu(audio_video_attachment)
         }
     }
 

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

@@ -58,6 +58,7 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:textDirection="locale"
+        tools:visibility="visible"
         app:layout_constraintEnd_toStartOf="@+id/layout_unread_messages_badge"
         app:layout_constraintStart_toStartOf="@+id/image_chat_icon"
         app:layout_constraintTop_toBottomOf="@+id/text_chat_name"

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

@@ -2,6 +2,7 @@
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/message_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:attr/selectableItemBackground"

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

@@ -2,6 +2,7 @@
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/attachment_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:attr/selectableItemBackground"