Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Mathieu Féry
mobile21
Commits
18808227
Commit
18808227
authored
Dec 11, 2020
by
Mathilde BALLOUHEY
Browse files
Ajout chanps dans DisplayResult
parent
7f70d655
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/src/main/res/layout-land/layout_display_result.xml
View file @
18808227
...
...
@@ -62,9 +62,7 @@
android:id=
"@+id/lbl_displayResult_class"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10dp"
android:layout_marginEnd=
"32dp"
android:layout_marginBottom=
"10dp"
android:layout_marginBottom=
"16dp"
android:text=
"TextView"
android:textAppearance=
"@style/AppTextTitle"
android:textSize=
"22sp"
...
...
@@ -77,10 +75,17 @@
android:id=
"@+id/lbl_displayResult_description"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10dp"
android:layout_marginBottom=
"10dp"
android:layout_marginBottom=
"16dp"
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
android:id=
"@+id/btn_displayResult_favourite"
android:layout_width=
"wrap_content"
...
...
@@ -107,19 +112,40 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"
match_par
ent"
android:layout_height=
"
wrap_cont
ent"
android:layout_weight=
"1"
>
<TextView
android:id=
"@+id/lbl_displayResult_title
Caracteristics
"
android:id=
"@+id/lbl_displayResult_title
Personnality
"
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"
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:text=
"Caracteristics"
android:textSize=
"20sp"
app:layout_constraintStart_toStartOf=
"
parent
"
app:layout_constraintTop_to
TopOf=
"parent
"
/>
app:layout_constraintStart_toStartOf=
"
@+id/lbl_displayResult_titlePersonnality
"
app:layout_constraintTop_to
BottomOf=
"@+id/lbl_displayResult_personality
"
/>
<LinearLayout
android:id=
"@+id/linearLayout"
...
...
@@ -207,17 +233,36 @@
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"8dp"
android:layout_marginBottom=
"8dp"
android:text=
"TextView"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"@+id/linearLayout"
app:layout_constraintStart_toStartOf=
"@+id/linearLayout"
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
android:layout_width=
"match_parent"
android:layout_height=
"
match_par
ent"
android:layout_height=
"
wrap_cont
ent"
android:layout_weight=
"1"
>
<TextView
...
...
@@ -234,16 +279,33 @@
<TextView
android:id=
"@+id/lbl_displayResult_equipements"
android:layout_width=
"0dp"
android:layout_height=
"
0dp
"
android:layout_height=
"
wrap_content
"
android:layout_marginStart=
"16dp"
android:layout_marginTop=
"8dp"
android:layout_marginEnd=
"16dp"
android:layout_marginBottom=
"16dp"
android:text=
"TextView"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"@+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>
</LinearLayout>
...
...
app/src/main/res/layout/layout_display_result.xml
View file @
18808227
...
...
@@ -62,9 +62,8 @@
android:id=
"@+id/lbl_displayResult_class"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10dp"
android:layout_marginEnd=
"32dp"
android:layout_marginBottom=
"1
0
dp"
android:layout_marginBottom=
"1
6
dp"
android:text=
"TextView"
android:textAppearance=
"@style/AppTextTitle"
android:textSize=
"22sp"
/>
...
...
@@ -73,17 +72,24 @@
android:id=
"@+id/lbl_displayResult_description"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10dp"
android:layout_marginBottom=
"10dp"
android:layout_marginBottom=
"16dp"
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
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"
android:layout_gravity=
"right"
app:elevation=
"0px"
app:fabSize=
"auto"
app:rippleColor=
"@color/transparence"
...
...
@@ -93,14 +99,34 @@
<TextView
android:id=
"@+id/lbl_displayResult_title
Caracteristics
"
android:id=
"@+id/lbl_displayResult_title
Personnality
"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
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:textSize=
"20sp"
app:layout_constraintStart_toStartOf=
"@+id/linearLayout2"
app:layout_constraintTop_toBottomOf=
"@+id/l
inearLayout2
"
/>
app:layout_constraintTop_toBottomOf=
"@+id/l
bl_displayResult_personality
"
/>
<LinearLayout
android:id=
"@+id/linearLayout"
...
...
@@ -176,7 +202,7 @@
android:id=
"@+id/lbl_displayResult_titleSkills"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"
3
2dp"
android:layout_marginTop=
"2
4
dp"
android:text=
"Skills"
android:textSize=
"20sp"
app:layout_constraintStart_toStartOf=
"@+id/lbl_displayResult_titleCaracteristics"
...
...
@@ -190,28 +216,69 @@
android:layout_marginTop=
"8dp"
android:text=
"TextView"
app:layout_constraintEnd_toEndOf=
"@+id/linearLayout"
app:layout_constraintStart_toStartOf=
"@+id/l
inearLayout
"
app:layout_constraintStart_toStartOf=
"@+id/l
bl_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
android:id=
"@+id/lbl_displayResult_titleEquipements"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"
3
2dp"
android:layout_marginTop=
"2
4
dp"
android:text=
"Equipements"
android:textSize=
"20sp"
app:layout_constraintStart_toStartOf=
"@+id/lbl_displayResult_titleSkills"
app:layout_constraintTop_toBottomOf=
"@+id/lbl_displayResult_s
ki
lls"
/>
app:layout_constraintTop_toBottomOf=
"@+id/lbl_displayResult_s
pe
lls"
/>
<TextView
android:id=
"@+id/lbl_displayResult_equipements"
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_displayResult_
skill
s"
app:layout_constraintStart_toStartOf=
"@+id/lbl_displayResult_
titleEquipement
s"
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>
</ScrollView>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment