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

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

@@ -6,8 +6,26 @@
     android:orientation="vertical"
     tools:context=".MultiActivity">
 
+    <Button
+        android:id="@+id/btnReturn"
+        android:layout_width="200dp"
+        android:layout_height="60dp"
+        android:layout_marginTop="50dp"
+        android:backgroundTint="@color/grey"
+        android:text="@string/retour" />
+
+    <Button
+        android:id="@+id/btnAddLobby"
+        android:layout_width="200dp"
+        android:layout_height="60dp"
+        android:layout_marginTop="50dp"
+        android:backgroundTint="@color/blue"
+        android:text="@string/addLobby" />
+
     <ListView
         android:id="@+id/listView"
+        android:background="@color/white"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
+
 </LinearLayout>

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

@@ -10,6 +10,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
+        android:textColor="@color/white"
         android:text="Bonjour depuis le serveur"
         android:textSize="18sp"/>
 </LinearLayout>

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

@@ -10,4 +10,5 @@
     <color name="green">#008000</color>
     <color name="orange">#FFA500</color>
     <color name="grey">#8C92AC</color>
+    <color name="blue">#0d6efd</color>
 </resources>

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

@@ -4,4 +4,8 @@
     <string name="multiplayer">Multiplayer</string>
     <string name="connexion">Connexion</string>
     <string name="profile">Profile</string>
+    <string name="retour">Retour</string>
+    <string name="addLobby">Ajouter un lobby</string>
+    <string name="lobby">lobby</string>
+    <string name="nbPlayer">nombre de joueurs</string>
 </resources>

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

@@ -13,5 +13,6 @@
         <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
         <item name="android:windowBackground">@drawable/background</item>
+        <!--<item name="android:fontFamily">@font/math_educ_font</item> -->
     </style>
 </resources>