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

Fix #3822: Remove maxLines contsraint's to enable long text to linebreak #4547

Merged
merged 6 commits into from
Sep 16, 2022
Merged

Fix #3822: Remove maxLines contsraint's to enable long text to linebreak #4547

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3a96740
Reduce MarginStart and MarginEnd.
KevinGitonga Sep 1, 2022
d6e03cc
Update maxLines to automatically to show extra text on new line.
KevinGitonga Sep 2, 2022
dbbae53
Update maxLines for other portrait layouts.
KevinGitonga Sep 5, 2022
b370af2
Make changes as requested on review.
KevinGitonga Sep 8, 2022
c391b54
Make more changes as advised by reviewer.
KevinGitonga Sep 13, 2022
39c99a0
Merge branch 'oppia:develop' into fix_portuguese_text_cut_off
KevinGitonga Sep 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/res/layout-sw600dp-port/onboarding_slide.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
android:layout_marginTop="48dp"
android:layout_marginEnd="160dp"
android:gravity="center_horizontal"
android:maxLines="1"
android:maxLines="2"
Copy link
Contributor

Choose a reason for hiding this comment

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

Same previous comment applies to this code too.

Remove maxLines attribute.

Also, please re-generate screenshots and update PR description just to be sure

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Noted.

android:text="@{viewModel.title}"
android:textSize="32sp"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
android:layout_marginEnd="160dp"
android:fontFamily="sans-serif-medium"
android:gravity="center_horizontal"
android:maxLines="1"
android:maxLines="2"
Copy link
Contributor

Choose a reason for hiding this comment

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

Same previous comment applies to this code too.

Remove maxLines attribute.

Also, please re-generate screenshots and update PR description just to be sure

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Noted.

android:text="@string/onboarding_slide_3_title"
android:textSize="32sp"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/onboarding_slide.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
android:layout_marginBottom="16dp"
android:fontFamily="sans-serif-medium"
android:gravity="center_horizontal"
android:maxLines="1"
android:maxLines="2"
Copy link
Contributor

Choose a reason for hiding this comment

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

Same previous comment applies to this code too.

Remove maxLines attribute.

Also, please re-generate screenshots and update PR description just to be sure

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Noted.

android:text="@{viewModel.title}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/onboarding_slide_final.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
android:layout_marginBottom="16dp"
android:fontFamily="sans-serif-medium"
android:gravity="center_horizontal"
android:maxLines="1"
android:maxLines="2"
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we should remove this maxLines attributes completely for this screen. So that even if in some screen it goes to three-lines the UI will be visible fully.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changes Applied.

android:text="@string/onboarding_slide_3_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down