Merge branch 'master' of http://gitlab.informatika.org/IF3111-2018-07/android
Showing
- .idea/modules.xml 2 additions, 1 deletion.idea/modules.xml
- app/src/main/java/com/example/leo/fitnessdiy/ChatActivity.java 2 additions, 10 deletions...rc/main/java/com/example/leo/fitnessdiy/ChatActivity.java
- app/src/main/java/com/example/leo/fitnessdiy/PlankActivity.java 59 additions, 2 deletions...c/main/java/com/example/leo/fitnessdiy/PlankActivity.java
- app/src/main/java/com/example/leo/fitnessdiy/PushupActivity.java 67 additions, 0 deletions.../main/java/com/example/leo/fitnessdiy/PushupActivity.java
- app/src/main/java/com/example/leo/fitnessdiy/SitupActivity.java 13 additions, 3 deletions...c/main/java/com/example/leo/fitnessdiy/SitupActivity.java
- app/src/main/java/com/example/leo/fitnessdiy/routes/api.java 6 additions, 2 deletionsapp/src/main/java/com/example/leo/fitnessdiy/routes/api.java
- app/src/main/res/drawable/buttton_grey.xml 19 additions, 0 deletionsapp/src/main/res/drawable/buttton_grey.xml
- app/src/main/res/drawable/buttton_login.xml 23 additions, 0 deletionsapp/src/main/res/drawable/buttton_login.xml
- app/src/main/res/drawable/plank_video_2.PNG 0 additions, 0 deletionsapp/src/main/res/drawable/plank_video_2.PNG
- app/src/main/res/drawable/pushup_video_1.png 0 additions, 0 deletionsapp/src/main/res/drawable/pushup_video_1.png
- app/src/main/res/drawable/pushup_video_2.png 0 additions, 0 deletionsapp/src/main/res/drawable/pushup_video_2.png
- app/src/main/res/drawable/situp_video_1.png 0 additions, 0 deletionsapp/src/main/res/drawable/situp_video_1.png
- app/src/main/res/drawable/situp_video_2.png 0 additions, 0 deletionsapp/src/main/res/drawable/situp_video_2.png
- app/src/main/res/layout/activity_chat.xml 1 addition, 0 deletionsapp/src/main/res/layout/activity_chat.xml
- app/src/main/res/layout/activity_home.xml 2 additions, 2 deletionsapp/src/main/res/layout/activity_home.xml
- app/src/main/res/layout/activity_level.xml 20 additions, 11 deletionsapp/src/main/res/layout/activity_level.xml
- app/src/main/res/layout/activity_login.xml 15 additions, 16 deletionsapp/src/main/res/layout/activity_login.xml
- app/src/main/res/layout/activity_pushup.xml 12 additions, 2 deletionsapp/src/main/res/layout/activity_pushup.xml
- app/src/main/res/layout/activity_situp.xml 12 additions, 0 deletionsapp/src/main/res/layout/activity_situp.xml
- app/src/main/res/layout/registration.xml 36 additions, 26 deletionsapp/src/main/res/layout/registration.xml
Please register or sign in to comment