Merge branch 'master' of http://gitlab.informatika.org/IF3111-2018-07/android
Showing
- .idea/modules.xml 2 additions, 1 deletion.idea/modules.xml
- app/build.gradle 1 addition, 0 deletionsapp/build.gradle
- app/google-services.json 9 additions, 97 deletionsapp/google-services.json
- app/src/main/AndroidManifest.xml 5 additions, 1 deletionapp/src/main/AndroidManifest.xml
- app/src/main/java/com/example/leo/fitnessdiy/Adapter/RecyclerViewAdapter.java 50 additions, 51 deletions...m/example/leo/fitnessdiy/Adapter/RecyclerViewAdapter.java
- app/src/main/java/com/example/leo/fitnessdiy/ChatActivity.java 11 additions, 0 deletions...rc/main/java/com/example/leo/fitnessdiy/ChatActivity.java
- app/src/main/java/com/example/leo/fitnessdiy/ChatMessage.java 2 additions, 0 deletions...src/main/java/com/example/leo/fitnessdiy/ChatMessage.java
- app/src/main/java/com/example/leo/fitnessdiy/HIstoryActivity.java 33 additions, 34 deletions...main/java/com/example/leo/fitnessdiy/HIstoryActivity.java
- app/src/main/java/com/example/leo/fitnessdiy/HomeActivity.java 48 additions, 0 deletions...rc/main/java/com/example/leo/fitnessdiy/HomeActivity.java
- app/src/main/java/com/example/leo/fitnessdiy/JoggingActivity.java 20 additions, 23 deletions...main/java/com/example/leo/fitnessdiy/JoggingActivity.java
- app/src/main/java/com/example/leo/fitnessdiy/PlankActivity.java 0 additions, 1 deletion...c/main/java/com/example/leo/fitnessdiy/PlankActivity.java
- app/src/main/java/com/example/leo/fitnessdiy/SensorActivity.java 58 additions, 0 deletions.../main/java/com/example/leo/fitnessdiy/SensorActivity.java
- app/src/main/java/com/example/leo/fitnessdiy/model/Plank.java 51 additions, 0 deletions...src/main/java/com/example/leo/fitnessdiy/model/Plank.java
- app/src/main/java/com/example/leo/fitnessdiy/model/PushUp.java 51 additions, 0 deletions...rc/main/java/com/example/leo/fitnessdiy/model/PushUp.java
- app/src/main/java/com/example/leo/fitnessdiy/model/SitUp.java 62 additions, 0 deletions...src/main/java/com/example/leo/fitnessdiy/model/SitUp.java
- app/src/main/java/com/example/leo/fitnessdiy/routes/api.java 6 additions, 0 deletionsapp/src/main/java/com/example/leo/fitnessdiy/routes/api.java
- app/src/main/res/layout/activity_history.xml 6 additions, 0 deletionsapp/src/main/res/layout/activity_history.xml
- app/src/main/res/layout/activity_sensor.xml 9 additions, 0 deletionsapp/src/main/res/layout/activity_sensor.xml
Please register or sign in to comment