Skip to content
Extraits de code Groupes Projets
Valider c3107ea6 rédigé par Arthur Schamroth's avatar Arthur Schamroth
Parcourir les fichiers

derniere version

parent 13c6ae3b
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!33Arthur
Masquer les modifications d'espaces
En ligne Côte à côte
app/src/main/java/be/lepl1509group13/workoutwarrior/ListExercicesAdapter.java
+ 3
− 75
Voir le fichier @ c3107ea6
......@@ -11,6 +11,7 @@ import android.widget.TextView;
import android.widget.Toast;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.Map;
......@@ -40,7 +41,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 +48,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 +57,16 @@ 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));
}
}
// 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());
// Rechercher l'exercice dans la HashMap et modifier ces paramètres
for (Exercise exo : exercises) {
if (Objects.equals(exo.name, exercise)) {
exo.description = new_description;
exo.breakVal = new_break_time * 1000;
}
}
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();
});
*/
System.out.println("details : " + Arrays.toString(activity.getClass().getDeclaredFields()));
System.out.println("details : " + activity.break_time);
});
// Ajouter un OnClickListener à l'image
......@@ -152,8 +83,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,7 +100,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() {
......
app/src/main/java/be/lepl1509group13/workoutwarrior/ProgramCreationActivity.java
+ 11
− 22
Voir le fichier @ c3107ea6
......@@ -87,7 +87,8 @@ public class ProgramCreationActivity extends AppCompatActivity {
ListExercicesAdapter exercisesListAdapter;
String descriptionText = "";
String descriptionText;
Long break_time;
@Override
protected void onCreate(Bundle savedInstanceState) {
......@@ -96,9 +97,6 @@ public class ProgramCreationActivity extends AppCompatActivity {
getSupportActionBar().hide();
//init_days_TextView();
db = firebaseDb.getReference("Workouts");
get_DB_Exercices();
......@@ -134,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);
......@@ -155,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();
......@@ -186,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
*/
......@@ -234,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);
......@@ -288,8 +282,6 @@ public class ProgramCreationActivity extends AppCompatActivity {
}
});
ImageView closeButton = dialog.findViewById(R.id.close_btn);
closeButton.setOnClickListener(w -> dialog.dismiss());
......@@ -310,11 +302,13 @@ public class ProgramCreationActivity extends AppCompatActivity {
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);
System.out.println(actual_exo);
}else{
Integer timer_int = Integer.parseInt(string_timer);
actual_exo = new Exercise(exercise_searched, description_str, break_time, "@drawable/developpe_couche_barre", timer_int);
actual_exo = new Exercise(exercise_searched, description_str, break_time, "@drawable/developpe_couche_barre", 0);
}
addToProgram(actual_exo, new ArrayList<>(current_days_checked));
addToProgram(actual_exo, new ArrayList<>(current_days_checked), description_text.getText().toString(), break_time);
dialog.dismiss();
// Effacer le champ de texte AutoCompleteTextView
input_exo.setText("");
......@@ -324,13 +318,11 @@ public class ProgramCreationActivity extends AppCompatActivity {
Toast.LENGTH_SHORT).show();
}
});
}
});
}
private CompoundButton.OnCheckedChangeListener myCheckBoxListener =
public CompoundButton.OnCheckedChangeListener myCheckBoxListener =
new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
......@@ -392,7 +384,6 @@ public class ProgramCreationActivity extends AppCompatActivity {
}
//for (CheckBox cb : cb_list) if (!Objects.equals(cb, cb_dimanche)) cb.setChecked(false);
}
System.out.println(current_days_checked);
}
};
......@@ -421,7 +412,7 @@ public class ProgramCreationActivity extends AppCompatActivity {
});
}
private void addToProgram(Exercise exercise, ArrayList<String> trainingDays) {
public void addToProgram(Exercise exercise, ArrayList<String> trainingDays, String description_text, Integer break_time) {
/**
* Add the new exercise to the program
*/
......@@ -462,8 +453,6 @@ public class ProgramCreationActivity extends AppCompatActivity {
}
}
System.out.println("program : " + program);
System.out.println("programByDay : " + programByDay);
}
}
......
app/src/main/java/be/lepl1509group13/workoutwarrior/WorkoutActivity.java
+ 1
− 0
Voir le fichier @ c3107ea6
......@@ -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 {
......
0% 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