diff --git a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/services/IServices.kt b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/services/IServices.kt index ac9c8e1..4ca3efa 100644 --- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/services/IServices.kt +++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/services/IServices.kt @@ -11,7 +11,6 @@ interface IServices { fun validLogin(username : String, passwd : String, - userSession : StateFlow, navController: (Int) -> Unit, initialierCurrentUser : (Int) ->Unit): Boolean diff --git a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/services/ServicesStub.kt b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/services/ServicesStub.kt index 33b68e3..0b01ea9 100644 --- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/services/ServicesStub.kt +++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/data/services/ServicesStub.kt @@ -5,6 +5,7 @@ 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 import com.example.what_the_fantasy.data.local.FavoriteStub.favorites +import com.example.what_the_fantasy.data.local.ImageStub.allImages import com.example.what_the_fantasy.data.local.QuoteStub.quotes import com.example.what_the_fantasy.data.model.Favorite import com.example.what_the_fantasy.data.model.Quote @@ -20,14 +21,12 @@ class ServicesStub : IServices { override fun validLogin(username : String, passwd : String, - userSession : StateFlow, navController: (Int) -> Unit, initialierCurrentUser : (Int) ->Unit): Boolean{ users.forEachIndexed { index, user -> val hashPassWd = hashPassword(passwd) if (user.username == username && user.password == hashPassWd) { - //userSession.value.id = index initialierCurrentUser(index) navController(index) logsUser.logInformationUserConnect(user, "UserConnect") @@ -97,7 +96,7 @@ class ServicesStub : IServices { val nbUser = userStub.size if(!isUsernameExist(username) && !isEmailExist(email)){ - val user = User(nbUser+1,username, email, date,randomImage(userStub), passwordhash, SrcLanguage.vo) + val user = User(nbUser,username, email, date,randomImage(), passwordhash, SrcLanguage.vo) users.add(user)//ajout au stub //Afficher tous les users @@ -110,7 +109,6 @@ class ServicesStub : IServices { override fun getFavorite(user: User): List { val favorite = favorites return favorite[0].quote - //return emptyList() } override fun getAllFavorite(): List = favorites @@ -143,8 +141,16 @@ class ServicesStub : IServices { return date.toString() } - fun randomImage(usersImage : List) : String{ - return "https://img.freepik.com/vecteurs-libre/personnage-guerrier-homme-fantaisie_1045-194.jpg?size=338&ext=jpg" + fun randomImage() : String{ + val sizeList = allImages.size + val randomNb = (0..sizeList).random() + allImages.forEach{image -> + if(image.id == randomNb){ + return image.url + } + + } + return allImages[0].url } fun isUsernameExist(username : String) : Boolean{ diff --git a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/SignUpPage.kt b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/SignUpPage.kt index 5acf8b8..3f7857c 100644 --- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/SignUpPage.kt +++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/SignUpPage.kt @@ -52,8 +52,7 @@ import com.example.what_the_fantasy.ui.viewModels.SignInUserViewModel @Composable fun SignUpPage(navControllerLogin: () -> Unit, signInUserVM :SignInUserViewModel,signInState : SignInUserState) { -// val signInUserVM : SignInUserViewModel = viewModel() -// val signInState by signInUserVM.userState.collectAsState() + Box( modifier = Modifier diff --git a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/states/AuthUserState.kt b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/states/AuthUserState.kt index f3263f1..10e361d 100644 --- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/states/AuthUserState.kt +++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/states/AuthUserState.kt @@ -4,7 +4,6 @@ import com.example.what_the_fantasy.data.model.SrcLanguage import com.example.what_the_fantasy.data.model.User data class AuthUserState ( - var id : Int = -1, val username : String = "", val password: String = "", ) \ No newline at end of file diff --git a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/viewModels/AuthUserViewModel.kt b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/viewModels/AuthUserViewModel.kt index 193cb2b..7aa9682 100644 --- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/viewModels/AuthUserViewModel.kt +++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/viewModels/AuthUserViewModel.kt @@ -14,9 +14,7 @@ class AuthUserViewModel : ViewModel(){ val userState : StateFlow = _userState.asStateFlow() - fun setId(id : Int){ - _userState.update { it.copy(id=id) } - } + fun setUsername(username : String){ _userState.update { it.copy(username=username) } } @@ -26,6 +24,6 @@ class AuthUserViewModel : ViewModel(){ } fun validLogin(username : String, passwd : String, navController: (Int) -> Unit, initialierCurrentUser : (Int) -> Unit) : Boolean{ - return services.validLogin(username,passwd,userState, navController, initialierCurrentUser) + return services.validLogin(username,passwd, navController, initialierCurrentUser) } } \ No newline at end of file