Skip to content

💄 디자인 화면 디테일 수정 #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Hongji03 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

💄 디자인 화면 디테일 수정 #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions feature/record/src/main/java/com/umc/record/component/DiaryBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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)
)
Expand Down
4 changes: 2 additions & 2 deletions feature/record/src/main/java/com/umc/record/component/LocationBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions feature/record/src/main/java/com/umc/record/screen/EditLocationScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
}
}
Expand Down
22 changes: 11 additions & 11 deletions feature/record/src/main/java/com/umc/record/screen/RecordScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() }
Expand All @@ -150,20 +150,20 @@ 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)
)
}
// 위치
Row(
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() }
Expand All @@ -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,
Expand All @@ -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() }
Expand Down