97rakshanegi/restaurantapp

Android App for ordering food online

RestaurantApp

Android App for ordering food online

All Restaurants

Menu

Order history

The app is built in kotlin and uses volley to send get and post request from the internshala serve through rest api calls.
The app also uses the room library to send data to the SQLite database.

Main features considered while developing
1.Recycler Views
2.Fragments
3.Room Library
4.Volley

Branches
1.master->New improvements and stable(connected to aws owned API-customised).
2.internshalTraining->Training course from internshal.com(internshala Api)
link->https://trainings.internshala.com/?referral=ISRP5558822&utm_source=ISRP_share_link&utm_medium=ISRP5558822&utm_campaign=TRAINING
3.TestEC2Server->To test new features and bugs on the AWS server.
4.FoodRunnerSellerApp->App for the restaurant owner to sign up their restaurants with FoodRunner(alpha stage).

How to contribute.
1.Click the fork button to get the repo to your account.
2.Copy the git clone link from your account.
eg ->https://github.com/YourUserName/RestaurantApp.git
3.Open android studio, and select File->New->import from version control(github).
4.Paste the link you copied in step 2.
5.Wait for all the files to get synced.
6.Create a new branch from master
a.In the bottom right you'll find git-master(click)
b.Select new branch
c.Name it as work_YourName.
d.Check the box to checkout.
7.Open file manager and move to the project folder where it is saved.
eg->C:\Users\YourPCName\AndroidStudioProjects\RestaurantApp
8.Move inside the project folder and right click->git-bash.
9.Type the command ->git remote add upstream https://github.com/AlbinoB/RestaurantApp.git
Note:Creating an upstream to be in sync with master and your branch->work_YourName.
10.Type the command->git fetch upstream
Note:fetches any updates on master and stores the changes in a separate branch ->upstream/master
11.Move to android studio.
a.In the bottom right you'll find git-work_YourName(click)
b.In remote branched->upstreams/master(click)->merge into current
c.On the pop up select->smart merge
c.You might get merge conflicts here.
d.See the files which are causing the conflict(Accept-Theirs or Accept-Yours or Merge(to see which lines are causing the conflict)).
e.Exclude .iml and files inside .idea.
Tip: select all the files mentioned above and click accept yours.
e.Push these changes to your fork, so that your remote->fork and work_YourName are in sync.
12.Add new features/bug fixes.
13.Commit only those files which you have changed.
14.Push the files to your fork.
15.Go to your fork repo on github.(Refresh)
16.Under branches select your branch->work_YourName
17.Find the orange button to create a pull request of the changes you have done.
18.Commment in brief of what all was done in which file.
19.If the feature is good the maintainer will merge it to the master.
20.Caution->If there are conflicts you need to get your fork in sync with master and resend the pull request(Don't click on new pull request).
click ->compare and pull request to merge the old pull request with the newly updated code.