Merge pull request CSC207-UofT#87 from 1239uth/main

Add nicer README

Author: uthmanmoh

README.md

@@ -1,21 +1,30 @@
-## Fitness Tracker with Social Media
+# FitApp - Fitness Tracking Android App
 
-FitApp is an android app that will serve as a fitness tracker with a social media
+FitApp is an Android App that will serve as a fitness tracker with a social media
 component for fitness enthusiasts who want to monitor and share their fitness experience.
 
+_Run in Android Studio for best experience_
 
-### NOTE when building (Only if using IntelliJ to run app)
+## Core Features
 
-Intellij may not automatically generate the `local.properties` file, which is required to run the program.
+- Add a routine with workouts containing exercises
+- Start a workout and keep track of progress
+- Document previous workouts in a workout log
 
-After cloning the repository, create a file called `local.properties` and put it right under
-the main module. Inside it, only one line is required, referencing your local location to the Android sdk.
+<br></br>
+Refer to the [Design Document](phase2/design_document.pdf) for more details
 
-##### For Mac Users:
-copy `sdk.dir=/Users/<YOUR_MAC_USERNAME_HERE>/Library/Android/sdk`
+## Screenshots
 
-##### For Windows Users:
-copy `sdk.dir=C\:\\Users\\<YOUR_WINDOWS_USERNAME_HERE>\\AppData\\Local\\Android\\Sdk`
+<img alt="Home Page" src="FitApp-screenshots/HomePage.png" width="250"/> <img alt="Login Page" src="FitApp-screenshots/Login.png" width="250"/>
 
-Here is an image demonstrating what the file would look like for a **Windows User**
-![image](https://user-images.githubusercontent.com/50709151/141846711-d53eaa30-ef1b-4101-8a46-a0ae5dd7d347.png)
+<img alt="Signup With Error" src="FitApp-screenshots/SignupError.png" width="250"/> <img alt="Weight Info Page" src="FitApp-screenshots/WeightInfo.png" width="250"/>
+
+<img alt="Dashboard Page" src="FitApp-screenshots/Dashboard.png" width="250"/> <img alt="Edit Profile Page" src="FitApp-screenshots/EditProfileInfo.png" width="250"/> <img alt="Edit Weight in Profile Page" src="FitApp-screenshots/EditWeight.png" width="250"/>
+
+<img alt="Routine List Page" src="FitApp-screenshots/RoutineList.png" width="250"/> <img alt="Add Routine Page" src="FitApp-screenshots/AddRoutine.png" width="250"/>
+
+<img alt="Add Workout Page" src="FitApp-screenshots/AddWorkout.png" width="250"/> <img alt="Add Exercise Page" src="FitApp-screenshots/AddExercise.png" width="250"/>
+
+<img alt="View Workout Page" src="FitApp-screenshots/ViewWorkout.png" width="250"/> <img alt="Workout Start" src="FitApp-screenshots/WorkoutStart.png" width="250"/> <img alt="Start Workout Page" src="FitApp-screenshots/StartWorkout.gif" width="250"/>
+<img alt="Workout Complete Page" src="FitApp-screenshots/WorkoutComplete.png" width="250"/> <img alt="Workout Logs Page" src="FitApp-screenshots/WorkoutLogs.png" width="250"/>