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 #3534: Merge help_without_drawer_activity.xml into single xml file #4144

Merged

Conversation

Akshatkamboj14
Copy link
Member

@Akshatkamboj14 Akshatkamboj14 commented Jan 31, 2022

Explanation

Fix #3534: Merge help_without_drawer_activity.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
After Before
Screenshot_20220130_131952 Screenshot_20220130_131205
Screenshot_20220130_132013 Screenshot_20220130_131235
Tablet
Screenshot_20220130_132122 Screenshot_20220130_130934
Screenshot_20220130_132140 Screenshot_20220130_131001

@rishidyno
Copy link
Contributor

Thanks @Akshatkamboj14 LGTM.

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.

@Akshatkamboj14 arrange the ss in tabular form like this #3523 PR

@oppiabot
Copy link

oppiabot bot commented Jan 31, 2022

Hi @Akshatkamboj14, it looks like some changes were requested on this pull request by @yash10019coder. PTAL. Thanks!

@Akshatkamboj14
Copy link
Member Author

@yash10019coder Done....

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.

LGTM @Akshatkamboj14 thanks

@rishidyno
Copy link
Contributor

@rt4914 Please approve the workflows. Thanks!

@rt4914 rt4914 self-assigned this Feb 1, 2022
@rishidyno rishidyno closed this Feb 1, 2022
@rishidyno rishidyno reopened this Feb 1, 2022
@rishidyno
Copy link
Contributor

@Akshatkamboj14 Update the project and static check will pass

@rishidyno
Copy link
Contributor

@rt4914 Now I understand why this was happening. Because he is 2 commits behind develop, so his code has TODO, but the issue is already closed.

@rishidyno rishidyno closed this Feb 1, 2022
@rishidyno rishidyno reopened this Feb 1, 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.

@rt4914 rt4914 merged commit fb1adc6 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
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merge help_without_drawer_activity.xml into single xml file
4 participants