jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5688 from vector-im/feature/aris/threads_main_timeline_messages_layout 

Improved thread rendering in the main timeline
This commit is contained in:
Aris Kotsomitopoulos 2022-04-04 23:22:51 +03:00 committed by GitHub
parent 3b8ffcf8a9 be77363c34
commit 8c9d2410b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5151.misc Normal file
View File

@ -0,0 +1 @@
Improve main timeline thread summary rendering

2
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
View File

@ -31,6 +31,7 @@ import org.matrix.android.sdk.api.session.room.model.message.MessageVerification
import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
import org.matrix.android.sdk.api.session.room.timeline.isEdition import org.matrix.android.sdk.api.session.room.timeline.isEdition
import org.matrix.android.sdk.api.session.room.timeline.isRootThread
import javax.inject.Inject import javax.inject.Inject
class TimelineMessageLayoutFactory @Inject constructor(private val session: Session, class TimelineMessageLayoutFactory @Inject constructor(private val session: Session,
@ -91,6 +92,7 @@ class TimelineMessageLayoutFactory @Inject constructor(private val session: Sess
nextDisplayableEvent.root.getClearType() !in listOf(EventType.MESSAGE, EventType.STICKER, EventType.ENCRYPTED) || nextDisplayableEvent.root.getClearType() !in listOf(EventType.MESSAGE, EventType.STICKER, EventType.ENCRYPTED) ||
isNextMessageReceivedMoreThanOneHourAgo || isNextMessageReceivedMoreThanOneHourAgo ||
isTileTypeMessage(nextDisplayableEvent) || isTileTypeMessage(nextDisplayableEvent) ||
event.isRootThread() ||
nextDisplayableEvent.isEdition() nextDisplayableEvent.isEdition()
val messageLayout = when (layoutSettingsProvider.getLayoutSettings()) { val messageLayout = when (layoutSettingsProvider.getLayoutSettings()) {