diff --git a/Project/android/app/src/main/java/sae/android/sae_2a/MainActivity.kt b/Project/android/app/src/main/java/sae/android/sae_2a/MainActivity.kt
index 9c6b612..749a0c0 100644
--- a/Project/android/app/src/main/java/sae/android/sae_2a/MainActivity.kt
+++ b/Project/android/app/src/main/java/sae/android/sae_2a/MainActivity.kt
@@ -9,39 +9,16 @@ import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import sae.android.sae_2a.ui.theme.SAE_2ATheme
+import sae.android.sae_2a.view.PreviewLoginScreen
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
-            SAE_2ATheme {
-                // A surface container using the 'background' color from the theme
-                Surface(
-                    modifier = Modifier.fillMaxSize(),
-                    color = MaterialTheme.colorScheme.background
-                ) {
-                    Greeting("Android")
-                }
-            }
+            PreviewLoginScreen()
         }
     }
 }
-
-@Composable
-fun Greeting(name: String, modifier: Modifier = Modifier) {
-    Text(
-        text = "Hello $name!",
-        modifier = modifier
-    )
-}
-
-@Preview(showBackground = true)
-@Composable
-fun GreetingPreview() {
-    SAE_2ATheme {
-        Greeting("Android")
-
-    }
-}
\ No newline at end of file
diff --git a/Project/android/app/src/main/java/sae/android/sae_2a/view/connection.kt b/Project/android/app/src/main/java/sae/android/sae_2a/view/connection.kt
index d099153..c66a27d 100644
--- a/Project/android/app/src/main/java/sae/android/sae_2a/view/connection.kt
+++ b/Project/android/app/src/main/java/sae/android/sae_2a/view/connection.kt
@@ -1,6 +1,6 @@
 package sae.android.sae_2a.view
 
-import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.Text
@@ -8,10 +8,64 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 
-@Preview
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.Button
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+
 @Composable
-fun form(){
-    Box(modifier = Modifier.fillMaxWidth()){
-        Text(text = "S'inscrire")
+fun LoginScreen(onLoginClicked: (String, String) -> Unit) {
+    var username by remember { mutableStateOf("") }
+    var password by remember { mutableStateOf("") }
+
+    val context = LocalContext.current
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize(). fillMaxWidth() .fillMaxHeight().background(Color(157,134,146)),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center
+    ) {
+        Text(text = "Log In", fontSize = 40.sp,
+            fontFamily = FontFamily.Serif,
+            modifier = Modifier
+                    .padding(bottom = 20.dp))
+        OutlinedTextField(
+            value = username,
+            onValueChange = { username = it },
+            label = { Text("Username") },
+            modifier = Modifier
+                .padding(bottom = 10.dp)
+        )
+
+        OutlinedTextField(
+            value = password,
+            onValueChange = { password = it },
+            label = { Text("Password") },
+            modifier = Modifier
+                .padding(bottom = 16.dp),
+            visualTransformation = PasswordVisualTransformation()
+        )
+
+        Button(
+            onClick = { onLoginClicked(username, password) },
+            modifier = Modifier
+        ) {
+            Text("Login")
+        }
     }
 }
+
+@Preview
+@Composable
+fun PreviewLoginScreen() {
+    LoginScreen(onLoginClicked = { _, _ -> })
+}
+