Skip to content
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

[Feature] 경조사비 메인 디자인 QA #109

Merged
merged 1 commit into from
Feb 21, 2024
Merged

[Feature] 경조사비 메인 디자인 QA #109

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: 3 additions & 1 deletion presentation/src/main/kotlin/ac/dnd/mour/android/presentation/common/view/chip/ChipItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ 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.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp

Expand Down Expand Up @@ -84,7 +85,8 @@ fun ChipItem(
Text(
text = chipText,
style = Body1.merge(
color = textColor.value
color = textColor.value,
fontWeight = if (isSelected) FontWeight.SemiBold else FontWeight.Normal
)
)
if (chipCount > 0) {
Expand Down
17 changes: 6 additions & 11 deletions ...otlin/ac/dnd/mour/android/presentation/ui/main/home/history/HistoryBackgroundComponent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import ac.dnd.mour.android.presentation.R
import ac.dnd.mour.android.presentation.common.theme.Body1
import ac.dnd.mour.android.presentation.common.theme.Gray000
import ac.dnd.mour.android.presentation.common.theme.Gray500
import ac.dnd.mour.android.presentation.common.theme.Gray600
import ac.dnd.mour.android.presentation.common.theme.Gray700
import ac.dnd.mour.android.presentation.common.theme.Headline1
import ac.dnd.mour.android.presentation.common.theme.Primary2
Expand Down Expand Up @@ -64,7 +65,7 @@ fun HistoryBackgroundComponent(
isTextFieldFocused: Boolean,
isViewUnrecordedState: Boolean,
onFocusChange: (Boolean) -> Unit,
alarmState: Boolean = true,
alarmState: Boolean = false,
onClickUnrecorded: () -> Unit,
onDeleteUnrecorded: () -> Unit,
onClickAlarm: () -> Unit,
Expand All @@ -83,11 +84,6 @@ fun HistoryBackgroundComponent(
label = "color state"
)

@Composable
fun getAlarmImage(): Painter {
return painterResource(if (alarmState) R.drawable.ic_notification_on else R.drawable.ic_notification)
}

Column(
modifier = Modifier
.fillMaxWidth()
Expand All @@ -105,7 +101,7 @@ fun HistoryBackgroundComponent(
modifier = Modifier.align(Alignment.CenterStart)
)
Image(
painter = getAlarmImage(),
painter = painterResource(R.drawable.ic_alarm_white),
contentDescription = null,
modifier = Modifier
.align(Alignment.CenterEnd)
Expand Down Expand Up @@ -206,7 +202,7 @@ fun HistoryBackgroundComponent(
.padding(16.dp)
) {
Image(
painter = painterResource(R.drawable.ic_close_circle),
painter = painterResource(R.drawable.ic_close_circle_inner_gray),
contentDescription = null,
modifier = Modifier
.align(Alignment.TopEnd)
Expand Down Expand Up @@ -242,14 +238,13 @@ fun HistoryBackgroundComponent(
Text(
text = "한번에 기록하기",
style = Body1.merge(
color = Gray500,
color = Gray600,
fontWeight = FontWeight.Medium
)
)
Image(
painter = painterResource(R.drawable.ic_chevron_right),
painter = painterResource(R.drawable.ic_chevron_right_gray),
contentDescription = null,
modifier = Modifier.size(16.dp)
)
}
}
Expand Down
11 changes: 5 additions & 6 deletions ...rc/main/kotlin/ac/dnd/mour/android/presentation/ui/main/home/history/HistoryPageScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import ac.dnd.mour.android.presentation.common.theme.Gray400
import ac.dnd.mour.android.presentation.common.theme.Gray500
import ac.dnd.mour.android.presentation.common.theme.Gray600
import ac.dnd.mour.android.presentation.common.theme.Gray700
import ac.dnd.mour.android.presentation.common.theme.Gray800
import ac.dnd.mour.android.presentation.common.theme.Primary4
import ac.dnd.mour.android.presentation.common.theme.Shapes
import ac.dnd.mour.android.presentation.common.theme.Space16
Expand Down Expand Up @@ -177,7 +178,7 @@ fun HistoryPageScreen(
Text(
text = "내역 ${relations.size}",
style = Body1.merge(
color = Gray600,
color = Gray700,
fontWeight = FontWeight.SemiBold
),
modifier = Modifier.align(Alignment.CenterStart)
Expand All @@ -193,7 +194,7 @@ fun HistoryPageScreen(
Text(
text = viewSortType.typeName,
style = Body1.merge(
color = Gray700,
color = Gray800,
fontWeight = FontWeight.Medium
)
)
Expand All @@ -220,7 +221,7 @@ fun HistoryPageScreen(
contentPadding = PaddingValues(0.dp),
modifier = Modifier
.width(116.dp)
.height(40.dp)
.wrapContentHeight()
) {
Row(
modifier = Modifier
Expand All @@ -233,10 +234,8 @@ fun HistoryPageScreen(
) {
if (viewSortType == type) {
Image(
painter = painterResource(R.drawable.ic_check_line),
painter = painterResource(R.drawable.ic_history_check),
contentDescription = null,
colorFilter = ColorFilter.tint(Primary4),
modifier = Modifier.size(Space24)
)
} else {
Box(
Expand Down
Loading
Loading