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

Adding-support-for-pinning-new-notes #214

Closed
wants to merge 9 commits into from
Closed

Adding-support-for-pinning-new-notes #214

wants to merge 9 commits into from

Conversation

Kayvee08
Copy link

Karanveer Singh added 7 commits October 26, 2023 21:11
bottomsheet-ui-for-pin-and-delete-options
bc37c27
camera-not-closing-on-image-capture-bug-fix
a0fca1e
adding-bottombar-to-notescreen-scaffold
470ee3a 
adding-pin-property-to-note
removing-delete-option-from-top-bar
adding-update-method-to-notescreenviewmodel
b291ea5
Merge remote-tracking branch 'origin/master' into feature/pin_notes
e77ecc5 
# Conflicts:
#	app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/AddEditScreen.kt
adding-the-logic-to-add-pinned-notes-to-the-top-of-list
4b6786c 
adding-pin-icon-next-to-pinned-notes
replacing-remembersaveable-with-rememberupdatedstate-in-note-card-as-…
d75a0ef 
…on-updating-the-list-whenever-pin-was-added-to-note-it-was-holding-reference-to-previous-image
@Kayvee08 Kayvee08 mentioned this pull request Oct 27, 2023
Closed
@aritra-tech
Copy link
Owner

Can you please fix the merge conflict and please give the branch name related to the name of the issue it gets hard for me to test which branch to check.
I hope you understand @Kayvee08

@Kayvee08
Copy link
Author

Kayvee08 commented Oct 27, 2023 •
edited
Loading

@aritra-tech I think I'will have to raise new PR,
Base branch cannot be updated

@aritra-tech
Copy link
Owner

@aritra-tech I think I'will have to raise new PR, Base branch cannot be updated

For at this point no need to create a new PR I will check the code through browser only. Just do two things

  • Send me a video of the working
  • Fix the merge conflict

@Kayvee08
Copy link
Author

Kayvee08 commented Oct 27, 2023 •
edited
Loading

@aritra-tech will be sharing, need to check on a bug

@aritra-tech
Copy link
Owner

Please fix the ktlint check

@aritra-tech
Copy link
Owner

Any update @Kayvee08?

@Kayvee08
Copy link
Author

@aritra-tech was stuck in some office work, will update soon

@aritra-tech
Copy link
Owner

@aritra-tech was stuck in some office work, will update soon

Okay okay no issue.

@aritra-tech
Copy link
Owner

Hey @Kayvee08 any update?
Actually, I was thinking of making a release today so if you can make the required changes then I can also add your changes to this latest release.
Thank you

@aritra-tech
Copy link
Owner

Sorry @Kayvee08 I am closing this PR.
Thanks for contributing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Kayvee08 Kayvee08

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Kayvee08 @aritra-tech