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

#67 fix fab position

Browse source
This commit is contained in:
Tibo De Peuter 2023-05-01 21:43:58 +02:00
parent e65c2fe002
commit 5788053c75
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,10 +2,8 @@ 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.border
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.padding
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
@ -60,11 +58,13 @@ fun AddButton(
horizontalAlignment = Alignment.CenterHorizontally, horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Top verticalArrangement = Arrangement.Top
) { ) {
// Show minis when expanded. Box {
if (multiFloatingState == MultiFloatingState.Expanded) { // Show minis when expanded.
ExpandedAddButton( if (multiFloatingState == MultiFloatingState.Expanded) {
addButtonActions = addButtonActions ExpandedAddButton(
) addButtonActions = addButtonActions
)
}
} }
// The base add button // The base add button
@ -75,7 +75,8 @@ fun AddButton(
MultiFloatingState.Collapsed -> MultiFloatingState.Expanded MultiFloatingState.Collapsed -> MultiFloatingState.Expanded
MultiFloatingState.Expanded -> MultiFloatingState.Collapsed MultiFloatingState.Expanded -> MultiFloatingState.Collapsed
} }
} },
modifier = Modifier.padding(bottom = if (multiFloatingState == MultiFloatingState.Expanded) 78.dp else 0.dp)
) { ) {
Icon( Icon(
imageVector = Icons.Default.Add, imageVector = Icons.Default.Add,