From 133d1c91185c65b26ed0a977b516aefc93acbfdf Mon Sep 17 00:00:00 2001
From: "maxence.guitard" <maxence.guitard@etu.uca.fr>
Date: Fri, 1 Mar 2024 17:59:54 +0100
Subject: [PATCH] feat : ajout du boutton retour dans la page multi

---
 .../com/example/mathseduc/ConnexionPlayerActivity.kt  |  6 +++---
 .../main/java/com/example/mathseduc/MultiActivity.kt  |  8 ++++++++
 Android/app/src/main/res/layout/activity_multi.xml    | 11 +++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Android/app/src/main/java/com/example/mathseduc/ConnexionPlayerActivity.kt b/Android/app/src/main/java/com/example/mathseduc/ConnexionPlayerActivity.kt
index c02057b..3cb4685 100644
--- a/Android/app/src/main/java/com/example/mathseduc/ConnexionPlayerActivity.kt
+++ b/Android/app/src/main/java/com/example/mathseduc/ConnexionPlayerActivity.kt
@@ -41,9 +41,9 @@ class ConnexionPlayerActivity : AppCompatActivity() {
         val btnRegister = findViewById<Button>(R.id.registerButton)
 
         btnReturn.setOnClickListener {
-            val intent = Intent(this, MainActivity::class.java)
-            startActivity(intent)
-            //finish();
+            //val intent = Intent(this, MainActivity::class.java)
+            //startActivity(intent)
+            this.finish();
         }
 
         btnRegister.setOnClickListener {
diff --git a/Android/app/src/main/java/com/example/mathseduc/MultiActivity.kt b/Android/app/src/main/java/com/example/mathseduc/MultiActivity.kt
index e114a92..42131b7 100644
--- a/Android/app/src/main/java/com/example/mathseduc/MultiActivity.kt
+++ b/Android/app/src/main/java/com/example/mathseduc/MultiActivity.kt
@@ -58,6 +58,14 @@ class MultiActivity : AppCompatActivity() {
             val intent = Intent(this, CreateLobbyActivity::class.java)
             startActivity(intent)
         }
+
+        val btnReturn = findViewById<ImageButton>(R.id.btnReturn)
+
+        btnReturn.setOnClickListener {
+            //val intent = Intent(this, MainActivity::class.java)
+            //startActivity(intent)
+            finish()
+        }
     }
 
     class LobbyAdapter(context: Context, lobbies: ArrayList<Lobby>): ArrayAdapter<Lobby>(context, 0, lobbies), View.OnClickListener {
diff --git a/Android/app/src/main/res/layout/activity_multi.xml b/Android/app/src/main/res/layout/activity_multi.xml
index c0a0c25..2b66deb 100644
--- a/Android/app/src/main/res/layout/activity_multi.xml
+++ b/Android/app/src/main/res/layout/activity_multi.xml
@@ -6,6 +6,17 @@
     android:orientation="vertical"
     tools:context=".MultiActivity">
 
+    <ImageButton
+        android:id="@+id/btnReturn"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_gravity="start"
+        android:layout_marginTop="16dp"
+        android:background="@drawable/arrow_small"
+        android:scaleType="center"
+        android:contentDescription="@string/retour"
+        android:layout_marginStart="15dp"/>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"