File tree Expand file tree Collapse file tree
app/src/main/java/com/texthip/thip/ui Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -51,7 +51,7 @@ fun ExpandableFloatingButton(
5151 Box (
5252 modifier = Modifier
5353 .fillMaxSize()
54- .padding(16 .dp), // TODO: 화면에서 버튼 위치 조정
54+ .padding(end = 20 .dp, bottom = 32 .dp),
5555 contentAlignment = Alignment .BottomEnd
5656 ) {
5757 Column (
@@ -65,7 +65,7 @@ fun ExpandableFloatingButton(
6565 ) {
6666 Column (
6767 modifier = Modifier
68- .padding(bottom = 80 .dp, end = 16 .dp) // TODO: 화면에서 버튼 위치 조정
68+ .padding(bottom = 94 .dp, end = 20 .dp)
6969 .width(184 .dp)
7070 .background(
7171 color = colors.Black ,
@@ -80,7 +80,6 @@ fun ExpandableFloatingButton(
8080 verticalArrangement = Arrangement .spacedBy(16 .dp)
8181 ) {
8282 menuItems.forEachIndexed { index, item ->
83- // if (index > 0) Spacer(modifier = Modifier.height(16.dp))
8483 MenuItem (
8584 icon = item.icon,
8685 text = item.text,
Original file line number Diff line number Diff line change @@ -26,8 +26,9 @@ import androidx.compose.ui.res.stringResource
2626import androidx.compose.ui.tooling.preview.Preview
2727import androidx.compose.ui.unit.dp
2828import com.texthip.thip.R
29+ import com.texthip.thip.ui.common.buttons.ExpandableFloatingButton
30+ import com.texthip.thip.ui.common.buttons.FabMenuItem
2931import com.texthip.thip.ui.common.buttons.FilterButton
30- import com.texthip.thip.ui.common.buttons.FloatingButton
3132import com.texthip.thip.ui.common.header.HeaderMenuBarTab
3233import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
3334import com.texthip.thip.ui.group.note.component.CommentBottomSheet
@@ -166,9 +167,19 @@ fun GroupNoteScreen() {
166167 )
167168 }
168169
169- FloatingButton (
170- icon = painterResource(id = R .drawable.ic_plus),
171- onClick = { /* 새 글 작성 */ }
170+ ExpandableFloatingButton (
171+ menuItems = listOf (
172+ FabMenuItem (
173+ icon = painterResource(R .drawable.ic_write),
174+ text = stringResource(R .string.write_record),
175+ onClick = { }
176+ ),
177+ FabMenuItem (
178+ icon = painterResource(R .drawable.ic_vote),
179+ text = stringResource(R .string.create_vote),
180+ onClick = { }
181+ )
182+ )
172183 )
173184 }
174185
You can’t perform that action at this time.
0 commit comments