Clear scrapped reaction views and fix layout

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

@@ -32,13 +32,20 @@ abstract class BaseViewHolder<T : BaseViewModel<*>>(
 
     private fun bindReactions() {
         data?.let {
+            val recyclerView = itemView.findViewById(R.id.recycler_view_reactions) as RecyclerView
+            val adapter: MessageReactionsAdapter
+            if (recyclerView.adapter == null) {
+                adapter = MessageReactionsAdapter()
+            } else {
+                adapter = recyclerView.adapter as MessageReactionsAdapter
+                adapter.clear()
+            }
+
             if (it.nextDownStreamMessage == null) {
-                val recyclerView = itemView.findViewById(R.id.recycler_view_reactions) as RecyclerView
-                val adapter = MessageReactionsAdapter()
                 val manager = GridLayoutManager(itemView.context, 6)
                 recyclerView.layoutManager = manager
                 recyclerView.adapter = adapter
-                adapter.addReactions(it.reactions)
+                adapter.addReactions(it.reactions.filterNot { it.shortname.startsWith(":") })
             }
         }
     }

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

@@ -34,6 +34,12 @@ class MessageReactionsAdapter : RecyclerView.Adapter<MessageReactionsViewHolder>
         notifyItemRangeInserted(0, reactions.size)
     }
 
+    fun clear() {
+        val oldSize = reactions.size
+        reactions.clear()
+        notifyItemRangeRemoved(0, oldSize)
+    }
+
     class MessageReactionsViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         @Inject lateinit var localRepository: LocalRepository
 

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

@@ -171,6 +171,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardPopup.Listener {
 
             val oldMessagesCount = adapter.itemCount
             adapter.appendData(dataSet)
+            recycler_view.scrollToPosition(92)
             if (oldMessagesCount == 0 && dataSet.isNotEmpty()) {
                 recycler_view.scrollToPosition(0)
             }

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

@@ -48,6 +48,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="@+id/text_description"
-        app:layout_constraintStart_toStartOf="@+id/text_description"
+        app:layout_constraintStart_toStartOf="@+id/image_preview"
         app:layout_constraintTop_toBottomOf="@+id/text_description" />
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file