Compare commits
53 Commits
brongniart
@ -1,28 +0,0 @@
|
||||
package com.example.what_the_fantasy.Logs
|
||||
|
||||
import android.util.Log
|
||||
import com.example.what_the_fantasy.data.model.User
|
||||
|
||||
class LogsUsers{
|
||||
fun logDebugAllUsers(users : List<User>, titleLog : String){
|
||||
for(user in users){
|
||||
Log.e(titleLog, "User created: ${user.username} => ${user.email} => ${user.imgUrl} => ${user.langage}")
|
||||
}
|
||||
}
|
||||
|
||||
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")
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,8 @@
|
||||
package com.example.what_the_fantasy.data.model
|
||||
|
||||
data class Comment(
|
||||
val content : String,
|
||||
val user : String,
|
||||
val date : String,
|
||||
val img : String
|
||||
)
|
||||
@ -1,7 +1,10 @@
|
||||
package com.example.what_the_fantasy.data.model
|
||||
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import com.example.what_the_fantasy.R
|
||||
|
||||
enum class SrcType (val value: String) {
|
||||
Movie("@string/movie"),
|
||||
VideoGame("@string/videoGame"),
|
||||
Series("@string/series"),
|
||||
Movie("movie" ),
|
||||
VideoGame("videoGame"),
|
||||
Series("series"),
|
||||
}
|
||||
@ -1,27 +1,43 @@
|
||||
package com.example.what_the_fantasy.data.services
|
||||
|
||||
import com.example.what_the_fantasy.data.model.Favorite
|
||||
import com.example.what_the_fantasy.data.model.Comment
|
||||
import com.example.what_the_fantasy.data.model.Quote
|
||||
import com.example.what_the_fantasy.data.model.SrcLanguage
|
||||
import com.example.what_the_fantasy.data.model.User
|
||||
import com.example.what_the_fantasy.ui.states.AuthUserState
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
|
||||
interface IServices {
|
||||
|
||||
fun validLogin(username : String,
|
||||
passwd : String,
|
||||
navController: (Int) -> Unit,
|
||||
initialierCurrentUser : (Int) ->Unit): Boolean
|
||||
|
||||
fun EditUsername(username : String, index : Int) : Boolean
|
||||
fun EditEmail(email : String, index : Int) : Boolean
|
||||
fun EditPasswd(passwd : String, index : Int)
|
||||
fun EditImage(imageURL : String, index : Int)
|
||||
fun ChangeLangage(user: User)
|
||||
fun EditImage(index : Int) : String
|
||||
fun ChangeLangage(index : Int): SrcLanguage
|
||||
fun isUsernameExist(username : String) : Boolean
|
||||
fun isEmailExist(email : String) : Boolean
|
||||
|
||||
fun CreateUser(username : String, email : String, passwd : String, services : IServices) : Boolean
|
||||
fun AddFav(userId: Int, QuoteId : Int)
|
||||
fun SupFav(userId: Int, QuoteId : Int)
|
||||
fun AddComment(content : String)
|
||||
fun CreateUser(username : String, email : String, passwd : String) : Boolean
|
||||
fun getFavorite(user: User): List<Quote>
|
||||
fun getAllUsers(): List<User>
|
||||
|
||||
fun getComment(quoteId : Int) : List<Comment>
|
||||
fun getUserById(id: Int): User?
|
||||
|
||||
fun SearchQuote(quote : String)
|
||||
|
||||
fun getQuote( id : Int): Quote?
|
||||
|
||||
fun isFavorite(id : Int): Boolean
|
||||
fun isFavorite(idQuote : Int, iduser: Int): Boolean
|
||||
fun getAllFavorite(): List<Favorite>
|
||||
fun getAllQuote(): List<Quote>
|
||||
fun getSomeQuotes(nb: Int, page: Int) : MutableList<Quote>
|
||||
|
||||
fun search(type : String ,search:String ,indexCount: Int): List<Quote>
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
package com.example.what_the_fantasy.ui.components
|
||||
package com.example.what_the_fantasy.data.services
|
||||
|
||||
import java.security.MessageDigest
|
||||
|
||||
@ -0,0 +1,39 @@
|
||||
package com.example.what_the_fantasy.logs
|
||||
import android.util.Log
|
||||
import com.example.what_the_fantasy.data.model.User
|
||||
|
||||
class LogsUsers{
|
||||
fun logDebugAllUsers(users : List<User>, titleLog : String){
|
||||
for(user in users){
|
||||
Log.d(titleLog, "User created: ${user.username} => ${user.email} => ${user.imgUrl} => ${user.langage}")
|
||||
}
|
||||
}
|
||||
|
||||
fun logDebugUserEmail(user : User?, titleLog : String){
|
||||
Log.d(titleLog, "User created: ${user?.username} => ${user?.email}")
|
||||
}
|
||||
|
||||
fun logDebugUserLangage(user : User?, titleLog : String){
|
||||
Log.d(titleLog, "User Change: ${user?.username} => ${user?.langage}")
|
||||
}
|
||||
|
||||
fun logInformationUserConnect(user : User?, titleLog : String){
|
||||
Log.i(titleLog, "${user?.username} logged in")
|
||||
}
|
||||
|
||||
fun unlogInformationUserConnect(titleLog : String){
|
||||
Log.i(titleLog, "Logged out")
|
||||
}
|
||||
|
||||
fun favoriteInformationUserTrue(titleLog : String, quoteId : Int, userId : Int){
|
||||
Log.i(titleLog, "User $userId added quote $quoteId to favorites")
|
||||
}
|
||||
|
||||
fun favoriteInformationUserFalse(titleLog : String, quoteId : Int, userId : Int){
|
||||
Log.i(titleLog, "User $userId removed quote $quoteId from favorites")
|
||||
}
|
||||
|
||||
fun shareInformationUser(titleLog : String, quoteId : Int, userId : Int){
|
||||
Log.i(titleLog, "User $userId shared quote $quoteId")
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,6 @@
|
||||
package com.example.what_the_fantasy.repository
|
||||
|
||||
import com.example.what_the_fantasy.data.services.IServices
|
||||
import okhttp3.Request
|
||||
|
||||
class AuthRepository {}
|
||||
@ -1,64 +0,0 @@
|
||||
package com.example.what_the_fantasy.ui.components
|
||||
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.background
|
||||
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.fillMaxHeight
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.rounded.AccountCircle
|
||||
import androidx.compose.material.icons.rounded.ArrowBack
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.IconButtonColors
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.unit.dp
|
||||
import com.example.what_the_fantasy.R
|
||||
import com.example.what_the_fantasy.ui.theme.colorButtonNav
|
||||
import com.example.what_the_fantasy.ui.theme.colorNavBar
|
||||
|
||||
@Composable
|
||||
fun BackBar(navBack : () ->Unit ,
|
||||
content : @Composable ()-> Unit ){
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
) {
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(70.dp)
|
||||
.background(colorNavBar),
|
||||
Arrangement.SpaceBetween,
|
||||
verticalAlignment = Alignment.Bottom
|
||||
) {
|
||||
IconButton(onClick = {navBack()},
|
||||
modifier = Modifier
|
||||
.size(60.dp)
|
||||
) {
|
||||
Icon(Icons.Rounded.ArrowBack,
|
||||
contentDescription = "Back",
|
||||
modifier = Modifier
|
||||
.size(60.dp)
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Box(modifier = Modifier.background(Color.Black).fillMaxHeight()) {
|
||||
content()
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,68 +0,0 @@
|
||||
package com.example.what_the_fantasy.ui.components
|
||||
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.style.TextOverflow
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import coil.compose.AsyncImage
|
||||
import com.example.what_the_fantasy.R
|
||||
import com.example.what_the_fantasy.data.model.Quote
|
||||
import com.example.what_the_fantasy.ui.theme.gradienBox
|
||||
|
||||
@Composable
|
||||
fun LittleQuoteComponent(quote : Quote){
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth(0.9f)
|
||||
.clip(RoundedCornerShape(16.dp))
|
||||
.background(gradienBox)
|
||||
) {
|
||||
val sizeTextInfoQuote = 13
|
||||
val lineHeightText = 12
|
||||
val sizeTextQuote = 16
|
||||
|
||||
AsyncImage(
|
||||
model = quote.imgUrl,
|
||||
contentDescription = "Quote picture",
|
||||
modifier = Modifier
|
||||
.size(130.dp)
|
||||
.clip(RoundedCornerShape(16.dp))
|
||||
)
|
||||
Column(modifier = Modifier.padding(10.dp)) {
|
||||
|
||||
TextInfoQuote(
|
||||
quote.content,
|
||||
sizeTextQuote,
|
||||
lineHeightText
|
||||
)
|
||||
|
||||
SpaceHeightComponent(40)
|
||||
|
||||
TextInfoQuote("${stringResource(R.string.dateQuote)} : ${quote.date}", sizeTextInfoQuote, lineHeightText)
|
||||
TextInfoQuote("${quote.type} : ${quote.source}", sizeTextInfoQuote, lineHeightText)
|
||||
TextInfoQuote("${stringResource(R.string.CharacterQuote)}: ${quote.character}", sizeTextInfoQuote, lineHeightText)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun TextInfoQuote(text : String, fontSizeText : Int, lineHeightText : Int){
|
||||
Text(text,
|
||||
color = Color.White,
|
||||
fontSize = fontSizeText.sp,
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
lineHeight = lineHeightText.sp)
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
package com.example.what_the_fantasy.ui.components
|
||||
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.unit.dp
|
||||
import com.example.what_the_fantasy.R
|
||||
|
||||
@Composable
|
||||
fun VisibleIconPasswordComponent(passwordVisible : Boolean){
|
||||
Icon(
|
||||
painterResource(
|
||||
if(passwordVisible){
|
||||
R.drawable.password_visible
|
||||
}
|
||||
else{
|
||||
R.drawable.password_no_visible
|
||||
}
|
||||
),
|
||||
contentDescription = "visible",
|
||||
modifier = Modifier
|
||||
.size(20.dp),
|
||||
tint = MaterialTheme.colorScheme.primary
|
||||
)
|
||||
}
|
||||
@ -0,0 +1,165 @@
|
||||
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.*
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.*
|
||||
import androidx.compose.ui.Alignment
|
||||
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.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.data.local.QuestionStub
|
||||
import com.example.what_the_fantasy.ui.components.NavBar
|
||||
import com.example.what_the_fantasy.ui.states.CurrentUserState
|
||||
import com.example.what_the_fantasy.ui.viewModels.CurrentUserViewModel
|
||||
|
||||
@Composable
|
||||
fun QuizRandom(
|
||||
navFavorite: () -> Unit,
|
||||
navAccueil: () -> Unit,
|
||||
navProfil:() -> Unit,
|
||||
navQuiz: () -> Unit,
|
||||
navSearch: () -> Unit,
|
||||
navControllerQuizEnd: (Int, Int) -> Unit,
|
||||
currentUserVM : CurrentUserViewModel,
|
||||
currentUserState : CurrentUserState,
|
||||
) {
|
||||
val questions = QuestionStub.shuffleRandomQuestions
|
||||
var idCurrentQuestion by remember { mutableIntStateOf(0) }
|
||||
var pts by remember { mutableIntStateOf(0) }
|
||||
var lifes by remember { mutableIntStateOf(3) }
|
||||
|
||||
val gradient = Brush.linearGradient(
|
||||
colors = listOf(MaterialTheme.colorScheme.onPrimary, MaterialTheme.colorScheme.onPrimary),
|
||||
start = Offset(0f, 1000f),
|
||||
end = Offset(1000f, 0f)
|
||||
)
|
||||
|
||||
fun onAnswerSelected(answer: String) {
|
||||
val currentQuestion = questions[idCurrentQuestion]
|
||||
val correctAnswer = mapOf(
|
||||
"A" to currentQuestion.ansA,
|
||||
"B" to currentQuestion.ansB,
|
||||
"C" to currentQuestion.ansC,
|
||||
"D" to currentQuestion.ansD
|
||||
)[currentQuestion.correctAns]
|
||||
|
||||
if (answer == correctAnswer) pts++
|
||||
else {
|
||||
lifes -= 1
|
||||
Log.d("Quiz Debug", "Lifes -1 :, $lifes")
|
||||
}
|
||||
if (idCurrentQuestion < questions.size - 1 && lifes > 0) idCurrentQuestion++
|
||||
else {
|
||||
navControllerQuizEnd(-1, pts)
|
||||
Log.d("Quiz Debug", "Game over lifes : $lifes")
|
||||
} // Retour menu
|
||||
}
|
||||
NavBar(
|
||||
navControllerFavorite = navFavorite,
|
||||
navControllerAccueil = navAccueil,
|
||||
navControllerProfil = navProfil,
|
||||
navControllerQuiz = navQuiz,
|
||||
navControllerSearch = navSearch,
|
||||
currentUserVM = currentUserVM,
|
||||
currentUserState = currentUserState,
|
||||
){
|
||||
Column (
|
||||
modifier = Modifier.fillMaxSize().background(Color(0xFF100C1B))
|
||||
) {
|
||||
// Contenu princiapl
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.weight(0.8f)
|
||||
.fillMaxWidth()
|
||||
.padding(horizontal = 50.dp, vertical = 20.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
val question = questions[idCurrentQuestion]
|
||||
|
||||
Column(
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
) {
|
||||
if (questions != null) {
|
||||
Text(
|
||||
text = "▶ Random Quiz ◀",
|
||||
color = Color.White,
|
||||
style = TextStyle(
|
||||
fontSize = 20.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
textAlign = TextAlign.Center
|
||||
)
|
||||
)
|
||||
}
|
||||
Spacer(Modifier.height(20.dp))
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.background(brush = gradient, shape = RoundedCornerShape(20.dp))
|
||||
.height(800.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
Text(
|
||||
"Question ${idCurrentQuestion + 1}",
|
||||
color = Color.White,
|
||||
fontSize = 18.sp,
|
||||
modifier = Modifier
|
||||
.padding(top = 20.dp)
|
||||
.weight(0.1f),
|
||||
style = TextStyle(
|
||||
fontSize = 25.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
textAlign = TextAlign.Center
|
||||
)
|
||||
)
|
||||
Text(
|
||||
question.question,
|
||||
color = Color.White,
|
||||
fontSize = 15.sp,
|
||||
modifier = Modifier
|
||||
.padding(horizontal = 25.dp)
|
||||
.weight(0.1f),
|
||||
textAlign = TextAlign.Center
|
||||
)
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.weight(0.7f)
|
||||
.fillMaxHeight()
|
||||
.padding(vertical = 30.dp),
|
||||
verticalArrangement = Arrangement.SpaceBetween
|
||||
|
||||
) {
|
||||
listOf(
|
||||
question.ansA,
|
||||
question.ansB,
|
||||
question.ansC,
|
||||
question.ansD
|
||||
).forEach { answer ->
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.width(220.dp)
|
||||
.height(50.dp)
|
||||
.background(Color.White, shape = RoundedCornerShape(16.dp))
|
||||
.clickable { onAnswerSelected(answer) }
|
||||
.padding(horizontal = 8.dp),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Text(answer, color = Color.Black, fontSize = 18.sp)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,8 +1,203 @@
|
||||
package com.example.what_the_fantasy.ui.screens
|
||||
|
||||
import androidx.compose.runtime.Composable
|
||||
import android.util.Log
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.background
|
||||
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.foundation.lazy.rememberLazyListState
|
||||
import androidx.compose.foundation.selection.selectable
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.text.KeyboardOptions
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.rounded.Search
|
||||
import androidx.compose.material3.*
|
||||
import androidx.compose.runtime.*
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.graphics.ColorFilter
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.semantics.Role
|
||||
import androidx.compose.ui.text.TextStyle
|
||||
import androidx.compose.ui.text.input.KeyboardType
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import com.example.what_the_fantasy.R
|
||||
import com.example.what_the_fantasy.data.model.Quote
|
||||
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.states.CurrentUserState
|
||||
import com.example.what_the_fantasy.ui.states.SearchState
|
||||
import com.example.what_the_fantasy.ui.viewModels.AuthUserViewModel
|
||||
import com.example.what_the_fantasy.ui.viewModels.CurrentUserViewModel
|
||||
import com.example.what_the_fantasy.ui.viewModels.SearchViewModel
|
||||
import kotlinx.coroutines.delay
|
||||
|
||||
|
||||
@Composable
|
||||
fun SearchPage() {
|
||||
fun SearchPage(
|
||||
navFavorite: () -> Unit,
|
||||
navAccueil: () -> Unit,
|
||||
navProfil: () -> Unit,
|
||||
navQuiz: () -> Unit,
|
||||
navQuote: (Int) -> Unit,
|
||||
navSearch: (String, String) -> Unit,
|
||||
type: String,
|
||||
search: String,
|
||||
currentUserVM : CurrentUserViewModel,
|
||||
currentUserState : CurrentUserState,
|
||||
searchVM : SearchViewModel,
|
||||
searchState : SearchState,
|
||||
) {
|
||||
|
||||
|
||||
val textQuoteSearch = stringResource(id = R.string.QuoteSearch)
|
||||
val textTitleSearch = stringResource(id = R.string.TitleQuoteSearch)
|
||||
val textCharacterSearch = stringResource(id = R.string.character)
|
||||
val textSearch = stringResource(id = R.string.Search)
|
||||
|
||||
val filtre = listOf("contenu", "personnage", "titre")
|
||||
//val filtre = listOf(textQuoteSearch, textCharacterSearch, textTitleSearch)
|
||||
val (newFiltre, onFiltreSelected) = remember { mutableStateOf(type) }
|
||||
|
||||
val page = remember { mutableIntStateOf(1) }
|
||||
val quotes = remember { mutableStateListOf<Quote>() }
|
||||
val isLoading = remember { mutableStateOf(false) }
|
||||
val state = rememberLazyListState()
|
||||
|
||||
LaunchedEffect(page.intValue, type, search) {
|
||||
if (!isLoading.value) {
|
||||
isLoading.value = true
|
||||
delay(500)
|
||||
val newQuotes = searchVM.search(type, search, page.intValue * 15)
|
||||
val uniqueQuotes = newQuotes.filterNot { new -> quotes.any { it.id == new.id } }
|
||||
if (uniqueQuotes.isNotEmpty()) {
|
||||
quotes.addAll(uniqueQuotes)
|
||||
}
|
||||
isLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
NavBar(
|
||||
onAccueil = true,
|
||||
navControllerFavorite = navFavorite,
|
||||
navControllerAccueil = navAccueil,
|
||||
navControllerProfil = navProfil,
|
||||
navControllerQuiz = navQuiz,
|
||||
navControllerSearch = { navSearch("contenu", "") },
|
||||
currentUserVM = currentUserVM,
|
||||
currentUserState = currentUserState,
|
||||
|
||||
|
||||
) {
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.background(MaterialTheme.colorScheme.background)
|
||||
) {
|
||||
Text(
|
||||
text = "▶ " + stringResource(R.string.TitleSearch) + " ◀",
|
||||
color = MaterialTheme.colorScheme.onBackground,
|
||||
fontSize = 24.sp,
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(16.dp),
|
||||
textAlign = TextAlign.Center
|
||||
)
|
||||
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||
OutlinedTextField(
|
||||
value = searchState.search,
|
||||
onValueChange = {
|
||||
searchVM.setSearch(it)
|
||||
},
|
||||
textStyle = TextStyle(color = MaterialTheme.colorScheme.onBackground),
|
||||
label = { Text(textSearch) },
|
||||
modifier = Modifier
|
||||
.padding(top = 2.dp)
|
||||
.fillMaxWidth()
|
||||
.height(70.dp),
|
||||
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Text),
|
||||
maxLines = 1,
|
||||
shape = CircleShape,
|
||||
trailingIcon = {
|
||||
IconButton(
|
||||
onClick = { navSearch(newFiltre, searchState.search) },
|
||||
modifier = Modifier
|
||||
.size(50.dp)
|
||||
.clip(CircleShape)
|
||||
) {
|
||||
|
||||
Image(
|
||||
painter = painterResource(id = R.drawable.search),
|
||||
contentDescription = "search",
|
||||
modifier = Modifier
|
||||
.size(30.dp),
|
||||
colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary)
|
||||
)
|
||||
}
|
||||
}
|
||||
)
|
||||
Row(horizontalArrangement = Arrangement.SpaceAround) {
|
||||
filtre.forEach { typeItem ->
|
||||
Row(
|
||||
Modifier
|
||||
.height(56.dp)
|
||||
.selectable(
|
||||
selected = (typeItem == newFiltre),
|
||||
onClick = { onFiltreSelected(typeItem) },
|
||||
role = Role.RadioButton
|
||||
)
|
||||
.padding(horizontal = 16.dp),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
RadioButton(
|
||||
selected = (typeItem == newFiltre),
|
||||
onClick = null
|
||||
)
|
||||
Text(
|
||||
text = typeItem,
|
||||
style = MaterialTheme.typography.bodyLarge,
|
||||
modifier = Modifier.padding(start = 16.dp),
|
||||
color = MaterialTheme.colorScheme.onBackground
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
LazyColumn(
|
||||
modifier = Modifier.weight(1f),
|
||||
state = state
|
||||
) {
|
||||
items(quotes) { quote ->
|
||||
Column(Modifier.clickable { navQuote(quote.id) }) {
|
||||
if(quote.language == currentUserState.langage) { // affiche les suggestions de citation dans la bonne langue
|
||||
QuoteLittle(quote)
|
||||
}
|
||||
}
|
||||
}
|
||||
item {
|
||||
if (state.layoutInfo.visibleItemsInfo.lastOrNull()?.index == quotes.size - 1 && !isLoading.value) {
|
||||
LaunchedEffect(Unit) {
|
||||
page.intValue++
|
||||
}
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(16.dp),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
CircularProgressIndicator()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package com.example.what_the_fantasy.ui.states
|
||||
|
||||
import com.example.what_the_fantasy.data.model.SrcLanguage
|
||||
import com.example.what_the_fantasy.data.model.User
|
||||
|
||||
data class AuthUserState (
|
||||
val username : String = "",
|
||||
val password: String = "",
|
||||
)
|
||||
@ -0,0 +1,13 @@
|
||||
package com.example.what_the_fantasy.ui.states
|
||||
|
||||
import com.example.what_the_fantasy.data.model.SrcLanguage
|
||||
|
||||
data class CurrentUserState (
|
||||
var id : Int = -1,
|
||||
val imagePath : String ="",
|
||||
var username :String="",
|
||||
var email : String="",
|
||||
var password : String="",
|
||||
var confirmPassword : String="",
|
||||
val langage : SrcLanguage = SrcLanguage.vo
|
||||
)
|
||||
@ -0,0 +1,7 @@
|
||||
package com.example.what_the_fantasy.ui.states
|
||||
|
||||
data class QuoteInformationUserState (
|
||||
val comment : String ="",
|
||||
val isFavorite : Boolean = false,
|
||||
val like : Int = 0
|
||||
)
|
||||
@ -0,0 +1,5 @@
|
||||
package com.example.what_the_fantasy.ui.states
|
||||
|
||||
data class SearchState (
|
||||
var search : String = ""
|
||||
)
|
||||
@ -0,0 +1,8 @@
|
||||
package com.example.what_the_fantasy.ui.states
|
||||
|
||||
data class SignInUserState (
|
||||
val username : String ="",
|
||||
val email : String ="",
|
||||
val password : String ="",
|
||||
val confirmPassword : String ="",
|
||||
)
|
||||
@ -0,0 +1,30 @@
|
||||
package com.example.what_the_fantasy.ui.viewModels
|
||||
|
||||
import android.util.Log
|
||||
import androidx.lifecycle.ViewModel
|
||||
import com.example.what_the_fantasy.data.services.ServicesStub
|
||||
import com.example.what_the_fantasy.ui.states.AuthUserState
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
import kotlinx.coroutines.flow.asStateFlow
|
||||
import kotlinx.coroutines.flow.update
|
||||
|
||||
class AuthUserViewModel : ViewModel(){
|
||||
private val services = ServicesStub() // faire repository qui gère les services Stub et API
|
||||
private val _userState = MutableStateFlow(AuthUserState())
|
||||
val userState : StateFlow<AuthUserState> = _userState.asStateFlow()
|
||||
|
||||
|
||||
|
||||
fun setUsername(username : String){
|
||||
_userState.update { it.copy(username=username) }
|
||||
}
|
||||
|
||||
fun setPassword(password : String){
|
||||
_userState.update { it.copy(password=password) }
|
||||
}
|
||||
|
||||
fun validLogin(username : String, passwd : String, navController: (Int) -> Unit, initialierCurrentUser : (Int) -> Unit) : Boolean{
|
||||
return services.validLogin(username,passwd, navController, initialierCurrentUser)
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,94 @@
|
||||
package com.example.what_the_fantasy.ui.viewModels
|
||||
|
||||
import android.util.Log
|
||||
import androidx.lifecycle.ViewModel
|
||||
import com.example.what_the_fantasy.data.model.SrcLanguage
|
||||
import com.example.what_the_fantasy.data.services.ServicesStub
|
||||
import com.example.what_the_fantasy.ui.states.CurrentUserState
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
import kotlinx.coroutines.flow.asStateFlow
|
||||
import kotlinx.coroutines.flow.update
|
||||
|
||||
class CurrentUserViewModel : ViewModel(){
|
||||
private val services = ServicesStub() // faire repository qui gère les services Stub et API
|
||||
private val _currentUserState = MutableStateFlow(CurrentUserState())
|
||||
var currentUserState : StateFlow<CurrentUserState> = _currentUserState.asStateFlow()
|
||||
|
||||
|
||||
fun initialiseCurrentUser(index : Int){
|
||||
services.getUserById(index)?.let {
|
||||
setId(it.id)
|
||||
setUsername(it.username)
|
||||
setEmail(it.email)
|
||||
setPassword(it.password)
|
||||
setLangue(it.langage)
|
||||
setImage(it.imgUrl)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
fun clearCurrentUser(){
|
||||
_currentUserState.value = CurrentUserState()
|
||||
}
|
||||
|
||||
fun setId(id : Int){
|
||||
_currentUserState.update {it.copy(id = id)}
|
||||
}
|
||||
|
||||
fun setUsername(username : String){
|
||||
_currentUserState.update {it.copy(username = username)}
|
||||
}
|
||||
|
||||
fun setEmail(email : String){
|
||||
_currentUserState.update {it.copy(email = email)}
|
||||
}
|
||||
|
||||
fun setPassword(password : String){
|
||||
_currentUserState.update {it.copy(password = password)}
|
||||
}
|
||||
|
||||
|
||||
fun setLangue(langue : SrcLanguage){
|
||||
_currentUserState.update {it.copy(langage = langue)}
|
||||
}
|
||||
fun setImage(imagePath : String){
|
||||
_currentUserState.update {it.copy(imagePath = imagePath)}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
fun editUsername(username : String, index : Int) : Boolean{
|
||||
_currentUserState.update {it.copy(username = username)}
|
||||
return services.EditUsername(username, index)
|
||||
}
|
||||
|
||||
fun editEmail(email : String, index : Int) : Boolean{
|
||||
_currentUserState.update {
|
||||
it.copy(email = email)
|
||||
}
|
||||
return services.EditEmail(email, index)
|
||||
}
|
||||
|
||||
fun editPassword(password : String, index : Int){
|
||||
services.EditPasswd(password, index)
|
||||
|
||||
}
|
||||
|
||||
fun editLangue(index : Int){
|
||||
val langage = services.ChangeLangage(index)
|
||||
|
||||
_currentUserState.update {
|
||||
it.copy(langage = langage)
|
||||
}
|
||||
}
|
||||
|
||||
fun editImage(index : Int){
|
||||
val image = services.EditImage(index)
|
||||
|
||||
_currentUserState.update {
|
||||
it.copy(imagePath = image)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,43 @@
|
||||
package com.example.what_the_fantasy.ui.viewModels
|
||||
|
||||
import android.util.Log
|
||||
import androidx.lifecycle.ViewModel
|
||||
import com.example.what_the_fantasy.data.services.ServicesStub
|
||||
import com.example.what_the_fantasy.ui.states.QuoteInformationUserState
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
import kotlinx.coroutines.flow.asStateFlow
|
||||
import kotlinx.coroutines.flow.update
|
||||
|
||||
class QuoteInformationUserViewModel: ViewModel() {
|
||||
private val services = ServicesStub() // faire repository qui gère les services Stub et API
|
||||
private val _quoteState = MutableStateFlow(QuoteInformationUserState())
|
||||
val quoteState : StateFlow<QuoteInformationUserState> = _quoteState.asStateFlow()
|
||||
|
||||
fun setComment(comment : String){
|
||||
_quoteState.update { it.copy(comment=comment) }
|
||||
}
|
||||
|
||||
fun setFavorite(isFavorite : Boolean){
|
||||
_quoteState.update { it.copy(isFavorite=isFavorite) }
|
||||
}
|
||||
|
||||
fun setLike(like : Int){
|
||||
if(like >= 0) {
|
||||
_quoteState.update { it.copy(like=like) }
|
||||
}
|
||||
}
|
||||
|
||||
fun addFav(userId: Int, idQuote: Int) {
|
||||
services.AddFav(userId, idQuote)
|
||||
setLike(quoteState.value.like + 1)
|
||||
setFavorite(true)
|
||||
}
|
||||
|
||||
fun supFav(userId: Int, idQuote: Int) {
|
||||
services.SupFav(userId, idQuote)
|
||||
setLike(quoteState.value.like - 1)
|
||||
setFavorite(false)
|
||||
//Log.e("Like", "Service ${quoteState.value.like}")
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
package com.example.what_the_fantasy.ui.viewModels
|
||||
|
||||
import androidx.lifecycle.ViewModel
|
||||
import com.example.what_the_fantasy.data.model.Quote
|
||||
import com.example.what_the_fantasy.data.services.ServicesStub
|
||||
import com.example.what_the_fantasy.ui.states.CurrentUserState
|
||||
import com.example.what_the_fantasy.ui.states.SearchState
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
import kotlinx.coroutines.flow.asStateFlow
|
||||
import kotlinx.coroutines.flow.update
|
||||
|
||||
class SearchViewModel : ViewModel() {
|
||||
private val services = ServicesStub() // faire repository qui gère les services Stub et API
|
||||
private val _searchState = MutableStateFlow(SearchState())
|
||||
var searchState : StateFlow<SearchState> = _searchState.asStateFlow()
|
||||
|
||||
|
||||
|
||||
fun setSearch(search : String){
|
||||
_searchState.update {it.copy(search = search)}
|
||||
}
|
||||
|
||||
fun search(type : String ,search:String ,indexCount: Int): List<Quote>{
|
||||
return services.search(type,search,indexCount)
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
package com.example.what_the_fantasy.ui.viewModels
|
||||
|
||||
import androidx.lifecycle.ViewModel
|
||||
import com.example.what_the_fantasy.data.services.ServicesStub
|
||||
import com.example.what_the_fantasy.ui.states.SignInUserState
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
import kotlinx.coroutines.flow.asStateFlow
|
||||
import kotlinx.coroutines.flow.update
|
||||
|
||||
class SignInUserViewModel: ViewModel() {
|
||||
private val services = ServicesStub() // faire repository qui gère les services Stub et API
|
||||
private val _userState = MutableStateFlow(SignInUserState())
|
||||
val userState : StateFlow<SignInUserState> = _userState.asStateFlow()
|
||||
|
||||
fun createUser(username: String, email: String, passwd: String) : Boolean{
|
||||
return services.CreateUser(username, email, passwd)
|
||||
}
|
||||
|
||||
fun setUsername(username : String){
|
||||
_userState.update { it.copy(username=username) }
|
||||
}
|
||||
|
||||
fun setEmail(email : String){
|
||||
_userState.update { it.copy(email=email) }
|
||||
}
|
||||
|
||||
fun setPassword(password : String){
|
||||
_userState.update { it.copy(password=password) }
|
||||
}
|
||||
fun setConfirmPassword(confirmPassword : String){
|
||||
_userState.update { it.copy(confirmPassword=confirmPassword) }
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,9 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="39dp"
|
||||
android:height="19dp"
|
||||
android:viewportWidth="39"
|
||||
android:viewportHeight="19">
|
||||
<path
|
||||
android:pathData="M25.655,1.196H11.58C9.495,1.196 7.6,2.098 6.226,3.55C4.852,5.003 4,7.006 4,9.212C4,11.416 4.852,13.42 6.226,14.872C7.6,16.325 9.495,17.226 11.58,17.226H24.79C26.263,18.341 28.065,19 30.003,19H30.015C32.486,19 34.734,17.931 36.361,16.21C37.988,14.489 39,12.114 39,9.5C39,6.887 37.99,4.51 36.359,2.792C34.73,1.07 32.483,0 30.015,0H30.003C28.43,0 26.946,0.435 25.655,1.196ZM30.482,8.22L30.512,8.226C30.568,7.977 30.705,7.779 30.925,7.637C31.143,7.493 31.371,7.451 31.609,7.51L31.616,7.479C31.379,7.42 31.192,7.274 31.057,7.043C30.922,6.81 30.882,6.57 30.938,6.32L30.908,6.312C30.852,6.563 30.715,6.761 30.496,6.904C30.277,7.047 30.048,7.089 29.811,7.029L29.804,7.06C30.042,7.12 30.228,7.266 30.364,7.497C30.5,7.728 30.538,7.968 30.482,8.22ZM33.003,9.432L33.039,9.441C33.109,9.126 33.282,8.878 33.557,8.699C33.832,8.519 34.118,8.466 34.416,8.541L34.425,8.503C34.127,8.428 33.893,8.246 33.723,7.954C33.553,7.663 33.503,7.36 33.573,7.046L33.537,7.037C33.467,7.352 33.294,7.599 33.019,7.779C32.744,7.959 32.457,8.012 32.16,7.937L32.151,7.976C32.449,8.05 32.683,8.232 32.852,8.523C33.023,8.814 33.073,9.118 33.003,9.432ZM30.351,5.022C29.279,5.577 28.507,6.703 28.417,8.053C28.283,10.068 29.719,11.816 31.625,11.958C32.529,12.025 33.377,11.718 34.032,11.161C34.357,10.885 34.693,11.128 34.551,11.476C33.777,13.386 31.923,14.66 29.852,14.505C27.235,14.311 25.263,11.91 25.446,9.143C25.622,6.491 27.724,4.458 30.212,4.481C30.67,4.486 30.767,4.807 30.351,5.022ZM30.003,1.123H30.015C34.373,1.123 37.939,4.892 37.939,9.5C37.939,14.108 34.369,17.878 30.015,17.878H30.003C25.65,17.878 22.08,14.108 22.08,9.5C22.08,4.892 25.645,1.123 30.003,1.123Z"
|
||||
android:fillColor="#ffffff"/>
|
||||
</vector>
|
||||
@ -1,10 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="39dp"
|
||||
android:height="19dp"
|
||||
android:viewportWidth="39"
|
||||
android:viewportHeight="19">
|
||||
<path
|
||||
android:pathData="M9.752,0H9.765C11.443,0 13.028,0.42 14.412,1.158H30.437C32.79,1.158 34.931,2.096 36.483,3.609C38.036,5.12 39,7.206 39,9.5C39,11.795 38.036,13.88 36.485,15.392L36.453,15.42C34.903,16.916 32.775,17.842 30.437,17.842H14.415C13.031,18.579 11.446,19 9.765,19H9.752C7.07,19 4.631,17.931 2.864,16.21C1.098,14.489 0,12.114 0,9.5C0,6.886 1.097,4.51 2.863,2.789L2.933,2.728C4.696,1.043 7.106,0 9.752,0ZM9.298,4.038C9.298,3.894 9.359,3.762 9.457,3.667C9.665,3.462 10.01,3.463 10.22,3.667L10.231,3.678C10.325,3.776 10.378,3.904 10.378,4.038V4.999C10.378,5.144 10.318,5.276 10.22,5.371C10.01,5.575 9.666,5.575 9.457,5.371C9.407,5.322 9.367,5.264 9.34,5.201C9.312,5.137 9.298,5.068 9.298,4.999V4.038ZM9.759,6.351C10.652,6.351 11.459,6.704 12.044,7.274C12.628,7.844 12.991,8.631 12.991,9.5C12.991,10.37 12.629,11.156 12.044,11.726C11.459,12.296 10.652,12.649 9.759,12.649C8.866,12.649 8.059,12.296 7.473,11.726C6.889,11.156 6.526,10.37 6.526,9.5C6.526,8.63 6.889,7.844 7.473,7.274C8.059,6.705 8.867,6.351 9.759,6.351ZM5.468,5.955C5.368,5.856 5.311,5.723 5.311,5.583C5.311,5.294 5.553,5.057 5.851,5.057C5.989,5.057 6.127,5.108 6.232,5.211L6.929,5.891C6.98,5.939 7.019,5.997 7.047,6.061C7.074,6.125 7.088,6.193 7.088,6.262C7.088,6.396 7.034,6.531 6.929,6.634C6.879,6.683 6.82,6.722 6.754,6.748C6.689,6.775 6.619,6.789 6.548,6.788C6.411,6.788 6.273,6.737 6.167,6.635L5.468,5.955ZM4.152,9.948C4.004,9.948 3.868,9.889 3.771,9.794C3.56,9.591 3.561,9.254 3.771,9.051L3.782,9.041C3.882,8.948 4.014,8.897 4.152,8.897H5.138C5.209,8.897 5.279,8.91 5.345,8.937C5.41,8.963 5.47,9.002 5.52,9.051C5.57,9.099 5.61,9.158 5.637,9.221C5.664,9.285 5.678,9.354 5.678,9.423C5.678,9.568 5.617,9.7 5.52,9.795C5.419,9.893 5.281,9.948 5.138,9.948H4.152ZM6.119,13.679C6.069,13.728 6.01,13.767 5.944,13.793C5.879,13.819 5.809,13.833 5.738,13.833C5.44,13.833 5.198,13.599 5.198,13.308C5.198,13.173 5.25,13.039 5.356,12.936L6.065,12.246C6.165,12.154 6.297,12.102 6.435,12.102C6.578,12.102 6.716,12.158 6.817,12.257C6.918,12.355 6.975,12.489 6.975,12.629C6.975,12.761 6.923,12.896 6.817,12.999L6.119,13.679ZM10.219,14.962C10.219,15.106 10.158,15.239 10.06,15.333C9.851,15.538 9.506,15.538 9.297,15.333L9.287,15.322C9.192,15.225 9.139,15.096 9.139,14.962V14.001C9.139,13.856 9.2,13.725 9.297,13.63C9.507,13.426 9.851,13.426 10.061,13.63C10.162,13.728 10.218,13.862 10.219,14.001V14.962ZM14.048,13.046C14.099,13.094 14.138,13.152 14.165,13.216C14.192,13.28 14.206,13.348 14.206,13.417C14.206,13.706 13.964,13.943 13.667,13.943C13.529,13.943 13.39,13.892 13.285,13.79L12.587,13.11C12.486,13.011 12.429,12.877 12.43,12.738C12.43,12.448 12.672,12.212 12.969,12.212C13.106,12.212 13.244,12.264 13.35,12.366L14.048,13.046ZM15.365,9.052C15.512,9.052 15.649,9.112 15.746,9.206C15.957,9.41 15.956,9.746 15.746,9.95L15.735,9.96C15.635,10.052 15.503,10.104 15.365,10.104H14.379C14.23,10.104 14.094,10.045 13.997,9.95C13.787,9.746 13.787,9.41 13.997,9.206C14.047,9.157 14.107,9.118 14.172,9.092C14.238,9.065 14.308,9.052 14.379,9.052H15.365ZM13.398,5.321C13.499,5.222 13.636,5.167 13.779,5.167C14.076,5.167 14.32,5.404 14.32,5.693C14.32,5.827 14.267,5.962 14.162,6.064L13.452,6.755C13.352,6.847 13.219,6.898 13.082,6.898C12.784,6.898 12.542,6.662 12.542,6.372C12.542,6.239 12.595,6.104 12.7,6.001L13.398,5.321ZM16.001,2.214C16.226,2.397 16.443,2.59 16.65,2.792C18.419,4.51 19.517,6.886 19.517,9.5C19.517,12.114 18.418,14.489 16.653,16.21C16.446,16.411 16.23,16.604 16.005,16.786H30.437C32.48,16.786 34.34,15.977 35.694,14.672L35.718,14.646C37.074,13.325 37.916,11.503 37.916,9.5C37.916,7.497 37.074,5.675 35.718,4.354C34.365,3.033 32.494,2.214 30.437,2.214H16.001ZM9.752,1.122H9.765C14.495,1.122 18.364,4.892 18.364,9.5C18.364,14.108 14.49,17.878 9.765,17.878H9.752C5.027,17.878 1.152,14.108 1.152,9.5C1.152,4.892 5.022,1.122 9.752,1.122Z"
|
||||
android:fillColor="#000000"
|
||||
android:fillType="evenOdd"/>
|
||||
</vector>
|
||||
@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="256dp"
|
||||
android:height="256dp"
|
||||
android:viewportWidth="256"
|
||||
android:viewportHeight="256">
|
||||
<path
|
||||
android:pathData="M115.8,18C90.7,20.2 67,29.2 47.6,43.8c-4.7,3.6 -13.8,12.4 -17.5,17C7.9,88.2 3.8,123.2 19.2,154c4.9,9.8 9.9,16.6 19,26c9.9,10.3 9.8,9.8 10.1,32.1l0.2,17.3l1.2,2.1c2.8,4.7 6.9,7.1 12.1,7.1c2.3,0 3.9,-0.3 5.3,-1c1.2,-0.5 9.1,-5.4 17.7,-10.9c8.6,-5.5 16.7,-10.4 18.2,-10.9c5.1,-1.9 8.2,-2.2 20.1,-2c12.5,0.3 20,-0.2 29.8,-2c12.8,-2.3 24,-6 35.5,-11.8c42.5,-21.2 64.2,-60.6 55.8,-101.5c-6,-29.3 -29.2,-55.7 -61.4,-69.7C162.2,19.8 138.5,16 115.8,18zM145.3,32.4c14.3,1.9 25.6,5.2 37.8,11.1c28.9,14 46.2,37.4 48.7,66.1c1.5,16.2 -2.8,33.1 -11.9,47.1c-13.1,20.1 -36.5,35 -63.8,40.6c-10.9,2.3 -13.4,2.5 -30.3,2.6c-17,0.1 -19.2,0.3 -25.8,2.4c-5.3,1.7 -7.1,2.7 -23.3,13l-14.5,9.3l-0.2,-15.6l-0.2,-15.5l-1.7,-4.8c-2.5,-7.1 -5.3,-11.3 -11.9,-18c-13.7,-13.9 -20.1,-25.2 -23.2,-41.2c-1.3,-6.8 -1.4,-19.4 -0.2,-26.4c4.6,-25.5 21.7,-46.8 48,-59.5c12.7,-6.1 25.8,-9.8 39.7,-11.2c2.8,-0.3 5.8,-0.6 6.7,-0.7C122.5,31.2 140.4,31.8 145.3,32.4z"
|
||||
android:fillColor="#000000"/>
|
||||
</vector>
|
||||
@ -0,0 +1,18 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="96dp"
|
||||
android:height="96dp"
|
||||
android:viewportWidth="96"
|
||||
android:viewportHeight="96">
|
||||
<path
|
||||
android:pathData="M45.6,45.8c-38,38.1 -40.4,41 -35.2,42 1.3,0.3 5,-2.8 12.1,-9.8l10.2,-10.2 4.3,2.8c3.7,2.5 5.4,2.9 11,2.9 5.5,-0 7.3,-0.4 10.7,-2.7 6.3,-4.1 8.8,-9 8.8,-16.9 0,-5.5 -0.4,-7.2 -2.9,-10.9l-2.8,-4.3 4.4,-4.3 4.3,-4.4 4.6,3.8c6.1,5 10.6,10.9 13.5,17.9 1.9,4.7 2.7,5.8 4.6,5.8 2,-0 2.3,-0.5 2.1,-3.3 -0.2,-5.8 -5.2,-14.3 -12.8,-21.8l-7.3,-7.2 6.5,-6.3c4.3,-4.3 6.3,-7.1 6.1,-8.4 -0.8,-5.5 -4,-2.9 -42.2,35.3zM60,47.2c7.6,12.4 -9,27.1 -20.1,17.9l-2.4,-2 2.6,-2.6c2.3,-2.3 2.8,-2.5 5.2,-1.4 5.4,2.5 10.5,-2.9 7.7,-8.1 -1,-1.8 -0.8,-2.6 1.1,-4.6 2.9,-3.1 3.5,-3 5.9,0.8z"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M36,19.6c-9.3,2.5 -16.2,6.4 -23.1,13.3 -10.1,10.2 -15.8,24.1 -10.1,24.9 1.4,0.2 2.4,-0.3 2.8,-1.5 7.1,-21 25.4,-33.7 46,-31.9 6.6,0.5 7.3,0.4 9.3,-1.8l2.3,-2.4 -5.2,-1.1c-6.8,-1.5 -15.3,-1.3 -22,0.5z"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M41.2,35.1c-6.6,1.9 -14.3,12.8 -13,18.4 0.2,0.7 4.9,-3.3 10.7,-9.1 10.8,-10.9 11,-11.8 2.3,-9.3z"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#00000000"/>
|
||||
</vector>
|
||||
@ -0,0 +1,14 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="96dp"
|
||||
android:height="96dp"
|
||||
android:viewportWidth="96"
|
||||
android:viewportHeight="96">
|
||||
<path
|
||||
android:pathData="M36,19.6c-9.3,2.5 -16.2,6.4 -23.1,13.3 -10.1,10.2 -15.8,24.1 -10.1,24.9 1.4,0.2 2.4,-0.3 2.8,-1.5 2.4,-7.2 6.8,-14.6 11.2,-19 22.4,-22.4 59.9,-14.8 71.8,14.6 1.9,4.5 2.7,5.6 4.6,5.6 5.9,-0 -0.1,-14.5 -10.1,-24.5 -12.9,-12.7 -30.6,-17.8 -47.1,-13.4z"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M40.5,35.9c-12.5,5.8 -15.5,20.7 -6.1,30.9 11.1,12.2 32.6,3.5 32.6,-13.2 0,-2.5 -0.5,-5.7 -1.1,-7.3 -2.4,-6.4 -10.9,-12.3 -17.9,-12.3 -1.9,-0 -5.3,0.9 -7.5,1.9zM53.5,41.4c10.4,4.4 9.8,20 -1,24.1 -4.5,1.8 -8.8,1.2 -12.5,-1.8 -7.5,-5.8 -6.2,-18.6 2.3,-22.2 4.1,-1.8 6.9,-1.8 11.2,-0.1z"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#00000000"/>
|
||||
</vector>
|
||||
@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="256dp"
|
||||
android:height="256dp"
|
||||
android:viewportWidth="256"
|
||||
android:viewportHeight="256">
|
||||
<path
|
||||
android:pathData="M96.1,10.5c-18.4,1.9 -36,9.2 -50.7,21.1c-4.1,3.3 -12.3,11.7 -15.2,15.5c-3.9,5 -7.8,11.4 -10.4,16.6C3.7,96.9 7.6,135 30.2,164.6c2.9,3.9 11.2,12.3 15.2,15.5c34.5,27.8 82.4,28.8 117.6,2.4l5.2,-3.9l33.4,33.4c36.3,36.2 34.3,34.5 38.6,33.7c2.2,-0.4 5.1,-3.4 5.5,-5.5c0.8,-4.2 2.4,-2.3 -33.7,-38.6l-33.4,-33.4l3.9,-5.2c26.4,-35.2 25.4,-83.2 -2.4,-117.6c-3.3,-4.1 -11.7,-12.3 -15.5,-15.2C144.7,15 120.4,8 96.1,10.5zM116,25.4c9.6,1.2 17.5,3.6 25.9,7.9c40,20 56.4,68.8 36.5,108.5c-14,27.7 -42,45.1 -72.6,45.1c-27,0 -52.4,-13.7 -67.6,-36.5C18.7,121.3 20.7,82 42.9,54.7c2.7,-3.3 9.4,-9.9 12.7,-12.5C72.2,28.9 95,22.6 116,25.4z"
|
||||
android:fillColor="#000000"/>
|
||||
</vector>
|
||||
@ -1,17 +0,0 @@
|
||||
package com.example.what_the_fantasy
|
||||
|
||||
import org.junit.Test
|
||||
|
||||
import org.junit.Assert.*
|
||||
|
||||
/**
|
||||
* Example local unit test, which will execute on the development machine (host).
|
||||
*
|
||||
* See [testing documentation](http://d.android.com/tools/testing).
|
||||
*/
|
||||
class ExampleUnitTest {
|
||||
@Test
|
||||
fun addition_isCorrect() {
|
||||
assertEquals(4, 2 + 2)
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,161 @@
|
||||
package com.example.what_the_fantasy
|
||||
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Test
|
||||
import com.example.what_the_fantasy.data.services.IServices
|
||||
import com.example.what_the_fantasy.data.services.ServicesStub
|
||||
import org.junit.Assert.assertFalse
|
||||
import org.junit.Assert.assertTrue
|
||||
|
||||
class UnitTestQuote {
|
||||
private val services : IServices = ServicesStub()
|
||||
|
||||
@Test
|
||||
fun testGetQuote_OK(){
|
||||
val quote = services.getQuote(1)
|
||||
assertEquals("All we have to decide is what to do with the time that is given us.",quote?.content)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testGetQuote_Fake(){
|
||||
val quote = services.getQuote(-1)
|
||||
assertEquals(null,quote?.content)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testGetSomeQuote_OK(){
|
||||
val quote = services.getSomeQuotes(4,1)
|
||||
assertEquals(4,quote.size)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testGetSomeQuoteIndexNegatif(){
|
||||
val quote = services.getSomeQuotes(-1,1)
|
||||
assertEquals(1,quote.size)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testGetSomeQuotePageNegatif(){
|
||||
val quote = services.getSomeQuotes(1,-1)
|
||||
assertEquals(1,quote.size)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testGetSomeQuoteIndex0(){
|
||||
val quote = services.getSomeQuotes(0,1)
|
||||
assertEquals(0,quote.size)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testSearchByFullQuote(){
|
||||
val quote = services.search("contenu","I am no man.",1)
|
||||
assertEquals("I am no man.",quote[0].content)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testSearchByHalfQuote(){
|
||||
val quote = services.search("contenu","I am no",1)
|
||||
assertEquals("I am no man.",quote[0].content)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testSearchByFullQuoteWithUpperCase(){
|
||||
val quote = services.search("contenu","I aM nO MaN",1)
|
||||
assertEquals("I am no man.",quote[0].content)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testSearchByHalfQuoteWithUpperCase(){
|
||||
val quote = services.search("contenu","I aM nO",1)
|
||||
assertEquals("I am no man.",quote[0].content)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testSearchByFullQuoteBad(){
|
||||
val quote = services.search("contenu","I am no Man bad",1)
|
||||
assertEquals(0,quote.size)
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@Test
|
||||
fun testSearchByFullCharacter(){
|
||||
val quote = services.search("personnage","Arwen",1)
|
||||
assertEquals("Arwen",quote[0].character)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testSearchByHalfCharacter(){
|
||||
val quote = services.search("personnage","Arw",1)
|
||||
assertEquals("Arwen",quote[0].character)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testSearchByFullCharacterWithUpperCase(){
|
||||
val quote = services.search("personnage","ArwEn",1)
|
||||
assertEquals("Arwen",quote[0].character)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testSearchByHalfCharacterWithUpperCase(){
|
||||
val quote = services.search("personnage","Arw",1)
|
||||
assertEquals("Arwen",quote[0].character)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testSearchByFullCharacterBad(){
|
||||
val quote = services.search("personnage","Arwen bad",1)
|
||||
assertEquals(0,quote.size)
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
fun testSearchByFullTitle(){
|
||||
val quote = services.search("titre","Star Wars",1)
|
||||
assertEquals("Star Wars",quote[0].source)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testSearchByHalfTitle(){
|
||||
val quote = services.search("titre","Star",1)
|
||||
assertEquals("Star Wars",quote[0].source)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testSearchByFullTitleWithUpperCase(){
|
||||
val quote = services.search("titre","StAr WaRs",1)
|
||||
assertEquals("Star Wars",quote[0].source)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testSearchByHalfTitleWithUpperCase(){
|
||||
val quote = services.search("titre","StAr",1)
|
||||
assertEquals("Star Wars",quote[0].source)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testSearchByTitleBad(){
|
||||
val quote = services.search("titre","Star Wars bad",1)
|
||||
assertEquals(0,quote.size)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testIsFavorite_OK(){
|
||||
|
||||
assertTrue(services.isFavorite(1,10))
|
||||
}
|
||||
@Test
|
||||
fun testIsFavorite_FakeQuote(){
|
||||
assertFalse(services.isFavorite(-1,10))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testIsFavorite_FakeUser(){
|
||||
assertFalse(services.isFavorite(1,-1))
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,158 @@
|
||||
package com.example.what_the_fantasy
|
||||
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.navigation.compose.rememberNavController
|
||||
import com.example.what_the_fantasy.data.model.SrcLanguage
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Test
|
||||
import com.example.what_the_fantasy.data.services.IServices
|
||||
import com.example.what_the_fantasy.data.services.ServicesStub
|
||||
import com.example.what_the_fantasy.data.services.hashPassword
|
||||
import org.junit.Assert.assertFalse
|
||||
import org.junit.Assert.assertTrue
|
||||
|
||||
class UnitTestUser {
|
||||
private val services : IServices = ServicesStub()
|
||||
|
||||
|
||||
@Test
|
||||
fun testCreateUser_OK(){
|
||||
assertTrue(services.CreateUser("username", "email", "passwd")
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testCreateUserSameUsername(){
|
||||
services.CreateUser("username2", "email2", "passwd")
|
||||
assertFalse(services.CreateUser("username2", "emai", "passwd"))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testCreateUserSameEmail(){
|
||||
services.CreateUser("username3", "email3", "passwd")
|
||||
assertFalse(services.CreateUser("usernam", "email3", "passwd")
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testCreateUserEmptyUsername(){
|
||||
assertFalse(services.CreateUser("", "email", "passwd")
|
||||
)
|
||||
}
|
||||
@Test
|
||||
fun testCreateUserEmptyEmail(){
|
||||
assertFalse(services.CreateUser("usernameEmptyEmail", "", "passwd")
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testCreateUserEmptyPassword(){
|
||||
assertFalse(services.CreateUser("usernameEmptyPassword", "email", "")
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testUserEditUsername_OK(){
|
||||
services.CreateUser("username4", "email4", "passwd")
|
||||
assertTrue(services.EditUsername("newUsername",11))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testUserEditUsernameSameUsernameWithAnotherUsername(){
|
||||
services.CreateUser("username5", "email5", "passwd")
|
||||
assertFalse(services.EditUsername("dev",10))
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
fun testUserEditEmail_OK(){
|
||||
services.CreateUser("username6", "email6", "passwd")
|
||||
assertTrue(services.EditEmail("newEmail",11))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testUserEditEmailSameUsernameWithAnotherEmail(){
|
||||
services.CreateUser("username7", "email7", "passwd")
|
||||
assertFalse(services.EditEmail("testeur@example.com",10))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testUserEditPassword_OK(){
|
||||
services.CreateUser("username8", "email8", "passwd")
|
||||
services.EditPasswd("newPassword",11)
|
||||
assertEquals(hashPassword("newPassword"), services.getUserById(11)?.password)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testUserChangeLangueVoAtVf(){
|
||||
services.CreateUser("username9", "email9", "passwd")
|
||||
services.ChangeLangage(11)
|
||||
assertEquals(SrcLanguage.vf, services.getUserById(11)?.langage)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testUserChangeLangueVfAtVo(){
|
||||
services.CreateUser("username10", "email10", "passwd")
|
||||
services.ChangeLangage(11)
|
||||
services.ChangeLangage(11)
|
||||
assertEquals(SrcLanguage.vo, services.getUserById(11)?.langage)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testUserExist_OK(){
|
||||
assertTrue(services.isUsernameExist("dev"))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testUserNotExist_OK(){
|
||||
assertFalse(services.isUsernameExist("devNotExist"))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testEmailExist_OK(){
|
||||
assertTrue(services.isEmailExist("testeur@example.com"))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testEmailNotExist_OK(){
|
||||
assertFalse(services.isUsernameExist("email@example.com"))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun TestUserValidLogin_OK() {
|
||||
val navControllerMock: (Int) -> Unit = {}
|
||||
val initialiserCurrentUserMock: (Int) -> Unit = {}
|
||||
|
||||
assertTrue(services.validLogin("dev", "1234", navControllerMock, initialiserCurrentUserMock))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun TestUserValidLoginBadUsername() {
|
||||
val navControllerMock: (Int) -> Unit = {}
|
||||
val initialiserCurrentUserMock: (Int) -> Unit = {}
|
||||
|
||||
assertFalse(services.validLogin("devBad", "1234", navControllerMock, initialiserCurrentUserMock))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun TestUserValidLoginBadPassword() {
|
||||
val navControllerMock: (Int) -> Unit = {}
|
||||
val initialiserCurrentUserMock: (Int) -> Unit = {}
|
||||
|
||||
assertFalse(services.validLogin("dev", "5678", navControllerMock, initialiserCurrentUserMock))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testGetUserById(){
|
||||
val user = services.getUserById(10)
|
||||
assertEquals("dev", user?.username)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testGetFavorite_User_Dev(){
|
||||
val user = services.getAllUsers()[10]
|
||||
val quotes = services.getFavorite(user)
|
||||
assertEquals(3, quotes.size)
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in new issue