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 #3236: Hi-Fi Add Profile Tablet #3724

Merged
merged 3 commits into from
Aug 31, 2021
Merged

Fix #3236: Hi-Fi Add Profile Tablet #3724

merged 3 commits into from
Aug 31, 2021

Conversation

viktoriias
Copy link
Contributor

@viktoriias viktoriias commented Aug 24, 2021 •
edited

Explanation

Fixes #3236: Hi-Fi Add Profile Tablet.

  • Remove layout-land, layout-sw600dp-port and layout-sw600dp-land files
  • Introduce dimensions resources
  • Change mobile layout to be of fixed width (see comment)

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.

@viktoriias viktoriias marked this pull request as draft August 24, 2021 18:35
@viktoriias
Copy link
Contributor Author

Tablet

Before After

@viktoriias
Copy link
Contributor Author

Tablet

Before After

@viktoriias
Copy link
Contributor Author

Phone

Before After

@viktoriias
Copy link
Contributor Author

Phone

Before After

@viktoriias viktoriias changed the title Merge files Fix #3236: Hi-Fi Add Profile Tablet Aug 24, 2021
@viktoriias viktoriias marked this pull request as ready for review August 24, 2021 21:53
@viktoriias viktoriias mentioned this pull request Aug 24, 2021
Closed
8 tasks
@viktoriias
Copy link
Contributor Author

@rt4914 PTAL if this PR satisfies the latest requirements, as mentioned in #3710 (review)

rt4914
rt4914 approved these changes Aug 28, 2021
View reviewed changes
Copy link
Contributor

@rt4914 rt4914 left a comment •
edited

Choose a reason for hiding this comment

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

@viktoriias One nit change suggested.

app/src/main/res/layout/add_profile_activity.xml Outdated Show resolved Hide resolved
@rt4914 rt4914 assigned viktoriias and unassigned rt4914 Aug 28, 2021
@viktoriias viktoriias assigned rt4914 and unassigned viktoriias Aug 28, 2021
@rt4914
Copy link
Contributor

rt4914 commented Aug 30, 2021

@viktoriias There are actually merge conflicts, can you please update this and merge directly?

@rt4914 rt4914 assigned viktoriias and unassigned rt4914 Aug 30, 2021
@viktoriias
Copy link
Contributor Author

@viktoriias There are actually merge conflicts, can you please update this and merge directly?

Merging is done, but I'm "not authorized to merge this pull request".

@viktoriias viktoriias assigned rt4914 and unassigned viktoriias Aug 30, 2021
@rt4914 rt4914 merged commit a1a07ce into oppia:develop Aug 31, 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

@rt4914 rt4914

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Hi-Fi Add Profile Tablet
3 participants
@viktoriias @rt4914 @Viktoriia-Lozova