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.

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

Feature/pending edits ux #407

Merged
merged 4 commits into from
Jul 22, 2019
Merged

Feature/pending edits ux #407

merged 4 commits into from
Jul 22, 2019

Conversation

BillCarsonFr
Copy link
Member

Show pending edits by fading the event body
Fixes #193

  • Show replace events in timeline when show hidden event option is selected in lab

@BillCarsonFr BillCarsonFr requested review from bmarty and ganfra and removed request for bmarty July 19, 2019 14:17
Copy link
Member

@ganfra ganfra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just 2 remarks

@@ -31,7 +31,8 @@ data class MessageInformationData(
val showInformation: Boolean = true,
/*List of reactions (emoji,count,isSelected)*/
var orderedReactionList: List<ReactionInfoData>? = null,
var hasBeenEdited: Boolean = false
var hasBeenEdited: Boolean = false,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should only get val on this class, could you please change that on the 3 fields?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

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

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think a basic If else would be more readable

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@BillCarsonFr BillCarsonFr merged commit 6176520 into develop Jul 22, 2019
@BillCarsonFr BillCarsonFr deleted the feature/pending_edits_ux branch July 22, 2019 21:53
@bmarty bmarty mentioned this pull request Aug 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Show pending edits by fading the event body
2 participants