From bd009caaf13c878e7a1a2075054d96896d59ef65 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 12 Jul 2019 10:22:58 +0200
Subject: [PATCH] Code cleanup

---
 .../home/room/detail/timeline/item/AbsMessageItem.kt       | 6 ++++--
 .../home/room/detail/timeline/item/MessageFileItem.kt      | 5 -----
 .../room/detail/timeline/item/MessageImageVideoItem.kt     | 5 -----
 .../home/room/detail/timeline/item/MessageTextItem.kt      | 5 -----
 .../home/room/detail/timeline/item/RedactedMessageItem.kt  | 7 -------
 5 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt
index f76601cd..cdcfceef 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt
@@ -40,9 +40,11 @@ import im.vector.riotx.features.ui.getMessageTextColor
 
 abstract class AbsMessageItem<H : AbsMessageItem.Holder> : BaseEventItem<H>() {
 
-    abstract val informationData: MessageInformationData
+    @EpoxyAttribute
+    lateinit var informationData: MessageInformationData
 
-    abstract val avatarRenderer: AvatarRenderer
+    @EpoxyAttribute
+    lateinit var avatarRenderer: AvatarRenderer
 
     @EpoxyAttribute
     lateinit var colorProvider: ColorProvider
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageFileItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageFileItem.kt
index 3d5fb452..e63881e2 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageFileItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageFileItem.kt
@@ -25,7 +25,6 @@ import androidx.annotation.DrawableRes
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.riotx.R
-import im.vector.riotx.features.home.AvatarRenderer
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base)
 abstract class MessageFileItem : AbsMessageItem<MessageFileItem.Holder>() {
@@ -36,10 +35,6 @@ abstract class MessageFileItem : AbsMessageItem<MessageFileItem.Holder>() {
     @DrawableRes
     var iconRes: Int = 0
     @EpoxyAttribute
-    override lateinit var informationData: MessageInformationData
-    @EpoxyAttribute
-    override lateinit var avatarRenderer: AvatarRenderer
-    @EpoxyAttribute
     var clickListener: View.OnClickListener? = null
 
     override fun bind(holder: Holder) {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageImageVideoItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
index bc47be74..b3cbaab0 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
@@ -22,7 +22,6 @@ import android.widget.ImageView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.riotx.R
-import im.vector.riotx.features.home.AvatarRenderer
 import im.vector.riotx.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
 import im.vector.riotx.features.media.ImageContentRenderer
 
@@ -32,10 +31,6 @@ abstract class MessageImageVideoItem : AbsMessageItem<MessageImageVideoItem.Hold
     @EpoxyAttribute
     lateinit var mediaData: ImageContentRenderer.Data
     @EpoxyAttribute
-    override lateinit var informationData: MessageInformationData
-    @EpoxyAttribute
-    override lateinit var avatarRenderer: AvatarRenderer
-    @EpoxyAttribute
     var playable: Boolean = false
     @EpoxyAttribute
     var clickListener: View.OnClickListener? = null
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageTextItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageTextItem.kt
index 9067dfde..7b7d3cbf 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageTextItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageTextItem.kt
@@ -24,7 +24,6 @@ import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.riotx.R
 import im.vector.riotx.core.utils.containsOnlyEmojis
-import im.vector.riotx.features.home.AvatarRenderer
 import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
 import im.vector.riotx.features.html.PillImageSpan
 import kotlinx.coroutines.Dispatchers
@@ -39,10 +38,6 @@ abstract class MessageTextItem : AbsMessageItem<MessageTextItem.Holder>() {
     @EpoxyAttribute
     var message: CharSequence? = null
     @EpoxyAttribute
-    override lateinit var avatarRenderer: AvatarRenderer
-    @EpoxyAttribute
-    override lateinit var informationData: MessageInformationData
-    @EpoxyAttribute
     var urlClickCallback: TimelineEventController.UrlClickCallback? = null
 
     private val mvmtMethod = BetterLinkMovementMethod.newInstance().also {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RedactedMessageItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RedactedMessageItem.kt
index 05967f00..f3979c54 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RedactedMessageItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RedactedMessageItem.kt
@@ -16,19 +16,12 @@
 
 package im.vector.riotx.features.home.room.detail.timeline.item
 
-import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.riotx.R
-import im.vector.riotx.features.home.AvatarRenderer
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base)
 abstract class RedactedMessageItem : AbsMessageItem<RedactedMessageItem.Holder>() {
 
-    @EpoxyAttribute
-    override lateinit var informationData: MessageInformationData
-    @EpoxyAttribute
-    override lateinit var avatarRenderer: AvatarRenderer
-
     override fun getStubType(): Int = STUB_ID
 
     override fun shouldShowReactionAtBottom() = false