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

cleaning / review

Browse Source
This commit is contained in:
Valere 2019-07-22 23:34:40 +02:00
parent 36af8a6a9f
commit c58328f94e
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@ -5,7 +5,7 @@ Features:
- -


Improvements: Improvements:
- - UI for pending edits (#193)


Other changes: Other changes:
- -

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

@ -164,8 +164,7 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : BaseEventItem<H>() {


protected fun renderSendState(root: View, textView: TextView?) { protected fun renderSendState(root: View, textView: TextView?) {
root.isClickable = informationData.sendState.isSent() root.isClickable = informationData.sendState.isSent()
val state = SendState.UNSENT.takeIf { informationData.hasPendingEdits } val state = if (informationData.hasPendingEdits) SendState.UNSENT else informationData.sendState
?: informationData.sendState
textView?.setTextColor(colorProvider.getMessageTextColor(state)) textView?.setTextColor(colorProvider.getMessageTextColor(state))
} }



6
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageInformationData.kt
View File

@ -30,9 +30,9 @@ data class MessageInformationData(
val memberName: CharSequence? = null, val memberName: CharSequence? = null,
val showInformation: Boolean = true, val showInformation: Boolean = true,
/*List of reactions (emoji,count,isSelected)*/ /*List of reactions (emoji,count,isSelected)*/
var orderedReactionList: List<ReactionInfoData>? = null, val orderedReactionList: List<ReactionInfoData>? = null,
var hasBeenEdited: Boolean = false, val hasBeenEdited: Boolean = false,
var hasPendingEdits: Boolean = false val hasPendingEdits: Boolean = false
) : Parcelable ) : Parcelable