Fix compilation issues after rebase

vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventController.kt

@@ -24,9 +24,7 @@ import androidx.recyclerview.widget.ListUpdateCallback
 import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.epoxy.EpoxyController
 import com.airbnb.epoxy.EpoxyModel
-import im.vector.matrix.android.api.session.events.model.toModel
 import im.vector.matrix.android.api.session.room.model.EditAggregatedSummary
-import im.vector.matrix.android.api.session.room.model.RoomMember
 import im.vector.matrix.android.api.session.room.model.message.*
 import im.vector.matrix.android.api.session.room.timeline.Timeline
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
@@ -229,10 +227,8 @@ class TimelineEventController(private val dateFormatter: TimelineDateFormatter,
             } else {
                 val mergedEvents = (prevSameTypeEvents + listOf(event)).asReversed()
                 val mergedData = mergedEvents.map { mergedEvent ->
-                    val eventContent: RoomMember? = mergedEvent.root.content.toModel()
-                    val prevEventContent: RoomMember? = mergedEvent.root.prevContent.toModel()
-                    val senderAvatar = RoomMemberEventHelper.senderAvatar(eventContent, prevEventContent, mergedEvent)
-                    val senderName = RoomMemberEventHelper.senderName(eventContent, prevEventContent, mergedEvent)
+                    val senderAvatar = mergedEvent.senderAvatar()
+                    val senderName = mergedEvent.senderName()
                     MergedHeaderItem.Data(
                             userId = mergedEvent.root.sender ?: "",
                             avatarUrl = senderAvatar,

vector/src/main/res/layout/item_public_room.xml

@@ -6,7 +6,6 @@
     android:id="@+id/itemPublicRoomLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_room_item"
     android:clickable="true"
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground">

vector/src/main/res/layout/item_room_directory.xml

@@ -6,7 +6,6 @@
     android:id="@+id/itemRoomDirectoryLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_room_item"
     android:clickable="true"
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground">

vector/src/main/res/values/colors.xml

@@ -21,8 +21,5 @@
     <color name="black_37">#5d000000</color>
 
     <color name="black">#000000</color>
-    <color name="black_87">#de000000</color>
-    <color name="black_38">#61000000</color>
-    <color name="black_37">#5d000000</color>
 
 </resources>