From a6f8fe9317a4d96ec05991cf0efc9654a6c2344f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 4 Dec 2019 12:08:18 +0100
Subject: [PATCH] Fix lint issue

---
 .../features/home/room/detail/timeline/item/BaseEventItem.kt  | 1 -
 .../home/room/detail/timeline/item/MergedHeaderItem.kt        | 2 +-
 .../src/main/res/layout/item_timeline_event_base_noinfo.xml   | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BaseEventItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BaseEventItem.kt
index 576e596f90..02b7341c72 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BaseEventItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BaseEventItem.kt
@@ -19,7 +19,6 @@ import android.view.View
 import android.view.ViewStub
 import android.widget.RelativeLayout
 import androidx.annotation.IdRes
-import androidx.core.view.marginStart
 import androidx.core.view.updateLayoutParams
 import com.airbnb.epoxy.EpoxyAttribute
 import im.vector.riotx.R
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedHeaderItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedHeaderItem.kt
index 3ffc8e65d6..a2a3c9ad3b 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedHeaderItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedHeaderItem.kt
@@ -103,6 +103,6 @@ abstract class MergedHeaderItem : BaseEventItem<MergedHeaderItem.Holder>() {
     }
 
     companion object {
-        private const val STUB_ID = R.id.messageContentMergedheaderStub
+        private const val STUB_ID = R.id.messageContentMergedHeaderStub
     }
 }
diff --git a/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml b/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
index b72933b94f..c1987dccb2 100644
--- a/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
@@ -10,7 +10,7 @@
         android:id="@+id/messageSelectedBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignBottom="@+id/informationBottom"
+        android:layout_alignBottom="@+id/readReceiptsView"
         android:layout_alignParentTop="true"
         android:background="?riotx_highlighted_message_background" />
 
@@ -47,7 +47,7 @@
             android:layout="@layout/item_timeline_event_blank_stub" />
 
         <ViewStub
-            android:id="@+id/messageContentMergedheaderStub"
+            android:id="@+id/messageContentMergedHeaderStub"
             style="@style/TimelineContentStubBaseParams"
             android:layout="@layout/item_timeline_event_merged_header_stub" />