From 1228a00395baebdee051e1649a4703763bfcd1b2 Mon Sep 17 00:00:00 2001
From: "maxence.guitard" <maxence.guitard@etu.uca.fr>
Date: Thu, 29 Feb 2024 17:14:20 +0100
Subject: [PATCH] fix : double code

---
 .../mathseduc/ConnexionPlayerActivity.kt      |  39 +++++-
 .../com/example/mathseduc/MainActivity.kt     |   5 -
 .../res/layout/activity_connexion_player.xml  | 118 +++++++++++++-----
 .../app/src/main/res/layout/activity_main.xml |   3 +-
 4 files changed, 126 insertions(+), 39 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 9348695..af7cf80 100644
--- a/Android/app/src/main/java/com/example/mathseduc/ConnexionPlayerActivity.kt
+++ b/Android/app/src/main/java/com/example/mathseduc/ConnexionPlayerActivity.kt
@@ -1,5 +1,6 @@
 package com.example.mathseduc
 
+import android.app.AlertDialog
 import android.content.Intent
 import android.os.Bundle
 import android.widget.Button
@@ -8,7 +9,6 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.example.mathseduc.controllers.ControllerPlayer
 import org.mindrot.jbcrypt.BCrypt
-
 class ConnexionPlayerActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -36,5 +36,40 @@ class ConnexionPlayerActivity : AppCompatActivity() {
                 Toast.makeText(this, "Connexion échoué. Veuillez réessayer.", Toast.LENGTH_SHORT).show()
             }
         }
+
+        val btnReturn = findViewById<Button>(R.id.btnReturn)
+        val btnRegister = findViewById<Button>(R.id.registerButton)
+
+        btnReturn.setOnClickListener {
+            val intent = Intent(this, MainActivity::class.java)
+            startActivity(intent)
+        }
+
+        btnRegister.setOnClickListener {
+            showRegisterDialog()
+        }
+    }
+
+    private fun showRegisterDialog() {
+        val builder = AlertDialog.Builder(this)
+        val inflater = layoutInflater
+        val dialogView = inflater.inflate(R.layout.dialog_register, null)
+
+        val etNickname = dialogView.findViewById<EditText>(R.id.nickname)
+        val etPassword = dialogView.findViewById<EditText>(R.id.password)
+
+        builder.setView(dialogView)
+                .setTitle("Créer son compte")
+                .setPositiveButton("Enregistrer") { dialog, which ->
+                    val nickname = etNickname.text.toString()
+                    val password = etPassword.text.toString()
+                    // Faites quelque chose avec le nom d'utilisateur et le mot de passe
+                }
+                .setNegativeButton("Fermer") { dialog, which ->
+                    dialog.dismiss()
+                }
+
+        val dialog = builder.create()
+        dialog.show()
     }
-}
\ No newline at end of file
+}
diff --git a/Android/app/src/main/java/com/example/mathseduc/MainActivity.kt b/Android/app/src/main/java/com/example/mathseduc/MainActivity.kt
index 093b60b..3ff99e7 100644
--- a/Android/app/src/main/java/com/example/mathseduc/MainActivity.kt
+++ b/Android/app/src/main/java/com/example/mathseduc/MainActivity.kt
@@ -38,10 +38,5 @@ class MainActivity : AppCompatActivity() {
             val intent = Intent(this, ConnexionPlayerActivity::class.java)
             startActivity(intent)
         }
-
-        btnConnexion.setOnClickListener{
-            val intent = Intent(this, ConnexionPlayerActivity::class.java)
-            startActivity(intent)
-        }
     }
 }
\ No newline at end of file
diff --git a/Android/app/src/main/res/layout/activity_connexion_player.xml b/Android/app/src/main/res/layout/activity_connexion_player.xml
index d49580e..7f7929b 100644
--- a/Android/app/src/main/res/layout/activity_connexion_player.xml
+++ b/Android/app/src/main/res/layout/activity_connexion_player.xml
@@ -1,40 +1,98 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="16dp">
+    tools:context=".ConnexionPlayerActivity">
 
-    <EditText
-        android:id="@+id/editTextNickname"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="Nickname"
-        android:background="#FFFFFF"
-        android:padding="8dp"
-        android:textColor="#000000"
-        android:layout_marginBottom="16dp"/>
-
-    <EditText
-        android:id="@+id/editTextPassword"
+    <Button
+        android:id="@+id/btnReturn"
+        android:layout_width="100dp"
+        android:layout_height="60dp"
+        android:layout_gravity="start"
+        android:layout_marginTop="16dp"
+        android:backgroundTint="@color/grey"
+        android:text="@string/retour"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.948"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="Password"
-        android:inputType="textPassword"
-        android:background="#FFFFFF"
-        android:padding="8dp"
-        android:textColor="#000000"
-        android:layout_below="@id/editTextNickname"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="16dp"/>
+        android:orientation="vertical"
+        android:padding="25dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="MissingConstraints">
 
-    <Button
-        android:id="@+id/buttonLogin"
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginBottom="15dp"
+            android:fontFamily="@font/math_educ_font"
+            android:text="@string/connexion"
+            android:textColor="@color/white"
+            android:textSize="40sp" />
+
+        <!--<TextView
+        android:id="@+id/errorTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Login"
-        android:background="#4CAF50"
-        android:textColor="#FFFFFF"
-        android:layout_below="@id/editTextPassword"
-        android:layout_marginTop="16dp"/>
-</RelativeLayout>
\ No newline at end of file
+        android:layout_marginBottom="15dp"
+        android:text=""
+        android:textAlignment="center"
+        android:textColor="@android:color/holo_red_dark"
+        android:textSize="20sp" /> -->
+
+        <EditText
+            android:id="@+id/editTextNickname"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:autofillHints=""
+            android:background="@drawable/rounded_corner"
+            android:hint="@string/nom_d_utilisateur"
+            android:inputType="text"
+            android:minHeight="50dp"
+            android:padding="8dp"
+            tools:ignore="RtlSymmetry" />
+
+        <EditText
+            android:id="@+id/editTextPassword"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="15dp"
+            android:autofillHints=""
+            android:background="@drawable/rounded_corner"
+            android:hint="@string/mot_de_passe"
+            android:inputType="textPassword"
+            android:minHeight="50dp"
+            android:padding="8dp"
+            tools:ignore="RtlSymmetry" />
+
+        <Button
+            android:id="@+id/buttonLogin"
+            android:layout_width="wrap_content"
+            android:layout_height="55dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="13dp"
+            android:backgroundTint="@color/blue"
+            android:text="@string/se_connecter" />
+
+        <Button
+            android:id="@+id/registerButton"
+            android:layout_width="wrap_content"
+            android:layout_height="55dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="3dp"
+            android:backgroundTint="@color/blue"
+            android:text="@string/s_inscrire" />
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Android/app/src/main/res/layout/activity_main.xml b/Android/app/src/main/res/layout/activity_main.xml
index 4da882b..762baed 100644
--- a/Android/app/src/main/res/layout/activity_main.xml
+++ b/Android/app/src/main/res/layout/activity_main.xml
@@ -6,8 +6,7 @@
     android:gravity="center"
     android:orientation="vertical"
     android:weightSum="10"
-    tools:context=".MainActivity"
-    android:gravity="center">
+    tools:context=".MainActivity">
 
 
     <FrameLayout