Display Read Receipt on unsupported events

vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/DefaultItemFactory.kt

@@ -17,21 +17,34 @@
 package im.vector.riotx.features.home.room.detail.timeline.factory
 
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
+import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
 import im.vector.riotx.features.home.room.detail.timeline.item.DefaultItem
 import im.vector.riotx.features.home.room.detail.timeline.item.DefaultItem_
+import im.vector.riotx.features.home.room.detail.timeline.util.MessageInformationDataFactory
 import javax.inject.Inject
 
-class DefaultItemFactory @Inject constructor(){
+class DefaultItemFactory @Inject constructor(private val avatarRenderer: AvatarRenderer,
+                                             private val informationDataFactory: MessageInformationDataFactory) {
 
-    fun create(event: TimelineEvent, highlight: Boolean, exception: Exception? = null): DefaultItem? {
+    fun create(event: TimelineEvent,
+               highlight: Boolean,
+               callback: TimelineEventController.Callback?,
+               exception: Exception? = null): DefaultItem? {
         val text = if (exception == null) {
             "${event.root.getClearType()} events are not yet handled"
         } else {
             "an exception occurred when rendering the event ${event.root.eventId}"
         }
+
+        val informationData = informationDataFactory.create(event, null)
+
         return DefaultItem_()
                 .text(text)
+                .avatarRenderer(avatarRenderer)
                 .highlighted(highlight)
+                .informationData(informationData)
+                .readReceiptsCallback(callback)
     }
 
 }

vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/TimelineItemFactory.kt

@@ -20,12 +20,7 @@ import im.vector.matrix.android.api.session.events.model.EventType
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
 import im.vector.riotx.core.epoxy.EmptyItem_
 import im.vector.riotx.core.epoxy.VectorEpoxyModel
-import im.vector.riotx.features.home.AvatarRenderer
 import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
-import im.vector.riotx.features.home.room.detail.timeline.helper.senderAvatar
-import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
-import im.vector.riotx.features.home.room.detail.timeline.item.NoticeItem_
-import im.vector.riotx.features.home.room.detail.timeline.util.MessageInformationDataFactory
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -71,7 +66,7 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
 
                 // Unhandled event types (yet)
                 EventType.STATE_ROOM_THIRD_PARTY_INVITE,
-                EventType.STICKER           -> defaultItemFactory.create(event, highlight)
+                EventType.STICKER           -> defaultItemFactory.create(event, highlight, callback)
                 else                        -> {
                     Timber.v("Type ${event.root.getClearType()} not handled")
                     null
@@ -79,7 +74,7 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
             }
         } catch (e: Exception) {
             Timber.e(e, "failed to create message item")
-            defaultItemFactory.create(event, highlight, e)
+            defaultItemFactory.create(event, highlight, callback, e)
         }
         return (computedModel ?: EmptyItem_())
     }

vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DefaultItem.kt

@@ -16,23 +16,38 @@
 
 package im.vector.riotx.features.home.room.detail.timeline.item
 
+import android.view.View
 import android.widget.TextView
-import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.riotx.R
+import im.vector.riotx.core.utils.DebouncedClickListener
+import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base_noinfo)
 abstract class DefaultItem : BaseEventItem<DefaultItem.Holder>() {
 
+    @EpoxyAttribute
+    lateinit var informationData: MessageInformationData
+
+    @EpoxyAttribute
+    lateinit var avatarRenderer: AvatarRenderer
+
+    @EpoxyAttribute
+    var readReceiptsCallback: TimelineEventController.ReadReceiptsCallback? = null
+
+    private val _readReceiptsClickListener = DebouncedClickListener(View.OnClickListener {
+        readReceiptsCallback?.onReadReceiptsClicked(informationData.readReceipts)
+    })
+
     @EpoxyAttribute
     var text: CharSequence? = null
 
     override fun bind(holder: Holder) {
         holder.messageView.text = text
 
-        // TODO We should handle read receipt here as well
+        holder.readReceiptsView.render(informationData.readReceipts, avatarRenderer, _readReceiptsClickListener)
-        holder.readReceiptsView.isVisible = false
     }
 
     override fun getViewType() = STUB_ID