From 22b5a27102b1cf96e5169a9b3786fed54cfaedde Mon Sep 17 00:00:00 2001 From: tdpeuter Date: Wed, 12 Apr 2023 09:34:09 +0200 Subject: [PATCH] #52 Complete sidebar without functionality --- .../common/composable/DrawerComposable.kt | 37 ++++++++++++++++--- app/src/main/res/values/strings.xml | 2 + 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/be/ugent/sel/studeez/common/composable/DrawerComposable.kt b/app/src/main/java/be/ugent/sel/studeez/common/composable/DrawerComposable.kt index ca88f02..7cd1b49 100644 --- a/app/src/main/java/be/ugent/sel/studeez/common/composable/DrawerComposable.kt +++ b/app/src/main/java/be/ugent/sel/studeez/common/composable/DrawerComposable.kt @@ -1,8 +1,9 @@ package be.ugent.sel.studeez.common.composable +import androidx.compose.foundation.Image import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* -import androidx.compose.material.Button +import androidx.compose.material.Divider import androidx.compose.material.Icon import androidx.compose.material.Text import androidx.compose.material.icons.Icons @@ -10,8 +11,9 @@ import androidx.compose.material.icons.filled.* import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp import be.ugent.sel.studeez.R import be.ugent.sel.studeez.resources import be.ugent.sel.studeez.ui.theme.StudeezTheme @@ -20,11 +22,9 @@ import be.ugent.sel.studeez.ui.theme.StudeezTheme @Composable fun Drawer() { Column(modifier = Modifier.fillMaxSize()) { + LoggedInUserCard() - // TODO Currently logged in user - // TODO What kind of user - - // TODO Divider + Divider() DrawerEntry( icon = Icons.Default.Home, @@ -81,10 +81,35 @@ fun DrawerEntry( } } +@Composable +fun LoggedInUserCard() { + Column() { + // TODO Profile picture of current user + Image( + painter = painterResource(id = R.drawable.ic_launcher_background), + contentDescription = stringResource(R.string.profile_picture_description) + ) + + // TODO Username + Text(text = "Username todo") + + // TODO Description of user (normal user or something else?) + Text(text = stringResource(id = R.string.user_description)) + } +} + @Preview @Composable fun DrawerPreview() { StudeezTheme { Drawer() } +} + +@Preview +@Composable +fun LoggedInUserCardPreview() { + StudeezTheme { + LoggedInUserCard() + } } \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4a805d0..8c1a5aa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -29,6 +29,8 @@ Log out + Profile Picture + Studeez user Timers