6543
/
BayernMessenger
forked from GitHub-Mirror/riotX-android
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Fix compilation issues after rebase

This commit is contained in:
Benoit Marty 2019-05-27 15:43:26 +02:00
parent b9d76f5047
commit 02555fcbac
4 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

1
vector/src/main/res/layout/item_public_room.xml
View File

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

1
vector/src/main/res/layout/item_room_directory.xml
View File

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

3
vector/src/main/res/values/colors.xml
View File

@ -21,8 +21,5 @@
<color name="black_37">#5d000000</color> <color name="black_37">#5d000000</color>


<color name="black">#000000</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> </resources>