Merge remote-tracking branch 'origin/master'
# Conflicts: # app/src/main/res/values/strings.xml
Showing
- .idea/modules.xml 2 additions, 1 deletion.idea/modules.xml
- app/src/main/java/com/example/leo/fitnessdiy/Adapter/JoggingListAdapter.java 86 additions, 0 deletions...om/example/leo/fitnessdiy/Adapter/JoggingListAdapter.java
- app/src/main/java/com/example/leo/fitnessdiy/Adapter/PlankListAdapter.java 80 additions, 0 deletions.../com/example/leo/fitnessdiy/Adapter/PlankListAdapter.java
- app/src/main/java/com/example/leo/fitnessdiy/Adapter/PushupListAdapter.java 80 additions, 0 deletions...com/example/leo/fitnessdiy/Adapter/PushupListAdapter.java
- app/src/main/java/com/example/leo/fitnessdiy/Adapter/RecyclerViewAdapter.java 0 additions, 68 deletions...m/example/leo/fitnessdiy/Adapter/RecyclerViewAdapter.java
- app/src/main/java/com/example/leo/fitnessdiy/Adapter/SitupListAdapter.java 80 additions, 0 deletions.../com/example/leo/fitnessdiy/Adapter/SitupListAdapter.java
- app/src/main/java/com/example/leo/fitnessdiy/HIstoryActivity.java 178 additions, 18 deletions...main/java/com/example/leo/fitnessdiy/HIstoryActivity.java
- app/src/main/java/com/example/leo/fitnessdiy/JoggingActivity.java 18 additions, 3 deletions...main/java/com/example/leo/fitnessdiy/JoggingActivity.java
- app/src/main/java/com/example/leo/fitnessdiy/RegistrationActivity.java 129 additions, 3 deletions...java/com/example/leo/fitnessdiy/RegistrationActivity.java
- app/src/main/java/com/example/leo/fitnessdiy/Utilities/PositionUtils.java 28 additions, 0 deletions...a/com/example/leo/fitnessdiy/Utilities/PositionUtils.java
- app/src/main/java/com/example/leo/fitnessdiy/model/PushUp.java 4 additions, 4 deletions...rc/main/java/com/example/leo/fitnessdiy/model/PushUp.java
- app/src/main/java/com/example/leo/fitnessdiy/model/SitUp.java 4 additions, 4 deletions...src/main/java/com/example/leo/fitnessdiy/model/SitUp.java
- app/src/main/java/com/example/leo/fitnessdiy/routes/api.java 2 additions, 0 deletionsapp/src/main/java/com/example/leo/fitnessdiy/routes/api.java
- app/src/main/res/drawable/down_button.png 0 additions, 0 deletionsapp/src/main/res/drawable/down_button.png
- app/src/main/res/drawable/jogging_icon.png 0 additions, 0 deletionsapp/src/main/res/drawable/jogging_icon.png
- app/src/main/res/layout/activity_history.xml 181 additions, 9 deletionsapp/src/main/res/layout/activity_history.xml
- app/src/main/res/layout/activity_jogging.xml 11 additions, 6 deletionsapp/src/main/res/layout/activity_jogging.xml
- app/src/main/res/layout/card.xml 0 additions, 33 deletionsapp/src/main/res/layout/card.xml
- app/src/main/res/layout/jogging_card.xml 33 additions, 0 deletionsapp/src/main/res/layout/jogging_card.xml
- app/src/main/res/layout/plank_card.xml 27 additions, 0 deletionsapp/src/main/res/layout/plank_card.xml
Please register or sign in to comment