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) ) } 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..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 @@ -5,12 +5,14 @@ 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.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 @@ -44,11 +46,12 @@ fun ConfirmDialog( ) { Box( modifier = modifier + .widthIn(min = 252.dp, max = 320.dp) .background( DayoTheme.colorScheme.background, - RoundedCornerShape(10.dp) + RoundedCornerShape(16.dp) ) - .clip(RoundedCornerShape(10.dp)) + .clip(RoundedCornerShape(16.dp)) ) { Column { DialogHeader(title, description) @@ -87,6 +90,7 @@ private fun DialogHeader(title: String, description: String) { } if (description.isNotBlank()) { + Spacer(Modifier.height(8.dp)) Text( text = description, color = Gray2_767B83,