From 61e60360a6348c2b7f6dcd4d45a27379143bd668 Mon Sep 17 00:00:00 2001 From: DongJun Huh Date: Tue, 28 Apr 2026 22:13:31 +0900 Subject: [PATCH 1/9] [QA] FIx comment mention list interaction and padding size --- .../daily/dayo/presentation/view/Comment.kt | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/view/Comment.kt b/presentation/src/main/java/daily/dayo/presentation/view/Comment.kt index 5eef5027..16443dba 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/Comment.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/Comment.kt @@ -5,6 +5,7 @@ import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.interaction.collectIsPressedAsState import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -329,20 +330,24 @@ fun CommentMentionSearchView(userResults: LazyPagingItems, onClickFo modifier = Modifier .background(DayoTheme.colorScheme.background) .fillMaxWidth(), - contentPadding = PaddingValues(horizontal = 18.dp) + contentPadding = PaddingValues(start = 18.dp, end = 18.dp, top = 16.dp, bottom = 12.dp), + verticalArrangement = Arrangement.spacedBy(4.dp) ) { items(userResults.itemCount) { index -> userResults[index]?.let { user -> + val interactionSource = remember { MutableInteractionSource() } + val isPressed = interactionSource.collectIsPressedAsState().value Row( modifier = Modifier - .background(DayoTheme.colorScheme.background) .fillMaxWidth() - .padding(vertical = 4.dp) + .clip(RoundedCornerShape(8.dp)) + .background(if (isPressed) Gray7_F6F6F7 else DayoTheme.colorScheme.background) .clickableSingle( - indication = ripple(bounded = false, radius = 8.dp, color = Gray7_F6F6F7), - interactionSource = remember { MutableInteractionSource() }, + indication = null, + interactionSource = interactionSource, onClick = { onClickFollowUser(user) } - ), + ) + .padding(horizontal = 8.dp, vertical = 4.dp), verticalAlignment = Alignment.CenterVertically ) { RoundImageView( @@ -350,12 +355,7 @@ fun CommentMentionSearchView(userResults: LazyPagingItems, onClickFo context = LocalContext.current, modifier = Modifier .clip(CircleShape) - .size(24.dp) - .clickableSingle( - interactionSource = remember { MutableInteractionSource() }, - indication = null, - onClick = { } - ), + .size(24.dp), imageDescription = "search users profile image", ) Spacer(modifier = Modifier.width(12.dp)) @@ -545,4 +545,4 @@ private fun PreviewCommentTextField() { focusRequester = commentFocusRequester, onClickPostComment = { } ) -} \ No newline at end of file +} From 1d4aa4d65cae1f8cd9dbc0ada4f2179253b3965a Mon Sep 17 00:00:00 2001 From: DongJun Huh Date: Tue, 28 Apr 2026 22:31:06 +0900 Subject: [PATCH 2/9] [QA] Fix comment delete snackbar display --- .../dayo/presentation/screen/post/PostScreen.kt | 12 ++++-------- .../view/dialog/CommentBottomSheetDialog.kt | 11 ++++------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/post/PostScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/post/PostScreen.kt index 8c4b2796..50fd3aa3 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/post/PostScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/post/PostScreen.kt @@ -18,7 +18,6 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.MutableState -import androidx.compose.runtime.SideEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.livedata.observeAsState import androidx.compose.runtime.mutableStateListOf @@ -106,12 +105,10 @@ fun PostScreen( postViewModel.requestDeletePostComment(commentId) } val postCommentDeleteSuccess by postViewModel.postCommentDeleteSuccess.observeAsState(Event(false)) - if (postCommentDeleteSuccess.getContentIfNotHandled() == true) { - postViewModel.requestPostComment(postId) - SideEffect { - coroutineScope.launch { - snackBarHostState.showSnackbar(context.getString(R.string.comment_delete_message)) - } + LaunchedEffect(postCommentDeleteSuccess) { + if (postCommentDeleteSuccess.getContentIfNotHandled() == true) { + postViewModel.requestPostComment(postId) + snackBarHostState.showSnackbar(context.getString(R.string.comment_delete_message)) } } var showReportDialog by remember { mutableStateOf(false) } @@ -493,4 +490,3 @@ private fun PreviewPostScreen() { ) } } - diff --git a/presentation/src/main/java/daily/dayo/presentation/view/dialog/CommentBottomSheetDialog.kt b/presentation/src/main/java/daily/dayo/presentation/view/dialog/CommentBottomSheetDialog.kt index 119f8970..65f65b92 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/dialog/CommentBottomSheetDialog.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/dialog/CommentBottomSheetDialog.kt @@ -15,7 +15,6 @@ import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.Surface import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.SideEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.livedata.observeAsState import androidx.compose.runtime.mutableStateListOf @@ -94,12 +93,10 @@ fun CommentBottomSheetDialog( postViewModel.requestDeletePostComment(commentId) } val postCommentDeleteSuccess by postViewModel.postCommentDeleteSuccess.observeAsState(Event(false)) - if (postCommentDeleteSuccess.getContentIfNotHandled() == true) { - postViewModel.requestPostComment(postId) - SideEffect { - coroutineScope.launch { - snackBarHostState.showSnackbar("댓글이 삭제되었어요.") - } + LaunchedEffect(postCommentDeleteSuccess) { + if (postCommentDeleteSuccess.getContentIfNotHandled() == true) { + postViewModel.requestPostComment(postId) + snackBarHostState.showSnackbar(context.getString(R.string.comment_delete_message)) } } var showReportDialog by remember { mutableStateOf(false) } From 15f37a5008f4d035c085274161bc5d8f0c82a1bb Mon Sep 17 00:00:00 2001 From: DongJun Huh Date: Tue, 28 Apr 2026 22:52:32 +0900 Subject: [PATCH 3/9] [QA] Fix comment bottom sheet header layout --- .../view/dialog/CommentBottomSheetDialog.kt | 51 +++++++++++++++---- 1 file changed, 40 insertions(+), 11 deletions(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/view/dialog/CommentBottomSheetDialog.kt b/presentation/src/main/java/daily/dayo/presentation/view/dialog/CommentBottomSheetDialog.kt index 65f65b92..50d5c715 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/dialog/CommentBottomSheetDialog.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/dialog/CommentBottomSheetDialog.kt @@ -5,7 +5,9 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.shape.RoundedCornerShape @@ -92,7 +94,11 @@ fun CommentBottomSheetDialog( val onClickDelete: (Long) -> Unit = { commentId -> postViewModel.requestDeletePostComment(commentId) } - val postCommentDeleteSuccess by postViewModel.postCommentDeleteSuccess.observeAsState(Event(false)) + val postCommentDeleteSuccess by postViewModel.postCommentDeleteSuccess.observeAsState( + Event( + false + ) + ) LaunchedEffect(postCommentDeleteSuccess) { if (postCommentDeleteSuccess.getContentIfNotHandled() == true) { postViewModel.requestPostComment(postId) @@ -130,14 +136,24 @@ fun CommentBottomSheetDialog( } // create comment - val replyCommentState = remember { mutableStateOf?>(null) } // parent comment Id, reply comment + val replyCommentState = + remember { mutableStateOf?>(null) } // parent comment Id, reply comment val onClickPostComment: () -> Unit = { if (replyCommentState.value == null) { if (commentText.value.text.isNotBlank()) { - postViewModel.requestCreatePostComment(commentText.value.text, postId, mentionedMemberIds) + postViewModel.requestCreatePostComment( + commentText.value.text, + postId, + mentionedMemberIds + ) } } else { - postViewModel.requestCreatePostCommentReply(replyCommentState.value!!, commentText.value.text, postId, mentionedMemberIds) + postViewModel.requestCreatePostCommentReply( + replyCommentState.value!!, + commentText.value.text, + postId, + mentionedMemberIds + ) } } val onClickReply: (Pair?) -> Unit = { reply -> @@ -146,7 +162,8 @@ fun CommentBottomSheetDialog( // show mention user name val replyUsername = "@${replyCommentState.value?.second?.nickname} " - commentText.value = TextFieldValue(text = replyUsername, selection = TextRange(replyUsername.length)) + commentText.value = + TextFieldValue(text = replyUsername, selection = TextRange(replyUsername.length)) commentFocusRequester.requestFocus() } val commentEnabled = if (replyCommentState.value == null) { @@ -204,7 +221,7 @@ fun CommentBottomSheetDialog( Column( modifier = Modifier .fillMaxWidth() - .padding(top = 12.dp, bottom = 65.dp) + .padding(bottom = 65.dp) .wrapContentHeight(), ) { CommentBottomSheetDialogTitle(clearComment, onClickClose) @@ -222,8 +239,14 @@ fun CommentBottomSheetDialog( } Column(modifier = Modifier.align(Alignment.BottomCenter)) { - if (showMentionSearchView.value) CommentMentionSearchView(userResults, onClickFollowUser) - if (replyCommentState.value != null) CommentReplyDescriptionView(replyCommentState, onClickCancelReply) + if (showMentionSearchView.value) CommentMentionSearchView( + userResults, + onClickFollowUser + ) + if (replyCommentState.value != null) CommentReplyDescriptionView( + replyCommentState, + onClickCancelReply + ) CommentTextField( enabled = commentEnabled, commentText = commentText, @@ -258,12 +281,15 @@ private fun CommentBottomSheetDialogTitle(clearComment: () -> Unit, onClickClose Box( modifier = Modifier .fillMaxWidth() - .wrapContentHeight() + .height(48.dp) .background(DayoTheme.colorScheme.background) ) { Text( text = stringResource(id = R.string.comment), - modifier = Modifier.align(Alignment.Center), + modifier = Modifier + .align(Alignment.Center) + .padding(top = 15.dp, bottom = 6.dp) + .height(27.dp), textAlign = TextAlign.Center, style = DayoTheme.typography.b1.copy(color = Dark, fontWeight = FontWeight.SemiBold) ) @@ -275,7 +301,10 @@ private fun CommentBottomSheetDialogTitle(clearComment: () -> Unit, onClickClose }, iconContentDescription = "close", iconPainter = painterResource(id = R.drawable.ic_x), - iconButtonModifier = Modifier.align(Alignment.CenterEnd) + iconButtonModifier = Modifier + .align(Alignment.CenterEnd) + .padding(end = 8.dp) + .size(32.dp) ) } } From a120b2c1d0af9949f647bb6c1652d7dc38411c35 Mon Sep 17 00:00:00 2001 From: DongJun Huh Date: Tue, 28 Apr 2026 23:09:59 +0900 Subject: [PATCH 4/9] [QA] Fix comment bottom sheet dismiss gesture --- .../main/java/daily/dayo/presentation/screen/main/MainScreen.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/main/MainScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/main/MainScreen.kt index 1241bd57..05040e92 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/main/MainScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/main/MainScreen.kt @@ -292,6 +292,7 @@ internal fun MainScreen( onDismissRequest = { bottomSheetController.hide() }, modifier = Modifier.navigationBarsPadding(), sheetState = bottomSheetState, + sheetGesturesEnabled = false, dragHandle = null ) { Box { From 17c1f6c899f93508074d1ac5087ec9f727c71916 Mon Sep 17 00:00:00 2001 From: DongJun Huh Date: Tue, 28 Apr 2026 23:14:04 +0900 Subject: [PATCH 5/9] [QA] Fix comment input height --- .../daily/dayo/presentation/view/Comment.kt | 49 +++++++++---------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/view/Comment.kt b/presentation/src/main/java/daily/dayo/presentation/view/Comment.kt index 16443dba..8b6c60d1 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/Comment.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/Comment.kt @@ -12,25 +12,18 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.defaultMinSize import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.shape.CircleShape -import androidx.compose.foundation.shape.CornerSize import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.BasicTextField -import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.Text -import androidx.compose.material.TextFieldDefaults -import androidx.compose.material.TextFieldDefaults.TextFieldDecorationBox -import androidx.compose.material.TextFieldDefaults.textFieldColors import androidx.compose.material3.Icon import androidx.compose.material3.ripple import androidx.compose.runtime.Composable @@ -56,7 +49,6 @@ import androidx.compose.ui.text.TextRange import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.TextFieldValue -import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.withStyle import androidx.compose.ui.tooling.preview.Preview @@ -396,7 +388,6 @@ fun CommentReplyDescriptionView(replyCommentState: MutableState - TextFieldDecorationBox( - value = commentText.value.text, - innerTextField = innerTextField, - enabled = true, - singleLine = false, - visualTransformation = VisualTransformation.None, - interactionSource = interactionSource, - placeholder = { Text(text = "댓글을 남겨주세요", style = DayoTheme.typography.b6.copy(Gray4_C5CAD2)) }, - shape = DayoTheme.shapes.small.copy(all = CornerSize(12.dp)), - colors = textFieldColors(backgroundColor = Gray7_F6F6F7), - contentPadding = TextFieldDefaults.textFieldWithLabelPadding(top = 8.dp, bottom = 8.dp, start = 12.dp) - ) + Box( + modifier = Modifier + .fillMaxSize() + .background(Gray7_F6F6F7, RoundedCornerShape(12.dp)) + .padding(horizontal = 12.dp, vertical = 8.dp), + contentAlignment = Alignment.CenterStart + ) { + if (commentText.value.text.isEmpty()) { + Text( + text = "댓글을 남겨주세요", + style = DayoTheme.typography.b6.copy(Gray4_C5CAD2) + ) + } + innerTextField() + } } ) + Spacer(modifier = Modifier.width(8.dp)) + Box( modifier = Modifier - .defaultMinSize(minWidth = 64.dp, minHeight = 36.dp) + .height(36.dp) .clip(RoundedCornerShape(12.dp)) .background(color = if (enabled) Primary_23C882 else PrimaryL1_8FD9B9) .clickableSingle(enabled = enabled) { onClickPostComment() } From b5dab3274419ba5d2b9eb5a8ed51469e47850de9 Mon Sep 17 00:00:00 2001 From: DongJun Huh Date: Tue, 28 Apr 2026 23:23:20 +0900 Subject: [PATCH 6/9] [QA] Fix Fong Weight --- .../java/daily/dayo/presentation/view/FeedPostView.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/view/FeedPostView.kt b/presentation/src/main/java/daily/dayo/presentation/view/FeedPostView.kt index 28d557db..6c9f2e4b 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/FeedPostView.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/FeedPostView.kt @@ -285,19 +285,19 @@ fun FeedPostView( // like count val dec = DecimalFormat("#,###") Row(modifier = Modifier.weight(1f)) { - Text(text = stringResource(id = R.string.post_like_count_message_1), style = DayoTheme.typography.caption1.copy(Gray2_767B83)) + Text(text = stringResource(id = R.string.post_like_count_message_1), style = DayoTheme.typography.caption2.copy(Gray2_767B83)) Text( text = " ${dec.format(post.heartCount)} ", - style = DayoTheme.typography.caption1, + style = DayoTheme.typography.caption2, modifier = if (post.heartCount != 0) Modifier.clickableSingle { post.postId?.let { onPostLikeUsersClick(it) } } else Modifier, color = if (post.heartCount != 0) Primary_23C882 else Gray4_C5CAD2) - Text(text = stringResource(id = R.string.post_like_count_message_2), style = DayoTheme.typography.caption1.copy(Gray2_767B83)) + Text(text = stringResource(id = R.string.post_like_count_message_2), style = DayoTheme.typography.caption2.copy(Gray2_767B83)) } // comment count Row { - Text(text = " ${dec.format(post.commentCount)} ", style = DayoTheme.typography.caption1, color = if (post.commentCount != 0) Primary_23C882 else Gray4_C5CAD2) - Text(text = stringResource(id = R.string.post_comment_count_message), style = DayoTheme.typography.caption1.copy(Gray2_767B83)) + Text(text = " ${dec.format(post.commentCount)} ", style = DayoTheme.typography.caption2, color = if (post.commentCount != 0) Primary_23C882 else Gray4_C5CAD2) + Text(text = stringResource(id = R.string.post_comment_count_message), style = DayoTheme.typography.caption2.copy(Gray2_767B83)) } } From d4c80b00e998f5fa31cbdd8c3f8df2628e4e0cd2 Mon Sep 17 00:00:00 2001 From: DongJun Huh Date: Tue, 28 Apr 2026 23:24:55 +0900 Subject: [PATCH 7/9] [QA] Fix Feed Empty View Image --- .../src/main/res/drawable/ic_feed_empty.xml | 105 +++++++++++------- 1 file changed, 63 insertions(+), 42 deletions(-) diff --git a/presentation/src/main/res/drawable/ic_feed_empty.xml b/presentation/src/main/res/drawable/ic_feed_empty.xml index 706bc726..dc7c7c6b 100644 --- a/presentation/src/main/res/drawable/ic_feed_empty.xml +++ b/presentation/src/main/res/drawable/ic_feed_empty.xml @@ -1,47 +1,68 @@ - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From d4b45d329292596b726375cf4686924cee3c3160 Mon Sep 17 00:00:00 2001 From: DongJun Huh Date: Tue, 28 Apr 2026 23:38:15 +0900 Subject: [PATCH 8/9] [QA] Fix comment empty state position --- .../daily/dayo/presentation/view/Comment.kt | 38 ++++++++++-------- .../view/dialog/CommentBottomSheetDialog.kt | 39 ++++++++++++++----- 2 files changed, 50 insertions(+), 27 deletions(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/view/Comment.kt b/presentation/src/main/java/daily/dayo/presentation/view/Comment.kt index 8b6c60d1..ee72340c 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/Comment.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/Comment.kt @@ -91,31 +91,35 @@ fun CommentListView( if (postComments.isEmpty()) { Column( horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.Center, modifier = Modifier .background(DayoTheme.colorScheme.background) .fillMaxSize() - .padding(top = 12.dp, bottom = 30.dp) .then(modifier) ) { - if (showEmptyIcon) { - Icon( - painter = painterResource(id = R.drawable.ic_comment_empty), - contentDescription = "empty", - tint = Color.Unspecified + Spacer(modifier = Modifier.weight(64f)) + + Column(horizontalAlignment = Alignment.CenterHorizontally) { + if (showEmptyIcon) { + Icon( + painter = painterResource(id = R.drawable.ic_comment_empty), + contentDescription = "empty", + tint = Color.Unspecified + ) + } + + Text( + text = stringResource(id = R.string.post_comment_empty), + style = DayoTheme.typography.b5.copy(Gray2_767B83), + modifier = Modifier.padding(top = 12.dp, bottom = 2.dp) + ) + Spacer(Modifier.height(2.dp)) + Text( + text = stringResource(id = R.string.post_comment_empty_description), + style = DayoTheme.typography.caption4.copy(Gray3_9FA5AE) ) } - Text( - text = stringResource(id = R.string.post_comment_empty), - style = DayoTheme.typography.b5.copy(Gray2_767B83), - modifier = Modifier.padding(top = 12.dp, bottom = 2.dp) - ) - Spacer(Modifier.height(2.dp)) - Text( - text = stringResource(id = R.string.post_comment_empty_description), - style = DayoTheme.typography.caption4.copy(Gray3_9FA5AE) - ) + Spacer(modifier = Modifier.weight(135f)) } } else { Column( diff --git a/presentation/src/main/java/daily/dayo/presentation/view/dialog/CommentBottomSheetDialog.kt b/presentation/src/main/java/daily/dayo/presentation/view/dialog/CommentBottomSheetDialog.kt index 50d5c715..98aecd32 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/dialog/CommentBottomSheetDialog.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/dialog/CommentBottomSheetDialog.kt @@ -325,16 +325,35 @@ private fun CommentBottomSheetDialogContent( .fillMaxHeight(0.8f) ) { item { - CommentListView( - currentMemberId = currentMemberId, - postComments = postComments, - onClickProfile = onClickCommentProfile, - onClickReply = onClickReply, - onClickDelete = onClickDelete, - onClickReport = onClickReport, - modifier = Modifier.padding(horizontal = 18.dp), - showEmptyIcon = true - ) + if (postComments.data.isEmpty()) { + Box( + modifier = Modifier + .fillParentMaxHeight() + .fillMaxWidth() + ) { + CommentListView( + currentMemberId = currentMemberId, + postComments = postComments, + onClickProfile = onClickCommentProfile, + onClickReply = onClickReply, + onClickDelete = onClickDelete, + onClickReport = onClickReport, + modifier = Modifier.padding(horizontal = 18.dp), + showEmptyIcon = true + ) + } + } else { + CommentListView( + currentMemberId = currentMemberId, + postComments = postComments, + onClickProfile = onClickCommentProfile, + onClickReply = onClickReply, + onClickDelete = onClickDelete, + onClickReport = onClickReport, + modifier = Modifier.padding(horizontal = 18.dp), + showEmptyIcon = true + ) + } } } } From 4be88c72e8e38ee9a5fa18ef0ef06b6b70efb43d Mon Sep 17 00:00:00 2001 From: DongJun Huh Date: Tue, 28 Apr 2026 23:47:40 +0900 Subject: [PATCH 9/9] [QA] Fix feed empty button style --- .../daily/dayo/presentation/screen/feed/FeedScreen.kt | 8 +++++++- .../main/java/daily/dayo/presentation/view/Button.kt | 10 ++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/feed/FeedScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/feed/FeedScreen.kt index b2ce5c71..292abf8b 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/feed/FeedScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/feed/FeedScreen.kt @@ -203,6 +203,12 @@ private fun FeedEmptyView(onEmptyViewClick: () -> Unit) { Text(text = stringResource(id = R.string.feed_empty_description), style = DayoTheme.typography.caption1.copy(Gray4_C5CAD2)) Spacer(modifier = Modifier.height(36.dp)) - FilledButton(onClick = onEmptyViewClick, label = stringResource(id = R.string.feed_empty_button)) + FilledButton( + onClick = onEmptyViewClick, + label = stringResource(id = R.string.feed_empty_button), + modifier = Modifier.height(44.dp), + contentPadding = PaddingValues(horizontal = 20.dp, vertical = 11.5.dp), + textStyle = DayoTheme.typography.b5 + ) } } diff --git a/presentation/src/main/java/daily/dayo/presentation/view/Button.kt b/presentation/src/main/java/daily/dayo/presentation/view/Button.kt index f13fa2a1..7679b6ba 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/Button.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/Button.kt @@ -50,7 +50,9 @@ fun FilledButton( modifier: Modifier = Modifier, enabled: Boolean = true, isTonal: Boolean = false, - icon: @Composable (() -> Unit)? = null + icon: @Composable (() -> Unit)? = null, + contentPadding: PaddingValues = ButtonDefaults.ContentPadding, + textStyle: TextStyle = DayoTheme.typography.b6 ) { val buttonColors = if (isTonal) ButtonDefaults.buttonColors( @@ -73,10 +75,10 @@ fun FilledButton( modifier = modifier, enabled = enabled, colors = buttonColors, - contentPadding = PaddingValues(horizontal = 16.dp, vertical = 8.dp), + contentPadding = contentPadding, content = { if (icon != null) icon() - Text(text = label, style = DayoTheme.typography.b6) + Text(text = label, style = textStyle) } ) } @@ -261,4 +263,4 @@ private fun PreviewDayoTextButton() { Text(text = "입니다.", style = DayoTheme.typography.caption3.copy(Gray4_C5CAD2)) } } -} \ No newline at end of file +}