diff --git a/app/src/main/java/be/lepl1509group13/workoutwarrior/ListExercicesAdapter.java b/app/src/main/java/be/lepl1509group13/workoutwarrior/ListExercicesAdapter.java
index 78804c5b4d3d23d1d7e5cad6689e1d85dba47b54..624d6a99e1e4be6379e1518949a19db3ab9ad62b 100644
--- a/app/src/main/java/be/lepl1509group13/workoutwarrior/ListExercicesAdapter.java
+++ b/app/src/main/java/be/lepl1509group13/workoutwarrior/ListExercicesAdapter.java
@@ -1,24 +1,51 @@
package be.lepl1509group13.workoutwarrior;
+import be.lepl1509group13.workoutwarrior.ProgramCreationActivity;
+import android.app.Dialog;
import android.content.Context;
import android.graphics.drawable.Drawable;
+import android.text.InputType;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.EditText;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
+import androidx.constraintlayout.widget.ConstraintLayout;
+
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import be.lepl1509group13.workoutwarrior.ProgramCreationActivity;
+
public class ListExercicesAdapter extends ArrayAdapter<String> {
private final Context context;
private ArrayList<String> values;
+ public Exercise actual_exo ;
+ public String img_actual_exo;
+ HashMap<Exercise, ArrayList<String>> program = new HashMap<>();
+
+ String name_exo;
+ String description_exo;
+ Long timer_exo;
+ Long break_exo;
+ ArrayList<String> days_exo = new ArrayList<String>();
+ CheckBox cb_lundi, cb_mardi, cb_mercredi, cb_jeudi, cb_vendredi, cb_samedi, cb_dimanche;
+ private ArrayList<CheckBox> cb_list = new ArrayList<>();
+ private ArrayList<String> current_days_checked = new ArrayList<>();
+ Integer nbre_day = 0;
+
public ListExercicesAdapter(Context context, ArrayList<String> values) {
super(context, R.layout.exercises_list_row, values);
this.context = context;
@@ -40,7 +67,6 @@ public class ListExercicesAdapter extends ArrayAdapter<String> {
ProgramCreationActivity activity = (ProgramCreationActivity) context;
- System.out.println("values : " + values);
String exercise = values.get(position);
String training_days = "";
Drawable delete_cross = context.getResources().getDrawable(R.drawable.cross_mark);
@@ -48,7 +74,6 @@ public class ListExercicesAdapter extends ArrayAdapter<String> {
// Get training days for this exercise
for (Map.Entry<Exercise, ArrayList<String>> set : activity.program.entrySet()) {
- System.out.println(set.getKey().name);
if (set.getKey().name == exercise) {
training_days = "";
for (String day : set.getValue()) {
@@ -58,84 +83,168 @@ public class ListExercicesAdapter extends ArrayAdapter<String> {
}
training_days = training_days.substring(0, training_days.length() - 2);
- System.out.println("training days : " + training_days);
-
// Display texts and images in Views
delete_button.setImageDrawable(delete_cross);
edit_button.setImageDrawable(pen);
exercise_name.setText(exercise);
training_daysView.setText(training_days);
-
-
// Ecouteur de clics pour chaque élément de la ListView
edit_button.setOnClickListener(view -> {
- /*
- System.out.println("details : " + activity.program);
- AlertDialog.Builder builder = new AlertDialog.Builder(view.getContext());
- View dialogView = inflater.inflate(R.layout.edit_workout, null);
- builder.setView(dialogView);
- AlertDialog dialog = builder.create();
- dialog.show();
-
-
- TextView exerciseName = dialogView.findViewById(R.id.exercise_name);
- exerciseName.setText(exercise);
-
- // Rechercher l'exercice dans la HashMap
- ArrayList<Exercise> exercises = activity.exoDetailsForEachDay.get(activity.current_day_displayed);
- String imageUrl;
- String description;
- for (Exercise exo : exercises) {
- if (Objects.equals(exo.name, exercise)) {
-
- // Afficher les détails de l'exo
- imageUrl = exo.image_url;
- ImageView imageView = dialogView.findViewById(R.id.exercise_image);
- int resourceId = context.getResources().getIdentifier(imageUrl, "drawable", context.getPackageName());
- imageView.setImageResource(resourceId);
-
- TextView descriptionTextView = dialogView.findViewById(R.id.description_edit);
- descriptionTextView.setText(exo.description);
-
-
- TextView break_time_TextView = dialogView.findViewById(R.id.pause_edit);
- break_time_TextView.setText(String.valueOf(exo.breakVal/1000));
+ days_exo = new ArrayList<>();
+ for (Map.Entry<Exercise, ArrayList<String>> set : activity.program.entrySet()) {
+ if (set.getKey().name == exercise) {
+ for (String day : set.getValue()) {
+ if(!days_exo.contains(day)){
+ days_exo.add(day);
+ }
+ }
+ name_exo = set.getKey().name;
+ description_exo = set.getKey().description;
+ timer_exo = Long.valueOf(set.getKey().timer);
+ break_exo = Long.valueOf(set.getKey().breakVal);
+ img_actual_exo = set.getKey().image_url;
+ }
+ }
+ Dialog dialog = new Dialog(this.context);
+ dialog.setContentView(R.layout.modify_exercice_popup);
+
+ ImageView closeButton = dialog.findViewById(R.id.close_btn);
+ closeButton.setOnClickListener(w -> dialog.dismiss());
+ cb_lundi = dialog.findViewById(R.id.checkbox_monday);
+ cb_mardi = dialog.findViewById(R.id.checkbox_tuesday);
+ cb_mercredi = dialog.findViewById(R.id.checkbox_wednesday);
+ cb_jeudi = dialog.findViewById(R.id.checkbox_thursday);
+ cb_vendredi = dialog.findViewById(R.id.checkbox_friday);
+ cb_samedi = dialog.findViewById(R.id.checkbox_saturday);
+ cb_dimanche = dialog.findViewById(R.id.checkbox_sunday);
+
+ cb_list.add(cb_lundi);
+ cb_list.add(cb_mardi);
+ cb_list.add(cb_mercredi);
+ cb_list.add(cb_jeudi);
+ cb_list.add(cb_vendredi);
+ cb_list.add(cb_samedi);
+ cb_list.add(cb_dimanche);
+
+ for(int i = 0; i < days_exo.size(); i++){
+ if(days_exo.get(i).equals("lundi")){
+ cb_lundi.setChecked(true);
+ current_days_checked.add(days_exo.get(i));
+ nbre_day += 1;
+ }
+ if(days_exo.get(i).equals("mardi")){
+ cb_mardi.setChecked(true);
+ current_days_checked.add(days_exo.get(i));
+ nbre_day += 1;
+ }
+ if(days_exo.get(i).equals("mercredi")){
+ cb_mercredi.setChecked(true);
+ current_days_checked.add(days_exo.get(i));
+ nbre_day += 1;
+ }
+ if(days_exo.get(i).equals("jeudi")){
+ cb_jeudi.setChecked(true);
+ current_days_checked.add(days_exo.get(i));
+ nbre_day += 1;
+ }
+ if(days_exo.get(i).equals("vendredi")){
+ cb_vendredi.setChecked(true);
+ current_days_checked.add(days_exo.get(i));
+ nbre_day += 1;
+ }
+ if(days_exo.get(i).equals("samedi")){
+ cb_samedi.setChecked(true);
+ current_days_checked.add(days_exo.get(i));
+ nbre_day += 1;
+ }
+ if(days_exo.get(i).equals("dimanche")){
+ cb_dimanche.setChecked(true);
+ current_days_checked.add(days_exo.get(i));
+ nbre_day += 1;
}
}
- // Enregistrer les modifications de l'exercice
- Button save_btn = dialogView.findViewById(R.id.save_modif_button);
- save_btn.setOnClickListener(v -> {
- EditText description_edit = dialogView.findViewById(R.id.description_edit);
- EditText break_time_edit = dialogView.findViewById(R.id.pause_edit);
-
- String new_description = description_edit.getText().toString();
- int new_break_time = Integer.parseInt(break_time_edit.getText().toString());
+ for (CheckBox cb : cb_list) cb.setOnCheckedChangeListener(myCheckBoxListener);
+ ConstraintLayout form_layout = dialog.findViewById(R.id.constraintLayout2);
- // Rechercher l'exercice dans la HashMap et modifier ces paramètres
+ EditText description_text = dialog.findViewById(R.id.exercise_description);
+ EditText timer_edit = dialog.findViewById(R.id.exercise_timer);
+ EditText break_edit = dialog.findViewById(R.id.exercice_break);
+ TextView timer_text = dialog.findViewById(R.id.timer_text);
+ if(description_exo != null){
+ description_text.setText(description_exo);
+ }
+ if(timer_exo == 0){
+ timer_edit.setVisibility(View.INVISIBLE);
+ timer_edit.setEnabled(false);
+ timer_text.setText("");
+ }else{
+ timer_edit.setText(timer_exo.toString());
+ }
+ if(break_exo != null){
+ break_edit.setText(break_exo.toString());
+ }
- for (Exercise exo : exercises) {
- if (Objects.equals(exo.name, exercise)) {
- exo.description = new_description;
- exo.breakVal = new_break_time * 1000;
+ dialog.show();
+ Button save_btn = dialog.findViewById(R.id.btn_save_modif);
+ save_btn.setOnClickListener(w -> {
+ if(nbre_day > 0){
+ String description_str = description_text.getText().toString();
+ String string_break = break_edit.getText().toString();
+ Integer break_time = Integer.parseInt(string_break);
+ String string_timer = timer_edit.getText().toString();
+ if(string_timer.equals("")){
+ actual_exo = new Exercise(name_exo, description_str, break_time, "@drawable/developpe_couche_barre", 0);
+ }else{
+ Integer timer_int = Integer.parseInt(string_timer);
+ actual_exo = new Exercise(name_exo, description_str, break_time, "@drawable/developpe_couche_barre", timer_int);
+ }
+ Iterator<Map.Entry<Exercise, ArrayList<String>>> iterator = activity.program.entrySet().iterator();
+ while (iterator.hasNext()) {
+ Map.Entry<Exercise, ArrayList<String>> entry = iterator.next();
+ Exercise key = entry.getKey();
+ if (key.name.equals(exercise)) {
+ key.description = description_str;
+ key.breakVal = break_time;
+ key.timer = Math.toIntExact(timer_exo);
+ }
}
+ dialog.dismiss();
+ }
+ else{
+ Toast.makeText(this.context, "Veuillez sélectionner au moins un jour !",
+ Toast.LENGTH_SHORT).show();
}
- activity.exoDetailsForEachDay.put(activity.current_day_displayed, exercises);
- System.out.println("details : " + activity.exoDetailsForEachDay);
- Toast.makeText(context, "Modifications sauvegardées", Toast.LENGTH_SHORT).show();
- dialog.dismiss();
-
-
});
- ImageView closeButton = dialogView.findViewById(R.id.close_btn);
- closeButton.setOnClickListener(v -> {
- // Fermer la pop-up
- dialog.dismiss();
+ form_layout.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (description_text.hasFocus()) {
+ description_text.clearFocus();
+ }
+ }
});
- */
+ description_text.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+ @Override
+ public void onFocusChange(View v, boolean hasFocus) {
+ if (!hasFocus) {
+ description_text.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_SENTENCES);
+ } else {
+ description_text.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_MULTI_LINE | InputType.TYPE_TEXT_FLAG_CAP_SENTENCES);
+ }
+ }
+ });
+ TextView name_exercice = dialog.findViewById(R.id.exercice_to_modify_name);
+ name_exercice.setText(name_exo);
+
+ int resId = context.getResources().getIdentifier(img_actual_exo, "drawable", context.getPackageName());
+ System.out.println(img_actual_exo);
+ System.out.println(resId);
+ ImageView image = dialog.findViewById(R.id.exercice_to_modify_image);
+ image.setImageResource(resId);
});
// Ajouter un OnClickListener à l'image
@@ -152,8 +261,6 @@ public class ListExercicesAdapter extends ArrayAdapter<String> {
}
}
-
-
ArrayList<String> updatedExercicesList = new ArrayList<>();
for (Map.Entry<Exercise, ArrayList<String>> set : activity.program.entrySet()) {
updatedExercicesList.add(set.getKey().name);
@@ -171,11 +278,6 @@ public class ListExercicesAdapter extends ArrayAdapter<String> {
this.values.clear();
this.values.addAll(exercices);
notifyDataSetChanged();
- System.out.println("values : " + values);
- }
-
- private void save_workout_details() {
-
}
String getShortDayName(String day) {
@@ -189,7 +291,70 @@ public class ListExercicesAdapter extends ArrayAdapter<String> {
else throw new IllegalArgumentException();
}
-
+ public CompoundButton.OnCheckedChangeListener myCheckBoxListener =
+ new CompoundButton.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ if (buttonView == cb_lundi) {
+ if(current_days_checked.contains("lundi")){
+ current_days_checked.remove("lundi");
+ nbre_day -= 1;
+ }else{
+ current_days_checked.add("lundi");
+ nbre_day += 1;
+ }
+ } else if (buttonView == cb_mardi) {
+ if(current_days_checked.contains("mardi")){
+ current_days_checked.remove("mardi");
+ nbre_day -= 1;
+ }else{
+ current_days_checked.add("mardi");
+ nbre_day += 1;
+ }
+ } else if (buttonView == cb_mercredi) {
+ if(current_days_checked.contains("mercredi")){
+ current_days_checked.remove("mercredi");
+ nbre_day -= 1;
+ }else{
+ current_days_checked.add("mercredi");
+ nbre_day += 1;
+ }
+ } else if (buttonView == cb_jeudi) {
+ if(current_days_checked.contains("jeudi")){
+ current_days_checked.remove("jeudi");
+ nbre_day -= 1;
+ }else{
+ current_days_checked.add("jeudi");
+ nbre_day += 1;
+ }
+ } else if (buttonView == cb_vendredi) {
+ if(current_days_checked.contains("vendredi")){
+ current_days_checked.remove("vendredi");
+ nbre_day -= 1;
+ }else{
+ current_days_checked.add("vendredi");
+ nbre_day += 1;
+ }
+ } else if (buttonView == cb_samedi) {
+ if(current_days_checked.contains("samedi")){
+ current_days_checked.remove("samedi");
+ nbre_day -= 1;
+ }else{
+ current_days_checked.add("samedi");
+ nbre_day += 1;
+ }
+ } else if (buttonView == cb_dimanche) {
+ if(current_days_checked.contains("dimanche")){
+ current_days_checked.remove("dimanche");
+ nbre_day -= 1;
+ }else{
+ current_days_checked.add("dimanche");
+ nbre_day += 1;
+ }
+ //for (CheckBox cb : cb_list) if (!Objects.equals(cb, cb_dimanche)) cb.setChecked(false);
+ }
+ }
+ };
}
diff --git a/app/src/main/java/be/lepl1509group13/workoutwarrior/ProgramCreationActivity.java b/app/src/main/java/be/lepl1509group13/workoutwarrior/ProgramCreationActivity.java
index cac6ea9931410f9bc3cde055fe8ecb8704737aef..6a3668f5d000d989d574ae8e92b6abd04a95ee57 100644
--- a/app/src/main/java/be/lepl1509group13/workoutwarrior/ProgramCreationActivity.java
+++ b/app/src/main/java/be/lepl1509group13/workoutwarrior/ProgramCreationActivity.java
@@ -7,6 +7,7 @@ import android.graphics.Color;
import android.graphics.Typeface;
import android.os.Bundle;
import android.provider.ContactsContract;
+import android.text.InputType;
import android.widget.AdapterView;
import android.content.Context;
import android.os.Bundle;
@@ -30,6 +31,7 @@ import android.widget.AutoCompleteTextView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
+import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@@ -66,9 +68,11 @@ public class ProgramCreationActivity extends AppCompatActivity {
// Déclaration variables
AutoCompleteTextView input_exo; // Champ de texte pour rechercher les exercices
+ Integer nbre_day = 0;
// Liste d'exos dynamique à remplir depuis la DB
public Exercise actual_exo ;
public String img_actual_exo;
+
private static ArrayList<String> EXOS = new ArrayList<>(); // Liste des exercices de la base de données
CheckBox cb_lundi, cb_mardi, cb_mercredi, cb_jeudi, cb_vendredi, cb_samedi, cb_dimanche;
private ArrayList<CheckBox> cb_list = new ArrayList<>();
@@ -83,7 +87,8 @@ public class ProgramCreationActivity extends AppCompatActivity {
ListExercicesAdapter exercisesListAdapter;
-
+ String descriptionText;
+ Long break_time;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -92,9 +97,6 @@ public class ProgramCreationActivity extends AppCompatActivity {
getSupportActionBar().hide();
//init_days_TextView();
-
-
-
db = firebaseDb.getReference("Workouts");
get_DB_Exercices();
@@ -130,12 +132,11 @@ public class ProgramCreationActivity extends AppCompatActivity {
// Ajoute l'exo dans la HashMap (en mémoire) et dans la ListView (sur la page) quand l'utilisateur appuie sur le bouton "ajouter"
addExerciceListener();
-
// Sauvegarde du programme
saveProgramListener();
}
- private void helpButtonListener(){
+ public void helpButtonListener(){
help_creation_program = findViewById(R.id.help_program_creation);
help_creation_program.setOnClickListener(v -> {
AlertDialog.Builder builder = new AlertDialog.Builder(ProgramCreationActivity.this);
@@ -151,7 +152,7 @@ public class ProgramCreationActivity extends AppCompatActivity {
});
}
- private void saveProgramListener(){
+ public void saveProgramListener(){
Button save_btn = findViewById((R.id.save_button));
save_btn.setOnClickListener(v -> {
convertToProgramByDay();
@@ -182,10 +183,7 @@ public class ProgramCreationActivity extends AppCompatActivity {
}
-
-
-
- private void addExerciceListener() {
+ public void addExerciceListener() {
/**
* Ajoute un exercice au jour courant dans la HashMap programByDay et dans la ListView exos_current_day
*/
@@ -230,7 +228,7 @@ public class ProgramCreationActivity extends AppCompatActivity {
for (DataSnapshot snapshot : dataSnapshot.getChildren()) {
Long timer = (snapshot.child("timer").getValue(Long.class))/1000;
img_actual_exo = snapshot.child("image_url").getValue(String.class);
- Long break_time = (snapshot.child("break").getValue(Long.class))/1000;
+ break_time = (snapshot.child("break").getValue(Long.class))/1000;
String description = snapshot.child("description").getValue(String.class);
EditText description_text = dialog.findViewById(R.id.exercise_description);
@@ -238,6 +236,27 @@ public class ProgramCreationActivity extends AppCompatActivity {
TextView timer_text = dialog.findViewById(R.id.timer_text);
TextView break_text = dialog.findViewById(R.id.exercice_break);
+ ConstraintLayout form_layout = dialog.findViewById(R.id.constraintLayout2);
+ form_layout.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (description_text.hasFocus()) {
+ description_text.clearFocus();
+ }
+ }
+ });
+
+ description_text.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+ @Override
+ public void onFocusChange(View v, boolean hasFocus) {
+ if (!hasFocus) {
+ description_text.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_SENTENCES);
+ } else {
+ description_text.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_MULTI_LINE | InputType.TYPE_TEXT_FLAG_CAP_SENTENCES);
+ }
+ }
+ });
+
if(description != null){
description_text.setText(description);
}
@@ -260,93 +279,111 @@ public class ProgramCreationActivity extends AppCompatActivity {
@Override
public void onCancelled(@NonNull DatabaseError databaseError) {
System.out.println(databaseError);
- }
- });
-
-
+ }
+ });
- ImageView closeButton = dialog.findViewById(R.id.close_btn);
- closeButton.setOnClickListener(w -> dialog.dismiss());
+ ImageView closeButton = dialog.findViewById(R.id.close_btn);
+ closeButton.setOnClickListener(w -> dialog.dismiss());
- TextView name_exercice = dialog.findViewById(R.id.exercice_to_modify_name);
- name_exercice.setText(exercise_searched);
+ TextView name_exercice = dialog.findViewById(R.id.exercice_to_modify_name);
+ name_exercice.setText(exercise_searched);
- Button save_btn = dialog.findViewById(R.id.btn_save_modif);
- save_btn.setOnClickListener(w -> {
- EditText description_text = dialog.findViewById(R.id.exercise_description);
- String description_str = description_text.getText().toString();
+ Button save_btn = dialog.findViewById(R.id.btn_save_modif);
+ save_btn.setOnClickListener(w -> {
+ if(nbre_day > 0){
+ EditText description_text = dialog.findViewById(R.id.exercise_description);
+ String description_str = description_text.getText().toString();
- EditText break_text = dialog.findViewById(R.id.exercice_break);
- String string_break = break_text.getText().toString();
- Integer break_time = Integer.parseInt(string_break);
+ EditText break_text = dialog.findViewById(R.id.exercice_break);
+ String string_break = break_text.getText().toString();
+ Integer break_time = Integer.parseInt(string_break);
- EditText timer_edit = dialog.findViewById(R.id.exercise_timer);
- String string_timer = timer_edit.getText().toString();
- if(string_timer.equals("")){
- actual_exo = new Exercise(exercise_searched, description_str, break_time, "@drawable/developpe_couche_barre", 0);
- }else{
- Integer timer_int = Integer.parseInt(string_timer);
- actual_exo = new Exercise(exercise_searched, description_str, break_time, "@drawable/developpe_couche_barre", timer_int);
+ EditText timer_edit = dialog.findViewById(R.id.exercise_timer);
+ String string_timer = timer_edit.getText().toString();
+ String img = "@drawable/"+img_actual_exo;
+ if(string_timer.equals("")){
+ actual_exo = new Exercise(exercise_searched, description_str, break_time, img, 0);
+ }else{
+ Integer timer_int = Integer.parseInt(string_timer);
+ actual_exo = new Exercise(exercise_searched, description_str, break_time, img, timer_int);
+ actual_exo = new Exercise(exercise_searched, description_str, break_time, img, 0);
+ }
+ addToProgram(actual_exo, new ArrayList<>(current_days_checked));
+ dialog.dismiss();
+ // Effacer le champ de texte AutoCompleteTextView
+ input_exo.setText("");
+ }
+ else{
+ Toast.makeText(ProgramCreationActivity.this, "Veuillez sélectionner au moins un jour !",
+ Toast.LENGTH_SHORT).show();
}
- addToProgram(actual_exo, new ArrayList<>(current_days_checked));
- dialog.dismiss();
});
-
- // Effacer le champ de texte AutoCompleteTextView
- input_exo.setText("");
}
});
}
- private CompoundButton.OnCheckedChangeListener myCheckBoxListener =
+ public CompoundButton.OnCheckedChangeListener myCheckBoxListener =
new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (buttonView == cb_lundi) {
if(current_days_checked.contains("lundi")){
current_days_checked.remove("lundi");
+ nbre_day -= 1;
}else{
current_days_checked.add("lundi");
+ nbre_day += 1;
}
} else if (buttonView == cb_mardi) {
if(current_days_checked.contains("mardi")){
current_days_checked.remove("mardi");
+ nbre_day -= 1;
}else{
current_days_checked.add("mardi");
+ nbre_day += 1;
}
} else if (buttonView == cb_mercredi) {
if(current_days_checked.contains("mercredi")){
current_days_checked.remove("mercredi");
+ nbre_day -= 1;
}else{
current_days_checked.add("mercredi");
+ nbre_day += 1;
}
} else if (buttonView == cb_jeudi) {
if(current_days_checked.contains("jeudi")){
current_days_checked.remove("jeudi");
+ nbre_day -= 1;
}else{
current_days_checked.add("jeudi");
+ nbre_day += 1;
}
} else if (buttonView == cb_vendredi) {
if(current_days_checked.contains("vendredi")){
current_days_checked.remove("vendredi");
+ nbre_day -= 1;
}else{
current_days_checked.add("vendredi");
+ nbre_day += 1;
}
} else if (buttonView == cb_samedi) {
if(current_days_checked.contains("samedi")){
current_days_checked.remove("samedi");
+ nbre_day -= 1;
}else{
current_days_checked.add("samedi");
+ nbre_day += 1;
}
} else if (buttonView == cb_dimanche) {
if(current_days_checked.contains("dimanche")){
current_days_checked.remove("dimanche");
+ nbre_day -= 1;
}else{
current_days_checked.add("dimanche");
+ nbre_day += 1;
}
//for (CheckBox cb : cb_list) if (!Objects.equals(cb, cb_dimanche)) cb.setChecked(false);
}
- System.out.println(current_days_checked);
}
};
@@ -375,7 +412,7 @@ public class ProgramCreationActivity extends AppCompatActivity {
});
}
- private void addToProgram(Exercise exercise, ArrayList<String> trainingDays) {
+ public void addToProgram(Exercise exercise, ArrayList<String> trainingDays) {
/**
* Add the new exercise to the program
*/
@@ -416,8 +453,6 @@ public class ProgramCreationActivity extends AppCompatActivity {
}
}
- System.out.println("program : " + program);
- System.out.println("programByDay : " + programByDay);
}
}
diff --git a/app/src/main/java/be/lepl1509group13/workoutwarrior/WorkoutActivity.java b/app/src/main/java/be/lepl1509group13/workoutwarrior/WorkoutActivity.java
index 58141cfc1e2a8c8acb55d3b84b863ae901c9a552..59820ab768c1ec4f95f5f2f33440f8c2ec5b8830 100644
--- a/app/src/main/java/be/lepl1509group13/workoutwarrior/WorkoutActivity.java
+++ b/app/src/main/java/be/lepl1509group13/workoutwarrior/WorkoutActivity.java
@@ -22,6 +22,7 @@ import com.google.firebase.database.DatabaseReference;
import com.google.firebase.database.FirebaseDatabase;
import com.google.firebase.database.ValueEventListener;
+import java.util.Arrays;
import java.util.Objects;
public class WorkoutActivity extends AppCompatActivity {
diff --git a/app/src/main/res/layout/modify_exercice_popup.xml b/app/src/main/res/layout/modify_exercice_popup.xml
index fdb200a10dc5081bb8035d0c989560873f5c742c..9722d04f05a01a842c0f1de26c2d25ff4081f840 100644
--- a/app/src/main/res/layout/modify_exercice_popup.xml
+++ b/app/src/main/res/layout/modify_exercice_popup.xml
@@ -179,7 +179,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Pause"
- android:text=""/>
+ android:text=""
+ android:maxLines="5"/>
<TextView
android:id="@+id/timer_text"