-
- Téléchargements
Merge branch 'main' into 'arthur'
# Conflicts: # app/src/main/java/be/lepl1509group13/workoutwarrior/ProgramCreationActivity.java
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Affichage de
- app/src/main/java/be/lepl1509group13/workoutwarrior/AccountActivity.java 10 ajouts, 2 suppressions...va/be/lepl1509group13/workoutwarrior/AccountActivity.java
- app/src/main/java/be/lepl1509group13/workoutwarrior/ListExercicesAdapter.java 61 ajouts, 30 suppressions.../lepl1509group13/workoutwarrior/ListExercicesAdapter.java
- app/src/main/java/be/lepl1509group13/workoutwarrior/MainActivity.java 41 ajouts, 5 suppressions.../java/be/lepl1509group13/workoutwarrior/MainActivity.java
- app/src/main/java/be/lepl1509group13/workoutwarrior/ProgramCreationActivity.java 47 ajouts, 44 suppressions...pl1509group13/workoutwarrior/ProgramCreationActivity.java
- app/src/main/res/drawable/check.png 0 ajout, 0 suppressionapp/src/main/res/drawable/check.png
- app/src/main/res/drawable/menu.png 0 ajout, 0 suppressionapp/src/main/res/drawable/menu.png
- app/src/main/res/layout/activity_main.xml 104 ajouts, 88 suppressionsapp/src/main/res/layout/activity_main.xml
- app/src/main/res/layout/exercises_list_row.xml 18 ajouts, 7 suppressionsapp/src/main/res/layout/exercises_list_row.xml
- app/src/main/res/layout/menu_header.xml 49 ajouts, 0 suppressionapp/src/main/res/layout/menu_header.xml
- app/src/main/res/layout/program_creation.xml 4 ajouts, 92 suppressionsapp/src/main/res/layout/program_creation.xml
- app/src/main/res/menu/menu_main.xml 11 ajouts, 0 suppressionapp/src/main/res/menu/menu_main.xml
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter