What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/Logs/LogsUsers.kt

@@ -4,13 +4,25 @@ import android.util.Log
 import com.example.what_the_fantasy.data.model.User
 
 class LogsUsers{
-     fun logDebugDisplayUsers(users : List<User>, titleLog : String){
+     fun logDebugAllUsers(users : List<User>, titleLog : String){
         for(user in users){
-            Log.e(titleLog, "User created: ${user.username} => ${user.email} => ${user.imgUrl} => ${user.language}")
+            Log.e(titleLog, "User created: ${user.username} => ${user.email} => ${user.imgUrl} => ${user.langage}")
         }
     }
 
-    fun logDebugDisplayUser(user : User?, titleLog : String){
+    fun logDebugUserEmail(user : User?, titleLog : String){
         Log.e(titleLog, "User created: ${user?.username} => ${user?.email}")
     }
+
+    fun logDebugUserLangage(user : User?, titleLog : String){
+        Log.e(titleLog, "User Change: ${user?.username} => ${user?.langage}")
+    }
+
+    fun logInformationUserConnect(user : User?, titleLog : String){
+        Log.e(titleLog, "${user?.username} logged in")
+    }
+
+    fun unlogInformationUserConnect(titleLog : String){
+        Log.e(titleLog, "Logged out")
+    }
 }

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

@@ -208,7 +208,7 @@ object QuoteStub {
         id = 19,
         content = "Le bonheur n'est pas quelque chose de tout fait. Il vient de vos propres actions.",
         likes = 500,
-        language = SrcLanguage.fr,
+        language = SrcLanguage.vo,
         character = CharacterStub.saruman.name,
         source = "Dalaï Lama",
         imgUrl = CharacterStub.saruman.imgUrl,

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

@@ -7,5 +7,5 @@ class User(
     var date:String,
     val imgUrl: String,
     var password: String,
-    val language : SrcLanguage
+    var langage : SrcLanguage
 )

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/services/IServices.kt

@@ -8,6 +8,7 @@ interface IServices {
     fun EditEmail(email : String, index : Int) : Boolean
     fun EditPasswd(passwd : String, index : Int)
     fun EditImage(imageURL : String, index : Int)
+    fun ChangeLangage(user: User)
 
     fun CreateUser(username : String, email : String, passwd : String, services : IServices) : Boolean
     fun getFavorite(username: String)

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/services/ServicesAPI.kt

@@ -20,6 +20,10 @@ class ServicesAPI : IServices {
         TODO("Not yet implemented")
     }
 
+    override fun ChangeLangage(user: User) {
+        TODO("Not yet implemented")
+    }
+
     override fun CreateUser(username: String, email: String, passwd: String, services: IServices) : Boolean {
         TODO("Not yet implemented")
     }

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/services/ServicesStub.kt

@@ -1,7 +1,6 @@
 package com.example.what_the_fantasy.data.services
 
 import android.annotation.SuppressLint
-import android.util.Log
 import com.example.what_the_fantasy.data.local.UserStub.users
 import com.example.what_the_fantasy.data.model.User
 import com.example.what_the_fantasy.Logs.LogsUsers
@@ -23,7 +22,7 @@ class ServicesStub : IServices {
         }
 
         //Afficher tous les users
-        logsUser.logDebugDisplayUser(user, "UsernameUpdate")
+        logsUser.logDebugUserEmail(user, "UsernameUpdate")
         return false
     }
 
@@ -35,7 +34,7 @@ class ServicesStub : IServices {
             return true
         }
         //Afficher tous les users
-        logsUser.logDebugDisplayUsers(getAllUsers(), "EmailUpdate")
+        logsUser.logDebugAllUsers(getAllUsers(), "EmailUpdate")
         return false
     }
 
@@ -45,13 +44,23 @@ class ServicesStub : IServices {
         user?.password = passwordhash
 
         //Afficher tous les users en log
-        logsUser.logDebugDisplayUsers(getAllUsers(), "PasswordUpdate")
+        logsUser.logDebugAllUsers(getAllUsers(), "PasswordUpdate")
     }
 
     override fun EditImage(imageURL: String,index : Int) {
         TODO("Not yet implemented")
     }
 
+    override fun ChangeLangage(user: User) {
+        if(user.langage == SrcLanguage.vo){
+            user.langage = SrcLanguage.fr
+        }
+        else{
+            user.langage = SrcLanguage.vo
+        }
+        logsUser.logDebugUserLangage(user, "ChangeLangue")
+    }
+
     override fun CreateUser(username: String, email: String, passwd: String, services : IServices) : Boolean {
         val date =dateDuJour()
         val passwordhash = hashPassword(passwd)
@@ -64,7 +73,7 @@ class ServicesStub : IServices {
             users.add(user)//ajout au stub
 
             //Afficher tous les users
-            logsUser.logDebugDisplayUsers(users, "CreateUser")
+            logsUser.logDebugAllUsers(users, "CreateUser")
             return true
         }
         return false

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

@@ -5,7 +5,6 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Text
 import androidx.compose.runtime.*
@@ -83,7 +82,7 @@ fun AccueilPage(
 
                     Column(Modifier.clickable {navQuote(quote.id)}
                     ) {
-                        if(quote.language == user.language){
+                        if(quote.language == user.langage){
                             QuoteLittle(quote)
                             Spacer(modifier = Modifier.height(16.dp))
                         }

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

@@ -19,7 +19,6 @@ import com.example.what_the_fantasy.data.local.FavoriteStub
 import com.example.what_the_fantasy.data.services.IServices
 import com.example.what_the_fantasy.ui.components.NavBar
 import com.example.what_the_fantasy.ui.components.QuoteLittle
-import com.example.what_the_fantasy.ui.navigations.OneQuote
 import com.example.what_the_fantasy.ui.theme.colorBackground
 
 @Composable

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

@@ -1,22 +1,17 @@
 package com.example.what_the_fantasy.ui.screens
 
-import android.util.Log
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -27,8 +22,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
@@ -36,22 +29,16 @@ import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.navigation.NavController
+import com.example.what_the_fantasy.Logs.LogsUsers
-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.data.services.IServices
-import com.example.what_the_fantasy.data.services.ServicesStub
 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.components.hashPassword
 import com.example.what_the_fantasy.ui.theme.colorBackground
 import com.example.what_the_fantasy.ui.theme.gradienBox
-import java.security.MessageDigest
 
 @Composable
 fun LoginPage(navControllerSignUp: () -> Unit, navControllerProfil: (Int) -> Unit, services : IServices) {
@@ -151,12 +138,13 @@ fun ConnexionButtonLogin(userStub : List<User>, id : String, passwd : String, ti
 
 
 fun validLogin(identifiant : String, passwd : String, users : List<User>, navController: (Int) -> Unit): Boolean {
-
+    val logsUser = LogsUsers() //gestion des logs pour les utilisateurs
 
     users.forEachIndexed { index, user ->
         val hashPassWd = hashPassword(passwd)
         if (user.username == identifiant && user.password == hashPassWd) {
             navController(index) // Passer l'index à la fonction navController
+            logsUser.logInformationUserConnect(user, "UserConnect")
             return true
         }
     }

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

@@ -1,15 +1,7 @@
 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
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
-import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -25,16 +17,13 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Check
 import androidx.compose.material.icons.filled.CheckCircle
 import androidx.compose.material.icons.filled.Edit
-import androidx.compose.material.icons.rounded.Face
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -44,10 +33,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
@@ -55,22 +41,17 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
-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.Logs.LogsUsers
 import com.example.what_the_fantasy.R
-import com.example.what_the_fantasy.data.local.QuestionStub
+import com.example.what_the_fantasy.data.model.User
-import com.example.what_the_fantasy.data.local.UserStub
 import com.example.what_the_fantasy.data.services.IServices
-//import com.example.what_the_fantasy.data.local.UserStub.users
-import com.example.what_the_fantasy.data.services.ServicesStub
 import com.example.what_the_fantasy.ui.components.ErrorMessageProfileComponent
 import com.example.what_the_fantasy.ui.components.NavBar
 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 com.example.what_the_fantasy.ui.theme.gradienBox
 
 @Composable
@@ -127,9 +108,11 @@ fun ProfilPage(index: Int,
             // Bouton
             //ButtonProfile(R.string.ButtonAddQuoteprofile, 18, Color.Black, Color.White,navUnLog) // Pas encore de navigation definie
             //SpaceHeightComponent(16)
-            ButtonProfile(R.string.ButtonLanguageprofile, 18, Color.Black, Color.White,navUnLog) // Pas encore de navigation definie
+            ButtonLanguage(R.string.ButtonLanguageprofile, 18, Color.Black, Color.White,services, user)
             SpaceHeightComponent(16)
-            ButtonProfile(R.string.ButtonUnlogprofile, 18, Color.Black, Color.White, navUnLog)
+            ButtonUnLog(R.string.ButtonUnlogprofile, 18, Color.Black, Color.White,navUnLog)
+
+
 
             }
         }
@@ -458,13 +441,34 @@ fun DisplayPassword(onEdit: () -> Unit) {
 }
 
 @Composable
-fun ButtonProfile(textResId : Int, size :Int, colorTexte : Color, colorButton : Color,navController: () -> Unit){
+fun ButtonUnLog(textResId : Int, size :Int, colorTexte : Color, colorButton : Color,navController: () -> Unit){
     val text = stringResource(id = textResId)
+    val logsUser = LogsUsers() //gestion des logs pour les utilisateurs
+
     Button(
-        onClick = { navController() },
+        onClick = {
+            navController()
+            logsUser.unlogInformationUserConnect("UserUnLog")
+                  },
         colors = ButtonDefaults.buttonColors(containerColor = colorButton),
         modifier = Modifier.fillMaxWidth(),
     ) {
         Text(text, fontSize = size.sp, color = colorTexte)
     }
+}
+
+@Composable
+fun ButtonLanguage(textResId : Int, size :Int, colorTexte : Color, colorButton : Color, service: IServices, user : User){
+    val text = stringResource(id = textResId)
+    val currentLangage = remember { mutableStateOf(user.langage) }
+    Button(
+        onClick = {
+            service.ChangeLangage(user)
+            currentLangage.value = user.langage
+        },
+        colors = ButtonDefaults.buttonColors(containerColor = colorButton),
+        modifier = Modifier.fillMaxWidth(),
+    ) {
+        Text("${text} (${currentLangage.value})", fontSize = size.sp, color = colorTexte)
+    }
 }

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

@@ -1,15 +1,8 @@
 package com.example.what_the_fantasy.ui.screens
 
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -17,14 +10,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.example.what_the_fantasy.R
-import com.example.what_the_fantasy.data.local.QuestionStub
 import com.example.what_the_fantasy.data.local.QuizStub
 import com.example.what_the_fantasy.ui.components.NavBar
 

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

@@ -2,16 +2,11 @@ package com.example.what_the_fantasy.ui.screens
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
-import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.gestures.scrollable
-import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -34,9 +29,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.example.what_the_fantasy.R
 import com.example.what_the_fantasy.data.local.QuizStub
-import com.example.what_the_fantasy.data.services.IServices
 import com.example.what_the_fantasy.ui.components.NavBar
 
 

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

@@ -1,10 +1,8 @@
 package com.example.what_the_fantasy.ui.screens
 
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.*
@@ -13,16 +11,12 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.example.what_the_fantasy.R
-import com.example.what_the_fantasy.data.local.QuestionStub
 import com.example.what_the_fantasy.data.local.QuizStub
-import com.example.what_the_fantasy.ui.components.BackBar
 import com.example.what_the_fantasy.ui.components.NavBar
 
 @Composable

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

@@ -1,17 +1,11 @@
 package com.example.what_the_fantasy.ui.screens
 
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
@@ -31,27 +25,20 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
 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.data.services.IServices
 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 com.example.what_the_fantasy.ui.theme.colorBackground
 import com.example.what_the_fantasy.ui.theme.gradienBox
-import com.example.what_the_fantasy.data.services.ServicesStub
 import com.example.what_the_fantasy.ui.components.ErrorMessageProfileComponent
-import com.example.what_the_fantasy.ui.components.hashPassword
 
 @Composable
 fun SignUpPage(navControllerLogin: () -> Unit, services : IServices) {

What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/theme/Color.kt

@@ -1,9 +1,14 @@
 package com.example.what_the_fantasy.ui.theme
 
+import android.content.Context
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
-import com.example.what_the_fantasy.R
+import androidx.core.content.ContextCompat
+
+fun Context.getColorFromRes(resId: Int): Color {
+    return Color(ContextCompat.getColor(this, resId))
+}
 
 val Purple80 = Color(0xFFD0BCFF)
 val PurpleGrey80 = Color(0xFFCCC2DC)
@@ -22,6 +27,7 @@ val gradienBox = Brush.linearGradient(
 )
 val colorBackground = Color(0xFF100C1B)
 
+
 val colorNavBar = Color.Black
 
 val colorButtonNavSelected= Color(0xFFC8C8C8)