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

Fix stickers display text on room summary #3221

Merged
merged 1 commit into from
Jul 19, 2024

Conversation

surakin
Copy link
Contributor

@surakin surakin commented Jul 19, 2024

Content

Tweak how stickers are displayed in the room summary

Motivation and context

After this change matrix-org/matrix-rust-sdk#3715 stickers will show up in the room summary but only displaying the content body, which can be interpreted as a file name or as a sticker description, but in both cases it can look like a normal message (Images appear as 'Image').

Screenshots / GIFs

Before
image
After
image

Tests

  • Step 1
  • Step 2
  • Step ...

Tested devices

  • Physical
  • Emulator
  • OS version(s):

Checklist

  • Changes have been tested on an Android device or Android emulator with API 23
  • UI change has been tested on both light and dark themes
  • Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility
  • Pull request is based on the develop branch
  • Pull request title will be used in the release note, it clearly define what will change for the user
  • Pull request includes screenshots or videos if containing UI changes
  • Pull request includes a sign off
  • You've made a self review of your PR

Copy link
Contributor

Thank you for your contribution! Here are a few things to check in the PR to ensure it's reviewed as quickly as possible:

  • Your branch should be based on origin/develop, at least when it was created.
  • The title of the PR will be used for release notes, so it needs to describe the change visible to the user.
  • The test pass locally running ./gradlew test.
  • The code quality check suite pass locally running ./gradlew runQualityChecks.
  • If you modified anything related to the UI, including previews, you'll have to run the Record screenshots GH action in your forked repo: that will generate compatible new screenshots. However, given Github Actions limitations, it will prevent the CI from running temporarily, until you upload a new commit after that one. To do so, just pull the latest changes and push an empty commit.

@surakin surakin changed the title Show latest sticker event on room summary Fix stickers display text on room summary Jul 19, 2024
@surakin surakin marked this pull request as ready for review July 19, 2024 12:40
@surakin surakin requested a review from a team as a code owner July 19, 2024 12:40
@surakin surakin requested review from ganfra and removed request for a team July 19, 2024 12:40
@bmarty bmarty added the Z-Community-PR Issue is solved by a community member's PR label Jul 19, 2024
@jmartinesp
Copy link
Member

I've created #3225 to try to fix the CI issues you're seeing. EX Enterprise setup apparently broke it.

@jmartinesp
Copy link
Member

@surakin that... didn't go well. Maybe you'll need to rebase origin/develop 🫤 .

@jmartinesp
Copy link
Member

Agh, the wrong code got merged... That's what I get for playing with different remotes and having 2 opened PRs...

Copy link
Member

@jmartinesp jmartinesp left a comment

Choose a reason for hiding this comment

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

Now that's better. Let's see if new screenshots are needed, otherwise LGTM.

Copy link
Member

@jmartinesp jmartinesp left a comment

Choose a reason for hiding this comment

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

It seems like a test case needs to be fixed before it's merged. It would also be nice to check if no screenshot updates are needed.

@surakin surakin force-pushed the latest_sticker_event branch 2 times, most recently from 38b570b to 4abd82b Compare July 19, 2024 16:21
@surakin
Copy link
Contributor Author

surakin commented Jul 19, 2024

It seems like a test case needs to be fixed before it's merged. It would also be nice to check if no screenshot updates are needed.

I ran the record screenshot actions and it didn't find any changes 🤔

@surakin surakin force-pushed the latest_sticker_event branch 2 times, most recently from 719194e to fdc2751 Compare July 19, 2024 17:38
Signed-off-by: Marco Antonio Alvarez <surakin@gmail.com>
Copy link

codecov bot commented Jul 19, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 76.12%. Comparing base (344e07b) to head (f2b074e).

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #3221      +/-   ##
===========================================
- Coverage    76.13%   76.12%   -0.02%     
===========================================
  Files         1645     1645              
  Lines        38839    38839              
  Branches      7530     7530              
===========================================
- Hits         29570    29566       -4     
- Misses        5361     5362       +1     
- Partials      3908     3911       +3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@jmartinesp jmartinesp merged commit 3a9830f into element-hq:develop Jul 19, 2024
22 checks passed
@surakin surakin deleted the latest_sticker_event branch July 19, 2024 20:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Z-Community-PR Issue is solved by a community member's PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants