Open Yash-Raj-Singh opened 3 years ago
@epicadk I have a question, What is the limit of item shown per page by a recyclerview ?
@epicadk I have a question, What is the limit of item shown per page by a recyclerview ?
Not sure if this was changes but I think the default limit is 20? cc @anitab-org/mentorship-maintainers
@epicadk I have a question, What is the limit of item shown per page by a recyclerview ?
Not sure if this was changes but I think the default limit is 20? cc @anitab-org/mentorship-maintainers
I did change it to 100 purposefully, cause otherwise it was searching only in those initial 20 items shown by recyclerview. I tried to extend it to 250 or 500 but figured out that 100 was a limit. Basically in some manner it is helping us to search in a broad data. What do you think? @epicadk
Please solve the merge conflicts. The rest of it seems good. 👍🏽
Please solve the merge conflicts. The rest of it seems good. 👍🏽
@epicadk Can you please tell me how to remove this conflict, cause I didn't understood well what to do here?
Please solve the merge conflicts. The rest of it seems good. 👍🏽
@epicadk Can you please tell me how to remove this conflict, cause I didn't understood well what to do here?
@Yash-Raj-Singh you need to fetch changes from develop branch of this repository and merge/rebase your branch. Let us know if you need any help
Please solve the merge conflicts. The rest of it seems good. 👍🏽
@epicadk Can you please tell me how to remove this conflict, cause I didn't understood well what to do here?
@Yash-Raj-Singh you need to fetch changes from develop branch of this repository and merge/rebase your branch. Let us know if you need any help
Thanks for quick assistance @devkapilbansal. So if I fetch the new updated develop branch and perform the changes there, won't it create a new PR?
Please solve the merge conflicts. The rest of it seems good. 👍🏽
@epicadk Can you please tell me how to remove this conflict, cause I didn't understood well what to do here?
@Yash-Raj-Singh you need to fetch changes from develop branch of this repository and merge/rebase your branch. Let us know if you need any help
Thanks for quick assistance @devkapilbansal. So if I fetch the new updated develop branch and perform the changes there, won't it create a new PR?
Nah, you need to rebase this branch and push the changes. This is how you should proceed:
# fetch the develop branch
git remote add upstream https://github.com/anitab-org/mentorship-android.git
git fetch upstream develop
# checkout on your branch
git checkout Toast_after_no_common_interest_found
# perform a rebase
git rebase upstream develop
# there will be some conflicts shown in the file mentioned above, i.e. `MembersFragment.kt`. Edit that file manually and do the changes.
# once done add your changes and continue
git add `app/src/main/java/org/systers/mentorship/view/fragments/MembersFragment.kt`
git rebase --continue
# force push your changes
git push -f
Note:- You can use merge instead of rebase too. Both will make the similar changes but they differ in how they work. Also, I will suggest get some hands on experience with git, https://learngitbranching.js.org/
Please solve the merge conflicts. The rest of it seems good. 👍🏽
@epicadk Can you please tell me how to remove this conflict, cause I didn't understood well what to do here?
@Yash-Raj-Singh you need to fetch changes from develop branch of this repository and merge/rebase your branch. Let us know if you need any help
Thanks for quick assistance @devkapilbansal. So if I fetch the new updated develop branch and perform the changes there, won't it create a new PR?
Nah, you need to rebase this branch and push the changes. This is how you should proceed:
# fetch the develop branch git remote add upstream https://github.com/anitab-org/mentorship-android.git git fetch upstream develop # checkout on your branch git checkout Toast_after_no_common_interest_found # perform a rebase git rebase upstream develop # there will be some conflicts shown in the file mentioned above, i.e. `MembersFragment.kt`. Edit that file manually and do the changes. # once done add your changes and continue git add `app/src/main/java/org/systers/mentorship/view/fragments/MembersFragment.kt` git rebase --continue # force push your changes git push -f
Note:- You can use merge instead of rebase too. Both will make the similar changes but they differ in how they work. Also, I will suggest get some hands on experience with git, https://learngitbranching.js.org/
@devkapilbansal Thanks, gonna do this asap.
@devkapilbansal I guess I messed up something, I am not getting it. And git rebase --continue was not working even after manually editing the file and performing git add . I have forked this repo so there an option to fetch upstream in github, I did that and then tried fixing it. Now even the resolve conflict option is showing something else. Can you check my last commit ?
@devkapilbansal @vj-codes Solved the merge conflict. Please have a look. :)
@isabelcosta Can you please review the code? Earlier it was having some merge conflicts, now all seems to be good. Thanks :)
@devkapilbansal Review needed, conflict has been resolved. Please have a look.
@epicadk Done bro 👍🏽 Check this out :)
@isabelcosta @epicadk Can you please review this PR, its been a long time? 😅
Description
Added Toast for the situation when no user with common interests are not found.
Fixes #864
Type of Change:
Code/Quality Assurance Only
How Has This Been Tested?
Manually tested on my smartphone.
Checklist:
Code/Quality Assurance Only
Video :
https://user-images.githubusercontent.com/57872757/129070258-7620b66e-7ae7-42f0-8358-e98f632dea8a.mp4