search

enviroCar / enviroCar-app

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

Replaced Terms and conditions and Privacy statment dialogs with link to web page #797

Closed cdhiraj40 closed 2 years ago

cdhiraj40 commented 2 years ago

fixes #589

cdhiraj40 commented 2 years ago

https://user-images.githubusercontent.com/75211982/130985020-9b94fee6-1149-4ec6-bfd5-e6720359a143.mp4

cdhiraj40 commented 2 years ago

@asaikarthikeya it goes to the main page after you click on the link how to avoid this so that it redirects to the same activity?

asaikarthikeya commented 2 years ago

@DhirajChauhan40 Please change the base of the PR to develop. We generally work on the develop branch, later during any release we test the develop and merge it to the master.

cdhiraj40 commented 2 years ago

@DhirajChauhan40 Please change the base of the PR to develop. We generally work on the develop branch, later during any release we test the develop and merge it to the master.

oh okay suree

cdhiraj40 commented 2 years ago

@asaikarthikeya Done.

asaikarthikeya commented 2 years ago

Record_2021-08-26-20-17-09.mp4

Rebase your PR on top of the existing commits in the develop branch. This kind of behaviour may not be observed in the develop branch as it has few commits that resolve this aspect of PR.

cdhiraj40 commented 2 years ago

Record_2021-08-26-20-17-09.mp4

Rebase your PR on top of the existing commits in the develop branch. This kind of behaviour may not be observed in the develop branch as it has few commits that resolve this aspect of PR.

i didn't understand by rebase, should I create this PR again with these changes?

asaikarthikeya commented 2 years ago

@DhirajChauhan40 In Android studio Step 1 : On the bottom right side branches, update the develop branch Step 2 : On the top options Git -> rebase -> develop.

cdhiraj40 commented 2 years ago

@asaikarthikeya sorry but i don't know how but many errors were coming for no reason so I had to delete my fork and refork it so now what to do? I'm not able to commit if you close this PR then I can create a new one with the requested change

asaikarthikeya commented 2 years ago

@asaikarthikeya sorry but i don't know how but many errors were coming for no reason so I had to delete my fork and refork it so now what to do? I'm not able to commit if you close this PR then I can create a new one with the requested change

OK. As you have already reforked it, You can create a new branch from the develop branch and work on that branch and create a PR again. I am closing this PR, If you have any doubt you can ask in this PR section