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

Merge remote-tracking branch 'origin/main'

main
Cemal Odabasioglu 2023-12-18 09:38:39 +01:00
parent cce696afe9 899d48f01a
commit 3956aad6c1
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,6 +143,11 @@ fun glossaryDetailedPage(glossary: List<Word>, onBackClick: () -> Unit) {
leadingIcon = {
Icon(imageVector = Icons.Default.Search, contentDescription = null)
},
colors = TextFieldDefaults.outlinedTextFieldColors(
focusedBorderColor = customRedColor,
cursorColor = customRedColor,
focusedLabelColor = customRedColor,
),
modifier = Modifier
.fillMaxWidth()
.padding(16.dp)

26
src/main/kotlin/main/Form.kt
View File

@ -5,7 +5,6 @@ import androidx.compose.material.*
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.filled.Check
import androidx.compose.material.icons.filled.Close
import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.mutableStateOf
@ -44,7 +43,7 @@ fun formPage(onCancelClick: () -> Unit) {
Text(text = "Confirmation d'ajout de mot")
},
text = {
Text("Le mot a bien été ajouté au glossaire.")
Text("Le mot '${name.value}' a bien été ajouté au glossaire.")
},
confirmButton = {
Button(
@ -77,6 +76,11 @@ fun formPage(onCancelClick: () -> Unit) {
value = name.value,
onValueChange = { name.value = it },
label = { Text("Mot *") },
colors = TextFieldDefaults.textFieldColors(
focusedIndicatorColor = customRedColor,
unfocusedIndicatorColor = Color.Gray,
focusedLabelColor = customRedColor
)
)
TextField(
@ -85,7 +89,8 @@ fun formPage(onCancelClick: () -> Unit) {
label = { Text("Description") },
colors = TextFieldDefaults.textFieldColors(
focusedIndicatorColor = customRedColor,
unfocusedIndicatorColor = Color.Gray
unfocusedIndicatorColor = Color.Gray,
focusedLabelColor = customRedColor
)
)
@ -95,7 +100,8 @@ fun formPage(onCancelClick: () -> Unit) {
label = { Text("Contexte principal *") },
colors = TextFieldDefaults.textFieldColors(
focusedIndicatorColor = customRedColor,
unfocusedIndicatorColor = Color.Gray
unfocusedIndicatorColor = Color.Gray,
focusedLabelColor = customRedColor
)
)
@ -105,7 +111,8 @@ fun formPage(onCancelClick: () -> Unit) {
label = { Text("Contexte 2") },
colors = TextFieldDefaults.textFieldColors(
focusedIndicatorColor = customRedColor,
unfocusedIndicatorColor = Color.Gray
unfocusedIndicatorColor = Color.Gray,
focusedLabelColor = customRedColor
)
)
@ -115,7 +122,8 @@ fun formPage(onCancelClick: () -> Unit) {
label = { Text("Lié à") },
colors = TextFieldDefaults.textFieldColors(
focusedIndicatorColor = customRedColor,
unfocusedIndicatorColor = Color.Gray
unfocusedIndicatorColor = Color.Gray,
focusedLabelColor = customRedColor
)
)
@ -125,7 +133,8 @@ fun formPage(onCancelClick: () -> Unit) {
label = { Text("Synonyme") },
colors = TextFieldDefaults.textFieldColors(
focusedIndicatorColor = customRedColor,
unfocusedIndicatorColor = Color.Gray
unfocusedIndicatorColor = Color.Gray,
focusedLabelColor = customRedColor
)
)
@ -135,7 +144,8 @@ fun formPage(onCancelClick: () -> Unit) {
label = { Text("Antonyme") },
colors = TextFieldDefaults.textFieldColors(
focusedIndicatorColor = customRedColor,
unfocusedIndicatorColor = Color.Gray
unfocusedIndicatorColor = Color.Gray,
focusedLabelColor = customRedColor
)
)