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

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()
     }
 }

Android/app/src/main/java/com/example/mathseduc/MainActivity.kt

@@ -15,9 +15,9 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        var btnSolo = findViewById<Button>(R.id.btnSolo)
+        val btnSolo = findViewById<Button>(R.id.btnSolo)
-        var btnMulti = findViewById<Button>(R.id.btnMulti)
+        val btnMulti = findViewById<Button>(R.id.btnMulti)
-        var btnConnexion = findViewById<Button>(R.id.btnConnexion)
+        val btnConnexion = findViewById<Button>(R.id.btnConnexion)
 
         btnSolo.setOnClickListener {
             // Traitement pour le bouton Solo

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/white" />
+    <corners android:radius="10dp" />
+    <stroke android:width="1dp"
+    android:color="@color/grey"/>
+</shape>

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
+    <Button
-        android:id="@+id/editTextNickname"
+        android:id="@+id/btnReturn"
-        android:layout_width="match_parent"
+        android:layout_width="100dp"
-        android:layout_height="wrap_content"
+        android:layout_height="60dp"
-        android:hint="Nickname"
+        android:layout_gravity="start"
-        android:background="#FFFFFF"
+        android:layout_marginTop="16dp"
-        android:padding="8dp"
+        android:backgroundTint="@color/grey"
-        android:textColor="#000000"
+        android:text="@string/retour"
-        android:layout_marginBottom="16dp"/>
+        app:layout_constraintEnd_toEndOf="parent"
-
+        app:layout_constraintHorizontal_bias="0.948"
-    <EditText
+        app:layout_constraintStart_toStartOf="parent"
-        android:id="@+id/editTextPassword"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="Password"
+        android:orientation="vertical"
-        android:inputType="textPassword"
+        android:padding="25dp"
-        android:background="#FFFFFF"
+        app:layout_constraintBottom_toBottomOf="parent"
-        android:padding="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
-        android:textColor="#000000"
+        app:layout_constraintStart_toStartOf="parent"
-        android:layout_below="@id/editTextNickname"
+        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="8dp"
+        tools:ignore="MissingConstraints">
-        android:layout_marginBottom="16dp"/>
 
-    <Button
+        <TextView
-        android:id="@+id/buttonLogin"
+            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:layout_marginBottom="15dp"
-        android:background="#4CAF50"
+        android:text=""
-        android:textColor="#FFFFFF"
+        android:textAlignment="center"
-        android:layout_below="@id/editTextPassword"
+        android:textColor="@android:color/holo_red_dark"
-        android:layout_marginTop="16dp"/>
+        android:textSize="20sp" /> -->
-</RelativeLayout>
+
+        <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>

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

@@ -3,10 +3,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:gravity="center"
     android:orientation="vertical"
     android:weightSum="10"
-    tools:context=".MainActivity"
+    tools:context=".MainActivity">
-    android:gravity="center">
 
 
     <FrameLayout

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

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+    <LinearLayout 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="350dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:background="@drawable/rounded_corner"
+        tools:ignore="MissingConstraints">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginBottom="15dp"
+            android:paddingTop="2dp"
+            android:fontFamily="@font/math_educ_font"
+            android:text="@string/creer_compte"
+            android:textColor="@color/black"
+            android:textSize="40sp"/>
+
+        <!--<TextView
+            android:id="@+id/errorTextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="15dp"
+            android:text=""
+            android:textAlignment="center"
+            android:textColor="@android:color/holo_red_dark"
+            android:textSize="20sp" /> -->
+
+        <EditText
+            android:id="@+id/nickname"
+            android:layout_width="320dp"
+            android:layout_height="wrap_content"
+            android:background="@drawable/rounded_corner"
+            android:hint="@string/nom_d_utilisateur"
+            android:layout_gravity="center_horizontal"
+            android:paddingStart="8dp"
+            android:inputType="text"
+            android:minHeight="50dp"
+            android:autofillHints=""
+            tools:ignore="RtlSymmetry" />
+
+        <EditText
+            android:id="@+id/password"
+            android:layout_width="320dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="18dp"
+            android:background="@drawable/rounded_corner"
+            android:layout_gravity="center_horizontal"
+            android:hint="@string/mot_de_passe"
+            android:inputType="textPassword"
+            android:minHeight="50dp"
+            android:paddingStart="8dp"
+            android:autofillHints=""
+            tools:ignore="RtlSymmetry" />
+
+        <Button
+            android:id="@+id/loginButton"
+            android:layout_width="wrap_content"
+            android:layout_gravity="center"
+            android:layout_height="55dp"
+            android:layout_marginTop="13dp"
+            android:backgroundTint="@color/blue"
+            android:text="@string/enregistrer" />
+
+        <Button
+            android:id="@+id/registerButton"
+            android:layout_width="wrap_content"
+            android:layout_height="55dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="1dp"
+            android:backgroundTint="@color/blackgrey"
+            android:text="@string/fermer" />
+
+    </LinearLayout>

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

@@ -11,4 +11,5 @@
     <color name="orange">#FFA500</color>
     <color name="grey">#8C92AC</color>
     <color name="blue">#0d6efd</color>
+    <color name="blackgrey">#5c636a</color>
 </resources>

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

@@ -11,6 +11,13 @@
     <string name="listLobbies">Liste des lobbies</string>
     <string name="difficulty_prompt">Selectionne la difficulty</string>
     <string name="chapter_prompt">Selectionne un chapter</string>
+    <string name="se_connecter">Se connecter</string>
+    <string name="mot_de_passe">Mot de passe</string>
+    <string name="s_inscrire">S\'inscrire</string>
+    <string name="nom_d_utilisateur">Nom d\'utilisateur</string>
+    <string name="creer_compte">Créer son compte</string>
+    <string name="fermer">Fermer</string>
+    <string name="enregistrer">Enregistrer</string>
 
     <string-array name="difficulty_array">
         <item>Facile</item>

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

@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.MathsEduc" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.MathsEduc" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>