Merge branch 'arthur' into 'main'

Arthur

See merge request !23

app/src/main/java/be/lepl1509group13/workoutwarrior/ListExercicesAdapter.java

@@ -17,7 +17,6 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 
 import com.google.firebase.database.DataSnapshot;

app/src/main/java/be/lepl1509group13/workoutwarrior/ProgramCreationActivity.java

@@ -130,10 +130,10 @@ public class ProgramCreationActivity extends AppCompatActivity {
 
         // Sauvegarde du programme
         saveProgramListener();
-        testLinstener();
+        //testLinstener();
     }
 
-    private void testLinstener(){
+    /**private void testLinstener(){
         Button testbtn = findViewById((R.id.save_test));
         testbtn.setOnClickListener(v -> {
             System.out.println("EXO SAVED: \n");
@@ -167,7 +167,7 @@ public class ProgramCreationActivity extends AppCompatActivity {
                 e.printStackTrace();
             }
         });
-    }
+    }**/
 
     private void helpButtonListener(){
         help_creation_program = findViewById(R.id.help_program_creation);

app/src/main/java/be/lepl1509group13/workoutwarrior/ProgramDetailActivity.java

@@ -4,11 +4,12 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -24,7 +25,7 @@ public class ProgramDetailActivity extends AppCompatActivity implements ProgramA
 
     private final FirebaseDatabase firebaseDb = FirebaseDatabase.getInstance();
     private DatabaseReference db;
-    TextView return_btn;
+    ImageButton return_btn;
     TextView start_workout;
 
     @Override
@@ -90,7 +91,7 @@ public class ProgramDetailActivity extends AppCompatActivity implements ProgramA
     private void getProgramData(int id){
         db.addValueEventListener(new ValueEventListener() {
             @Override
-            public void onDataChange(@NonNull DataSnapshot snapshot) {
+            public void onDataChange(DataSnapshot snapshot) {
                 DataSnapshot program = snapshot.child(Integer.toString(id));
 
                 //update the title of the program
@@ -106,7 +107,7 @@ public class ProgramDetailActivity extends AppCompatActivity implements ProgramA
             }
 
             @Override
-            public void onCancelled(@NonNull DatabaseError error) {
+            public void onCancelled(DatabaseError error) {
                 Toast.makeText(ProgramDetailActivity.this, "Fail to get data.", Toast.LENGTH_SHORT).show();
             }
         });
@@ -115,7 +116,7 @@ public class ProgramDetailActivity extends AppCompatActivity implements ProgramA
     private void getExercisesData(String[] exercises_id){
         db.addValueEventListener(new ValueEventListener() {
             @Override
-            public void onDataChange(@NonNull DataSnapshot snapshot) {
+            public void onDataChange(DataSnapshot snapshot) {
                 String[][] exercisesData = new String[exercises_id.length][];
 
                 //For each exercises that is link with the program in the database, add the data
@@ -138,7 +139,7 @@ public class ProgramDetailActivity extends AppCompatActivity implements ProgramA
             }
 
             @Override
-            public void onCancelled(@NonNull DatabaseError error) {
+            public void onCancelled(DatabaseError error) {
                 Toast.makeText(ProgramDetailActivity.this, "Fail to get data.", Toast.LENGTH_SHORT).show();
             }
         });

app/src/main/java/be/lepl1509group13/workoutwarrior/WorkoutActivity.java

 package be.lepl1509group13.workoutwarrior;
 
-import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.annotation.SuppressLint;
@@ -11,6 +10,7 @@ import android.os.CountDownTimer;
 import android.os.Vibrator;
 import android.view.View;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -64,7 +64,7 @@ public class WorkoutActivity extends AppCompatActivity {
         Button next_btn = findViewById(R.id.next_btn);
         next_btn.setOnClickListener(v -> onNextClick());
 
-        Button return_btn = findViewById(R.id.return_btn);
+        ImageButton return_btn = findViewById(R.id.return_btn);
         return_btn.setOnClickListener(view -> finish());
 
         // Timer de pause entre les séries
@@ -105,7 +105,7 @@ public class WorkoutActivity extends AppCompatActivity {
     private void getProgramData(int id){
         db.addValueEventListener(new ValueEventListener() {
             @Override
-            public void onDataChange(@NonNull DataSnapshot snapshot) {
+            public void onDataChange(DataSnapshot snapshot) {
                 DataSnapshot program = snapshot.child(Integer.toString(id));
 
                 //update the name of the program
@@ -136,7 +136,7 @@ public class WorkoutActivity extends AppCompatActivity {
             }
 
             @Override
-            public void onCancelled(@NonNull DatabaseError error) {
+            public void onCancelled(DatabaseError error) {
                 Toast.makeText(WorkoutActivity.this, "Fail to get data.", Toast.LENGTH_SHORT).show();
             }
         });
@@ -145,7 +145,7 @@ public class WorkoutActivity extends AppCompatActivity {
     private void getWorkoutData(String id) {
         db.addValueEventListener(new ValueEventListener() {
             @Override
-            public void onDataChange(@NonNull DataSnapshot snapshot) {
+            public void onDataChange(DataSnapshot snapshot) {
 
                 DataSnapshot workout = snapshot.child(id);
 
@@ -187,7 +187,7 @@ public class WorkoutActivity extends AppCompatActivity {
             }
 
             @Override
-            public void onCancelled(@NonNull DatabaseError error) {
+            public void onCancelled(DatabaseError error) {
                 Toast.makeText(WorkoutActivity.this, "Fail to get data.", Toast.LENGTH_SHORT).show();
             }
         });

app/src/main/res/layout/activity_account.xml

@@ -10,13 +10,15 @@
         android:id="@+id/account_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="80dp"
+        android:paddingHorizontal="20dp"
         android:textAlignment="center"
         android:textSize="20sp"
-        android:paddingHorizontal="20dp"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/relativeLayout"
-        tools:text="Hello"/>
+        tools:text="Hello" />
 
     <RelativeLayout
         android:id="@+id/field_layout"
@@ -87,10 +89,11 @@
     <RelativeLayout
         android:id="@+id/relativeLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="80dp"
+        android:background="@color/orange"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent" />
 
         <ImageButton
             android:id="@+id/return_from_account"
@@ -112,7 +115,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-    </RelativeLayout>
+
 
     <Button
         android:id="@+id/logout"

app/src/main/res/layout/activity_detail_program.xml

@@ -6,19 +6,30 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <Button
+    <RelativeLayout
+        android:id="@+id/navigation_menu"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:background="@color/orange"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageButton
         android:id="@+id/return_btn2"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="20dp"
-        android:backgroundTint="@color/light_grey"
-        android:fontFamily="@font/poppins_semibold"
+        android:layout_width="66dp"
+        android:layout_height="61dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginBottom="10dp"
+        android:background="@color/orange"
         android:paddingLeft="10dp"
         android:paddingTop="1dp"
         android:paddingRight="10dp"
         android:paddingBottom="4dp"
-        android:text="✖"
+        android:scaleType="fitCenter"
+        android:src="@drawable/return_button"
         android:textAlignment="center"
         android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
@@ -38,6 +49,7 @@
             android:id="@+id/program_view_recycler"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="25dp"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
     </ScrollView>

app/src/main/res/layout/activity_workout.xml

@@ -6,6 +6,15 @@
     android:layout_height="match_parent"
     tools:context=".WorkoutActivity">
 
+  <RelativeLayout
+      android:id="@+id/navigation_menu"
+      android:layout_width="match_parent"
+      android:layout_height="80dp"
+      android:background="@color/orange"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+
   <TextView
       android:id="@+id/workout_name"
       android:layout_width="wrap_content"
@@ -13,24 +22,27 @@
       android:layout_marginTop="25dp"
       android:fontFamily="@font/poppins_semibold"
       android:text=""
-      android:textColor="@color/bwhite"
+      android:textColor="@color/black"
       android:textSize="20dp"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent" />
 
-  <Button
+  <ImageButton
       android:id="@+id/return_btn"
-      android:layout_width="40dp"
-      android:layout_height="40dp"
-      android:layout_marginLeft="20dp"
-      android:layout_marginTop="20dp"
-      android:fontFamily="@font/poppins_semibold"
+      android:layout_width="66dp"
+      android:layout_height="61dp"
+      android:layout_marginStart="10dp"
+      android:layout_marginTop="10dp"
+      android:layout_marginEnd="10dp"
+      android:layout_marginBottom="10dp"
+      android:background="@color/orange"
       android:paddingLeft="10dp"
       android:paddingTop="1dp"
       android:paddingRight="10dp"
       android:paddingBottom="4dp"
-      android:text="✖"
+      android:scaleType="fitCenter"
+      android:src="@drawable/return_button"
       android:textAlignment="center"
       android:textSize="16sp"
       app:layout_constraintStart_toStartOf="parent"

app/src/main/res/layout/edit_workout.xml

@@ -17,8 +17,8 @@
 
         <TextView
             android:id="@+id/exercise_name"
-            android:layout_width="201dp"
-            android:layout_height="60dp"
+            android:layout_width="200dp"
+            android:layout_height="wrap_content"
             android:layout_marginLeft="25dp"
             android:fontFamily="@font/poppins_semibold"
             android:gravity="center"
@@ -55,22 +55,55 @@
         android:layout_marginTop="-300dp"
         app:layout_constraintTop_toBottomOf="@+id/constraintLayout3">
 
-        <EditText
-            android:id="@+id/description_edit"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="Description"
-            android:inputType="textMultiLine"
-            android:maxLines="5"
-            android:minLines="3" />
-
-        <EditText
-            android:id="@+id/pause_edit"
-            android:layout_marginTop="10dp"
+            >
+
+            <TextView
+                android:id="@+id/textView2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Description :"
+                android:textSize="20dp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <EditText
+                android:id="@+id/description_edit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="Description"
+                android:inputType="textMultiLine"
+                android:maxLines="5"
+                android:minLines="3" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="Temps de pause (en secondes)"
-            android:inputType="number" />
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/textView3"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Temps de pause en seconde :"
+                android:textSize="20dp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <EditText
+                android:id="@+id/pause_edit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="Temps de pause (en secondes)"
+                android:inputType="number"
+                app:layout_constraintTop_toBottomOf="@+id/textView3" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <Button
             android:id="@+id/save_modif_button"

app/src/main/res/layout/exercice.xml

@@ -10,6 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="8dp"
+        android:gravity="center"
         tools:ignore="MissingConstraints">
 
         <TextView
@@ -27,6 +28,7 @@
             android:orientation="horizontal">
             <ImageView
                 android:id="@+id/delete_button"
+                android:layout_marginLeft="30dp"
                 android:layout_alignParentStart="true"
                 android:clickable="true"
                 android:src="@drawable/ic_launcher_background"
@@ -37,6 +39,7 @@
 
             <ImageView
                 android:id="@+id/edit_button"
+                android:layout_marginLeft="30dp"
                 android:layout_alignParentStart="true"
                 android:clickable="true"
                 android:src="@drawable/ic_launcher_background"

app/src/main/res/layout/exercice_details_pop_up.xml

@@ -5,25 +5,39 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/exercise_popup_name"
-        android:layout_width="197dp"
-        android:layout_height="38dp"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@+id/constraintLayout2"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.260"
         android:layout_marginTop="40dp"
-        android:fontFamily="@font/poppins_semibold"
-        android:gravity="center"
-        android:textSize="20sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_marginBottom="50dp"
+        tools:layout_editor_absoluteX="0dp">
+
+        <TextView
+            android:id="@+id/exercise_popup_name"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:fontFamily="@font/poppins_semibold"
+            android:gravity="center"
+            android:textSize="20sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraintLayout2"
         android:layout_width="381dp"
         android:layout_height="441dp"
+        android:layout_marginBottom="100dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/exercise_popup_name">
+        app:layout_constraintHorizontal_bias="0.466"
+        app:layout_constraintStart_toStartOf="parent">
 
         <TextView
             android:id="@+id/exercise_popup_description"

app/src/main/res/layout/help_creation_program_popup.xml

@@ -3,21 +3,31 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/white">
 
-    <TextView
-        android:id="@+id/exercise_popup_name"
-        android:layout_width="wrap_content"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraintLayout4"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="64dp"
-        android:fontFamily="@font/poppins_semibold"
-        android:gravity="center"
-        android:text="Aide concernant la création de programme"
-        android:textSize="20sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="60dp"
+        android:layout_marginBottom="40dp">
+
+        <TextView
+            android:id="@+id/exercise_popup_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/poppins_semibold"
+            android:gravity="center"
+            android:text="Aide concernant la création de programme"
+            android:textSize="20sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="381dp"
@@ -26,12 +36,15 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.466"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/exercise_popup_name"
-        app:layout_constraintVertical_bias="0.316">
+        app:layout_constraintTop_toBottomOf="@+id/constraintLayout4">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.293"
+            tools:layout_editor_absoluteX="0dp">
 
             <TextView
                 android:id="@+id/explication_text1"
@@ -44,8 +57,8 @@
 
             <TextView
                 android:id="@+id/explication_text2"
-                android:layout_width="350dp"
-                android:layout_height="match_parent"
+                android:layout_width="357dp"
+                android:layout_height="65dp"
                 android:layout_marginTop="15dp"
                 android:text="• Sélectionnez l'exercice que vous voulez ajouter pour ce(s) jour(s) dans la liste déroulante et cliquez sur le bouton ajouter exercice."
                 android:textSize="16dp"

app/src/main/res/layout/program_creation.xml

@@ -46,20 +46,6 @@
             android:textAlignment="center"
             android:textSize="16sp" />
 
-        <Button
-            android:id="@+id/save_test"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="120dp"
-            android:layout_marginTop="12dp"
-            android:background="#FFFFFF"
-            android:backgroundTint="#FFFFFF"
-            android:clickable="true"
-            android:scaleType="fitCenter"
-            android:text="TEST"
-            android:textAlignment="center"
-            android:textSize="16sp" />
-
 
     </RelativeLayout>