Skip to content
Extraits de code Groupes Projets
Valider 932745a4 rédigé par Rémy Mathieu's avatar Rémy Mathieu
Parcourir les fichiers

Patch custom workout layout

parent 021937b4
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!40Patch custom workout layout
Masquer les modifications d'espaces
En ligne Côte à côte
app/src/main/java/be/lepl1509group13/workoutwarrior/ProgramDetailActivity.java
+ 6
− 5
Voir le fichier @ 932745a4
......@@ -5,9 +5,9 @@ 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.LinearLayout;
import android.widget.ListView;
import android.widget.SimpleAdapter;
import android.widget.TextView;
......@@ -48,7 +48,7 @@ public class ProgramDetailActivity extends AppCompatActivity implements ProgramA
private FirebaseAuth mAuth;
private HashMap<String, ArrayList<Exercise>> programHash;
ImageButton return_btn;
TextView start_workout, delete_workout, show_workout, share_workout;
private Button start_workout, delete_workout, show_workout, share_workout;
private boolean isLocalProgram = false;
private String[][] exercisesData = null;
private ArrayList<ArrayList<String>> allExercices = new ArrayList<ArrayList<String>>();
......@@ -75,15 +75,15 @@ public class ProgramDetailActivity extends AppCompatActivity implements ProgramA
show_workout = findViewById(R.id.show_workout);
show_workout.setOnClickListener(view -> showWorkout());
share_workout = findViewById(R.id.share_workout);
share_workout.setOnClickListener(view -> shareWorkout());
db = firebaseDb.getReference("Programs");
getProgramData(id, this_intent.getStringExtra("name"));
return_btn = findViewById(R.id.return_btn2);
return_btn.setOnClickListener(view -> finish());
share_workout = findViewById(R.id.share_workout);
share_workout.setOnClickListener(view -> {shareWorkout();});
start_workout = findViewById(R.id.start_workout);
start_workout.setOnClickListener(view -> {
Intent intent = new Intent(ProgramDetailActivity.this, WorkoutActivity.class);
......@@ -381,6 +381,7 @@ public class ProgramDetailActivity extends AppCompatActivity implements ProgramA
isLocalProgram = false;
delete_workout.setVisibility(View.INVISIBLE);
show_workout.setVisibility(View.INVISIBLE);
share_workout.setVisibility(View.INVISIBLE);
db.addValueEventListener(new ValueEventListener() {
@Override
public void onDataChange(@NonNull DataSnapshot snapshot) {
......
app/src/main/res/layout/activity_detail_program.xml
+ 28
− 27
Voir le fichier @ 932745a4
......@@ -36,12 +36,12 @@
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/delete_workout"
android:id="@+id/share_workout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/orange"
android:backgroundTint="@color/orange"
android:text="@string/delete_workout"
android:text="@string/share_workout"
android:textColor="@color/black"
app:iconTint="@color/orange"
android:layout_marginEnd="15dp"
......@@ -111,33 +111,34 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<Button
android:id="@+id/share_workout"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="80dp"
android:background="@color/orange"
android:backgroundTint="@color/orange"
android:text="@string/share_workout"
android:textColor="@color/black"
android:translationX="80dp"
app:iconTint="@color/orange"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintTop_toBottomOf="@+id/start_workout"
android:gravity="center">
<Button
android:id="@+id/show_workout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/orange"
android:backgroundTint="@color/orange"
android:text="@string/show_workout"
android:textColor="@color/black"
app:iconTint="@color/orange"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/start_workout" />
<Button
android:id="@+id/show_workout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/orange"
android:backgroundTint="@color/orange"
android:text="@string/show_workout"
android:textColor="@color/black"
app:iconTint="@color/orange"
android:layout_marginRight="35dp"/>
<Button
android:id="@+id/delete_workout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/orange"
android:backgroundTint="@color/orange"
android:text="@string/delete_workout"
android:textColor="@color/black"
app:iconTint="@color/orange" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/values/strings.xml
+ 3
− 3
Voir le fichier @ 932745a4
......@@ -8,8 +8,8 @@
<string name="entrainement_foot">Entrainement Foot</string>
<string name="entrainement_badminton">Entrainement Badminton</string>
<string name="launch_workout">Démarrer</string>
<string name="delete_workout">Supprimer le programme</string>
<string name="show_workout">Afficher le programme</string>
<string name="delete_workout">Supprimer</string>
<string name="show_workout">Afficher</string>
<string name="title_activity_account">AccountActivity</string>
<string name="prompt_email">Email</string>
<string name="prompt_password">Password</string>
......@@ -24,5 +24,5 @@
<string name="add_friend_activity_title">Entrez le pseudo de l\'ami à ajouter</string>
<string name="add_friend_activity_btn_text">Ajouter</string>
<string name="login_title">Veuillez d\'abord vous connecter</string>
<string name="share_workout">Partager</string>
<string name="share_workout">Partager ce programme</string>
</resources>
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