Unverified Commit bfecc4c2 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 e78b3646 9082baf4
Pipeline #28850 failed with stages
in 1 minute and 17 seconds
......@@ -64,16 +64,28 @@
<TextView
android:id="@+id/lbl_displayResult_name"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:text="TextView"
android:textSize="22sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/lbl_displayResult_class"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/img_displayResult_reloadName"
android:layout_width="wrap_content"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/lbl_displayResult_class"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/lbl_displayResult_name"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@android:drawable/ic_popup_sync"
app:tint="#97FFFFFF" />
<TextView
android:id="@+id/lbl_displayResult_class"
android:layout_width="wrap_content"
......
......@@ -64,15 +64,28 @@
<TextView
android:id="@+id/lbl_displayResult_name"
android:layout_width="0dp"
android:layout_width="wrap_content"
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_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/img_displayResult_reloadName"
android:layout_width="wrap_content"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/lbl_displayResult_class"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/lbl_displayResult_name"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@android:drawable/ic_popup_sync"
app:tint="#97FFFFFF" />
<TextView
android:id="@+id/lbl_displayResult_class"
android:layout_width="wrap_content"
......
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