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 #3540 : Merge lessons_chapter_view.xml into single xml file #4146

Conversation

aayushimathur6
Copy link
Collaborator

@aayushimathur6 aayushimathur6 commented Jan 31, 2022

Explanation

Fix #3540 : Merge lessons_chapter_view.xml into single xml file

Essential Checklist

  • The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • Any changes to scripts/assets files have their rationale included in the PR explanation.
  • The PR follows the style guide.
  • The PR does not contain any unnecessary code changes from Android Studio (reference).
  • The PR is made from a branch that's not called "develop" and is up-to-date with "develop".
  • The PR is assigned to the appropriate reviewers (reference).

For UI-specific PRs only

If your PR includes UI-related changes, then:

  • Add screenshots for portrait/landscape for both a tablet & phone of the before & after UI changes
  • For the screenshots above, include both English and pseudo-localized (RTL) screenshots (see RTL guide)
  • Add a video showing the full UX flow with a screen reader enabled (see accessibility guide)
  • Add a screenshot demonstrating that you ran affected Espresso tests locally & that they're passing
BEFORE AFTER
pixel5potrait Screenshot_20220130_135926
WhatsApp Image 2022-02-01 at 2 54 51 AM (1) Screenshot_20220130_141221
nexus9potrait Screenshot_20220130_141849
WhatsApp Image 2022-02-01 at 2 54 51 AM (2) Screenshot_20220130_141820

@rishidyno
Copy link
Contributor

rishidyno commented Jan 31, 2022

@aayushimathur6 PTAL can you please rearrange the image as they are not correct in their current state.

@rishidyno
Copy link
Contributor

Also I think the image are incorrect please rectify them. Thanks!

@ayush0402
Copy link
Contributor

Before screenshots for landscape modes are not correct. Rest seems to be fine.

@aayushimathur6
Copy link
Collaborator Author

corrected it, please check @ayush0402 @rishidyno !!

@ayush0402
Copy link
Contributor

@aayushimathur6 LGTM, Thanks. Just a nit suggestion, try to keep screenshots for comparison to be of same size, you can use size attributes in markdown to fix it.

@ayush0402
Copy link
Contributor

@rt4914 Please approve the workflows. Thanks.

@aayushimathur6
Copy link
Collaborator Author

aayushimathur6 commented Jan 31, 2022

okay @ayush0402 next time I will keep this in my mind

@rishidyno
Copy link
Contributor

LGTM Thanks!

@rt4914
Copy link
Contributor

rt4914 commented Feb 2, 2022

@aayushimathur6 Your PR is 3 commits behind develop. Please update the develop on your fork and also update this branch. You can notice it says "3 commits behind oppia:develop"
Screenshot 2022-02-02 at 1 33 07 PM

Once its up-to-date all CI checks should pass.

@rt4914 rt4914 assigned aayushimathur6 and unassigned rt4914 Feb 2, 2022
Copy link
Contributor

@rt4914 rt4914 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks.

@oppiabot oppiabot bot added the PR: LGTM label Feb 2, 2022
… Merge_lessons_chapter_view.xml_into_single_xml_file
@aayushimathur6
Copy link
Collaborator Author

Hey @rt4914 please review my changes

@rt4914 rt4914 enabled auto-merge (squash) February 2, 2022 12:42
@rt4914 rt4914 merged commit 5841ea4 into oppia:develop Feb 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merge lessons_chapter_view.xml into single xml file
4 participants