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 #3573: Merge section_title.xml into single xml #3977

Merged

Conversation

JishnuGoyal
Copy link
Contributor

@JishnuGoyal JishnuGoyal commented Oct 28, 2021

Explanation

Fixes issue #3573

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 (Mobile-Landscape)
image

Before (Mobile-Portrait)
image

After (Mobile-Landscape)
image

After (Mobile-Portrait)
image

Before (Tablet-Landscape)
image

Before (Tablet-Portrait)
image

After (Tablet-Landscape)
image

After (Tablet-Portrait)
image

@JishnuGoyal JishnuGoyal marked this pull request as ready for review October 28, 2021 20:11
@JishnuGoyal
Copy link
Contributor Author

Kindly review my PR @rt4914

@rt4914 rt4914 self-assigned this Nov 3, 2021
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.

PTAL Thanks

app/src/main/res/values/dimens.xml Outdated Show resolved Hide resolved
@rt4914
Copy link
Contributor

rt4914 commented Nov 3, 2021

@bkaur-bkj Can you please review this PR before I do full review?

@oppiabot oppiabot bot unassigned rt4914 Nov 3, 2021
@oppiabot
Copy link

oppiabot bot commented Nov 3, 2021

Unassigning @rt4914 since the review is done.

@oppiabot
Copy link

oppiabot bot commented Nov 3, 2021

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

@rt4914 rt4914 assigned rt4914 and bkaur-bkj and unassigned JishnuGoyal Nov 4, 2021
Copy link
Contributor

@bkaur-bkj bkaur-bkj left a comment

Choose a reason for hiding this comment

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

@JishnuGoyal please take a note that you don't need to resolve the comments by yourself because reviewers use them to verify that the requested changes are made. Other than that everything looks good to me. @rt4914 PTAL

@oppiabot oppiabot bot unassigned bkaur-bkj Nov 5, 2021
@oppiabot
Copy link

oppiabot bot commented Nov 11, 2021

Unassigning @JishnuGoyal since a re-review was requested. @JishnuGoyal, please make sure you have addressed all review comments. Thanks!

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.

@JishnuGoyal Just merge this branch with latest develop to get remove of Merge Conflicts and then it should be good to merge.

@rt4914 rt4914 assigned JishnuGoyal and unassigned rt4914 Nov 11, 2021
@JishnuGoyal
Copy link
Contributor Author

@rt4914 PTAL

@oppiabot oppiabot bot assigned rt4914 and unassigned JishnuGoyal Nov 12, 2021
@oppiabot
Copy link

oppiabot bot commented Nov 12, 2021

Unassigning @JishnuGoyal since a re-review was requested. @JishnuGoyal, please make sure you have addressed all review comments. Thanks!

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.

@JishnuGoyal There are unexpected changes. Please undo them.

@rt4914 rt4914 assigned JishnuGoyal and unassigned rt4914 Nov 12, 2021
@JishnuGoyal
Copy link
Contributor Author

I'm sorry, I usually try to make sure to not push changes from that directory.

PTAL @rt4914 , thanks for being so patient with me :)

@oppiabot oppiabot bot assigned rt4914 and unassigned JishnuGoyal Nov 13, 2021
@oppiabot
Copy link

oppiabot bot commented Nov 13, 2021

Unassigning @JishnuGoyal since a re-review was requested. @JishnuGoyal, please make sure you have addressed all review comments. Thanks!

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 removed their assignment Nov 15, 2021
@rt4914 rt4914 enabled auto-merge (squash) November 15, 2021 19:20
@rt4914 rt4914 self-assigned this Nov 15, 2021
@oppiabot oppiabot bot unassigned rt4914 Nov 15, 2021
@oppiabot
Copy link

oppiabot bot commented Nov 15, 2021

Unassigning @rt4914 since they have already approved the PR.

@oppiabot
Copy link

oppiabot bot commented Nov 15, 2021

Assigning @BenHenning for code owner reviews. Thanks!

@rt4914 rt4914 merged commit e28e285 into oppia:develop Nov 15, 2021
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.

None yet

4 participants