From 9bdf9a5c02193fc872018108e2c71b26d0b84313 Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Mon, 27 Apr 2026 23:30:01 +0900 Subject: [PATCH 1/4] #1062 [QA] Remove bottom sheet style --- .../presentation/view/dialog/BottomSheetDialog.kt | 2 +- .../res/drawable/dialog_bottom_sheet_default.xml | 8 -------- presentation/src/main/res/values-night/themes.xml | 12 +----------- presentation/src/main/res/values/themes.xml | 14 +------------- 4 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 presentation/src/main/res/drawable/dialog_bottom_sheet_default.xml diff --git a/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt b/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt index c20c3a78..d17a05ab 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt @@ -68,7 +68,7 @@ fun BottomSheetDialog( modifier = Modifier .fillMaxWidth() .wrapContentHeight(), - shape = RoundedCornerShape(12.dp, 12.dp, 0.dp, 0.dp), + shape = RoundedCornerShape(20.dp, 20.dp, 0.dp, 0.dp), color = White_FFFFFF ) { Column( diff --git a/presentation/src/main/res/drawable/dialog_bottom_sheet_default.xml b/presentation/src/main/res/drawable/dialog_bottom_sheet_default.xml deleted file mode 100644 index c3b32566..00000000 --- a/presentation/src/main/res/drawable/dialog_bottom_sheet_default.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/values-night/themes.xml b/presentation/src/main/res/values-night/themes.xml index 136c45c1..0a88fee6 100644 --- a/presentation/src/main/res/values-night/themes.xml +++ b/presentation/src/main/res/values-night/themes.xml @@ -12,8 +12,6 @@ #FFFFFFFF true - - @style/AppBottomSheetDialogTheme - - - - \ No newline at end of file + diff --git a/presentation/src/main/res/values/themes.xml b/presentation/src/main/res/values/themes.xml index 909bc9c7..5708138f 100644 --- a/presentation/src/main/res/values/themes.xml +++ b/presentation/src/main/res/values/themes.xml @@ -12,8 +12,6 @@ #FFFFFFFF true - - @style/AppBottomSheetDialogTheme - - - - - \ No newline at end of file + From a04a17430895d1f3583ee1c59b5418190af022df Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Mon, 27 Apr 2026 23:31:21 +0900 Subject: [PATCH 2/4] #1062 [QA] Add bottom sheet menu height --- .../daily/dayo/presentation/view/dialog/BottomSheetDialog.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt b/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt index d17a05ab..13bdd354 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt @@ -160,21 +160,22 @@ fun BottomSheetDialog( Row( modifier = Modifier .fillMaxWidth() - .wrapContentHeight() + .height(56.dp) .background( if (isPressed) Gray6_F0F1F3 else White_FFFFFF, RoundedCornerShape(12.dp, 12.dp, 0.dp, 0.dp) ) - .padding(16.dp) .clickable( onClick = button.second, interactionSource = interactionSource, indication = null ), horizontalArrangement = Arrangement.Center, + verticalAlignment = Alignment.CenterVertically ) { Text( text = button.first, + textAlign = TextAlign.Center, color = if ((isFirstButtonColored && index == 0) || (checkedButtonIndex == index)) checkedColor else normalColor, fontSize = 16.sp, style = DayoTheme.typography.b4 From 8c52bd0e063d9145ba7f4ce0449dd599fbe8221e Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Tue, 28 Apr 2026 22:00:11 +0900 Subject: [PATCH 3/4] [QA] Replace height with heightIn --- .../daily/dayo/presentation/view/dialog/BottomSheetDialog.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt b/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt index 13bdd354..67a511f0 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt @@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.Spacer 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.width import androidx.compose.foundation.layout.wrapContentHeight @@ -160,7 +161,7 @@ fun BottomSheetDialog( Row( modifier = Modifier .fillMaxWidth() - .height(56.dp) + .heightIn(min = 56.dp) .background( if (isPressed) Gray6_F0F1F3 else White_FFFFFF, RoundedCornerShape(12.dp, 12.dp, 0.dp, 0.dp) From f8f6770ce8cd986c96e2bc8b4d46b2641de5f414 Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Tue, 28 Apr 2026 22:10:37 +0900 Subject: [PATCH 4/4] [QA] Fix rounded corner shape --- .../daily/dayo/presentation/view/dialog/BottomSheetDialog.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt b/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt index 67a511f0..fa24d869 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt @@ -164,7 +164,7 @@ fun BottomSheetDialog( .heightIn(min = 56.dp) .background( if (isPressed) Gray6_F0F1F3 else White_FFFFFF, - RoundedCornerShape(12.dp, 12.dp, 0.dp, 0.dp) + RoundedCornerShape(20.dp, 20.dp, 0.dp, 0.dp) ) .clickable( onClick = button.second,