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

Fixes #3465 Merge completed activity into single file #3689

Merged

Conversation

vrajdesai78
Copy link
Contributor

Explanation

I have merged completed_story_item and completed_story_list_fragment into single files by giving it's dimension in dimens.xml file.

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.

@vrajdesai78 vrajdesai78 deleted the merge-completed-activity-into-single-file branch August 16, 2021 16:20
@vrajdesai78 vrajdesai78 restored the merge-completed-activity-into-single-file branch August 16, 2021 16:20
@vrajdesai78 vrajdesai78 reopened this Aug 16, 2021
@vrajdesai78 vrajdesai78 changed the title Merge completed activity into single file Fixes #3465 Merge completed activity into single file Aug 17, 2021
@rt4914 rt4914 self-assigned this Aug 23, 2021
@rt4914
Copy link
Contributor

rt4914 commented Aug 23, 2021

@vrajdesai78 I think you will need to update your branch by merging with latest develop.

@vrajdesai78
Copy link
Contributor Author

@rt4914 Please review my pull request

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.

@vrajdesai78 PTAL.

Thanks.

app/src/main/res/values-sw600dp-port/dimens.xml Outdated Show resolved Hide resolved
app/src/main/res/values-sw600dp-land/dimens.xml Outdated Show resolved Hide resolved
app/src/main/res/values/dimens.xml Outdated Show resolved Hide resolved
@rt4914 rt4914 assigned vrajdesai78 and unassigned rt4914 Aug 30, 2021
@rt4914 rt4914 assigned rt4914 and unassigned vrajdesai78 Sep 1, 2021
@rt4914
Copy link
Contributor

rt4914 commented Sep 1, 2021

@vrajdesai78 Please do not resolve comments. Actually you should reply to the comments mentioning whether they are done or not and based on your reply I will review it and then if needed I will resolve the comment.

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 392b1ad into oppia:develop Sep 1, 2021
@vrajdesai78
Copy link
Contributor Author

@vrajdesai78 Please do not resolve comments. Actually you should reply to the comments mentioning whether they are done or not and based on your reply I will review it and then if needed I will resolve the comment.

Ok next time I won't resolve comments. Thank you for merging my pull request.

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.

None yet

2 participants