filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor view visibilities 

Reduce redundant code when having alternative views for the same
information available for different styles.

While we are at it: fix the setting view timestamps for all messages in
dual-bubble mode (even though it looks bad with the current design).

Change-Id: Id9598c6536c3cb5d93073e9d09485c009a53cd00
This commit is contained in:
SpiritCroc 2020-10-13 13:36:31 +02:00
parent e29ca1256f
commit e81a7211b2
1 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,83 +63,87 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
override fun bind(holder: H) { override fun bind(holder: H) {
super.bind(holder) super.bind(holder)
val contentInBubble = infoInBubbles(holder.memberNameView.context) val contentInBubble = infoInBubbles(holder.memberNameView.context)
if (attributes.informationData.showInformation and (!contentInBubble || !attributes.informationData.sentByMe)) {
holder.avatarImageView.layoutParams = holder.avatarImageView.layoutParams?.apply { val avatarImageView: ImageView?
val memberNameView: TextView?
val timeView: TextView?
val hiddenViews = ArrayList<View>()
val invisibleViews = ArrayList<View>()
// Select which views are visible, based on bubble style and other criteria
if (attributes.informationData.showInformation) {
if (contentInBubble) {
memberNameView = holder.bubbleMemberNameView
timeView = holder.bubbleTimeView
hiddenViews.add(holder.memberNameView)
hiddenViews.add(holder.timeView)
} else {
memberNameView = holder.memberNameView
timeView = holder.timeView
hiddenViews.add(holder.bubbleMemberNameView)
hiddenViews.add(holder.bubbleTimeView)
}
} else if (attributes.informationData.forceShowTimestamp) {
memberNameView = null
//hiddenViews.add(holder.memberNameView) // this one get's some special hiding treatment below
hiddenViews.add(holder.bubbleMemberNameView)
if (contentInBubble) {
timeView = holder.bubbleTimeView
hiddenViews.add(holder.timeView)
hiddenViews.add(holder.memberNameView)
} else {
timeView = holder.timeView
hiddenViews.add(holder.bubbleTimeView)
// Set to INVISIBLE instead of adding to hiddenViews, which are set to GONE
// (upstream sets memberNameView.isInvisible = true here, which is effectively the same)
invisibleViews.add(holder.memberNameView)
}
} else {
memberNameView = null
hiddenViews.add(holder.memberNameView)
hiddenViews.add(holder.bubbleMemberNameView)
timeView = null
hiddenViews.add(holder.timeView)
hiddenViews.add(holder.bubbleTimeView)
}
// Dual-side bubbles: hide own avatar, and all in direct chats
if ((!attributes.informationData.showInformation) ||
(contentInBubble && (attributes.informationData.sentByMe || attributes.informationData.isDirect))) {
avatarImageView = null
hiddenViews.add(holder.avatarImageView)
} else {
avatarImageView = holder.avatarImageView
}
hiddenViews.forEach {
// Same as it.isVisible = false
it.visibility = View.GONE
}
invisibleViews.forEach {
// Same as it.isInvisible = true
it.visibility = View.INVISIBLE
}
// Views available in upstream Element
avatarImageView?.layoutParams = avatarImageView?.layoutParams?.apply {
height = attributes.avatarSize height = attributes.avatarSize
width = attributes.avatarSize width = attributes.avatarSize
} }
//holder.avatarImageView.visibility = View.VISIBLE avatarImageView?.visibility = View.VISIBLE
holder.avatarImageView.setOnClickListener(_avatarClickListener) avatarImageView?.setOnClickListener(_avatarClickListener)
//holder.memberNameView.visibility = View.VISIBLE memberNameView?.visibility = View.VISIBLE
holder.memberNameView.setOnClickListener(_memberNameClickListener) memberNameView?.setOnClickListener(_memberNameClickListener)
holder.bubbleMemberNameView.setOnClickListener(_memberNameClickListener) timeView?.visibility = View.VISIBLE
//holder.timeView.visibility = View.VISIBLE timeView?.text = attributes.informationData.time
holder.timeView.text = attributes.informationData.time memberNameView?.text = attributes.informationData.memberName
holder.bubbleTimeView.text = attributes.informationData.time memberNameView?.setTextColor(attributes.getMemberNameColor())
holder.memberNameView.text = attributes.informationData.memberName if (avatarImageView != null) attributes.avatarRenderer.render(attributes.informationData.matrixItem, avatarImageView)
holder.bubbleMemberNameView.text = attributes.informationData.memberName avatarImageView?.setOnLongClickListener(attributes.itemLongClickListener)
holder.memberNameView.setTextColor(attributes.getMemberNameColor()) memberNameView?.setOnLongClickListener(attributes.itemLongClickListener)
holder.bubbleMemberNameView.setTextColor(attributes.getMemberNameColor())
attributes.avatarRenderer.render(attributes.informationData.matrixItem, holder.avatarImageView) // Views added by Schildi
holder.avatarImageView.setOnLongClickListener(attributes.itemLongClickListener)
holder.memberNameView.setOnLongClickListener(attributes.itemLongClickListener)
holder.bubbleMemberNameView.setOnLongClickListener(attributes.itemLongClickListener)
if (hideSenderInformation()) {
holder.memberNameView.visibility = View.GONE
holder.timeView.visibility = View.GONE
holder.bubbleMemberNameView.visibility = View.GONE
holder.bubbleTimeView.visibility = View.GONE
if (attributes.informationData.isDirect) {
holder.avatarImageView.visibility = View.GONE
} else {
holder.avatarImageView.visibility = View.VISIBLE
}
} else if (contentInBubble) {
holder.memberNameView.visibility = View.GONE
holder.timeView.visibility = View.GONE
holder.bubbleMemberNameView.visibility = View.VISIBLE
holder.bubbleTimeView.visibility = View.VISIBLE
if (attributes.informationData.isDirect) {
holder.avatarImageView.visibility = View.GONE
} else {
holder.avatarImageView.visibility = View.VISIBLE
}
} else {
holder.memberNameView.visibility = View.VISIBLE
holder.timeView.visibility = View.VISIBLE
holder.bubbleMemberNameView.visibility = View.GONE
holder.bubbleTimeView.visibility = View.GONE
holder.avatarImageView.visibility = View.VISIBLE
}
} else {
holder.avatarImageView.setOnClickListener(null)
holder.memberNameView.setOnClickListener(null)
holder.avatarImageView.visibility = View.GONE
if (attributes.informationData.forceShowTimestamp) {
holder.memberNameView.isInvisible = true
holder.timeView.isVisible = true
holder.timeView.text = attributes.informationData.time
} else {
holder.memberNameView.isVisible = false
holder.timeView.isVisible = false
}
holder.avatarImageView.setOnLongClickListener(null)
holder.memberNameView.setOnLongClickListener(null)
if (attributes.informationData.showInformation && !hideSenderInformation()/* && contentInBubble && attributes.informationData.sentByMe */) {
holder.bubbleTimeView.visibility = View.VISIBLE
holder.bubbleTimeView.text = attributes.informationData.time
holder.bubbleMemberNameView.visibility = View.VISIBLE
holder.bubbleMemberNameView.setOnClickListener(_memberNameClickListener)
holder.bubbleMemberNameView.text = attributes.informationData.memberName
holder.bubbleMemberNameView.setTextColor(attributes.getMemberNameColor())
holder.bubbleMemberNameView.setOnLongClickListener(attributes.itemLongClickListener)
} else {
holder.bubbleTimeView.visibility = View.GONE
holder.bubbleMemberNameView.setOnClickListener(null)
holder.bubbleMemberNameView.visibility = View.GONE
holder.bubbleMemberNameView.setOnLongClickListener(null)
}
}
holder.viewStubContainer.minimumWidth = getViewStubMinimumWidth(holder, contentInBubble, attributes.informationData.showInformation) holder.viewStubContainer.minimumWidth = getViewStubMinimumWidth(holder, contentInBubble, attributes.informationData.showInformation)
} }
@ -227,10 +231,6 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
return attributes.informationData.sentByMe return attributes.informationData.sentByMe
} }
private fun hideSenderInformation(): Boolean {
return pseudoBubbleAllowed() && false
}
open fun getBubbleMargin(density: Float, reverseBubble: Boolean): Int { open fun getBubbleMargin(density: Float, reverseBubble: Boolean): Int {
return round(96*density).toInt() return round(96*density).toInt()
} }