From 0699f131f2e757865e05396f85a388838bb81589 Mon Sep 17 00:00:00 2001 From: Lucie GOIGOUX Date: Thu, 28 Mar 2024 08:25:29 +0100 Subject: [PATCH] fix arborescence --- .../sae_2a/{ui/screen => view}/HomeScreen.kt | 5 +---- .../sae_2a/{ui/screen => view}/RegisterScreen.kt | 2 +- .../{ui/screen => view}/VocabularyListScreen.kt | 0 .../main/java/sae/android/sae_2a/view/profile.kt | 13 +++++++++++++ 4 files changed, 15 insertions(+), 5 deletions(-) rename Project/android/app/src/main/java/sae/android/sae_2a/{ui/screen => view}/HomeScreen.kt (94%) rename Project/android/app/src/main/java/sae/android/sae_2a/{ui/screen => view}/RegisterScreen.kt (98%) rename Project/android/app/src/main/java/sae/android/sae_2a/{ui/screen => view}/VocabularyListScreen.kt (100%) create mode 100644 Project/android/app/src/main/java/sae/android/sae_2a/view/profile.kt diff --git a/Project/android/app/src/main/java/sae/android/sae_2a/ui/screen/HomeScreen.kt b/Project/android/app/src/main/java/sae/android/sae_2a/view/HomeScreen.kt similarity index 94% rename from Project/android/app/src/main/java/sae/android/sae_2a/ui/screen/HomeScreen.kt rename to Project/android/app/src/main/java/sae/android/sae_2a/view/HomeScreen.kt index 496f649..5727813 100644 --- a/Project/android/app/src/main/java/sae/android/sae_2a/ui/screen/HomeScreen.kt +++ b/Project/android/app/src/main/java/sae/android/sae_2a/view/HomeScreen.kt @@ -1,4 +1,4 @@ -package sae.android.sae_2a.ui.screen +package sae.android.sae_2a.view import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -18,9 +18,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource -import androidx.compose.ui.semantics.Role.Companion.Image import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.navigation.compose.NavHost @@ -28,7 +26,6 @@ import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController import sae.android.sae_2a.R import sae.android.sae_2a.game.VocabularyScreen -import sae.android.sae_2a.ui.screen.RegisterScreen @Composable diff --git a/Project/android/app/src/main/java/sae/android/sae_2a/ui/screen/RegisterScreen.kt b/Project/android/app/src/main/java/sae/android/sae_2a/view/RegisterScreen.kt similarity index 98% rename from Project/android/app/src/main/java/sae/android/sae_2a/ui/screen/RegisterScreen.kt rename to Project/android/app/src/main/java/sae/android/sae_2a/view/RegisterScreen.kt index c2c4e81..6a5ec67 100644 --- a/Project/android/app/src/main/java/sae/android/sae_2a/ui/screen/RegisterScreen.kt +++ b/Project/android/app/src/main/java/sae/android/sae_2a/view/RegisterScreen.kt @@ -1,4 +1,4 @@ -package sae.android.sae_2a.ui.screen +package sae.android.sae_2a.view import androidx.compose.foundation.Image diff --git a/Project/android/app/src/main/java/sae/android/sae_2a/ui/screen/VocabularyListScreen.kt b/Project/android/app/src/main/java/sae/android/sae_2a/view/VocabularyListScreen.kt similarity index 100% rename from Project/android/app/src/main/java/sae/android/sae_2a/ui/screen/VocabularyListScreen.kt rename to Project/android/app/src/main/java/sae/android/sae_2a/view/VocabularyListScreen.kt diff --git a/Project/android/app/src/main/java/sae/android/sae_2a/view/profile.kt b/Project/android/app/src/main/java/sae/android/sae_2a/view/profile.kt new file mode 100644 index 0000000..06c4792 --- /dev/null +++ b/Project/android/app/src/main/java/sae/android/sae_2a/view/profile.kt @@ -0,0 +1,13 @@ +package sae.android.sae_2a.view + +import androidx.compose.runtime.Composable + +@Composable +fun profileScreen() { + val nom = "testNom" + val prenom = "testPrenom" + val pseudo = "testPseudo" + + + +} \ No newline at end of file