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 #3560: Merged multiple xml files - completed_story_list_activity, profile_list_fragment, topic_fragment, #4354

Merged
merged 1 commit into from
May 17, 2022

Conversation

rt4914
Copy link
Contributor

@rt4914 rt4914 commented May 11, 2022

Explanation

Fix #3560 : Merge profile_list_fragment.xml

Merged multiple xml files - completed_story_list_activity, profile_list_fragment, topic_fragment

How to review this PR?

Ideally we add screenshots of the before vs after UI and compare them but below mentioned steps are better for reviewing

  1. DO NOT CHECKOUT INTO THIS BRANCH instead checkout to latest develop branch locally.
  2. Now open https://text-compare.com/ where you can paste code of two files and compare them.
  3. Now open the Files Changed section on github.
  4. Check which files have been changed, for example completed_story_list_activity has been changed/deleted, then copy the xml code of layout/completed_story_list_activity (from android studio) and paste it on left-side of https://text-compare.com/ and copy code of layout-land/completed_story_list_activity and paste it on right now. (Although for this particular file the change which was identified was incorrect in landscape file and therefore it was deleted directly.)
  5. Compare and see that same differences are applied in Files Changed section of github.

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

@github-actions
Copy link

Thanks for submitting this pull request! Some main reviewers
have taken time off for the next few weeks, so it may take a
little while before we can look at this PR. We appreciate your
patience while some of our team members recharge. We'll be fully
returning on 23 May 2022.

Copy link
Contributor

@yash10019coder yash10019coder left a comment

Choose a reason for hiding this comment

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

hi @rt4914 your PR Looks good to me LGTM thanks.

@seanlip
Copy link
Member

seanlip commented May 17, 2022

Merging per request from @rt4914

@seanlip seanlip merged commit 2030148 into develop May 17, 2022
@seanlip seanlip deleted the merge-multiple-files branch May 17, 2022 10:39
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.

Merge profile_list_fragment.xml into single xml file
3 participants