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/src/main/AndroidManifest.xml 6 additions, 2 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/com/example/leo/fitnessdiy/ExerciseActivity.java 13 additions, 0 deletions...ain/java/com/example/leo/fitnessdiy/ExerciseActivity.java
- app/src/main/java/com/example/leo/fitnessdiy/ExerciseFragment.java 108 additions, 0 deletions...ain/java/com/example/leo/fitnessdiy/ExerciseFragment.java
- app/src/main/java/com/example/leo/fitnessdiy/HistoryFragment.java 108 additions, 0 deletions...main/java/com/example/leo/fitnessdiy/HistoryFragment.java
- app/src/main/java/com/example/leo/fitnessdiy/HomeActivity.java 38 additions, 1 deletion...rc/main/java/com/example/leo/fitnessdiy/HomeActivity.java
- app/src/main/java/com/example/leo/fitnessdiy/LevelActivity.java 37 additions, 0 deletions...c/main/java/com/example/leo/fitnessdiy/LevelActivity.java
- app/src/main/java/com/example/leo/fitnessdiy/PlankActivity.java 32 additions, 0 deletions...c/main/java/com/example/leo/fitnessdiy/PlankActivity.java
- app/src/main/res/layout/activity_exercise.xml 14 additions, 0 deletionsapp/src/main/res/layout/activity_exercise.xml
- app/src/main/res/layout/activity_home.xml 29 additions, 7 deletionsapp/src/main/res/layout/activity_home.xml
- app/src/main/res/layout/activity_level.xml 44 additions, 0 deletionsapp/src/main/res/layout/activity_level.xml
- app/src/main/res/layout/activity_plank.xml 30 additions, 0 deletionsapp/src/main/res/layout/activity_plank.xml
- app/src/main/res/layout/fragment_exercise.xml 13 additions, 0 deletionsapp/src/main/res/layout/fragment_exercise.xml
- app/src/main/res/layout/fragment_history.xml 13 additions, 0 deletionsapp/src/main/res/layout/fragment_history.xml
- app/src/main/res/values/strings.xml 5 additions, 0 deletionsapp/src/main/res/values/strings.xml
Please register or sign in to comment