search

pratyushmp / Batua

A personal app to track and manage your expenses.
48 stars 57 forks source link

Spinner login screen #59

Closed rakshitkamboj closed 3 years ago

rakshitkamboj commented 3 years ago

I have successfully added a spinner in login_Screen that will show up after clicking on LoginButton and will hide when user will navigate to homeScreen and also if any error occurred during the process it will hide itself.

rakshitkamboj commented 3 years ago

@pratyushmp Can you please review this PR.

pratyushmp commented 3 years ago

Attach a video of the changes you have made.

rakshitkamboj commented 3 years ago

@pratyushmp Here it is.

https://user-images.githubusercontent.com/69065683/112667214-01fab680-8e83-11eb-8af3-810da2ed4b4f.mp4

pratyushmp commented 3 years ago

@rakshitkamboj There are merge conflicts in your PR, please resolve them

rakshitkamboj commented 3 years ago

@pratyushmp Can you please help me in solving the conflicts. This is my first time having these type of conflicts. Can you please guide me in solving these ?

pratyushmp commented 3 years ago

@rakshitkamboj make sure that the branch from which you creating a PR is up to date with the main repository of Batua.

infiniteoverflow commented 3 years ago

@rakshitkamboj You need to make sure that your branch is even with the main branch. For that do the following :

git remote add upstream 'https://github.com/pratyushmp/Batua'

git fetch upstream

git pull upstream main

git push origin <your-branch-name>

Enter these 4 commands in ur terminal and this will even ur branch...that should fix this.

If this dosent work , we will find some other alternatives

rakshitkamboj commented 3 years ago

@infiniteoverflow @pratyushmp Thanks a lot for helping. Now I think it have no conflicts in it . Please check it now.

pratyushmp commented 3 years ago

@rakshitkamboj Good Job!!