From 76da52408fe67c27fe63bc16f5012747a7145645 Mon Sep 17 00:00:00 2001 From: casperjr Date: Mon, 13 Jan 2025 22:55:46 +0900 Subject: [PATCH] =?UTF-8?q?[ui]:=20AddMenuTagScreenPreview=EC=9D=98=20?= =?UTF-8?q?=EB=B3=B8=EB=AC=B8=20=EC=9E=85=EB=A0=A5=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=20=EC=A0=95=EB=A0=AC=20=EC=88=98=EC=A0=95,?= =?UTF-8?q?=20=EC=BB=A4=EC=84=9C=20=EC=9C=84=EC=B9=98=20=EC=B6=94=EC=A0=81?= =?UTF-8?q?(#14)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/addmenu/screen/AddMenuTagScreen.kt | 51 ++++++++++++------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/kuit/ourmenu/ui/addmenu/screen/AddMenuTagScreen.kt b/app/src/main/java/com/kuit/ourmenu/ui/addmenu/screen/AddMenuTagScreen.kt index 99bda06..33ce555 100644 --- a/app/src/main/java/com/kuit/ourmenu/ui/addmenu/screen/AddMenuTagScreen.kt +++ b/app/src/main/java/com/kuit/ourmenu/ui/addmenu/screen/AddMenuTagScreen.kt @@ -14,7 +14,9 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width +import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll import androidx.compose.material3.BottomSheetScaffold import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults @@ -58,6 +60,8 @@ fun AddMenuTagScreen(modifier: Modifier = Modifier) { val useTagBottomSheet by rememberSaveable { mutableStateOf(false) } var memoTitle by rememberSaveable { mutableStateOf("") } var memoBody by rememberSaveable { mutableStateOf("") } + val scrollState = rememberScrollState() + BottomSheetScaffold( scaffoldState = scaffoldState, topBar = { @@ -71,10 +75,10 @@ fun AddMenuTagScreen(modifier: Modifier = Modifier) { }, sheetContainerColor = Color.White, sheetContent = { - if (useTagBottomSheet){ + if (useTagBottomSheet) { //음색 태그 선택하는 bottom sheet TagSelectBottomSheet() - }else{ + } else { //아이콘 선택하는 bottom sheet IconSelectBottomSheet() } @@ -158,7 +162,7 @@ fun AddMenuTagScreen(modifier: Modifier = Modifier) { text = memoTitle, onTextChange = { memoTitle = it }, shape = RoundedCornerShape(8.dp), - paddingValues = PaddingValues(28.dp,12.dp), + paddingValues = PaddingValues(28.dp, 12.dp), containerColor = Neutral100, placeHolder = { Text( @@ -170,25 +174,34 @@ fun AddMenuTagScreen(modifier: Modifier = Modifier) { textStyle = ourMenuTypography().pretendard_500_14.copy(color = Neutral700) ) Spacer(modifier = Modifier.height(8.dp)) - CustomTextField( + Box( modifier = Modifier .fillMaxWidth() .height(88.dp) - .border(1.dp, Neutral300, RoundedCornerShape(8.dp)), - text = memoBody, - onTextChange = { memoBody = it }, - shape = RoundedCornerShape(8.dp), - paddingValues = PaddingValues(28.dp,12.dp), - containerColor = Neutral100, - placeHolder = { - Text( - text = stringResource(R.string.type_body), - style = ourMenuTypography().pretendard_500_12, - color = Neutral500, - ) - }, - textStyle = ourMenuTypography().pretendard_500_14.copy(color = Neutral700) - ) + .background(Neutral100) + .border(1.dp, Neutral300, RoundedCornerShape(8.dp)) + .verticalScroll(scrollState), + ) { + CustomTextField( + modifier = Modifier + .fillMaxWidth() + .height(88.dp), + text = memoBody, + singleLine = false, + onTextChange = { memoBody = it }, + shape = RoundedCornerShape(8.dp), + paddingValues = PaddingValues(28.dp, 12.dp), + containerColor = Neutral100, + placeHolder = { + Text( + text = stringResource(R.string.type_body), + style = ourMenuTypography().pretendard_500_12, + color = Neutral500, + ) + }, + textStyle = ourMenuTypography().pretendard_500_14.copy(color = Neutral700) + ) + } //아이콘 Spacer(modifier = Modifier.height(20.dp))