-
Notifications
You must be signed in to change notification settings - Fork 499
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
Fix #3573: Merge section_title.xml into single xml #3977
Conversation
# Conflicts: # app/src/main/res/values-land/dimens.xml # app/src/main/res/values-sw600dp-land/dimens.xml # app/src/main/res/values-sw600dp-port/dimens.xml # app/src/main/res/values/dimens.xml
reverts changes made under .idea folder This reverts commit 6357646
This reverts commit 3aa516e
This reverts commit a7a2ddb
Kindly review my PR @rt4914 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
PTAL Thanks
@bkaur-bkj Can you please review this PR before I do full review? |
Unassigning @rt4914 since the review is done. |
Hi @JishnuGoyal, it looks like some changes were requested on this pull request by @rt4914. PTAL. Thanks! |
There was a problem hiding this 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
Unassigning @JishnuGoyal since a re-review was requested. @JishnuGoyal, please make sure you have addressed all review comments. Thanks! |
There was a problem hiding this 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.
# Conflicts: # app/src/main/res/values-land/dimens.xml # app/src/main/res/values/dimens.xml
@rt4914 PTAL |
Unassigning @JishnuGoyal since a re-review was requested. @JishnuGoyal, please make sure you have addressed all review comments. Thanks! |
There was a problem hiding this 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.
...elf/Uncommitted_changes_before_Update_at_12-11-2021_16_31_[Default_Changelist]/shelved.patch
Outdated
Show resolved
Hide resolved
.idea/shelf/Uncommitted_changes_before_Update_at_12-11-2021_16_31__Default_Changelist_.xml
Outdated
Show resolved
Hide resolved
...elf/Uncommitted_changes_before_Update_at_29-10-2021_00_50_[Default_Changelist]/shelved.patch
Outdated
Show resolved
Hide resolved
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 :) |
Unassigning @JishnuGoyal since a re-review was requested. @JishnuGoyal, please make sure you have addressed all review comments. Thanks! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, thanks.
Unassigning @rt4914 since they have already approved the PR. |
Assigning @BenHenning for code owner reviews. Thanks! |
Explanation
Fixes issue #3573
Essential Checklist
For UI-specific PRs only
If your PR includes UI-related changes, then:
Before (Mobile-Landscape)
Before (Mobile-Portrait)
After (Mobile-Landscape)
After (Mobile-Portrait)
Before (Tablet-Landscape)
Before (Tablet-Portrait)
After (Tablet-Landscape)
After (Tablet-Portrait)