From 1c5d2276ef55d2f769d7da6df2401f3b2be6b9c4 Mon Sep 17 00:00:00 2001
From: "maxence.guitard" <maxence.guitard@etu.uca.fr>
Date: Thu, 29 Feb 2024 15:42:27 +0100
Subject: [PATCH] feat : style page Connexion et lien entre page

---
 .../com/example/mathseduc/MainActivity.kt     | 10 +-
 .../src/main/res/drawable/rounded_corner.xml  |  8 ++
 .../main/res/layout/activity_connexion.xml    | 99 +++++++++++++++++++
 .../app/src/main/res/layout/activity_main.xml |  4 +-
 .../src/main/res/layout/activity_multi.xml    | 14 +--
 .../src/main/res/layout/dialog_register.xml   | 82 +++++++++++++++
 Android/app/src/main/res/values/colors.xml    |  1 +
 Android/app/src/main/res/values/strings.xml   |  7 ++
 Android/app/src/main/res/values/themes.xml    |  2 +-
 9 files changed, 216 insertions(+), 11 deletions(-)
 create mode 100644 Android/app/src/main/res/drawable/rounded_corner.xml
 create mode 100644 Android/app/src/main/res/layout/activity_connexion.xml
 create mode 100644 Android/app/src/main/res/layout/dialog_register.xml

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 311a7f3..7471817 100644
--- a/Android/app/src/main/java/com/example/mathseduc/MainActivity.kt
+++ b/Android/app/src/main/java/com/example/mathseduc/MainActivity.kt
@@ -11,8 +11,9 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        var btnSolo = findViewById<Button>(R.id.btnSolo)
-        var btnMulti = findViewById<Button>(R.id.btnMulti)
+        val btnSolo = findViewById<Button>(R.id.btnSolo)
+        val btnMulti = findViewById<Button>(R.id.btnMulti)
+        val btnConnexion = findViewById<Button>(R.id.btnConnexion)
 
         btnSolo.setOnClickListener {
             // Traitement pour le bouton Solo
@@ -23,5 +24,10 @@ class MainActivity : AppCompatActivity() {
             val intent = Intent(this, MultiActivity::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/drawable/rounded_corner.xml b/Android/app/src/main/res/drawable/rounded_corner.xml
new file mode 100644
index 0000000..ade94df
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/Android/app/src/main/res/layout/activity_connexion.xml b/Android/app/src/main/res/layout/activity_connexion.xml
new file mode 100644
index 0000000..2c98137
--- /dev/null
+++ b/Android/app/src/main/res/layout/activity_connexion.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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">
+
+    <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:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="MissingConstraints">
+
+        <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: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="15dp"
+            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_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 b1179fb..eb877d2 100644
--- a/Android/app/src/main/res/layout/activity_main.xml
+++ b/Android/app/src/main/res/layout/activity_main.xml
@@ -3,9 +3,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:gravity="center"
     android:orientation="vertical"
-    tools:context=".MainActivity"
-    android:gravity="center">
+    tools:context=".MainActivity">
 
     <ImageView
         android:id="@+id/background_image"
diff --git a/Android/app/src/main/res/layout/activity_multi.xml b/Android/app/src/main/res/layout/activity_multi.xml
index dd63d46..63977fb 100644
--- a/Android/app/src/main/res/layout/activity_multi.xml
+++ b/Android/app/src/main/res/layout/activity_multi.xml
@@ -19,22 +19,24 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="50dp"
-        android:fontFamily="@font/math_educ_font"
-        android:layout_marginTop="30dp"
         android:layout_marginStart="20dp"
+        android:layout_marginTop="30dp"
+        android:fontFamily="@font/math_educ_font"
         android:text="@string/listLobbies"
         android:textColor="@color/white"
-        android:textSize="40sp" />
+        android:textSize="40sp"
+        tools:ignore="TextSizeCheck" />
 
     <Button
         android:id="@+id/btnAddLobby"
         android:layout_width="140dp"
         android:layout_height="60dp"
-        android:layout_marginTop="5dp"
-        android:backgroundTint="@color/blue"
         android:layout_gravity="end"
+        android:layout_marginTop="5dp"
         android:layout_marginEnd="15dp"
-        android:text="@string/addLobby" />
+        android:backgroundTint="@color/blue"
+        android:text="@string/addLobby"
+        tools:ignore="TextSizeCheck" />
 
     <include layout="@layout/header_list_lobby" />
 
diff --git a/Android/app/src/main/res/layout/dialog_register.xml b/Android/app/src/main/res/layout/dialog_register.xml
new file mode 100644
index 0000000..ac4985d
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/Android/app/src/main/res/values/colors.xml b/Android/app/src/main/res/values/colors.xml
index e6e69b1..a069b20 100644
--- a/Android/app/src/main/res/values/colors.xml
+++ b/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>
\ No newline at end of file
diff --git a/Android/app/src/main/res/values/strings.xml b/Android/app/src/main/res/values/strings.xml
index 56433bf..6c23a1e 100644
--- a/Android/app/src/main/res/values/strings.xml
+++ b/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>
diff --git a/Android/app/src/main/res/values/themes.xml b/Android/app/src/main/res/values/themes.xml
index c5970b1..cc92e23 100644
--- a/Android/app/src/main/res/values/themes.xml
+++ b/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>