diff --git a/feature/record/src/main/java/com/umc/record/component/DiaryBottomSheet.kt b/feature/record/src/main/java/com/umc/record/component/DiaryBottomSheet.kt index 9deab783..41fcd516 100644 --- a/feature/record/src/main/java/com/umc/record/component/DiaryBottomSheet.kt +++ b/feature/record/src/main/java/com/umc/record/component/DiaryBottomSheet.kt @@ -53,7 +53,7 @@ data class DiaryBottomSheetProp( val isButtonEnabled: Boolean ) -private val bottomSheetShape = RoundedCornerShape(topStart = 20.dp, topEnd = 20.dp) +private val bottomSheetShape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp) @Composable fun DiaryBottomSheet( @@ -93,7 +93,7 @@ fun DiaryBottomSheet( Text( text = prop.userName + stringResource(id = R.string.record_here), fontSize = 15.sp, - color = Color(0xFFFF9681), + color = Color(0xFFFF8072), fontWeight = FontWeight.Bold, modifier = Modifier.padding(8.dp) ) diff --git a/feature/record/src/main/java/com/umc/record/component/LocationBottomSheet.kt b/feature/record/src/main/java/com/umc/record/component/LocationBottomSheet.kt index cec37d57..06da63b1 100644 --- a/feature/record/src/main/java/com/umc/record/component/LocationBottomSheet.kt +++ b/feature/record/src/main/java/com/umc/record/component/LocationBottomSheet.kt @@ -51,7 +51,7 @@ data class LocationBottomSheetProp( val onConfirm: (confirmedLocationName: String) -> Unit ) -private val bottomSheetShape = RoundedCornerShape(topStart = 20.dp, topEnd = 20.dp) +private val bottomSheetShape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp) @Composable fun LocationBottomSheet( @@ -101,7 +101,7 @@ fun LocationBottomSheet( + (if (prop.location.hasFinalConsonant()) "으로 " else "로 ") + stringResource(id = R.string.modify_location), style = TextStyle( - fontSize = 16.sp, + fontSize = 15.sp, color = Color(0xFFFF9681), fontWeight = FontWeight.Bold, textAlign = TextAlign.Center, diff --git a/feature/record/src/main/java/com/umc/record/screen/EditLocationScreen.kt b/feature/record/src/main/java/com/umc/record/screen/EditLocationScreen.kt index 8d91b93f..857bed85 100644 --- a/feature/record/src/main/java/com/umc/record/screen/EditLocationScreen.kt +++ b/feature/record/src/main/java/com/umc/record/screen/EditLocationScreen.kt @@ -51,17 +51,17 @@ fun EditLocationScreen( modifier = Modifier .fillMaxWidth() .weight(1f) - .padding(16.dp), + .padding(17.dp), ) { IconButton( onClick = onLocationButtonClicked, - modifier = Modifier.size(72.dp) + modifier = Modifier.size(60.dp) ) { ShadowedIcon( id = R.drawable.btn_location, contentDescription = null, - width = 72.dp, - height = 72.dp, + width = 59.04.dp, + height = 55.dp, ) } } diff --git a/feature/record/src/main/java/com/umc/record/screen/RecordScreen.kt b/feature/record/src/main/java/com/umc/record/screen/RecordScreen.kt index b01830b0..d71029cd 100644 --- a/feature/record/src/main/java/com/umc/record/screen/RecordScreen.kt +++ b/feature/record/src/main/java/com/umc/record/screen/RecordScreen.kt @@ -132,10 +132,10 @@ fun RecordScreen( verticalAlignment = Alignment.CenterVertically, modifier = Modifier .background( - color = Color(0xFEF6F2E5), - shape = RoundedCornerShape(percent = 50) + color = Color(0xFEFF9888), + shape = RoundedCornerShape(15.dp) ) - .clip(RoundedCornerShape(percent = 50)) + .clip(RoundedCornerShape(15.dp)) .clickable { onDateChipClicked() } .onGloballyPositioned { val height = with(density) { it.size.height.toDp() } @@ -150,9 +150,9 @@ fun RecordScreen( Text( text = date.toLocalDate().toString(), textAlign = TextAlign.Center, - fontSize = 15.sp, + fontSize = 13.sp, color = Color.Primary300, - modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp) + modifier = Modifier.padding(horizontal = 16.dp, vertical = 5.dp) ) } // 위치 @@ -160,10 +160,10 @@ fun RecordScreen( modifier = Modifier .weight(1f, fill = false) .background( - color = Color(0xFEF6F2E5), - shape = RoundedCornerShape(percent = 50) + color = Color(0xFEFF9888), + shape = RoundedCornerShape(15.dp) ) - .clip(RoundedCornerShape(percent = 50)) + .clip(RoundedCornerShape(15.dp)) .clickable { onLocationChipClicked() } .onGloballyPositioned { val height = with(density) { it.size.height.toDp() } @@ -188,7 +188,7 @@ fun RecordScreen( ) Text( text = location, - fontSize = 15.sp, + fontSize = 13.sp, color = Color.Primary300, modifier = Modifier.padding(end = 4.dp), maxLines = 1, @@ -207,9 +207,9 @@ fun RecordScreen( modifier = Modifier .background( color = categoryBackgroundColor, - shape = RoundedCornerShape(percent = 50) + shape = RoundedCornerShape(15.dp) ) - .clip(RoundedCornerShape(percent = 50)) + .clip(RoundedCornerShape(15.dp)) .clickable { onCategoryChipClicked() } .onGloballyPositioned { val height = with(density) { it.size.height.toDp() }