From 20ac70f2a112a1458970d21aa111a0a9457562d6 Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Mon, 20 Apr 2026 22:18:09 +0900 Subject: [PATCH 1/4] #1064 [QA] Fix folder option drop down menu --- .../daily/dayo/presentation/screen/folder/FolderScreen.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/folder/FolderScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/folder/FolderScreen.kt index f95aa868..68d61718 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/folder/FolderScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/folder/FolderScreen.kt @@ -39,6 +39,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource @@ -410,7 +411,8 @@ private fun FolderDropdownMenu( onDismissRequest = { expanded.value = false }, modifier = Modifier .background(DayoTheme.colorScheme.background) - .width(140.dp) + .width(140.dp), + shape = RoundedCornerShape(16.dp) ) { menuItems.forEach { DropdownMenuItem( @@ -436,6 +438,9 @@ private fun FolderDropdownMenu( it.onClickMenu() expanded.value = false }, + modifier = Modifier + .padding(horizontal = 4.dp) + .clip(RoundedCornerShape(12.dp)), contentPadding = PaddingValues(horizontal = 16.dp, vertical = 11.5.dp) ) } From 5548b69d1aadce9f30a93e3d8f3043704d2ee68f Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Wed, 22 Apr 2026 20:55:37 +0900 Subject: [PATCH 2/4] #1055 [QA] Fix rounded corner on folder delete dialog --- .../java/daily/dayo/presentation/view/dialog/ConfirmDialog.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/view/dialog/ConfirmDialog.kt b/presentation/src/main/java/daily/dayo/presentation/view/dialog/ConfirmDialog.kt index 4fd215dd..cb4f5a12 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/dialog/ConfirmDialog.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/dialog/ConfirmDialog.kt @@ -46,9 +46,9 @@ fun ConfirmDialog( modifier = modifier .background( DayoTheme.colorScheme.background, - RoundedCornerShape(10.dp) + RoundedCornerShape(16.dp) ) - .clip(RoundedCornerShape(10.dp)) + .clip(RoundedCornerShape(16.dp)) ) { Column { DialogHeader(title, description) From 0f25b05b8db253c0276397731cbd8d760818ec48 Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Wed, 22 Apr 2026 20:56:15 +0900 Subject: [PATCH 3/4] #1055 [QA] Add spacer in confirm dialog --- .../java/daily/dayo/presentation/view/dialog/ConfirmDialog.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/presentation/src/main/java/daily/dayo/presentation/view/dialog/ConfirmDialog.kt b/presentation/src/main/java/daily/dayo/presentation/view/dialog/ConfirmDialog.kt index cb4f5a12..8b9894b5 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/dialog/ConfirmDialog.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/dialog/ConfirmDialog.kt @@ -5,7 +5,9 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.Text @@ -87,6 +89,7 @@ private fun DialogHeader(title: String, description: String) { } if (description.isNotBlank()) { + Spacer(Modifier.height(8.dp)) Text( text = description, color = Gray2_767B83, From 163d9e06f3d5b9a24b04bd86b0ad97415235f0d6 Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Wed, 22 Apr 2026 21:39:16 +0900 Subject: [PATCH 4/4] #1055 [QA] Add widthIn to confirm dialog --- .../daily/dayo/presentation/view/dialog/ConfirmDialog.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/view/dialog/ConfirmDialog.kt b/presentation/src/main/java/daily/dayo/presentation/view/dialog/ConfirmDialog.kt index 8b9894b5..4634dc10 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/dialog/ConfirmDialog.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/dialog/ConfirmDialog.kt @@ -9,10 +9,10 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.Text import androidx.compose.material3.Divider -import androidx.compose.material3.Surface +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -46,6 +46,7 @@ fun ConfirmDialog( ) { Box( modifier = modifier + .widthIn(min = 252.dp, max = 320.dp) .background( DayoTheme.colorScheme.background, RoundedCornerShape(16.dp)