Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issue with timeline message view reuse while rich text editor is enabled #8688

Merged
merged 2 commits into from Nov 17, 2023
Merged

Fix issue with timeline message view reuse while rich text editor is enabled #8688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09d1979
Fix issue with message view reuse while rich text editor is enabled
jonnyandrew Nov 17, 2023
af0c84b
Add changelog
jonnyandrew Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/8688.bugfix
View file
Open in desktop
@@ -0,0 +1 @@
Fix issue with timeline message view reuse while rich text editor is enabled
27 changes: 21 additions & 6 deletions ...or/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
View file
Open in desktop
Expand Up @@ -85,8 +85,13 @@ abstract class MessageTextItem : AbsMessageItem<MessageTextItem.Holder>() {
}
holder.previewUrlView.delegate = previewUrlCallback
holder.previewUrlView.renderMessageLayout(attributes.informationData.messageLayout)

val messageView: AppCompatTextView = if (useRichTextEditorStyle) holder.richMessageView else holder.plainMessageView
if (useRichTextEditorStyle) {
holder.plainMessageView?.isVisible = false
} else {
holder.richMessageView?.isVisible = false
}
val messageView: AppCompatTextView = if (useRichTextEditorStyle) holder.requireRichMessageView() else holder.requirePlainMessageView()
messageView.isVisible = true
if (useBigFont) {
messageView.textSize = 44F
} else {
Expand Down Expand Up @@ -133,11 +138,21 @@ abstract class MessageTextItem : AbsMessageItem<MessageTextItem.Holder>() {
val previewUrlView by bind<PreviewUrlView>(R.id.messageUrlPreview)
private val richMessageStub by bind<ViewStub>(R.id.richMessageTextViewStub)
private val plainMessageStub by bind<ViewStub>(R.id.plainMessageTextViewStub)
val richMessageView: AppCompatTextView by lazy {
richMessageStub.inflate().findViewById(R.id.messageTextView)
var richMessageView: AppCompatTextView? = null
private set
var plainMessageView: AppCompatTextView? = null
private set

fun requireRichMessageView(): AppCompatTextView {
val view = richMessageView ?: richMessageStub.inflate().findViewById(R.id.messageTextView)
richMessageView = view
return view
}
val plainMessageView: AppCompatTextView by lazy {
plainMessageStub.inflate().findViewById(R.id.messageTextView)

fun requirePlainMessageView(): AppCompatTextView {
val view = plainMessageView ?: plainMessageStub.inflate().findViewById(R.id.messageTextView)
plainMessageView = view
return view
}
}

Expand Down