Merge branch 'master' of http://gitlab.informatika.org/IF3111-2018-07/android
Showing
- .idea/modules.xml 1 addition, 2 deletions.idea/modules.xml
- app/src/main/java/com/example/leo/fitnessdiy/LoginActivity.java 80 additions, 3 deletions...c/main/java/com/example/leo/fitnessdiy/LoginActivity.java
- app/src/main/java/com/example/leo/fitnessdiy/PlankActivity.java 21 additions, 25 deletions...c/main/java/com/example/leo/fitnessdiy/PlankActivity.java
- app/src/main/java/com/example/leo/fitnessdiy/Utilities/NetworkUtils.java 5 additions, 0 deletions...va/com/example/leo/fitnessdiy/Utilities/NetworkUtils.java
- app/src/main/java/com/example/leo/fitnessdiy/model/Users.java 25 additions, 0 deletions...src/main/java/com/example/leo/fitnessdiy/model/Users.java
- app/src/main/res/layout/activity_plank.xml 1 addition, 1 deletionapp/src/main/res/layout/activity_plank.xml
Please register or sign in to comment