Unverified Commit 50367599 authored by Mathieu Féry (Mathius)'s avatar Mathieu Féry (Mathius)
Browse files

Merge branch 'front' of gitlab.univ-nantes.fr:E20C136A/mobile21 into front

parents f155c993 5880cfb5
Pipeline #28835 failed with stages
in 51 seconds
...@@ -58,18 +58,33 @@ ...@@ -58,18 +58,33 @@
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
<TextView <androidx.constraintlayout.widget.ConstraintLayout
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_marginBottom="16dp"
android:text="TextView" <TextView
android:textAppearance="@style/AppTextTitle" android:id="@+id/lbl_displayResult_name"
android:textSize="22sp" android:layout_width="0dp"
app:layout_constraintEnd_toEndOf="parent" android:layout_height="wrap_content"
app:layout_constraintHorizontal_bias="0.3" android:layout_marginBottom="4dp"
app:layout_constraintStart_toEndOf="@+id/img_displayResult_gif" android:text="TextView"
app:layout_constraintTop_toTopOf="@+id/img_displayResult_gif" /> android:textSize="22sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/lbl_displayResult_class"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/lbl_displayResult_class"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="TextView"
android:textAppearance="@style/AppTextTitle"
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView <TextView
android:id="@+id/lbl_displayResult_description" android:id="@+id/lbl_displayResult_description"
......
...@@ -58,15 +58,32 @@ ...@@ -58,15 +58,32 @@
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
<TextView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/lbl_displayResult_class"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:layout_marginEnd="32dp"
android:layout_marginBottom="16dp" <TextView
android:text="TextView" android:id="@+id/lbl_displayResult_name"
android:textAppearance="@style/AppTextTitle" android:layout_width="0dp"
android:textSize="22sp" /> android:layout_height="wrap_content"
android:text="TextView"
android:textSize="22sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/lbl_displayResult_class"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/lbl_displayResult_class"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="TextView"
android:textAppearance="@style/AppTextTitle"
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView <TextView
android:id="@+id/lbl_displayResult_description" android:id="@+id/lbl_displayResult_description"
......
...@@ -21,13 +21,34 @@ ...@@ -21,13 +21,34 @@
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
<TextView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/lbl_rclr_specie"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1">
android:text="TextView"
android:textSize="24sp" /> <TextView
android:id="@+id/lbl_rclr_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="6dp"
android:text="TextView"
android:textSize="24sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/lbl_rclr_specie"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/lbl_rclr_specie"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="TextView"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView <TextView
android:id="@+id/lbl_rclr_decription" android:id="@+id/lbl_rclr_decription"
......
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