Skip to content
Extraits de code Groupes Projets
Valider 6ac6a6bd rédigé par Kilian Sonna's avatar Kilian Sonna
Parcourir les fichiers

add comma in exercise list row

parent 5aecb9d6
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -51,10 +51,11 @@ public class ListExercicesAdapter extends ArrayAdapter<String> { ...@@ -51,10 +51,11 @@ public class ListExercicesAdapter extends ArrayAdapter<String> {
if (set.getKey().name == exercise) { if (set.getKey().name == exercise) {
training_days = ""; training_days = "";
for (String day : set.getValue()) { for (String day : set.getValue()) {
training_days += getShortDayName(day) + " "; training_days += getShortDayName(day) + ", ";
} }
} }
} }
training_days = training_days.substring(0, training_days.length() - 2);
System.out.println("training days : " + training_days); System.out.println("training days : " + training_days);
......
...@@ -342,8 +342,10 @@ public class ProgramCreationActivity extends AppCompatActivity { ...@@ -342,8 +342,10 @@ public class ProgramCreationActivity extends AppCompatActivity {
/** /**
* Add the new exercise to the program * Add the new exercise to the program
*/ */
if (exoInProgram(exercise)) messageExerciseAlreadyInProgram(); if (exoInProgram(exercise)) {
else { Toast.makeText(this, "Exercice déjà dans le programme !",
Toast.LENGTH_SHORT).show();
} else {
program.put(exercise, trainingDays); program.put(exercise, trainingDays);
exercisesListAdapter.add(exercise.name); exercisesListAdapter.add(exercise.name);
} }
...@@ -358,11 +360,6 @@ public class ProgramCreationActivity extends AppCompatActivity { ...@@ -358,11 +360,6 @@ public class ProgramCreationActivity extends AppCompatActivity {
} }
return false; return false;
} }
private void messageExerciseAlreadyInProgram() {
/**
* Display message "Exercise already in program"
*/
}
} }
class Exercise implements Serializable { class Exercise implements Serializable {
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter