From 46958143494edca018fcbac89e84abba317b34a9 Mon Sep 17 00:00:00 2001 From: "leni.beaulaton" Date: Tue, 18 Feb 2025 18:03:41 +0100 Subject: [PATCH] Color --- .../example/what_the_fantasy/MainActivity.kt | 3 +-- .../what_the_fantasy/ui/screens/LoginPage.kt | 20 +++++++++---------- .../what_the_fantasy/ui/screens/SignUpPage.kt | 20 +++++++++---------- .../what_the_fantasy/ui/theme/Color.kt | 10 +++++++++- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/MainActivity.kt b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/MainActivity.kt index 07f86de..2d893b5 100644 --- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/MainActivity.kt +++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/MainActivity.kt @@ -25,8 +25,7 @@ class MainActivity : ComponentActivity() { setContent { What_The_FantasyTheme { - AppNavigator() // Accès à la page login et SingUp (pour le moment) - //ProfilPage() //Accès à la page profil + AppNavigator() //QuizPage() } } diff --git a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/LoginPage.kt b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/LoginPage.kt index 6cbc262..f6e1023 100644 --- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/LoginPage.kt +++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/screens/LoginPage.kt @@ -40,31 +40,29 @@ import com.example.what_the_fantasy.data.local.UserStub import com.example.what_the_fantasy.data.model.User import com.example.what_the_fantasy.ui.components.SpaceHeightComponent import com.example.what_the_fantasy.ui.components.TitlePageComponent +import com.example.what_the_fantasy.ui.theme.colorBackground +import com.example.what_the_fantasy.ui.theme.gradienBox import java.security.MessageDigest @Composable fun LoginPage(navControllerSignUp: () -> Unit, navControllerProfil: () -> Unit) { val users = UserStub.allUsers; - val gradient = Brush.linearGradient( - colors = listOf(Color(0xFF7B1FA2), Color(0xFF311B92)), // Violet clair → Violet foncé - start = Offset(0f, 1000f), // Départ en bas à gauche - end = Offset(1000f, 0f) // Fin en haut à droite - ) + Box( modifier = Modifier .fillMaxSize() - .background(Color(0xFF100C1B)), + .background(colorBackground), contentAlignment = Alignment.Center ){ Column( modifier = Modifier - .fillMaxWidth(0.9f) // Ajuste la largeur - .padding(20.dp) // Marge extérieure - .clip(RoundedCornerShape(16.dp)) // Arrondi les angles - .background(gradient) // Ajoute un fond blanc - .padding(20.dp), // Padding interne + .fillMaxWidth(0.9f) + .padding(20.dp) + .clip(RoundedCornerShape(16.dp)) + .background(gradienBox) + .padding(20.dp), horizontalAlignment = Alignment.CenterHorizontally ) { 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 3394b60..3e77782 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 @@ -43,28 +43,26 @@ import com.example.what_the_fantasy.R import com.example.what_the_fantasy.ui.components.SpaceHeightComponent import com.example.what_the_fantasy.ui.components.TitlePageComponent import com.example.what_the_fantasy.ui.theme.What_The_FantasyTheme +import com.example.what_the_fantasy.ui.theme.colorBackground +import com.example.what_the_fantasy.ui.theme.gradienBox @Composable fun SignUpPage(navController: NavController) { - val gradient = Brush.linearGradient( - colors = listOf(Color(0xFF7B1FA2), Color(0xFF311B92)), // Violet clair → Violet foncé - start = Offset(0f, 1000f), // Départ en bas à gauche - end = Offset(1000f, 0f) // Fin en haut à droite - ) + Box( modifier = Modifier .fillMaxSize() - .background(Color(0xFF100C1B)), + .background(colorBackground), contentAlignment = Alignment.Center ){ Column( modifier = Modifier - .fillMaxWidth(0.9f) // Ajuste la largeur - .padding(20.dp) // Marge extérieure - .clip(RoundedCornerShape(16.dp)) // Arrondi les angles - .background(gradient) // Ajoute un fond blanc - .padding(20.dp), // Padding interne + .fillMaxWidth(0.9f) + .padding(20.dp) + .clip(RoundedCornerShape(16.dp)) + .background(gradienBox) + .padding(20.dp), horizontalAlignment = Alignment.CenterHorizontally ) { diff --git a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/theme/Color.kt b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/theme/Color.kt index 02f6d8b..41c8deb 100644 --- a/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/theme/Color.kt +++ b/What_The_Fantasy/app/src/main/java/com/example/what_the_fantasy/ui/theme/Color.kt @@ -1,5 +1,7 @@ package com.example.what_the_fantasy.ui.theme +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color val Purple80 = Color(0xFFD0BCFF) @@ -8,4 +10,10 @@ val Pink80 = Color(0xFFEFB8C8) val Purple40 = Color(0xFF6650a4) val PurpleGrey40 = Color(0xFF625b71) -val Pink40 = Color(0xFF7D5260) \ No newline at end of file +val Pink40 = Color(0xFF7D5260) +val gradienBox = Brush.linearGradient( + colors = listOf(Color(0xFF7B1FA2), Color(0xFF311B92)), // Violet clair → Violet foncé + start = Offset(0f, 1000f), // Départ en bas à gauche + end = Offset(1000f, 0f) // Fin en haut à droite +) +val colorBackground = Color(0xFF100C1B) \ No newline at end of file