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 #3536: Merged home_activity.xml files #4053

Merged
merged 4 commits into from
Jan 7, 2022

Conversation

mukulasija
Copy link
Contributor

##Merged 3 home_activity xml files into single xml file
Fix #3536
Just deleted 2 of the 3 home_activity files because after comparing in text compare I found that not a single character was different in all three files and also added the layout_height parameter in dimen file.

Following are the before and after screenshots:

tab_old_portrait
tab_new_portrait
tab_old_landscape
tab_new_landscape
phone_old_landscape
phone_new_landscape
phone_old_portrait
phone_new_portrait

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).

@mukulasija
Copy link
Contributor Author

@rt4910 PTAL

@BenHenning
Copy link
Sponsor Member

Hi. As of today, some main reviewers have taken time off for the next few weeks, so it may take a little while before we can look at this PR. We appreciate your patience while some of our team members recharge. We'll be fully returning on 4 January 2021.

Copy link
Contributor

@Arjupta Arjupta left a comment

Choose a reason for hiding this comment

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

@mukulasija nice the chabges looks good to me.

@oppiabot
Copy link

oppiabot bot commented Dec 20, 2021

Assigning @rt4914 for code owner reviews. Thanks!

@oppiabot
Copy link

oppiabot bot commented Dec 27, 2021

Hi @mukulasija, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

@oppiabot oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Dec 27, 2021
@Arjupta
Copy link
Contributor

Arjupta commented Jan 1, 2022

@mukulasija do resolve conflicts and update your PR so that it can be merged soon.

@oppiabot oppiabot bot removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Jan 1, 2022
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.

@mukulasija Thanks. One nit change suggested.

Also please update the title of this PR to:
Fix #3536: Merged home_activity.xml files

app/src/main/res/layout/home_activity.xml Outdated Show resolved Hide resolved
@rt4914 rt4914 assigned mukulasija and unassigned rt4914 Jan 3, 2022
@mukulasija mukulasija changed the title merged home-activity files into single xml file Fix #3536: Merged home_activity.xml files Jan 4, 2022
@mukulasija mukulasija requested a review from rt4914 January 4, 2022 08:36
@Arjupta Arjupta assigned rt4914 and unassigned mukulasija Jan 4, 2022
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 merged commit 5d278b2 into oppia:develop Jan 7, 2022
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.

Merge home_activity.xml into single xml file
4 participants