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.

Sign up for GitHub

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

Jump to bottom

Fix #3474: Merge faq single activity into single layout file. #3526

Merged
merged 29 commits into from
Aug 6, 2021
Merged

Fix #3474: Merge faq single activity into single layout file. #3526

merged 29 commits into from
Aug 6, 2021

Conversation

rishidyno
Copy link
Contributor

@rishidyno rishidyno commented Jul 26, 2021 •
edited

Explanation

Fix #3474

Checklist

  • The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
  • The PR follows the style guide.
  • The PR does not contain any unnecessary auto-generated code from Android Studio.
  • The PR is made from a branch that's not called "develop".
  • The PR is made from a branch that is up-to-date with "develop".
  • The PR's branch is based on "develop" and not on any other branch.
  • The PR is assigned to an appropriate reviewer in both the Assignees and the Reviewers sections.

@rishidyno rishidyno requested a review from rt4914 as a code owner July 26, 2021 17:24
@rishidyno rishidyno changed the title Merge faq single activity into single layout file. Fix #3474: Merge faq single activity into single layout file. Jul 26, 2021
@rishidyno rishidyno mentioned this pull request Jul 26, 2021
Closed
8 tasks
@rishidyno
Copy link
Contributor Author

rishidyno commented Jul 26, 2021 •
edited

OLD Screenshots NEW Screenshots
Screenshot_20210727_025302 Screenshot_20210727_024438
Screenshot_20210727_025318 Screenshot_20210727_024330
Screenshot_20210727_025340 Screenshot_20210727_024527
Screenshot_20210727_025333 Screenshot_20210804_130410

@rishidyno
Copy link
Contributor Author

@rt4914 I have added the required screenshots and all tests have passed. Please, review my PR

prayutsu
prayutsu reviewed Jul 28, 2021
View reviewed changes
Copy link
Contributor

@prayutsu prayutsu left a comment

Choose a reason for hiding this comment

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

Generally LGTM, just have one comment.

app/src/main/res/values-sw600dp-land/booleans.xml Outdated Show resolved Hide resolved
@prayutsu prayutsu assigned rishidyno and unassigned prayutsu Jul 28, 2021
@rishidyno
Copy link
Contributor Author

@rt4914 @anandwana001 Please review my PR.

@prayutsu
Copy link
Contributor

@rishidyno PR mostly looks good to me, can you please add the screenshots in a table so that it is easy to compare?

@Sparsh1212 Sparsh1212 added the PR don't merge - NEEDS UPDATE Corresponds to PRs that need to be updated with the latest develop changes before they can be merged label Jul 30, 2021
@anandwana001
Copy link
Contributor

Assign me once all test case gets pass.

@anandwana001 anandwana001 removed their assignment Jul 31, 2021
@rishidyno
Copy link
Contributor Author

Ptal @anandwana001 Assigning this to you.

prayutsu
prayutsu suggested changes Aug 4, 2021
View reviewed changes
Copy link
Contributor

@prayutsu prayutsu left a comment

Choose a reason for hiding this comment

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

Left some more comments, PTAL @rishidyno

rishidyno and others added 4 commits August 4, 2021 18:54
@rt4914
Copy link
Contributor

rt4914 commented Aug 4, 2021

@rishidyno Please reply to the open comments so that reviewer can know what exactly you did for that particular comment.

@rishidyno
Copy link
Contributor Author

@rt4914 All addressed changes are done. I have retained all the attributes needed and deleted unnecessary ones.

@rishidyno
Copy link
Contributor Author

@rishidyno Please reply to the open comments so that reviewer can know what exactly you did for that particular comment.

Sir! sorry for the inconvenience. I will take care of this in the future.

@rt4914 rt4914 assigned rt4914 and prayutsu and unassigned anandwana001 and rishidyno Aug 5, 2021
@rt4914 rt4914 removed the request for review from BenHenning August 5, 2021 03:08
prayutsu
prayutsu approved these changes Aug 5, 2021
View reviewed changes
Copy link
Contributor

@prayutsu prayutsu 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 @rishidyno.

@prayutsu prayutsu removed their assignment Aug 5, 2021
@prayutsu prayutsu removed the PR don't merge - NEEDS UPDATE Corresponds to PRs that need to be updated with the latest develop changes before they can be merged label Aug 5, 2021
@rishidyno
Copy link
Contributor Author

rishidyno commented Aug 5, 2021 •
edited

Ptal @rt4914

All tests have passed and I have updated the project.

rt4914
rt4914 approved these changes Aug 6, 2021
View reviewed changes
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 enabled auto-merge (squash) August 6, 2021 08:05
@oppiabot
Copy link

oppiabot bot commented Aug 6, 2021

Unassigning @rt4914 since they have already approved the PR.

@oppiabot oppiabot bot unassigned rt4914 Aug 6, 2021
@rishidyno
Copy link
Contributor Author

LGTM, thanks.

Thanks @rt4914

@rt4914 rt4914 merged commit 43dcceb into oppia:develop Aug 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rt4914 rt4914 rt4914 approved these changes

@prayutsu prayutsu prayutsu approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Convert faq_single_activity into single layout file
5 participants
@rishidyno @prayutsu @anandwana001 @rt4914 @Sparsh1212