Cemal
/
QualiNomme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' 

# Conflicts:
#	src/main/kotlin/main/Detail.kt
main
Cemal Odabasioglu 2023-12-18 16:11:29 +01:00
parent 86862d510b c7f59ccda2
commit 7cfdcf1f09
1 changed files with 89 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

284
src/main/kotlin/main/Detail.kt
View File

@ -1,228 +1,122 @@
package main package main
import androidx.compose.foundation.background
import androidx.compose.foundation.border import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.grid.GridCells import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.grid.items import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.Button
import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.Icon
import androidx.compose.material.* import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.filled.Delete import androidx.compose.runtime.Composable
import androidx.compose.material.icons.filled.Search
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
@Composable @Composable
fun glossaryDetailedPage(glossary: List<Word>, onBackClick: () -> Unit) { fun glossaryDetailedPage(glossary: List<Word>, onBackClick: () -> Unit) {
var searchQuery by remember { mutableStateOf("") }
var sortOption by remember { mutableStateOf("Nom ↑") }
var filteredGlossary by remember { mutableStateOf(glossary) }
val menuExpanded = remember { mutableStateOf(false) }
// Sort the glossary according to the selected option
val sortedGlossaire = remember(glossary, sortOption) {
val glossaireCopy = glossary.toMutableList()
when (sortOption) {
"Nom ↑" -> glossaireCopy.sortBy { it.name }
"Nom ↓" -> glossaireCopy.sortByDescending { it.name }
"Contexte ↑" -> glossaireCopy.sortBy { it.mainContext }
"Contexte ↓" -> glossaireCopy.sortByDescending { it.mainContext }
}
glossaireCopy
}
// Update the filtered glossary when the search query changes
filteredGlossary = if (searchQuery.isNotEmpty()) {
glossary.filter { mot ->
mot.name.contains(searchQuery, ignoreCase = true) ||
mot.description.contains(searchQuery, ignoreCase = true) ||
mot.mainContext.contains(searchQuery, ignoreCase = true) ||
mot.secondaryContext.contains(searchQuery, ignoreCase = true) ||
mot.relatedTo.contains(searchQuery, ignoreCase = true) ||
mot.synonymous.contains(searchQuery, ignoreCase = true) ||
mot.antonym.contains(searchQuery, ignoreCase = true)
}
} else {
sortedGlossaire
}
Column( Column(
modifier = Modifier.fillMaxSize(), modifier = Modifier.fillMaxSize(),
verticalArrangement = Arrangement.Top, // Align content at the top
horizontalAlignment = Alignment.CenterHorizontally horizontalAlignment = Alignment.CenterHorizontally
) { ) {
TopAppBar( Text(text = "Détail du glossaire", style = MaterialTheme.typography.h3)
backgroundColor = customRedColor,
title = { Text("Glossaire", color = Color.White) },
navigationIcon = {
IconButton(onClick = onBackClick) {
Icon(imageVector = Icons.Default.ArrowBack, contentDescription = "Retour", tint = Color.White)
}
}
)
Row( Spacer(modifier = Modifier.height(16.dp))
modifier = Modifier
.fillMaxWidth() glossaryTable(glossary = glossary)
.padding(16.dp),
horizontalArrangement = Arrangement.SpaceBetween Spacer(modifier = Modifier.height(16.dp))
Button(
onClick = { onBackClick() },
colors = androidx.compose.material.ButtonDefaults.buttonColors(
backgroundColor = customRedColor,
contentColor = Color.White
)
) { ) {
Box( Icon(imageVector = Icons.Default.ArrowBack, contentDescription = null)
modifier = Modifier Text("Retour")
.border(1.dp, customRedColor, RoundedCornerShape(4.dp)) }
.padding(8.dp) }
.clickable { }
menuExpanded.value = !menuExpanded.value
}
) {
Text(
text = "Trier par: $sortOption",
color = Color.Black
)
}
DropdownMenu( // Faire un tableau qui affiche les mots et leur définition
expanded = menuExpanded.value, @Composable
onDismissRequest = { fun glossaryTable(glossary: List<Word>) {
menuExpanded.value = false val listState = rememberLazyListState()
}, LazyColumn(state = listState, modifier = Modifier.padding(16.dp)) {
) { item {
DropdownMenuItem(onClick = { headerRow()
sortOption = "Nom ↑" }
menuExpanded.value = false items(glossary) { word ->
}) { glossaryDataRow(word)
Text("Nom ↑")
}
DropdownMenuItem(onClick = {
sortOption = "Nom ↓"
menuExpanded.value = false
}) {
Text("Nom ↓")
}
DropdownMenuItem(onClick = {
sortOption = "Contexte ↑"
menuExpanded.value = false
}) {
Text("Contexte ↑")
}
DropdownMenuItem(onClick = {
sortOption = "Contexte ↓"
menuExpanded.value = false
}) {
Text("Contexte ↓")
}
} }
} }
}
OutlinedTextField(
value = searchQuery,
onValueChange = {
searchQuery = it
},
label = { Text("Rechercher dans le glossaire") },
keyboardOptions = KeyboardOptions.Default.copy(
imeAction = ImeAction.Search,
keyboardType = KeyboardType.Text
),
singleLine = true, // Single line text field
leadingIcon = {
Icon(imageVector = Icons.Default.Search, contentDescription = null)
},
colors = TextFieldDefaults.outlinedTextFieldColors(
focusedBorderColor = customRedColor,
cursorColor = customRedColor,
focusedLabelColor = customRedColor,
),
modifier = Modifier
.fillMaxWidth()
.padding(16.dp)
)
LazyVerticalGrid( @Composable
columns = GridCells.Fixed(2), fun headerRow() {
contentPadding = PaddingValues(16.dp), val headers = listOf(
modifier = Modifier.fillMaxSize() "Mot",
) { "Définition",
items(filteredGlossary) { mot -> "Contexte principal",
glossaryCard(mot, onDeleteClick = { wordToDelete -> "Contexte secondaire",
deleteWordOfGlossary(wordToDelete) "Mot lié",
// Display the updated glossary "Synonyme",
filteredGlossary = loadDatasFromFile("glossaire.json") "Antonyme"
)
}) Row(
} modifier = Modifier
.fillMaxWidth()
.background(customRedColor)
.border(1.dp, Color.Black),
verticalAlignment = Alignment.CenterVertically
) {
headers.forEach { header ->
Text(
text = header,
fontWeight = FontWeight.Bold,
modifier = Modifier.weight(1f).padding(8.dp),
color = Color.White
)
} }
} }
} }
@Composable @Composable
fun glossaryCard(word: Word, onDeleteClick: (Word) -> Unit) { fun CellContent(text: String, modifier: Modifier = Modifier) {
Card( Text(
modifier = Modifier text = text,
.fillMaxWidth() modifier = modifier
.padding(8.dp), )
elevation = 8.dp
) {
Column(
modifier = Modifier
.fillMaxSize()
.padding(16.dp)
) {
Text(text = word.name, style = MaterialTheme.typography.h6)
Spacer(modifier = Modifier.height(8.dp))
Text(text = "Description: ${word.description}")
Spacer(modifier = Modifier.height(4.dp))
Text(text = "Contexte principal: ${word.mainContext}")
Spacer(modifier = Modifier.height(4.dp))
Text(text = "Contexte 2: ${word.secondaryContext}")
Spacer(modifier = Modifier.height(4.dp))
Text(text = "Lié à: ${word.relatedTo}")
Spacer(modifier = Modifier.height(4.dp))
Text(text = "Synonyme: ${word.synonymous}")
Spacer(modifier = Modifier.height(4.dp))
Text(text = "Antonyme: ${word.antonym}")
// Add a delete button to delete the word
IconButton(
onClick = { onDeleteClick(word) },
modifier = Modifier
.align(Alignment.End)
.padding(top = 8.dp)
) {
Icon(
imageVector = Icons.Default.Delete,
contentDescription = "Supprimer",
tint = customRedColor
)
}
}
}
} }
fun deleteWordOfGlossary(word: Word) { @Composable
val wordsList = loadDatasFromFile("glossaire.json").toMutableList() fun glossaryDataRow(word: Word) {
Row(
// Delete the word from the list modifier = Modifier
wordsList.remove(word) .fillMaxWidth()
.background(Color.White)
// Save the updated list to the file .border(1.dp, Color.Black), // Ajouter une bordure à chaque ligne
//saveDatasInFile(wordsList) verticalAlignment = Alignment.CenterVertically
) {
println("Mot supprimé avec succès : ${word.name}") val modifier = Modifier.weight(1f).padding(8.dp)
// Contenu de chaque cellule
CellContent(word.name, modifier)
CellContent(word.description, modifier)
CellContent(word.mainContext, modifier)
CellContent(word.secondaryContext, modifier)
CellContent(word.relatedTo, modifier)
CellContent(word.synonymous, modifier)
CellContent(word.antonym, modifier)
}
} }