Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-17 02:15:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bubbles: fix recycling issue

Browse Source
This commit is contained in:
ganfra 2022-01-12 18:45:40 +01:00
parent af542a8243
commit f7df0b891e
17 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
View File

@ -172,7 +172,9 @@ class MessageItemFactory @Inject constructor(
is MessagePollContent -> buildPollContent(messageContent, informationData, highlight, callback, attributes)
else -> buildNotHandledMessageItem(messageContent, informationData, highlight, callback, attributes)
}
return messageItem?.apply {
return messageItem?.takeIf {
it.layout == R.layout.item_timeline_event_base
}?.apply {
layout(informationData.messageLayout.layoutRes)
}
}

15
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
View File

@ -27,6 +27,7 @@ import im.vector.app.core.epoxy.VectorEpoxyHolder
import im.vector.app.core.epoxy.VectorEpoxyModel
import im.vector.app.core.platform.CheckableView
import im.vector.app.core.utils.DimensionConverter
import timber.log.Timber
/**
* Children must override getViewType()
@ -43,6 +44,20 @@ abstract class BaseEventItem<H : BaseEventItem.BaseHolder> : VectorEpoxyModel<H>
@EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
lateinit var dimensionConverter: DimensionConverter
final override fun getViewType(): Int {
// This makes sure we have a unique integer for the combination of layout and ViewStubId.
return pairingFunction(layout, getViewStubId()).also {
Timber.v("GetViewType: for ${javaClass.canonicalName} $it with layout:$layout and stubId:${getViewStubId()}")
}
}
abstract fun getViewStubId(): Int
// Szudzik function
private fun pairingFunction(a: Int, b: Int): Int {
return if (a >= b) a * a + a + b else a + b * b
}
@CallSuper
override fun bind(holder: H) {
super.bind(holder)

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

@ -50,7 +50,7 @@ abstract class CallTileTimelineItem : AbsBaseMessageItem<CallTileTimelineItem.Ho
@EpoxyAttribute
lateinit var attributes: Attributes
override fun getViewType() = STUB_ID
override fun getViewStubId() = STUB_ID
override fun bind(holder: Holder) {
super.bind(holder)

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

@ -46,7 +46,7 @@ abstract class DefaultItem : BaseEventItem<DefaultItem.Holder>() {
return listOf(attributes.informationData.eventId)
}
override fun getViewType() = STUB_ID
override fun getViewStubId() = STUB_ID
class Holder : BaseHolder(STUB_ID) {
val avatarImageView by bind<ImageView>(R.id.itemDefaultAvatarView)

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

@ -29,7 +29,7 @@ import im.vector.app.features.home.AvatarRenderer
@EpoxyModelClass(layout = R.layout.item_timeline_event_base_noinfo)
abstract class MergedMembershipEventsItem : BasedMergedItem<MergedMembershipEventsItem.Holder>() {
override fun getViewType() = STUB_ID
override fun getViewStubId() = STUB_ID
@EpoxyAttribute
override lateinit var attributes: Attributes

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

@ -51,7 +51,7 @@ abstract class MergedRoomCreationItem : BasedMergedItem<MergedRoomCreationItem.H
@EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
var movementMethod: MovementMethod? = null
override fun getViewType() = STUB_ID
override fun getViewStubId() = STUB_ID
override fun bind(holder: Holder) {
super.bind(holder)

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

@ -44,7 +44,7 @@ abstract class MessageBlockCodeItem : AbsMessageItem<MessageBlockCodeItem.Holder
holder.editedView.setTextOrHide(editedSpan?.charSequence)
}
override fun getViewType() = STUB_ID
override fun getViewStubId() = STUB_ID
class Holder : AbsMessageItem.Holder(STUB_ID) {
val messageView by bind<TextView>(R.id.codeBlockTextView)

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

@ -95,7 +95,7 @@ abstract class MessageFileItem : AbsMessageItem<MessageFileItem.Holder>() {
contentDownloadStateTrackerBinder.unbind(mxcUrl)
}
override fun getViewType() = STUB_ID
override fun getViewStubId() = STUB_ID
class Holder : AbsMessageItem.Holder(STUB_ID) {
val progressLayout by bind<ViewGroup>(R.id.messageFileUploadProgressLayout)

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

@ -83,7 +83,7 @@ abstract class MessageImageVideoItem : AbsMessageItem<MessageImageVideoItem.Hold
super.unbind(holder)
}
override fun getViewType() = STUB_ID
override fun getViewStubId() = STUB_ID
class Holder : AbsMessageItem.Holder(STUB_ID) {
val progressLayout by bind<ViewGroup>(R.id.messageMediaUploadProgressLayout)

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

@ -115,7 +115,7 @@ abstract class MessageTextItem : AbsMessageItem<MessageTextItem.Holder>() {
previewUrlRetriever?.removeListener(attributes.informationData.eventId, previewUrlViewUpdater)
}
override fun getViewType() = STUB_ID + layout
override fun getViewStubId() = STUB_ID
class Holder : AbsMessageItem.Holder(STUB_ID) {
val messageView by bind<AppCompatTextView>(R.id.messageTextView)

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

@ -120,7 +120,7 @@ abstract class MessageVoiceItem : AbsMessageItem<MessageVoiceItem.Holder>() {
voiceMessagePlaybackTracker.unTrack(attributes.informationData.eventId)
}
override fun getViewType() = STUB_ID
override fun getViewStubId() = STUB_ID
class Holder : AbsMessageItem.Holder(STUB_ID) {
val voiceLayout by bind<ViewGroup>(R.id.voiceLayout)

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

@ -64,7 +64,7 @@ abstract class NoticeItem : BaseEventItem<NoticeItem.Holder>() {
return listOf(attributes.informationData.eventId)
}
override fun getViewType() = STUB_ID
override fun getViewStubId() = STUB_ID
class Holder : BaseHolder(STUB_ID) {
val avatarImageView by bind<ImageView>(R.id.itemNoticeAvatarView)

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

@ -46,6 +46,8 @@ abstract class PollItem : AbsMessageItem<PollItem.Holder>() {
@EpoxyAttribute
lateinit var optionViewStates: List<PollOptionViewState>
override fun getViewStubId() = STUB_ID
override fun bind(holder: Holder) {
super.bind(holder)
val relatedEventId = eventId ?: return

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

@ -22,7 +22,7 @@ import im.vector.app.R
@EpoxyModelClass(layout = R.layout.item_timeline_event_base)
abstract class RedactedMessageItem : AbsMessageItem<RedactedMessageItem.Holder>() {
override fun getViewType() = STUB_ID
override fun getViewStubId() = STUB_ID
override fun shouldShowReactionAtBottom() = false

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

@ -40,7 +40,7 @@ abstract class StatusTileTimelineItem : AbsBaseMessageItem<StatusTileTimelineIte
@EpoxyAttribute
lateinit var attributes: Attributes
override fun getViewType() = STUB_ID
override fun getViewStubId() = STUB_ID
@SuppressLint("SetTextI18n")
override fun bind(holder: Holder) {

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

@ -51,7 +51,7 @@ abstract class VerificationRequestItem : AbsBaseMessageItem<VerificationRequestI
@EpoxyAttribute
var callback: TimelineEventController.Callback? = null
override fun getViewType() = STUB_ID
override fun getViewStubId() = STUB_ID
@SuppressLint("SetTextI18n")
override fun bind(holder: Holder) {

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

@ -41,7 +41,7 @@ abstract class WidgetTileTimelineItem : AbsBaseMessageItem<WidgetTileTimelineIte
@EpoxyAttribute
lateinit var attributes: Attributes
override fun getViewType() = STUB_ID
override fun getViewStubId() = STUB_ID
@SuppressLint("SetTextI18n")
override fun bind(holder: Holder) {