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

@@ -5,10 +5,10 @@ import android.content.Intent
 import android.os.Bundle
 import android.widget.Button
 import android.widget.EditText
+import android.widget.ImageButton
 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)
@@ -37,12 +37,13 @@ class ConnexionPlayerActivity : AppCompatActivity() {
             }
         }
 
-        val btnReturn = findViewById<Button>(R.id.btnReturn)
+        val btnReturn = findViewById<ImageButton>(R.id.btnReturn)
         val btnRegister = findViewById<Button>(R.id.registerButton)
 
         btnReturn.setOnClickListener {
             val intent = Intent(this, MainActivity::class.java)
             startActivity(intent)
+            //finish();
         }
 
         btnRegister.setOnClickListener {
@@ -57,19 +58,22 @@ class ConnexionPlayerActivity : AppCompatActivity() {
 
         val etNickname = dialogView.findViewById<EditText>(R.id.nickname)
         val etPassword = dialogView.findViewById<EditText>(R.id.password)
+        val btnSave = dialogView.findViewById<Button>(R.id.buttonSave)
+        val btnDismiss = dialogView.findViewById<Button>(R.id.buttonDismiss)
 
-        builder.setView(dialogView)
+        val dialog = builder.setView(dialogView).create()
-                .setTitle("Créer son compte")
+
-                .setPositiveButton("Enregistrer") { dialog, which ->
+        btnSave.setOnClickListener {
-                    val nickname = etNickname.text.toString()
+            val nickname = etNickname.text.toString()
-                    val password = etPassword.text.toString()
+            val password = etPassword.text.toString()
-                    // Faites quelque chose avec le nom d'utilisateur et le mot de passe
+            // Faites quelque chose avec le nom d'utilisateur et le mot de passe
-                }
+            dialog.dismiss()
-                .setNegativeButton("Fermer") { dialog, which ->
+        }
-                    dialog.dismiss()
+
-                }
+        btnDismiss.setOnClickListener {
+            dialog.dismiss()
+        }
 
-        val dialog = builder.create()
         dialog.show()
     }
 }

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

@@ -5,17 +5,31 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ConnexionPlayerActivity">
-
+    <!--<Button
-    <Button
         android:id="@+id/btnReturn"
         android:layout_width="100dp"
-        android:layout_height="60dp"
+        android:layout_height="100dp"
+        android:layout_gravity="start"
+        android:layout_marginTop="16dp"
+        android:text="@string/fleche"
+        android:background="@android:color/transparent"
+        android:textSize="70sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.051"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />-->
+
+    <ImageButton
+        android:id="@+id/btnReturn"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
         android:layout_gravity="start"
         android:layout_marginTop="16dp"
-        android:backgroundTint="@color/grey"
+        android:background="@drawable/arrow_small"
-        android:text="@string/retour"
+        android:scaleType="center"
+        android:contentDescription="@string/retour"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.948"
+        app:layout_constraintHorizontal_bias="0.030"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -38,7 +52,7 @@
             android:fontFamily="@font/math_educ_font"
             android:text="@string/connexion"
             android:textColor="@color/white"
-            android:textSize="40sp" />
+            android:textSize="50sp" />
 
         <!--<TextView
         android:id="@+id/errorTextView"
@@ -83,7 +97,7 @@
             android:layout_height="55dp"
             android:layout_gravity="center"
             android:layout_marginTop="13dp"
-            android:backgroundTint="@color/blue"
+            android:backgroundTint="@color/turquoise"
             android:text="@string/se_connecter" />
 
         <Button

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

@@ -6,12 +6,8 @@
         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">
+        android:layout_gravity="center">
 
         <TextView
             android:layout_width="wrap_content"
@@ -61,22 +57,34 @@
             android:autofillHints=""
             tools:ignore="RtlSymmetry" />
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="end"
+        android:layout_marginTop="15dp">
+
         <Button
-            android:id="@+id/loginButton"
+            android:id="@+id/buttonDismiss"
             android:layout_width="wrap_content"
-            android:layout_gravity="center"
             android:layout_height="55dp"
-            android:layout_marginTop="13dp"
+            android:layout_marginEnd="10dp"
-            android:backgroundTint="@color/blue"
+            android:backgroundTint="@color/blackgrey"
-            android:text="@string/enregistrer" />
+            android:text="@string/fermer"
+            android:textColor="@color/white"
+            style="?android:attr/buttonBarButtonStyle" />
 
         <Button
-            android:id="@+id/registerButton"
+            android:id="@+id/buttonSave"
             android:layout_width="wrap_content"
             android:layout_height="55dp"
-            android:layout_gravity="center"
+            android:layout_marginEnd="15dp"
-            android:layout_marginTop="1dp"
+            android:backgroundTint="@color/blue"
-            android:backgroundTint="@color/blackgrey"
+            android:text="@string/enregistrer"
-            android:text="@string/fermer" />
+            android:textColor="@color/white"
+            style="?android:attr/buttonBarButtonStyle" />
 
     </LinearLayout>
+
+
+</LinearLayout>

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

@@ -13,4 +13,6 @@
     <color name="blue">#0d6efd</color>
     <color name="red">#FF0000</color>
     <color name="blackgrey">#5c636a</color>
+    <color name="cyan">#00FFFF</color>
+    <color name="turquoise">#40E0D0</color>
 </resources>

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

@@ -18,6 +18,7 @@
     <string name="creer_compte">Créer son compte</string>
     <string name="fermer">Fermer</string>
     <string name="enregistrer">Enregistrer</string>
+    <string name="fleche">←</string>
 
     <string-array name="difficulty_array">
         <item>Facile</item>

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

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