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

Ajout 'Search Tenor' et corection vue paysage DisplayGif

parent 970e7e28
Pipeline #23279 failed with stages
in 2 minutes and 41 seconds
...@@ -14,13 +14,13 @@ ...@@ -14,13 +14,13 @@
<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="match_parent"
android:layout_margin="8dp"
android:layout_weight="1"> android:layout_weight="1">
<LinearLayout <LinearLayout
android:id="@+id/linearLayout3" android:id="@+id/linearLayout3"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
...@@ -74,23 +74,14 @@ ...@@ -74,23 +74,14 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout> </LinearLayout>
<TextView
android:id="@+id/lbl_displayGif_titleRelatedGif"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="Related GIFs"
app:layout_constraintStart_toStartOf="@+id/linearLayout3"
app:layout_constraintTop_toBottomOf="@+id/linearLayout3" />
<TextView <TextView
android:id="@+id/lbl_displayGif_nbResult" android:id="@+id/lbl_displayGif_nbResult"
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_marginTop="40dp"
android:text="Nb Results" android:text="Nb Results"
app:layout_constraintStart_toEndOf="@+id/lbl_displayGif_titleRelatedGif" app:layout_constraintStart_toStartOf="@+id/linearLayout3"
app:layout_constraintTop_toTopOf="@+id/lbl_displayGif_titleRelatedGif" /> app:layout_constraintTop_toBottomOf="@+id/linearLayout3" />
<EditText <EditText
android:id="@+id/txt_displayGif_nbResult" android:id="@+id/txt_displayGif_nbResult"
...@@ -123,7 +114,7 @@ ...@@ -123,7 +114,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
android:text="Rechercher un gif" android:text="Rechercher un gif"
app:layout_constraintStart_toStartOf="@+id/lbl_displayGif_titleRelatedGif" app:layout_constraintStart_toStartOf="@+id/lbl_displayGif_nbResult"
app:layout_constraintTop_toBottomOf="@+id/skbr_displayGif_nbResult" /> app:layout_constraintTop_toBottomOf="@+id/skbr_displayGif_nbResult" />
<EditText <EditText
...@@ -138,6 +129,16 @@ ...@@ -138,6 +129,16 @@
app:layout_constraintStart_toEndOf="@+id/lbl_displayGif_recherche" app:layout_constraintStart_toEndOf="@+id/lbl_displayGif_recherche"
app:layout_constraintTop_toTopOf="@+id/lbl_displayGif_recherche" /> app:layout_constraintTop_toTopOf="@+id/lbl_displayGif_recherche" />
<TextView
android:id="@+id/lbl_displayGif_searchTenor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Search Tenor"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="@+id/lbl_displayGif_recherche"
app:layout_constraintStart_toStartOf="@+id/lbl_displayGif_recherche"
app:layout_constraintTop_toBottomOf="@+id/lbl_displayGif_recherche" />
<Switch <Switch
android:id="@+id/swtch_displayGif_isNSFW" android:id="@+id/swtch_displayGif_isNSFW"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -150,12 +151,31 @@ ...@@ -150,12 +151,31 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/rclr_displayGif_relatedGif"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_margin="8dp"
tools:listitem="@layout/layout_pattern_gif" /> android:layout_weight="1">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rclr_displayGif_relatedGif"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:listitem="@layout/layout_pattern_gif" />
<TextView
android:id="@+id/lbl_displayGif_titleRelatedGif"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Related GIFs"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout> </LinearLayout>
......
...@@ -143,6 +143,18 @@ ...@@ -143,6 +143,18 @@
app:layout_constraintStart_toEndOf="@+id/lbl_displayGif_recherche" app:layout_constraintStart_toEndOf="@+id/lbl_displayGif_recherche"
app:layout_constraintTop_toTopOf="@+id/lbl_displayGif_recherche" /> app:layout_constraintTop_toTopOf="@+id/lbl_displayGif_recherche" />
<TextView
android:id="@+id/lbl_displayGif_searchTenor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Search Tenor"
android:textSize="12sp"
app:layout_constraintBottom_toTopOf="@+id/rclr_displayGif_relatedGif"
app:layout_constraintEnd_toEndOf="@+id/lbl_displayGif_recherche"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/lbl_displayGif_recherche"
app:layout_constraintTop_toBottomOf="@+id/lbl_displayGif_recherche" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rclr_displayGif_relatedGif" android:id="@+id/rclr_displayGif_relatedGif"
android:layout_width="0dp" android:layout_width="0dp"
......
Supports Markdown
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