tdpeuter/2023SELab1-project-Studeez
tdpeuter/2023SELab1-project-Studeez
Archived
1
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

#67 fab styling

Browse source
This commit is contained in:
Tibo De Peuter 2023-05-01 19:45:35 +02:00
parent 5a2632c08a
commit f74da5abc3
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/be/ugent/sel/studeez/common/composable/FloatingActionButtonComposable.kt
View file

@ -2,9 +2,7 @@ package be.ugent.sel.studeez.common.composable
import androidx.compose.animation.core.animateFloat import androidx.compose.animation.core.animateFloat
import androidx.compose.animation.core.updateTransition import androidx.compose.animation.core.updateTransition
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.material.FloatingActionButton import androidx.compose.material.FloatingActionButton
import androidx.compose.material.Icon import androidx.compose.material.Icon
import androidx.compose.material.IconButton import androidx.compose.material.IconButton
@ -19,9 +17,11 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.rotate import androidx.compose.ui.draw.rotate
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import be.ugent.sel.studeez.ui.theme.StudeezTheme import be.ugent.sel.studeez.ui.theme.StudeezTheme
const val TRANSITION = "transition" const val TRANSITION = "transition"
val HEIGHT_DIFFERENCE = 30.dp
enum class MultiFloatingState { enum class MultiFloatingState {
Expanded, Expanded,
Collapsed Collapsed
@ -83,20 +83,28 @@ fun ExpandedAddButton(
addButtonActions: AddButtonActions addButtonActions: AddButtonActions
) { ) {
Row { Row {
IconButton(onClick = addButtonActions.onTaskClick) { IconButton(
onClick = addButtonActions.onTaskClick,
modifier = Modifier.padding(36.dp, HEIGHT_DIFFERENCE, 36.dp, 0.dp)
) {
Column (horizontalAlignment = Alignment.CenterHorizontally) { Column (horizontalAlignment = Alignment.CenterHorizontally) {
Icon(imageVector = Icons.Default.Check, contentDescription = "Task") Icon(imageVector = Icons.Default.Check, contentDescription = "Task")
Text(text = "Task") Text(text = "Task")
} }
} }
IconButton(onClick = addButtonActions.onFriendClick) { IconButton(onClick = addButtonActions.onFriendClick) {
Column (horizontalAlignment = Alignment.CenterHorizontally) { Column (horizontalAlignment = Alignment.CenterHorizontally) {
Icon(imageVector = Icons.Default.Person, contentDescription = "Friend") Icon(imageVector = Icons.Default.Person, contentDescription = "Friend")
Text(text = "Friend") Text(text = "Friend")
} }
} }
IconButton(onClick = addButtonActions.onSessionClick) {
Column (horizontalAlignment = Alignment.CenterHorizontally) { IconButton(
onClick = addButtonActions.onSessionClick,
modifier = Modifier.padding(36.dp, HEIGHT_DIFFERENCE, 36.dp, 0.dp)
) {
Column(horizontalAlignment = Alignment.CenterHorizontally) {
Icon(imageVector = Icons.Default.DateRange, contentDescription = "Session") Icon(imageVector = Icons.Default.DateRange, contentDescription = "Session")
Text(text = "Session") Text(text = "Session")
} }

2
app/src/main/java/be/ugent/sel/studeez/common/composable/drawer/DrawerComposable.kt
View file

@ -101,7 +101,7 @@ fun DrawerEntry(
Row( Row(
horizontalArrangement = Arrangement.Center, horizontalArrangement = Arrangement.Center,
modifier = Modifier modifier = Modifier
.clickable(onClick = { onClick() }) .clickable(onClick = onClick)
.fillMaxWidth() .fillMaxWidth()
) { ) {
Box( Box(