diff --git a/android/app/src/main/java/fr/iut/sciencequest/view/AccountScreen.kt b/android/app/src/main/java/fr/iut/sciencequest/view/AccountScreen.kt index fc30a6b..b2619b6 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/view/AccountScreen.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/view/AccountScreen.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.Modifier @Composable fun AccountScreen(goToAccount: () -> Unit, goToHome: () -> Unit) { Column(modifier = Modifier.fillMaxWidth()) { - topBar(goToAccount, goToHome) + TopBar(goToAccount, goToHome) Text(text = "Account") } } \ No newline at end of file diff --git a/android/app/src/main/java/fr/iut/sciencequest/view/HomeScreen.kt b/android/app/src/main/java/fr/iut/sciencequest/view/HomeScreen.kt index 055afc2..4f00d38 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/view/HomeScreen.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/view/HomeScreen.kt @@ -5,8 +5,8 @@ import androidx.compose.ui.tooling.preview.Preview @Composable fun HomeScreen(goToHome: () -> Unit, goToAccount: () -> Unit) { - topBar(goToAccount, goToHome) - mainContent() + TopBar(goToAccount, goToHome) + MainContent() } @Preview @@ -16,6 +16,6 @@ fun HomeScreenPreview() { } @Composable -fun mainContent() { +fun MainContent() { } \ No newline at end of file diff --git a/android/app/src/main/java/fr/iut/sciencequest/view/TopBar.kt b/android/app/src/main/java/fr/iut/sciencequest/view/TopBar.kt index ac4dbe5..c17727d 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/view/TopBar.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/view/TopBar.kt @@ -14,7 +14,7 @@ import androidx.compose.ui.tooling.preview.Preview import fr.iut.sciencequest.R @Composable -fun topBar(goToAccount: () -> Unit, goToHome: () -> Unit, modifier: Modifier? = Modifier.fillMaxWidth()) { +fun TopBar(goToAccount: () -> Unit, goToHome: () -> Unit, modifier: Modifier? = Modifier.fillMaxWidth()) { Row(horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.Top) { FilledIconButton(onClick = { goToHome() }) { Image(painter = painterResource(id = R.drawable.menu), contentDescription = "Menu") @@ -28,6 +28,6 @@ fun topBar(goToAccount: () -> Unit, goToHome: () -> Unit, modifier: Modifier? = @Preview @Composable -fun topBarPreview(){ - topBar(goToAccount = {}, goToHome = {}) +fun TopBarPreview(){ + TopBar(goToAccount = {}, goToHome = {}) } \ No newline at end of file