From 8ac0c9a46e8d942dd8c58270af38fb279539af2d Mon Sep 17 00:00:00 2001 From: Alix JEUDI--LEMOINE Date: Wed, 13 Mar 2024 09:31:03 +0100 Subject: [PATCH] Ajout de 3 colonnes dans la ligne de la navbar pour bien placer chaque item --- .../java/fr/iut/sciencequest/view/TopBar.kt | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) 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 3df9a67..8e10bcf 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 @@ -2,7 +2,7 @@ package fr.iut.sciencequest.view import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.material3.FilledIconButton @@ -17,13 +17,19 @@ import fr.iut.sciencequest.R @Composable fun TopBar(goToAccount: () -> Unit, goToHome: () -> Unit, modifier: Modifier? = Modifier.fillMaxWidth()) { - Row(horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { - FilledIconButton(onClick = { goToHome() }) { - Image(painter = painterResource(id = R.drawable.menu), contentDescription = "Menu") + Row(horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) { + Column(horizontalAlignment = Alignment.Start) { + FilledIconButton(onClick = { goToHome() }) { + Image(painter = painterResource(id = R.drawable.menu), contentDescription = "Menu") + } } - Text(text = stringResource(id = R.string.app_name)) - FilledIconButton(onClick = { goToAccount() }) { - Image(painter = painterResource(id = R.drawable.account_circle_outline), contentDescription = "Account") + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Text(text = stringResource(id = R.string.app_name)) + } + Column(horizontalAlignment = Alignment.End) { + FilledIconButton(onClick = { goToAccount() }) { + Image(painter = painterResource(id = R.drawable.account_circle_outline), contentDescription = "Account") + } } } }