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

Added menu icon to the top right to navigate to the "Settings" screen #97

Merged
merged 4 commits into from
Mar 11, 2021

Conversation

sakshi2707
Copy link
Contributor

@sakshi2707 sakshi2707 commented Mar 11, 2021

Updated profile screen by adding menu icon to the top right . This issue #39 was assigned to me and now is resolved.

Related Issue

  • Fixes # .

Proposed Changes

  • Added menu icon to the top right to navigate to the "Settings" screen

Additional Information

  • Any additional information about the change

Checklist

  • Tested
  • No Conflicts
  • Change In Code
  • Change In Documentation

Updated profile screen by adding menu icon to the top right . This issue himanshusharma89#39 was assigned to me and now is resolved.
@sakshi2707
Copy link
Contributor Author

closes #39 via #97
Added menu icon in Profile Screen as assigned @himanshusharma89

@himanshusharma89
Copy link
Owner

@sakshi2707 Can you create a new file named settings.dart and shift the Settings Widget from profile to the new file in views. Also resolve this conflict for PR to be merged.

made separate settings.dart and added widget
@sakshi2707
Copy link
Contributor Author

@himanshusharma89 I've made the respective changes for issue #39

@himanshusharma89
Copy link
Owner

@himanshusharma89 I've made the respective changes for issue #39

It looks good but you need to update your code to resolve the conflicts, do git pull once and resolve the conflicts. Also, you don't need to commit every file on an update, you need to commit once when the task is done. Try to squash the commits to one. If you face any issue do let me know.

@sakshi2707
Copy link
Contributor Author

sakshi2707 commented Mar 11, 2021

@himanshusharma89 I've resolved all the conflicts. I'm not able to squash the commits into one as I'm a newbie. Please do merge it like this,if possible. Thankyou

@himanshusharma89
Copy link
Owner

@himanshusharma89 I've resolved all the conflicts. I'm not able to squash the commits into one as I'm a newbie. Please do merge it like this,if possible. Thankyou

Okay, I'll do that for now, but next time make sure to have not more than 2 commits.

@himanshusharma89 himanshusharma89 added GSSOC21 Issues created for GSSOC'21 Level1 easy gssoc issue labels Mar 11, 2021
@himanshusharma89
Copy link
Owner

@himanshusharma89 I've resolved all the conflicts. I'm not able to squash the commits into one as I'm a newbie. Please do merge it like this,if possible. Thankyou

Before merging can you add the screenshot of the screen, it was mentioned in the PR to do so.

@sakshi2707
Copy link
Contributor Author

sakshi2707 commented Mar 11, 2021

Actually I have removed the project from my system now. I forgot to take a screenshot, by mistake., sorry for that.
Now I tried to clone the project again, so there are some SDK versions issue coming.

So it would be great if you merge my PR ,if possible . Thankyou

@himanshusharma89 himanshusharma89 merged commit 26e9ccc into himanshusharma89:master Mar 11, 2021
@Rishabh510 Rishabh510 mentioned this pull request Mar 12, 2021
@himanshusharma89
Copy link
Owner

@sakshi2707 Make sure to fix the issue before pushing something next time.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
GSSOC21 Issues created for GSSOC'21 Level1 easy gssoc issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants