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

Show target user avatars for collapsed membership changes #4148

Conversation

Johennes
Copy link
Contributor

This commit switches to displaying the target user's avatar for collapsed membership changes which addresses the avatar issue reported in #4102.

This now brings the avatar display on par with the Element web app. Collapsed membership changes use the target avatar, expanded changes use the sender avatar. Note that the web app currently still has more sophisticated logic around combining membership changes (e.g. "... invited and joined") which allows it to show less collapsed avatars in certain cases.

Screenshot 2021-03-25 at 10 38 26

Depends on: matrix-org/matrix-ios-kit#793

Signed-off-by: Johannes Marbach n0-0ne+github@mailbox.org

Pull Request Checklist

  • I read the contributing guide
  • UI change has been tested on both light and dark themes, in portrait and landscape orientations and on iPhone and iPad simulators
  • Pull request is based on the develop branch
  • Pull request updates CHANGES.rst
  • Pull request includes screenshots or videos of UI changes
  • Pull request includes a sign off

This commit switches to displaying the target user's avatar for collapsed membership
changes which addresses the avatar issue reported in element-hq#4102.

Depends on: matrix-org/matrix-ios-kit#793

Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>
Copy link
Contributor

@daniellekirkwood daniellekirkwood left a comment

Choose a reason for hiding this comment

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

This is awesome, thanks!

@stefanceriu stefanceriu changed the base branch from develop to johennes/feature/target-avatars February 7, 2022 15:44
@stefanceriu stefanceriu merged commit 676fe5d into element-hq:johennes/feature/target-avatars Feb 7, 2022
@stefanceriu
Copy link
Member

Thank you for taking the time to raise this. As it had conflicts with develop I took the liberty of merging it to a separate branch and will handle the rest.

stefanceriu pushed a commit that referenced this pull request Feb 7, 2022
This commit switches to displaying the target user's avatar for collapsed membership
changes which addresses the avatar issue reported in #4102.

Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>
@Johennes
Copy link
Contributor Author

Johennes commented Feb 7, 2022

Thanks both and sorry this hung around in unmergeable state.

stefanceriu pushed a commit that referenced this pull request Feb 7, 2022
This commit switches to displaying the target user's avatar for collapsed membership
changes which addresses the avatar issue reported in #4102.

Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>
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.

3 participants