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 #3208: Hi-Fi FAQ Single #3209

Merged
merged 4 commits into from
May 21, 2021
Merged

Fix #3208: Hi-Fi FAQ Single #3209

merged 4 commits into from
May 21, 2021

Conversation

anandwana001
Copy link
Contributor

@anandwana001 anandwana001 commented May 20, 2021 •
edited

Explanation

Fixes #3208

  1. https://xd.adobe.com/view/d405de00-a871-4f0f-73a0-f8acef30349b-a234/screen/77162555-41af-49a8-a171-4b3cf21a1901/
  2. https://xd.adobe.com/view/0687f00c-695b-437a-79a6-688e7f4f7552-70b6/screen/195a7967-e7f0-4f62-a99c-8fac560e41d8/

Screenshots

Screenshot_1621515320
Screenshot_1621515293
Screenshot_1621515162
Screenshot_1621515156

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.

@anandwana001 anandwana001 requested a review from rt4914 as a code owner May 20, 2021 04:18
rt4914
rt4914 suggested changes May 20, 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.

The two comments that I have mentioned in #3207 applies for this too.
Screenshot_1621497857

@rt4914 rt4914 assigned anandwana001 and unassigned rt4914 May 20, 2021
@anandwana001
Copy link
Contributor Author

@rt4914 updated a bit differently than faq single as per the mocks, to keep the consistency of the centered list with a grey background.

@anandwana001 anandwana001 assigned rt4914 and unassigned anandwana001 May 20, 2021
rt4914
rt4914 approved these changes May 21, 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.

In previous PR review I wrote it incorrectly, actually the file should be only for sw600dp-land as the portrait UI does not contain any grey background. Apologies for confusion.
Everything else looks good just shift the sw600dp file to sw600dp-land file

@rt4914 rt4914 assigned anandwana001 and unassigned rt4914 May 21, 2021
@oppiabot oppiabot bot added the PR: LGTM label May 21, 2021
@oppiabot
Copy link

oppiabot bot commented May 21, 2021

Hi @anandwana001, this PR is ready to be merged. Please address any remaining comments prior to merging, and feel free to merge this PR once the CI checks pass and you're happy with it. Thanks!

@anandwana001 anandwana001 enabled auto-merge (squash) May 21, 2021 08:07
@anandwana001
Merge branch 'develop' of https://github.com/oppia/oppia-android into…
862c227 
… faq-single-ui

# 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
@anandwana001 anandwana001 enabled auto-merge (squash) May 21, 2021 08:47
@anandwana001 anandwana001 merged commit 918dea0 into oppia:develop May 21, 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

Assignees

@anandwana001 anandwana001

Labels
PR: LGTM
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Hi-Fi FAQ Single
2 participants
@anandwana001 @rt4914