Commit 129765a7 authored by Mathilde BALLOUHEY's avatar Mathilde BALLOUHEY
Browse files

Ajout HP et langages à la vue

parent 0bb81886
Pipeline #23372 failed with stages
in 4 minutes and 27 seconds
......@@ -86,17 +86,31 @@
android:text="TextView"
android:textColor="#97FFFFFF" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/btn_displayResult_favourite"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:backgroundTint="@color/transparence"
android:clickable="true"
app:elevation="0px"
app:fabSize="auto"
app:rippleColor="@color/transparence"
app:srcCompat="@drawable/ic_baseline_star_border_24" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<TextView
android:id="@+id/lbl_displayResult_hp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="HP :" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/btn_displayResult_favourite"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:backgroundTint="@color/transparence"
android:clickable="true"
app:elevation="0px"
app:fabSize="auto"
app:rippleColor="@color/transparence"
app:srcCompat="@drawable/ic_baseline_star_border_24" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
......@@ -113,13 +127,13 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_weight="1">
<TextView
android:id="@+id/lbl_displayResult_titlePersonnality"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:text="Personality"
app:layout_constraintStart_toStartOf="parent"
......@@ -263,18 +277,38 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_weight="1">
<TextView
android:id="@+id/lbl_displayResult_titleEquipements"
android:id="@+id/lbl_displayResult_titleLanguages"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Languages"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/lbl_displayResult_languages"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:text="TextView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/lbl_displayResult_titleLanguages"
app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_titleLanguages" />
<TextView
android:id="@+id/lbl_displayResult_titleEquipements"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="Equipements"
android:textSize="20sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_languages" />
<TextView
android:id="@+id/lbl_displayResult_equipements"
......
......@@ -83,17 +83,31 @@
android:text="TextView"
android:textColor="#97FFFFFF" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/btn_displayResult_favourite"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:backgroundTint="@color/transparence"
android:clickable="true"
app:elevation="0px"
app:fabSize="auto"
app:rippleColor="@color/transparence"
app:srcCompat="@drawable/ic_baseline_star_border_24" />
android:orientation="horizontal">
<TextView
android:id="@+id/lbl_displayResult_hp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="HP :" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/btn_displayResult_favourite"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:backgroundTint="@color/transparence"
android:clickable="true"
app:elevation="0px"
app:fabSize="auto"
app:rippleColor="@color/transparence"
app:srcCompat="@drawable/ic_baseline_star_border_24" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
......@@ -239,6 +253,25 @@
app:layout_constraintStart_toStartOf="@+id/lbl_displayRsult_titleSpells"
app:layout_constraintTop_toBottomOf="@+id/lbl_displayRsult_titleSpells" />
<TextView
android:id="@+id/lbl_displayResult_titleLanguages"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:text="Languages"
app:layout_constraintStart_toStartOf="@+id/lbl_displayRsult_titleSpells"
app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_spells" />
<TextView
android:id="@+id/lbl_displayResult_languages"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="TextView"
app:layout_constraintEnd_toEndOf="@+id/lbl_displayResult_spells"
app:layout_constraintStart_toStartOf="@+id/lbl_displayResult_spells"
app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_titleLanguages" />
<TextView
android:id="@+id/lbl_displayResult_titleEquipements"
android:layout_width="wrap_content"
......@@ -247,7 +280,7 @@
android:text="Equipements"
android:textSize="20sp"
app:layout_constraintStart_toStartOf="@+id/lbl_displayResult_titleSkills"
app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_spells" />
app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_languages" />
<TextView
android:id="@+id/lbl_displayResult_equipements"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment