Commit 18808227 authored by Mathilde BALLOUHEY's avatar Mathilde BALLOUHEY
Browse files

Ajout chanps dans DisplayResult

parent 7f70d655
...@@ -62,9 +62,7 @@ ...@@ -62,9 +62,7 @@
android:id="@+id/lbl_displayResult_class" android:id="@+id/lbl_displayResult_class"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginBottom="16dp"
android:layout_marginEnd="32dp"
android:layout_marginBottom="10dp"
android:text="TextView" android:text="TextView"
android:textAppearance="@style/AppTextTitle" android:textAppearance="@style/AppTextTitle"
android:textSize="22sp" android:textSize="22sp"
...@@ -77,10 +75,17 @@ ...@@ -77,10 +75,17 @@
android:id="@+id/lbl_displayResult_description" android:id="@+id/lbl_displayResult_description"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginBottom="16dp"
android:layout_marginBottom="10dp"
android:text="TextView" /> android:text="TextView" />
<TextView
android:id="@+id/lbl_displayResult_system"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:text="TextView"
android:textColor="#97FFFFFF" />
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/btn_displayResult_favourite" android:id="@+id/btn_displayResult_favourite"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -107,19 +112,40 @@ ...@@ -107,19 +112,40 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_weight="1"> android:layout_weight="1">
<TextView <TextView
android:id="@+id/lbl_displayResult_titleCaracteristics" android:id="@+id/lbl_displayResult_titlePersonnality"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:text="Personality"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/lbl_displayResult_personality"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:text="TextView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/lbl_displayResult_titlePersonnality"
app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_titlePersonnality" />
<TextView
android:id="@+id/lbl_displayResult_titleCaracteristics"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:text="Caracteristics" android:text="Caracteristics"
android:textSize="20sp" android:textSize="20sp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="@+id/lbl_displayResult_titlePersonnality"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_personality" />
<LinearLayout <LinearLayout
android:id="@+id/linearLayout" android:id="@+id/linearLayout"
...@@ -207,17 +233,36 @@ ...@@ -207,17 +233,36 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:text="TextView" android:text="TextView"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/linearLayout" app:layout_constraintEnd_toEndOf="@+id/linearLayout"
app:layout_constraintStart_toStartOf="@+id/linearLayout" app:layout_constraintStart_toStartOf="@+id/linearLayout"
app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_titleSkills" /> app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_titleSkills" />
<TextView
android:id="@+id/lbl_displayRsult_titleSpells"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Spells"
app:layout_constraintStart_toStartOf="@+id/lbl_displayResult_titleSkills"
app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_skills" />
<TextView
android:id="@+id/lbl_displayResult_spells"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp"
android:text="TextView"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/lbl_displayResult_skills"
app:layout_constraintStart_toStartOf="@+id/lbl_displayResult_skills"
app:layout_constraintTop_toBottomOf="@+id/lbl_displayRsult_titleSpells" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_weight="1"> android:layout_weight="1">
<TextView <TextView
...@@ -234,16 +279,33 @@ ...@@ -234,16 +279,33 @@
<TextView <TextView
android:id="@+id/lbl_displayResult_equipements" android:id="@+id/lbl_displayResult_equipements"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:text="TextView" android:text="TextView"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/lbl_displayResult_titleEquipements" app:layout_constraintStart_toStartOf="@+id/lbl_displayResult_titleEquipements"
app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_titleEquipements" /> app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_titleEquipements" />
<TextView
android:id="@+id/lbl_displatResult_titleSaves"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="Saves"
app:layout_constraintStart_toStartOf="@+id/lbl_displayResult_titleEquipements"
app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_equipements" />
<TextView
android:id="@+id/lbl_displayResult_saves"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="TextView"
app:layout_constraintEnd_toEndOf="@+id/lbl_displayResult_equipements"
app:layout_constraintStart_toStartOf="@+id/lbl_displayResult_equipements"
app:layout_constraintTop_toBottomOf="@+id/lbl_displatResult_titleSaves" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout> </LinearLayout>
......
...@@ -62,9 +62,8 @@ ...@@ -62,9 +62,8 @@
android:id="@+id/lbl_displayResult_class" android:id="@+id/lbl_displayResult_class"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginEnd="32dp" android:layout_marginEnd="32dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="16dp"
android:text="TextView" android:text="TextView"
android:textAppearance="@style/AppTextTitle" android:textAppearance="@style/AppTextTitle"
android:textSize="22sp" /> android:textSize="22sp" />
...@@ -73,17 +72,24 @@ ...@@ -73,17 +72,24 @@
android:id="@+id/lbl_displayResult_description" android:id="@+id/lbl_displayResult_description"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginBottom="16dp"
android:layout_marginBottom="10dp"
android:text="TextView" /> android:text="TextView" />
<TextView
android:id="@+id/lbl_displayResult_system"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:text="TextView"
android:textColor="#97FFFFFF" />
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/btn_displayResult_favourite" android:id="@+id/btn_displayResult_favourite"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right"
android:backgroundTint="@color/transparence" android:backgroundTint="@color/transparence"
android:clickable="true" android:clickable="true"
android:layout_gravity="right"
app:elevation="0px" app:elevation="0px"
app:fabSize="auto" app:fabSize="auto"
app:rippleColor="@color/transparence" app:rippleColor="@color/transparence"
...@@ -93,14 +99,34 @@ ...@@ -93,14 +99,34 @@
<TextView <TextView
android:id="@+id/lbl_displayResult_titleCaracteristics" android:id="@+id/lbl_displayResult_titlePersonnality"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
android:text="Personality"
app:layout_constraintStart_toStartOf="@+id/linearLayout2"
app:layout_constraintTop_toBottomOf="@+id/linearLayout2" />
<TextView
android:id="@+id/lbl_displayResult_personality"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:text="TextView"
app:layout_constraintEnd_toEndOf="@+id/linearLayout2"
app:layout_constraintStart_toStartOf="@+id/lbl_displayResult_titlePersonnality"
app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_titlePersonnality" />
<TextView
android:id="@+id/lbl_displayResult_titleCaracteristics"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:text="Caracteristics" android:text="Caracteristics"
android:textSize="20sp" android:textSize="20sp"
app:layout_constraintStart_toStartOf="@+id/linearLayout2" app:layout_constraintStart_toStartOf="@+id/linearLayout2"
app:layout_constraintTop_toBottomOf="@+id/linearLayout2" /> app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_personality" />
<LinearLayout <LinearLayout
android:id="@+id/linearLayout" android:id="@+id/linearLayout"
...@@ -176,7 +202,7 @@ ...@@ -176,7 +202,7 @@
android:id="@+id/lbl_displayResult_titleSkills" android:id="@+id/lbl_displayResult_titleSkills"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="32dp" android:layout_marginTop="24dp"
android:text="Skills" android:text="Skills"
android:textSize="20sp" android:textSize="20sp"
app:layout_constraintStart_toStartOf="@+id/lbl_displayResult_titleCaracteristics" app:layout_constraintStart_toStartOf="@+id/lbl_displayResult_titleCaracteristics"
...@@ -190,28 +216,69 @@ ...@@ -190,28 +216,69 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:text="TextView" android:text="TextView"
app:layout_constraintEnd_toEndOf="@+id/linearLayout" app:layout_constraintEnd_toEndOf="@+id/linearLayout"
app:layout_constraintStart_toStartOf="@+id/linearLayout" app:layout_constraintStart_toStartOf="@+id/lbl_displayResult_titleSkills"
app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_titleSkills" /> app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_titleSkills" />
<TextView
android:id="@+id/lbl_displayRsult_titleSpells"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:text="Spells"
app:layout_constraintStart_toStartOf="@+id/lbl_displayResult_titleSkills"
app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_skills" />
<TextView
android:id="@+id/lbl_displayResult_spells"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:text="TextView"
app:layout_constraintEnd_toEndOf="@+id/lbl_displayResult_skills"
app:layout_constraintStart_toStartOf="@+id/lbl_displayRsult_titleSpells"
app:layout_constraintTop_toBottomOf="@+id/lbl_displayRsult_titleSpells" />
<TextView <TextView
android:id="@+id/lbl_displayResult_titleEquipements" android:id="@+id/lbl_displayResult_titleEquipements"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="32dp" android:layout_marginTop="24dp"
android:text="Equipements" android:text="Equipements"
android:textSize="20sp" android:textSize="20sp"
app:layout_constraintStart_toStartOf="@+id/lbl_displayResult_titleSkills" app:layout_constraintStart_toStartOf="@+id/lbl_displayResult_titleSkills"
app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_skills" /> app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_spells" />
<TextView <TextView
android:id="@+id/lbl_displayResult_equipements" android:id="@+id/lbl_displayResult_equipements"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:text="TextView" android:text="TextView"
app:layout_constraintEnd_toEndOf="@+id/lbl_displayResult_skills" app:layout_constraintEnd_toEndOf="@+id/lbl_displayResult_skills"
app:layout_constraintStart_toStartOf="@+id/lbl_displayResult_skills" app:layout_constraintStart_toStartOf="@+id/lbl_displayResult_titleEquipements"
app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_titleEquipements" /> app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_titleEquipements" />
<TextView
android:id="@+id/lbl_displatResult_titleSaves"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:text="Saves"
app:layout_constraintStart_toStartOf="@+id/lbl_displayResult_titleEquipements"
app:layout_constraintTop_toBottomOf="@+id/lbl_displayResult_equipements" />
<TextView
android:id="@+id/lbl_displayResult_saves"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:text="TextView"
app:layout_constraintEnd_toEndOf="@+id/lbl_displayResult_equipements"
app:layout_constraintStart_toStartOf="@+id/lbl_displatResult_titleSaves"
app:layout_constraintTop_toBottomOf="@+id/lbl_displatResult_titleSaves" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView> </ScrollView>
\ No newline at end of file
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