search

enviroCar / enviroCar-app

enviroCar Android Application
https://envirocar.org
GNU General Public License v3.0
88 stars 154 forks source link

Add a place holder text when no tracks are uploaded #815

Closed cdhiraj40 closed 2 years ago

cdhiraj40 commented 2 years ago

fixes #454

cdhiraj40 commented 2 years ago

https://user-images.githubusercontent.com/75211982/133624776-c7381fcb-a3f6-4ac0-ab4b-c2345676102b.mp4

cdhiraj40 commented 2 years ago

The merge conflict is about @override The reason I commented it is because I didn't know which superclass to use with. If anyone can explain me I shall change the code and commit again. Thank you.

asaikarthikeya commented 2 years ago

The merge conflict is about @override The reason I commented it is because I didn't know which superclass to use with. If anyone can explain me I shall change the code and commit again. Thank you.

Hey, Could you check now. And @override is for showNoTracksInfo() method.

asaikarthikeya commented 2 years ago

@cdhiraj40 You can squash all commits into 1 commit. Many thanks for bringing this into notice. :)

cdhiraj40 commented 2 years ago

The merge conflict is about @override The reason I commented it is because I didn't know which superclass to use with. If anyone can explain me I shall change the code and commit again. Thank you.

Hey, Could you check now. And @override is for showNoTracksInfo() method.

so since you changed and added @override do I have to do anything?

cdhiraj40 commented 2 years ago

@cdhiraj40 You can squash all commits into 1 commit. Many thanks for bringing this into notice. :)

the earlier 3? actually, that's only 1 commit another one I did revert so that didn't change anything. sorry I didn't get what you saying

asaikarthikeya commented 2 years ago

The merge conflict is about @override The reason I commented it is because I didn't know which superclass to use with. If anyone can explain me I shall change the code and commit again. Thank you.

Hey, Could you check now. And @override is for showNoTracksInfo() method.

so since you changed and added @override do I have to do anything?

Nope, PR looks good to me. Just sqaush the commits after that this can be merged. You can refer this https://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git

asaikarthikeya commented 2 years ago

@cdhiraj40 You can squash all commits into 1 commit. Many thanks for bringing this into notice. :)

the earlier 3? actually, that's only 1 commit another one I did revert so that didn't change anything. sorry I didn't get what you saying

Yes, Although it did not changed any part of code. It is a good practice to keep the commits that have code changes. Main branch should only contain commits that are relevant. Hope this clears the doubts :)

cdhiraj40 commented 2 years ago

@cdhiraj40 You can squash all commits into 1 commit. Many thanks for bringing this into notice. :)

the earlier 3? actually, that's only 1 commit another one I did revert so that didn't change anything. sorry I didn't get what you saying

Yes, Although it did not changed any part of code. It is a good practice to keep the commits that have code changes. Main branch should only contain commits that are relevant. Hope this clears the doubts :)

yes, that totally makes sense. I will do it asap. Thanks for the help

cdhiraj40 commented 2 years ago

@asaikarthikeya I guess I did it. you can add that @override again

asaikarthikeya commented 2 years ago

@cdhiraj40 You can squash all commits into 1 commit. Many thanks for bringing this into notice. :)

the earlier 3? actually, that's only 1 commit another one I did revert so that didn't change anything. sorry I didn't get what you saying

Yes, Although it did not changed any part of code. It is a good practice to keep the commits that have code changes. Main branch should only contain commits that are relevant. Hope this clears the doubts :)

yes, that totally makes sense. I will do it asap. Thanks for the help

No hurry @cdhiraj40 . This PR might not be merged immediately as @SebaDro sir is working on the contribution guildlines. @SebaDro When will be the new guildlines be released so that we can accept new developers contributions?

asaikarthikeya commented 2 years ago

@asaikarthikeya I guess I did it. you can add that @override again

You can resolve the conflicts in a new commit. No problem :)

SebaDro commented 2 years ago

If you would consider, rebasing your PR on the current develop branch I'm willing to merge it :-)

cdhiraj40 commented 2 years ago

If you would consider, rebasing your PR on the current develop branch I'm willing to merge it :-)

Hey I think I did it. you can check. (if it didn't happen can you tell me what do I do because I did update my develop & issue454 branch )

SebaDro commented 2 years ago

Do a git rebase and afterwards a force push to your issue branch

cdhiraj40 commented 2 years ago

Do a git rebase and afterwards a force push to your issue branch

it showsEverything up-to-date

SebaDro commented 2 years ago

Your commits contain changes that are already present in the develop branch. Your pull request should only contain all *new *changes. If rebasing is not possible, please, consider creating a new pull request.

cdhiraj40 commented 2 years ago

Your commits contain changes that are already present in the develop branch. Your pull request should only contain all new changes. If rebasing is not possible, please, consider creating a new pull request.

sorry for the inconvenience I will make a new PR for the issue. Thanks for the help :) Can I close this now?

asaikarthikeya commented 2 years ago

Your commits contain changes that are already present in the develop branch. Your pull request should only contain all new changes. If rebasing is not possible, please, consider creating a new pull request.

sorry for the inconvenience I will make a new PR for the issue. Thanks for the help :) Can I close this now?

Yes, you can close this and create a new PR with the relavent code changes. Thanks.