From 67669bddae057cb7bc621450a5cb0041b51c3cd2 Mon Sep 17 00:00:00 2001
From: KaulH <samuelberion@gmail.com>
Date: Sat, 30 Mar 2024 15:45:18 +0100
Subject: [PATCH] apply suggestions

---
 .../java/com/iqball/app/page/LoginPage.kt     | 31 ++++++++++++-------
 .../java/com/iqball/app/page/RegisterPage.kt  | 31 +++++++++++++------
 2 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/iqball/app/page/LoginPage.kt b/app/src/main/java/com/iqball/app/page/LoginPage.kt
index f1cd62e..9c30099 100644
--- a/app/src/main/java/com/iqball/app/page/LoginPage.kt
+++ b/app/src/main/java/com/iqball/app/page/LoginPage.kt
@@ -5,6 +5,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.foundation.layout.*
 import androidx.compose.material3.Button
 import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -18,7 +19,6 @@ import com.iqball.app.api.service.AuthService
 import com.iqball.app.session.Authentication
 import kotlinx.coroutines.runBlocking
 
-
 @Composable
 fun LoginPage(
     service: AuthService,
@@ -45,21 +45,24 @@ fun LoginPage(
                 fontSize = 28.sp,
                 color = Color.Black
             )
-            Spacer(modifier = Modifier.height(16.dp))
-            errors?.let { message ->
-                Text(
-                    text = message,
-                    color = Color.Red,
-                    fontSize = 14.sp,
-                    modifier = Modifier.padding(vertical = 8.dp)
-                )
-            }
+
+            Text(
+                text = errors,
+                color = Color.Red,
+                fontSize = 14.sp,
+                modifier = Modifier.padding(vertical = 8.dp)
+            )
+
             Spacer(modifier = Modifier.height(16.dp))
             OutlinedTextField(
                 value = email,
                 onValueChange = { email = it },
                 label = { Text("Email") },
-                modifier = Modifier.fillMaxWidth()
+                modifier = Modifier.fillMaxWidth(),
+                colors = OutlinedTextFieldDefaults.colors(
+                    focusedTextColor = Color.Black,
+                    unfocusedTextColor = Color.Black
+                )
             )
             Spacer(modifier = Modifier.height(16.dp))
             OutlinedTextField(
@@ -67,7 +70,11 @@ fun LoginPage(
                 onValueChange = { password = it },
                 label = { Text("Password") },
                 visualTransformation = PasswordVisualTransformation(),
-                modifier = Modifier.fillMaxWidth()
+                modifier = Modifier.fillMaxWidth(),
+                colors = OutlinedTextFieldDefaults.colors(
+                    focusedTextColor = Color.Black,
+                    unfocusedTextColor = Color.Black
+                )
             )
             Spacer(modifier = Modifier.height(16.dp))
 
diff --git a/app/src/main/java/com/iqball/app/page/RegisterPage.kt b/app/src/main/java/com/iqball/app/page/RegisterPage.kt
index ce91d21..898ca43 100644
--- a/app/src/main/java/com/iqball/app/page/RegisterPage.kt
+++ b/app/src/main/java/com/iqball/app/page/RegisterPage.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Button
 import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -56,20 +57,22 @@ fun RegisterPage(
                 color = Color.Black
             )
             Spacer(modifier = Modifier.height(16.dp))
-            errors?.let { message ->
-                Text(
-                    text = message,
-                    color = Color.Red,
-                    fontSize = 14.sp,
-                    modifier = Modifier.padding(vertical = 8.dp)
-                )
-            }
+            Text(
+                text = errors,
+                color = Color.Red,
+                fontSize = 14.sp,
+                modifier = Modifier.padding(vertical = 8.dp)
+            )
             Spacer(modifier = Modifier.height(16.dp))
             OutlinedTextField(
                 value = username,
                 onValueChange = { username = it },
                 label = { Text("Nom d'utilisateur") },
-                modifier = Modifier.fillMaxWidth()
+                modifier = Modifier.fillMaxWidth(),
+                colors = OutlinedTextFieldDefaults.colors(
+                    focusedTextColor = Color.Black,
+                    unfocusedTextColor = Color.Black
+                )
             )
             Spacer(modifier = Modifier.height(16.dp))
             OutlinedTextField(
@@ -77,6 +80,10 @@ fun RegisterPage(
                 onValueChange = { password = it },
                 label = { Text("Mot de passe") },
                 modifier = Modifier.fillMaxWidth(),
+                colors = OutlinedTextFieldDefaults.colors(
+                    focusedTextColor = Color.Black,
+                    unfocusedTextColor = Color.Black
+                ),
                 visualTransformation = PasswordVisualTransformation()
             )
             Spacer(modifier = Modifier.height(16.dp))
@@ -84,7 +91,11 @@ fun RegisterPage(
                 value = email,
                 onValueChange = { email = it },
                 label = { Text("Email") },
-                modifier = Modifier.fillMaxWidth()
+                modifier = Modifier.fillMaxWidth(),
+                colors = OutlinedTextFieldDefaults.colors(
+                    focusedTextColor = Color.Black,
+                    unfocusedTextColor = Color.Black
+                )
             )
             Button(onClick = {
                 runBlocking {