Merge branch 'master' of https://codefirst.iut.uca.fr/git/jade.van_brabandt/3.01-QCM_MuscuMaths

Android/app/src/main/res/drawable/top_rounded_corner.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:topLeftRadius="20dp"
+        android:topRightRadius="20dp"/>
+    <solid android:color="@color/grey"/>
+</shape>

Android/app/src/main/res/layout/activity_multi.xml

@@ -2,30 +2,46 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical"
     tools:context=".MultiActivity">
 
     <Button
         android:id="@+id/btnReturn"
-        android:layout_width="200dp"
+        android:layout_width="100dp"
         android:layout_height="60dp"
-        android:layout_marginTop="50dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginStart="20dp"
         android:backgroundTint="@color/grey"
+        android:layout_gravity="start"
         android:text="@string/retour" />
 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="50dp"
+        android:fontFamily="@font/math_educ_font"
+        android:layout_marginTop="30dp"
+        android:layout_marginStart="20dp"
+        android:text="@string/listLobbies"
+        android:textColor="@color/white"
+        android:textSize="40sp" />
+
     <Button
         android:id="@+id/btnAddLobby"
-        android:layout_width="200dp"
+        android:layout_width="140dp"
         android:layout_height="60dp"
-        android:layout_marginTop="50dp"
+        android:layout_marginTop="5dp"
         android:backgroundTint="@color/blue"
+        android:layout_gravity="end"
+        android:layout_marginEnd="15dp"
         android:text="@string/addLobby" />
 
+    <include layout="@layout/header_list_lobby" />
+
     <ListView
         android:id="@+id/listView"
-        android:background="@color/white"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="524dp"
+        android:background="@color/white" />
 
-</LinearLayout>
+</LinearLayout>

Android/app/src/main/res/layout/header_list_lobby.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:layout_marginTop="5dp"
+    android:background="@drawable/top_rounded_corner"
+    android:padding="16dp">
+
+    <TextView
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="@string/lobby"
+        android:textColor="@android:color/white"
+        android:textSize="18sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/nbPlayer"
+        android:textColor="@android:color/white"
+        android:textSize="18sp"
+        android:textStyle="bold" />
+
+</LinearLayout>

Android/app/src/main/res/values/strings.xml

@@ -8,6 +8,7 @@
     <string name="addLobby">Ajouter un lobby</string>
     <string name="lobby">lobby</string>
     <string name="nbPlayer">nombre de joueurs</string>
+    <string name="listLobbies">Liste des lobbies</string>
     <string name="difficulty_prompt">Selectionne la difficulty</string>
     <string name="chapter_prompt">Selectionne un chapter</string>