Merge pull request 'profile' (#12) from profile into master

Reviewed-on: #12

What_The_Fantasy/app/build.gradle.kts

@@ -50,7 +50,7 @@ android {
 }
 
 dependencies {
-
+    implementation(libs.bcrypt) // pour hacher les mdp
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.activity.compose)
@@ -68,4 +68,6 @@ dependencies {
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
+    implementation(libs.coil.compose) //gére les url des image
+
 }

What_The_Fantasy/app/src/main/AndroidManifest.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
+    
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
     <application
         android:allowBackup="true"

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/MainActivity.kt

@@ -11,6 +11,7 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.navigation.NavController
 import com.example.what_the_fantasy.ui.screens.AppNavigator
 import com.example.what_the_fantasy.ui.theme.What_The_FantasyTheme
 import com.example.what_the_fantasy.ui.screens.LoginPage
@@ -23,27 +24,13 @@ class MainActivity : ComponentActivity() {
         enableEdgeToEdge()
         setContent {
             What_The_FantasyTheme {
-                Column {
+
-                    Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
+                AppNavigator() // Accès à la page login et SingUp (pour le moment)
-                        Title(
-                            title = "What The Fantasy",
-                            modifier = Modifier.padding(innerPadding)
-                        )
-                    }
-                }
-                //AppNavigator() // Accès à la page login et SingUp (pour le moment)
                 //ProfilPage()    //Accès à la page profil
-                QuizPage()
+                //QuizPage()
             }
         }
     }
 }
 
-@Composable
-fun Title(title: String, modifier: Modifier = Modifier) {
-    Text(
-        text = "Welcome to $title!",
-        modifier = modifier
-    )
-}
 

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/local/UserStub.kt

@@ -8,73 +8,90 @@ object UserStub {
         username = "Aragorn123",
         email = "aragorn@example.com",
         date = "2022-01-15",
-        imgUrl = "https://img.freepik.com/vecteurs-libre/personnage-guerrier-fantaisie_1045-185.jpg?size=338&ext=jpg"
+        imgUrl = "https://img.freepik.com/vecteurs-libre/personnage-guerrier-fantaisie_1045-185.jpg?size=338&ext=jpg",
-    )
+        password = "03ac674216f3e15c761ee1a5e255f067953623c8b388b4459e13f978d7c846f4") // 1234
+
     val user2 = User(
         id = 2,
         username = "Legolas456",
         email = "legolas@example.com",
         date = "2021-05-23",
-        imgUrl = "https://img.freepik.com/vecteurs-libre/personnage-elfe-fantaisie_1045-186.jpg?size=338&ext=jpg"
+        imgUrl = "https://img.freepik.com/vecteurs-libre/personnage-elfe-fantaisie_1045-186.jpg?size=338&ext=jpg",
-    )
+        password = "03ac674216f3e15c761ee1a5e255f067953623c8b388b4459e13f978d7c846f4") // 1234
+
     val user3 = User(
         id = 3,
         username = "Gandalf789",
         email = "gandalf@example.com",
         date = "2020-09-10",
-        imgUrl = "https://img.freepik.com/vecteurs-libre/personnage-magicien-fantaisie_1045-187.jpg?size=338&ext=jpg"
+        imgUrl = "https://img.freepik.com/vecteurs-libre/personnage-magicien-fantaisie_1045-187.jpg?size=338&ext=jpg",
-    )
+        password = "03ac674216f3e15c761ee1a5e255f067953623c8b388b4459e13f978d7c846f4") // 1234
+
     val user4 = User(
         id = 4,
         username = "FrodoBaggins",
         email = "frodo@example.com",
         date = "2023-03-18",
-        imgUrl = "https://img.freepik.com/vecteurs-libre/personnage-hobbit-fantaisie_1045-188.jpg?size=338&ext=jpg"
+        imgUrl = "https://img.freepik.com/vecteurs-libre/personnage-hobbit-fantaisie_1045-188.jpg?size=338&ext=jpg",
-    )
+        password = "03ac674216f3e15c761ee1a5e255f067953623c8b388b4459e13f978d7c846f4") // 1234
+
     val user5 = User(
         id = 5,
         username = "Gimli999",
         email = "gimli@example.com",
         date = "2022-07-04",
-        imgUrl = "https://img.freepik.com/vecteurs-libre/personnage-nain-fantaisie_1045-189.jpg?size=338&ext=jpg"
+        imgUrl = "https://img.freepik.com/vecteurs-libre/personnage-nain-fantaisie_1045-189.jpg?size=338&ext=jpg",
-    )
+        password = "03ac674216f3e15c761ee1a5e255f067953623c8b388b4459e13f978d7c846f4") // 1234
+
     val user6 = User(
         id = 6,
         username = "Galadriel321",
         email = "galadriel@example.com",
         date = "2021-11-30",
-        imgUrl = "https://img.freepik.com/vecteurs-libre/personnage-elfe-femme-fantaisie_1045-190.jpg?size=338&ext=jpg"
+        imgUrl = "https://img.freepik.com/vecteurs-libre/personnage-elfe-femme-fantaisie_1045-190.jpg?size=338&ext=jpg",
-    )
+        password = "03ac674216f3e15c761ee1a5e255f067953623c8b388b4459e13f978d7c846f4") // 1234
+
     val user7 = User(
         id = 7,
         username = "Boromir654",
         email = "boromir@example.com",
         date = "2023-06-22",
-        imgUrl = "https://img.freepik.com/vecteurs-libre/personnage-guerrier-homme-fantaisie_1045-191.jpg?size=338&ext=jpg"
+        imgUrl = "https://img.freepik.com/vecteurs-libre/personnage-guerrier-homme-fantaisie_1045-191.jpg?size=338&ext=jpg",
-    )
+        password = "03ac674216f3e15c761ee1a5e255f067953623c8b388b4459e13f978d7c846f4") // 1234
+
     val user8 = User(
         id = 8,
         username = "Eowyn777",
         email = "eowyn@example.com",
         date = "2022-04-11",
-        imgUrl = "https://img.freepik.com/vecteurs-libre/personnage-guerriere-femme-fantaisie_1045-192.jpg?size=338&ext=jpg"
+        imgUrl = "https://img.freepik.com/vecteurs-libre/personnage-guerriere-femme-fantaisie_1045-192.jpg?size=338&ext=jpg",
-    )
+        password = "03ac674216f3e15c761ee1a5e255f067953623c8b388b4459e13f978d7c846f4") // 1234
+
     val user9 = User(
         id = 9,
         username = "Saruman888",
         email = "saruman@example.com",
         date = "2021-08-15",
-        imgUrl = "https://img.freepik.com/vecteurs-libre/personnage-magicien-malefique-fantaisie_1045-193.jpg?size=338&ext=jpg"
+        imgUrl = "https://img.freepik.com/vecteurs-libre/personnage-magicien-malefique-fantaisie_1045-193.jpg?size=338&ext=jpg",
-    )
+        password = "03ac674216f3e15c761ee1a5e255f067953623c8b388b4459e13f978d7c846f4") // 1234
+
     val user10 = User(
         id = 10,
         username = "Faramir222",
         email = "faramir@example.com",
         date = "2023-02-08",
-        imgUrl = "https://img.freepik.com/vecteurs-libre/personnage-guerrier-homme-fantaisie_1045-194.jpg?size=338&ext=jpg"
+        imgUrl = "https://img.freepik.com/vecteurs-libre/personnage-guerrier-homme-fantaisie_1045-194.jpg?size=338&ext=jpg",
-    )
+        password = "03ac674216f3e15c761ee1a5e255f067953623c8b388b4459e13f978d7c846f4") // 1234
+
+    val user11 = User(
+        id = 10,
+        username = "testeur",
+        email = "testeur@example.com",
+        date = "2023-02-08",
+        imgUrl = "https://img.freepik.com/vecteurs-libre/personnage-guerrier-homme-fantaisie_1045-194.jpg?size=338&ext=jpg",
+        password = "03ac674216f3e15c761ee1a5e255f067953623c8b388b4459e13f978d7c846f4") // 1234
 
     val allUsers: List<User> = listOf(
-        user1, user2, user3, user4, user5, user6, user7, user8, user9, user10
+        user1, user2, user3, user4, user5, user6, user7, user8, user9, user10, user11
     )
 }

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/model/User.kt

@@ -5,5 +5,6 @@ class User(
     var username:String,
     var email:String,
     var date:String,
-    val imgUrl: String
+    val imgUrl: String,
+    val password: String
 )

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/components/ErrorMessageComponent.kt

@@ -0,0 +1,22 @@
+package com.example.what_the_fantasy.ui.components
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+
+
+@Composable
+fun ErrorMessageProfileComponent(titleResId : Int) {
+    val textError = stringResource(id = titleResId)
+    Text(
+        text = textError,
+        color = Color.Red,
+        fontSize = 12.sp,
+        modifier = Modifier.padding(top = 4.dp)
+    )
+}

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/components/SpaceComponent.kt

@@ -0,0 +1,15 @@
+package com.example.what_the_fantasy.ui.components
+
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.width
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun SpaceHeightComponent(height : Int){
+    Spacer(
+        modifier = Modifier
+            .height(height.dp)) // Ajoute un espacement
+}

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/components/TitleComponents.kt

@@ -0,0 +1,21 @@
+package com.example.what_the_fantasy.ui.components
+
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+
+
+
+@Composable
+fun TitlePageComponent(titleResId : Int, size : Int, color : Color) {
+    val title = stringResource(id = titleResId)
+    Text(
+        text = title,
+        fontSize = size.sp,
+        fontWeight = FontWeight.Bold,
+        color = color
+    )
+}

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/LoginPage.kt

@@ -2,6 +2,7 @@ package com.example.what_the_fantasy.ui.screens
 
 import android.os.Bundle
 import android.text.style.BackgroundColorSpan
+import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
@@ -44,14 +45,22 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.example.what_the_fantasy.ui.theme.What_The_FantasyTheme
 import androidx.navigation.NavController
+import androidx.navigation.Navigation
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import com.example.what_the_fantasy.R
+import com.example.what_the_fantasy.data.local.UserStub
+import com.example.what_the_fantasy.data.model.User
+import com.example.what_the_fantasy.ui.components.SpaceHeightComponent
+import com.example.what_the_fantasy.ui.components.TitlePageComponent
+import org.mindrot.jbcrypt.BCrypt
+import java.security.MessageDigest
 
 @Composable
 fun LoginPage(navController : NavController) {
 
+    val users = UserStub.allUsers;
     val gradient = Brush.linearGradient(
         colors = listOf(Color(0xFF7B1FA2), Color(0xFF311B92)), // Violet clair → Violet foncé
         start = Offset(0f, 1000f), // Départ en bas à gauche
@@ -74,28 +83,22 @@ fun LoginPage(navController : NavController) {
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
 
-            TitlePage(R.string.titleLogin, 20,Color.White)
+            TitlePageComponent(R.string.titleLogin, 20,Color.White)
-            IdentifiantTextField(R.string.IdentifiantLogin)
+            val identifiant =IdentifiantTextField(R.string.IdentifiantLogin)
-            PassWdTextField(R.string.PasswdLogin)
+            val passwd = PassWdTextField(R.string.PasswdLogin)
-            Space(16)
+            SpaceHeightComponent(16)
-            ConnexionButtonLogin(R.string.ButtonLogin,18, Color.White, Color.Black)
+            ConnexionButtonLogin(users,identifiant, passwd, R.string.ButtonLogin,18, Color.White, Color.Black,navController)
-            Space(16)
+            SpaceHeightComponent(16)
             CreateAccountButton(R.string.ButtonCreateLogin,12, Color.White, navController)
-
         }
     }
 }
 
-@Composable
+
-fun Space(height : Int){
-    Spacer(
-        modifier = Modifier
-            .height(height.dp)) // Ajoute un espacement
-}
 
 
 @Composable
-fun IdentifiantTextField(textIdentifiantResId : Int){
+fun IdentifiantTextField(textIdentifiantResId : Int) : String{
     val textIdentifiant = stringResource(id = textIdentifiantResId)
     var identifiant by remember { mutableStateOf("") } // Stocke la valeur du champ
     Column(modifier = Modifier.padding(top = 16.dp)) {
@@ -110,10 +113,11 @@ fun IdentifiantTextField(textIdentifiantResId : Int){
             shape = RoundedCornerShape(16.dp) // 🔹 Bords arrondis
         )
     }
+    return identifiant;
 }
 
 @Composable
-fun PassWdTextField(textpasswdResId : Int){
+fun PassWdTextField(textpasswdResId : Int) : String{
     val textpasswd = stringResource(id = textpasswdResId)
     var passwd by remember { mutableStateOf("") } // Stocke la valeur du champ
     var passwordVisible by remember { mutableStateOf(false) } // État pour afficher/masquer
@@ -131,27 +135,28 @@ fun PassWdTextField(textpasswdResId : Int){
                 IconButton(onClick = { passwordVisible = !passwordVisible }) {
                 }
             },
-            shape = RoundedCornerShape(16.dp) // 🔹 Bords arrondis
+            shape = RoundedCornerShape(16.dp) // Bords arrondis
         )
     }
+    return passwd;
 }
 
-@Composable
+//@Composable
-fun TitlePage(titleResId : Int, size : Int, color : Color){
+//fun TitlePage(titleResId : Int, size : Int, color : Color){
-    val title = stringResource(id = titleResId)
+//    val title = stringResource(id = titleResId)
-    Text(
+//    Text(
-        text = title,
+//        text = title,
-        fontSize = size.sp,
+//        fontSize = size.sp,
-        fontWeight = FontWeight.Bold,
+//        fontWeight = FontWeight.Bold,
-        color = color
+//        color = color
-    )
+//    )
-}
+//}
 
 @Composable
-fun ConnexionButtonLogin(titleResId : Int, size : Int, colorButton : Color, colorText : Color){
+fun ConnexionButtonLogin(userStub : List<User>, id : String, passwd : String, titleResId : Int, size : Int, colorButton : Color, colorText : Color, navController: NavController){
     val title = stringResource(id = titleResId)
     Button(
-        onClick = { /* Action */ },
+        onClick = { validLogin(id, passwd, userStub, navController) },
         colors = ButtonDefaults.buttonColors(containerColor = colorButton),
         modifier = Modifier
             .fillMaxWidth(),
@@ -160,6 +165,30 @@ fun ConnexionButtonLogin(titleResId : Int, size : Int, colorButton : Color, colo
     }
 }
 
+
+fun validLogin(identifiant : String, passwd : String, users : List<User>, navController: NavController){
+    users.forEach { user ->
+        val hashPassWd = hashPassword(passwd)
+
+        if (user.username == identifiant && user.password == hashPassWd){
+            navController.navigate("profile")
+            //navController.navigate(ProfilPage(navController))
+        }
+    }
+}
+
+fun hashPassword(password: String): String {
+    // SHA-256
+    val digest = MessageDigest.getInstance("SHA-256")
+
+    // Convertir mdp en bytes et appliquer le hash
+    val hashedBytes = digest.digest(password.toByteArray())
+
+    // Convertir le tableau de bytes en une chaîne hexadécimale
+    return hashedBytes.joinToString("") { "%02x".format(it) }
+}
+
+
 @Composable
 fun CreateAccountButton(titleResId : Int, size : Int, color : Color, navController: NavController){
     val title = stringResource(id = titleResId)
@@ -180,6 +209,7 @@ fun AppNavigator() {
     NavHost(navController, startDestination = "login") {
         composable("login") { LoginPage(navController) }
         composable("signup") { SignUpPage(navController) }
+        composable("profile") { ProfilPage(navController) }
     }
 
 }

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/ProfilPage.kt

@@ -1,6 +1,9 @@
 package com.example.what_the_fantasy.ui.screens
 
+import android.content.Context
 import android.os.Bundle
+import android.util.Patterns
+import android.widget.ImageView
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
@@ -54,16 +57,24 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
+import coil.compose.AsyncImage
 import com.example.what_the_fantasy.R
+import com.example.what_the_fantasy.data.local.QuestionStub
+import com.example.what_the_fantasy.data.local.UserStub
+import com.example.what_the_fantasy.ui.components.ErrorMessageProfileComponent
+import com.example.what_the_fantasy.ui.components.SpaceHeightComponent
+import com.example.what_the_fantasy.ui.components.TitlePageComponent
 import com.example.what_the_fantasy.ui.theme.What_The_FantasyTheme
 
 @Composable
-fun ProfilPage() {
+fun ProfilPage(navController: NavController) {
     val gradient = Brush.linearGradient(
         colors = listOf(Color(0xFF7B1FA2), Color(0xFF311B92)), // Violet clair → Violet foncé
         start = Offset(0f, 1000f), // Départ en bas à gauche
         end = Offset(1000f, 0f) // Fin en haut à droite
     )
+    val user = UserStub.allUsers
+    val index = 2 // Pour changer l'utilisateur pour le moment
 
     Box(
         modifier = Modifier
@@ -82,30 +93,27 @@ fun ProfilPage() {
         ) {
 
             // Titre
-            TitleProfil(R.string.titleProfile, 20, Color.White)
+            TitlePageComponent(R.string.titleProfile, 20, Color.White)
-            SpaceProfil(16)
+            SpaceHeightComponent(16)
 
             // Image de profil
-            val id = R.drawable.ic_launcher_foreground
+            ImageProfil(user[index].imgUrl, 120, 2, Color.White)
-            ImageProfil(id, 120, 2, Color.White)
+            SpaceHeightComponent(16)
 
+            EditUsername(user[index].username)// Édition du Username
+            SpaceHeightComponent(16)
 
-            SpaceProfil(16)
+            EditEmail(user[index].email)// Édition du Email
-
-            EditUsername()// Édition du Username
-            SpaceProfil(16)
-
-            EditEmail()// Édition du Email
             Spacer(modifier = Modifier.height(8.dp))
 
             EditPasswd()
-            SpaceProfil(16)
+            SpaceHeightComponent(16)
 
             // Bouton
             ButtonProfile(R.string.ButtonAddQuoteprofile,18, Color.Black, Color.White)
-            SpaceProfil(16)
+            SpaceHeightComponent(16)
             ButtonProfile(R.string.ButtonLanguageprofile,18, Color.Black, Color.White)
-            SpaceProfil(16)
+            SpaceHeightComponent(16)
             ButtonProfile(R.string.ButtonUnlogprofile, 18, Color.Black, Color.White)
 
         }
@@ -113,254 +121,322 @@ fun ProfilPage() {
 }
 
 
-@Composable
-fun SpaceProfil(height : Int){
-    Spacer(
-        modifier = Modifier
-            .height(height.dp)) // Ajoute un espacement
-}
 
 
-@Composable
-fun TitleProfil(titleResId : Int, size : Int, color : Color){
-    val title = stringResource(id = titleResId)
-    Text(
-        text = title,
-        fontSize = size.sp,
-        fontWeight = FontWeight.Bold,
-        color = color
-    )
-}
 
 @Composable
-fun ImageProfil(imgProfil : Int, size :Int, sizeBorber : Int, colorBorder : Color){
+fun ImageProfil(imgProfil : String, size :Int, sizeBorber : Int, colorBorder : Color){
-    Image(
+
-        painter = painterResource(imgProfil),
+    AsyncImage(
+        model = imgProfil,
         contentDescription = "Photo de profil",
         modifier = Modifier
             .size(size.dp)
             .clip(CircleShape)
-            .border(sizeBorber.dp, colorBorder, CircleShape)
     )
 }
 
 
 @Composable
-fun EditEmail(){
+fun EditEmail(userEmail: String) {
-    var email by remember { mutableStateOf("user@example.com") }
+    var email by remember { mutableStateOf(userEmail) }
-    var isEditingEmail by remember { mutableStateOf(false) } // État d'édition
+    var isEditingEmail by remember { mutableStateOf(false) }
     var emailError by remember { mutableStateOf(false) }
 
     if (isEditingEmail) {
-        OutlinedTextField(
+        EmailEditingField(
-            value = email,
+            email = email,
-            onValueChange = {
+            onEmailChange = { newEmail ->
-                email = it
+                email = newEmail
-                emailError = !android.util.Patterns.EMAIL_ADDRESS.matcher(it).matches()
+                emailError = !Patterns.EMAIL_ADDRESS.matcher(newEmail).matches()
             },
-            modifier = Modifier.fillMaxWidth(),
+            onDone = {
-            textStyle = TextStyle(color = Color.White, fontSize = 18.sp),
+                if (!emailError) isEditingEmail = false
-            singleLine = true,
-            keyboardOptions = KeyboardOptions.Default.copy(
-                keyboardType = KeyboardType.Email, // ✅ Clavier spécialisé pour email
-                imeAction = ImeAction.Done
-            ),
-            keyboardActions = KeyboardActions(
-                onDone = { if (!emailError) isEditingEmail = false } // ✅ Fermer si l'email est valide
-            ),
-            trailingIcon = {
-                IconButton(onClick = { if (!emailError) isEditingEmail = false }) {
-                    Icon(imageVector = Icons.Default.Check, contentDescription = "Valider")
-                }
             },
-            isError = emailError // ✅ Afficher l'erreur si l'email est invalide
+            emailError = emailError
         )
-        if (emailError) {
-            val text = stringResource(id = R.string.ErrorEmailprofile)
-            Text(
-                text = text,
-                color = Color.Red,
-                fontSize = 12.sp,
-                modifier = Modifier.padding(top = 4.dp)
-            )
-        }
     } else {
-        Row(
+        DisplayEmail(email = email, onEdit = { isEditingEmail = true })
-            verticalAlignment = Alignment.CenterVertically,
+    }
-            modifier = Modifier.clickable { isEditingEmail = true }
+}
-        ) {
+
-            Text(
+@Composable
-                text = email,
+fun EmailEditingField(
-                fontSize = 18.sp,
+    email: String,
-                fontWeight = FontWeight.Bold,
+    onEmailChange: (String) -> Unit,
-                color = Color.White
+    onDone: () -> Unit,
-            )
+    emailError: Boolean
-            Icon(
+) {
-                imageVector = Icons.Default.Edit,
+    OutlinedTextField(
-                contentDescription = "Modifier",
+        value = email,
-                tint = Color.White,
+        onValueChange = onEmailChange,
-                modifier = Modifier.size(16.dp).padding(start = 8.dp)
+        modifier = Modifier.fillMaxWidth(),
-            )
+        textStyle = TextStyle(color = Color.White, fontSize = 18.sp),
-        }
+        singleLine = true,
+        keyboardOptions = KeyboardOptions.Default.copy(
+            keyboardType = KeyboardType.Email,
+            imeAction = ImeAction.Done
+        ),
+        keyboardActions = KeyboardActions(
+            onDone = { onDone() }
+        ),
+        trailingIcon = {
+            IconButton(onClick = { if (!emailError) onDone() }) {
+                Icon(imageVector = Icons.Default.Check, contentDescription = "Valider")
+            }
+        },
+        isError = emailError
+    )
+
+    if (emailError) {
+        ErrorMessageProfileComponent(R.string.ErrorEmailprofile)
     }
 }
 
 
 @Composable
-fun EditUsername(){
+fun DisplayEmail(email: String, onEdit: () -> Unit) {
-    var username by remember { mutableStateOf("Username") }
+    Row(
-    var isEditingUsername by remember { mutableStateOf(false) } // État d'édition
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier.clickable { onEdit() }
+    ) {
+        Text(
+            text = email,
+            fontSize = 18.sp,
+            fontWeight = FontWeight.Bold,
+            color = Color.White
+        )
+        Icon(
+            imageVector = Icons.Default.Edit,
+            contentDescription = "Modifier",
+            tint = Color.White,
+            modifier = Modifier.size(16.dp).padding(start = 8.dp)
+        )
+    }
+}
+
+
+
+
+
+@Composable
+fun EditUsername(userName: String) {
+    var username by remember { mutableStateOf(userName) }
+    var isEditingUsername by remember { mutableStateOf(false) }
 
     if (isEditingUsername) {
-        OutlinedTextField(
+        UsernameEditingField(
-            value = username,
+            username = username,
-            onValueChange = { username = it },
+            onUsernameChange = { username = it },
-            modifier = Modifier.fillMaxWidth(),
+            onDone = { isEditingUsername = false }
-            textStyle = TextStyle(color = Color.White, fontSize = 18.sp),
-            singleLine = true,
-            keyboardOptions = KeyboardOptions.Default.copy(
-                imeAction = ImeAction.Done
-            ),
-            keyboardActions = KeyboardActions(
-                onDone = { isEditingUsername = false } // Quand on appuie sur "Done"
-            ),
-            trailingIcon = {
-                IconButton(onClick = { isEditingUsername = false }) {
-                    Icon(imageVector = Icons.Default.Check, contentDescription = "Valider")
-                }
-            }
         )
     } else {
-        Row(
+        DisplayUsername(username = username, onEdit = { isEditingUsername = true })
-            verticalAlignment = Alignment.CenterVertically,
+    }
-            modifier = Modifier.clickable { isEditingUsername = true }
+}
-        ) {
+
-            Text(
+@Composable
-                text = username,
+fun UsernameEditingField(
-                fontSize = 18.sp,
+    username: String,
-                fontWeight = FontWeight.Bold,
+    onUsernameChange: (String) -> Unit,
-                color = Color.White
+    onDone: () -> Unit
-            )
+) {
-            Icon(
+    OutlinedTextField(
-                imageVector = Icons.Default.Edit,
+        value = username,
-                contentDescription = "Modifier",
+        onValueChange = onUsernameChange,
-                tint = Color.White,
+        modifier = Modifier.fillMaxWidth(),
-                modifier = Modifier.size(16.dp).padding(start = 8.dp)
+        textStyle = TextStyle(color = Color.White, fontSize = 18.sp),
-            )
+        singleLine = true,
+        keyboardOptions = KeyboardOptions.Default.copy(
+            imeAction = ImeAction.Done
+        ),
+        keyboardActions = KeyboardActions(
+            onDone = { onDone() } // Quand on appuie sur "Done", on met fin à l'édition
+        ),
+        trailingIcon = {
+            IconButton(onClick = { onDone() }) {
+                Icon(imageVector = Icons.Default.Check, contentDescription = "Valider")
+            }
         }
+    )
+}
+
+@Composable
+fun DisplayUsername(username: String, onEdit: () -> Unit) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier.clickable { onEdit() }
+    ) {
+        Text(
+            text = username,
+            fontSize = 18.sp,
+            fontWeight = FontWeight.Bold,
+            color = Color.White
+        )
+        Icon(
+            imageVector = Icons.Default.Edit,
+            contentDescription = "Modifier",
+            tint = Color.White,
+            modifier = Modifier.size(16.dp).padding(start = 8.dp)
+        )
     }
 }
 
 
+
+
+
+
 @Composable
-fun EditPasswd(){
+fun EditPasswd() {
     var password by remember { mutableStateOf("*******") }
     var isEditingPassword by remember { mutableStateOf(false) }
     var newPassword by remember { mutableStateOf("") }
     var confirmPassword by remember { mutableStateOf("") }
     var passwordVisible by remember { mutableStateOf(false) }
     var passwordError by remember { mutableStateOf(false) }
+
     if (isEditingPassword) {
-        Column {
+        PasswordEditingFields(
-            val text = stringResource(id = R.string.NewPasswdprofile)
+            newPassword = newPassword,
-            OutlinedTextField(
+            confirmPassword = confirmPassword,
-                value = newPassword,
+            onNewPasswordChange = { newPassword = it },
-                onValueChange = { newPassword = it },
+            onConfirmPasswordChange = {
-                label = { Text(text) },
+                confirmPassword = it
-                modifier = Modifier.fillMaxWidth(),
+                passwordError = newPassword != it
-                textStyle = TextStyle(color = Color.White, fontSize = 18.sp),
+            },
-                singleLine = true,
+            passwordVisible = passwordVisible,
-                keyboardOptions = KeyboardOptions.Default.copy(
+            onPasswordVisibilityChange = { passwordVisible = it },
-                    keyboardType = KeyboardType.Password,
+            passwordError = passwordError,
-                    imeAction = ImeAction.Next
+            onDone = {
-                ),
+                if (!passwordError && newPassword.isNotEmpty()) {
-                visualTransformation = if (passwordVisible) VisualTransformation.None else PasswordVisualTransformation(),
+                    password = newPassword
-                trailingIcon = {
+                    isEditingPassword = false
-                    IconButton(onClick = { passwordVisible = !passwordVisible }) {
-
-                    }
                 }
-            )
-
-            Spacer(modifier = Modifier.height(8.dp))
-            val textConfirm = stringResource(id = R.string.ConfirmNewPasswdprofile)
-            OutlinedTextField(
-                value = confirmPassword,
-                onValueChange = {
-                    confirmPassword = it
-                    passwordError = newPassword != it
-                },
-
-                label = { Text(textConfirm) },
-                modifier = Modifier.fillMaxWidth(),
-                textStyle = TextStyle(color = Color.White, fontSize = 18.sp),
-                singleLine = true,
-                keyboardOptions = KeyboardOptions.Default.copy(
-                    keyboardType = KeyboardType.Password,
-                    imeAction = ImeAction.Done
-                ),
-                keyboardActions = KeyboardActions(
-                    onDone = { if (!passwordError && newPassword.isNotEmpty()) {
-                        password = newPassword
-                        isEditingPassword = false
-                    }}
-                ),
-                visualTransformation = if (passwordVisible) VisualTransformation.None else PasswordVisualTransformation(),
-                trailingIcon = {
-                    IconButton(onClick = { passwordVisible = !passwordVisible }) {
-
-                    }
-                },
-                isError = passwordError
-            )
-
-            if (passwordError) {
-                val text = stringResource(id = R.string.Errorpasswdprofile)
-                Text(
-                    text = text,
-                    color = Color.Red,
-                    fontSize = 12.sp,
-                    modifier = Modifier.padding(top = 4.dp)
-                )
             }
+        )
+    } else {
+        DisplayPassword(onEdit = { isEditingPassword = true })
+    }
+}
 
-            Spacer(modifier = Modifier.height(8.dp))
+@Composable
+fun PasswordEditingFields(
+    newPassword: String,
+    confirmPassword: String,
+    onNewPasswordChange: (String) -> Unit,
+    onConfirmPasswordChange: (String) -> Unit,
+    passwordVisible: Boolean,
+    onPasswordVisibilityChange: (Boolean) -> Unit,
+    passwordError: Boolean,
+    onDone: () -> Unit
+) {
+    Column {
+        val text = stringResource(id = R.string.NewPasswdprofile)
+        PasswordTextField(
+            value = newPassword,
+            onValueChange = onNewPasswordChange,
+            label = text,
+            passwordVisible = passwordVisible,
+            onPasswordVisibilityChange = onPasswordVisibilityChange
+        )
 
-            Button(
+        Spacer(modifier = Modifier.height(8.dp))
-                onClick = {
+
-                    if (!passwordError && newPassword.isNotEmpty()) {
+        val textConfirm = stringResource(id = R.string.ConfirmNewPasswdprofile)
-                        password = newPassword
+        PasswordTextField(
-                        isEditingPassword = false
+            value = confirmPassword,
-                    }
+            onValueChange = onConfirmPasswordChange,
-                },
+            label = textConfirm,
-                colors = ButtonDefaults.buttonColors(containerColor = Color.White),
+            passwordVisible = passwordVisible,
-                modifier = Modifier.fillMaxWidth()
+            onPasswordVisibilityChange = onPasswordVisibilityChange,
-            ) {
+            isError = passwordError,
-                val text = stringResource(id = R.string.ButtonSaveprofile)
+            onDone = onDone
-                Text(text, fontSize = 18.sp, color = Color.Black)
+        )
-            }
+
-        }
+        if (passwordError) {
-    } else {
+            ErrorMessageProfileComponent(R.string.Errorpasswdprofile)
-        Row(
-            verticalAlignment = Alignment.CenterVertically,
-            modifier = Modifier.clickable { isEditingPassword = true }
-        ) {
-            Text(
-                text = password,
-                fontSize = 18.sp,
-                fontWeight = FontWeight.Bold,
-                color = Color.White
-            )
-            Icon(
-                imageVector = Icons.Default.Edit,
-                contentDescription = "Modifier",
-                tint = Color.White,
-                modifier = Modifier.size(16.dp).padding(start = 8.dp)
-            )
         }
+
+        Spacer(modifier = Modifier.height(8.dp))
+
+        SaveButton(onClick = onDone)
     }
 }
 
+@Composable
+fun PasswordTextField(
+    value: String,
+    onValueChange: (String) -> Unit,
+    label: String,
+    passwordVisible: Boolean,
+    onPasswordVisibilityChange: (Boolean) -> Unit,
+    isError: Boolean = false,
+    onDone: (() -> Unit)? = null
+) {
+    OutlinedTextField(
+        value = value,
+        onValueChange = onValueChange,
+        label = { Text(label) },
+        modifier = Modifier.fillMaxWidth(),
+        textStyle = TextStyle(color = Color.White, fontSize = 18.sp),
+        singleLine = true,
+        keyboardOptions = KeyboardOptions.Default.copy(
+            keyboardType = KeyboardType.Password,
+            imeAction = if (onDone != null) ImeAction.Done else ImeAction.Next
+        ),
+        keyboardActions = onDone?.let {
+            KeyboardActions(onDone = { it() })
+        } ?: KeyboardActions.Default,
+        visualTransformation = if (passwordVisible) VisualTransformation.None else PasswordVisualTransformation(),
+        trailingIcon = {
+            IconButton(onClick = { onPasswordVisibilityChange(!passwordVisible) }) {
+                // Ajout d'une icône pour montrer/masquer le mot de passe
+            }
+        },
+        isError = isError
+    )
+}
+
+@Composable
+fun SaveButton(onClick: () -> Unit) {
+    Button(
+        onClick = onClick,
+        colors = ButtonDefaults.buttonColors(containerColor = Color.White),
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        val text = stringResource(id = R.string.ButtonSaveprofile)
+        Text(text,
+            fontSize = 18.sp,
+            color = Color.Black)
+    }
+}
+
+@Composable
+fun DisplayPassword(onEdit: () -> Unit) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier.clickable { onEdit() }
+    ) {
+        Text(
+            text = "*****",
+            fontSize = 18.sp,
+            fontWeight = FontWeight.Bold,
+            color = Color.White
+        )
+        Icon(
+            imageVector = Icons.Default.Edit,
+            contentDescription = "Modifier",
+            tint = Color.White,
+            modifier = Modifier.size(16.dp).padding(start = 8.dp)
+        )
+    }
+}
+
+
+
+
+
 
 @Composable
 fun ButtonProfile(textResId : Int, size :Int, colorTexte : Color, colorButton : Color){

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/SignUpPage.kt

@@ -40,7 +40,10 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
 import com.example.what_the_fantasy.R
+import com.example.what_the_fantasy.ui.components.SpaceHeightComponent
+import com.example.what_the_fantasy.ui.components.TitlePageComponent
 import com.example.what_the_fantasy.ui.theme.What_The_FantasyTheme
+import org.mindrot.jbcrypt.BCrypt
 
 @Composable
 fun SignUpPage(navController: NavController) {
@@ -66,26 +69,21 @@ fun SignUpPage(navController: NavController) {
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
 
-            TitlePage(R.string.titleSignUp, 20,Color.White)
+            TitlePageComponent(R.string.titleSignUp, 20,Color.White)
             IdentifiantTextFieldSign(R.string.IdentifiantLogin)
             EmailTextFieldSign("Email*")
             PassWdTextFieldSign(R.string.PasswdLogin)
             PassWdConfirmTextFieldSign(R.string.ConfirmPassWdSignUp)
-            SpaceSign(16)
+            SpaceHeightComponent(16)
             ConnexionButtonSign(R.string.ButtonSignUp,18, Color.White, Color.Black)
-            SpaceSign(16)
+            SpaceHeightComponent(16)
             CreateAccountButtonSign(R.string.ButtonLogin,12, Color.White, navController = navController)
 
         }
     }
 }
 
-@Composable
+
-fun SpaceSign(height : Int){
-    Spacer(
-        modifier = Modifier
-            .height(height.dp)) // Ajoute un espacement
-}
 
 
 @Composable
@@ -119,7 +117,7 @@ fun EmailTextFieldSign(textIdentifiant : String){
                 .fillMaxWidth()
                 .padding(top = 8.dp),
             keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email),
-            shape = RoundedCornerShape(16.dp) // 🔹 Bords arrondis
+            shape = RoundedCornerShape(16.dp) // Bords arrondis
         )
     }
 }
@@ -172,15 +170,7 @@ fun PassWdConfirmTextFieldSign(textpasswdResId : Int){
     }
 }
 
-//@Composable
+
-//fun TitleSign(title : String, size : Int, color : Color){
-//    Text(
-//        text = title,
-//        fontSize = size.sp,
-//        fontWeight = FontWeight.Bold,
-//        color = color
-//    )
-//}
 
 @Composable
 fun ConnexionButtonSign(titleResId : Int, size : Int, colorButton : Color, colorText : Color){

What_The_Fantasy/gradle/libs.versions.toml

@@ -1,5 +1,8 @@
 [versions]
 agp = "8.6.0"
+bcrypt = "0.4"
+coilCompose = "2.2.1"
+
 kotlin = "1.9.0"
 coreKtx = "1.10.1"
 junit = "4.13.2"
@@ -13,6 +16,9 @@ navigationCommonAndroid = "2.9.0-alpha05"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+bcrypt = { module = "org.mindrot:jbcrypt", version.ref = "bcrypt" }
+coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coilCompose" }
+
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }