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.

Sign up for GitHub

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

Jump to bottom

[Rich text editor] Add inline code to rich text editor #8011

Merged
merged 9 commits into from Jan 30, 2023
Merged

[Rich text editor] Add inline code to rich text editor #8011

merged 9 commits into from Jan 30, 2023

Conversation

jonnyandrew
Copy link
Contributor

Type of change

  • Feature
  • Bugfix
  • Technical
  • Other :

Content

Motivation and context

PSU-1069

Screenshots / GIFs

Timeline, with rich text editor enabled

Before After
Light before-light-rich-text after-light-rich-text
Dark before-dark-rich-text after-light-rich-text

Timeline, with rich text editor disabled

Before After
Light before-light-legacy after-light-legacy
Dark before-dark-legacy after-dark-legacy

Inline code in the editor

editor.webm

Tests

  • Enable rich text editor in labs
  • Start typing a message
  • Use the new formatting button to create inline code
  • Send the message
  • Note the new formatting in the timeline

Tested devices

  • Physical
  • Emulator
  • OS version(s): Android 13

Checklist

@jonnyandrew jonnyandrew requested review from a team and bmarty and removed request for a team January 26, 2023 17:38
@jonnyandrew jonnyandrew marked this pull request as ready for review January 26, 2023 17:39
@jonnyandrew jonnyandrew mentioned this pull request Jan 27, 2023
Merged
bmarty
bmarty approved these changes Jan 30, 2023
View reviewed changes
Copy link
Member

@bmarty bmarty 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 a question about the usage of io.element.android.wysiwyg.EditorStyledTextView.

vector/src/main/res/layout/item_timeline_event_text_message_stub.xml Outdated
@@ -7,7 +7,7 @@
android:orientation="vertical"
tools:viewBindingIgnore="true">

<TextView
<io.element.android.wysiwyg.EditorStyledTextView
Copy link
Member

Choose a reason for hiding this comment

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

I understand that this will be used even if the lab flag is disabled for the rich text composer. Can it be an issue?
I mean if the app crashes because of io.element.android.wysiwyg.EditorStyledTextView, the users will not be able to disable the lab flag to fallback to a stable version.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've updated so that the text view class will depend on whether the rich text editor is enabled in Labs: 4107887

Copy link
Member

Choose a reason for hiding this comment

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

LGTM, thanks!

@sonarcloud
Copy link

sonarcloud bot commented Jan 30, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

76.6% 76.6% Coverage
0.0% 0.0% Duplication

@jonnyandrew jonnyandrew merged commit 00f9c36 into develop Jan 30, 2023
@jonnyandrew jonnyandrew deleted the feat/PSU-1069-inline-code branch January 30, 2023 17:35
This was referenced Feb 28, 2023
Closed
Merged
@rom4nik rom4nik mentioned this pull request Jun 8, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bmarty bmarty bmarty approved these changes

@callumu callumu Awaiting requested review from callumu

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Inline code formatted messages display with extra line breaks
2 participants
@jonnyandrew @bmarty