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

[FIX/#287] 필터링 재설정 바텀시트 패딩 수정 #293

Merged
merged 3 commits into from
Oct 22, 2024
Merged

[FIX/#287] 필터링 재설정 바텀시트 패딩 수정 #293

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
550be8e
[FIX/#287] 필터링 재설정 바텀시트 패딩 수정
Hyobeen-Park Oct 14, 2024
3d861d1
Merge remote-tracking branch 'origin/develop' into fix/#287-change-fi…
Hyobeen-Park Oct 20, 2024
0666045
Merge remote-tracking branch 'origin/develop' into fix/#287-change-fi…
Hyobeen-Park Oct 22, 2024
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
16 changes: 13 additions & 3 deletions feature/src/main/java/com/terning/feature/home/component/HomeFilteringBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,26 +65,29 @@ fun HomeFilteringBottomSheet(
content = {
Column(
modifier = modifier
.padding(horizontal = 24.dp)
.fillMaxWidth(),
) {
Text(
text = stringResource(id = R.string.change_filter_top_bar_title),
style = TerningTheme.typography.title2,
color = Black,
modifier = Modifier
.padding(horizontal = 24.dp)
.padding(bottom = 16.dp),
)

HorizontalDivider(
thickness = 1.dp,
color = Grey200,
modifier = Modifier
.padding(horizontal = 24.dp),
)

ChangeFilteringTitleText(
text = stringResource(id = R.string.change_filter_grade_title),
modifier = Modifier
.padding(top = 18.dp, bottom = 12.dp)
.padding(horizontal = 24.dp)
)

ChangeFilteringRadioGroup(
Expand All @@ -97,13 +100,16 @@ fun HomeFilteringBottomSheet(
),
onButtonClick = { index ->
currentGrade = Grade.entries[index]
}
},
modifier = Modifier
.padding(horizontal = 24.dp),
)

ChangeFilteringTitleText(
text = stringResource(id = R.string.change_filter_period_title),
modifier = Modifier
.padding(top = 32.dp, bottom = 12.dp)
.padding(horizontal = 24.dp)
)

ChangeFilteringRadioGroup(
Expand All @@ -115,13 +121,16 @@ fun HomeFilteringBottomSheet(
),
onButtonClick = { index ->
currentPeriod = WorkingPeriod.entries[index]
}
},
modifier = Modifier
.padding(horizontal = 24.dp),
)

ChangeFilteringTitleText(
text = stringResource(id = R.string.change_filter_start_work_title),
modifier = Modifier
.padding(top = 32.dp, bottom = 49.dp)
.padding(horizontal = 24.dp)
)

YearMonthPicker(
Expand All @@ -137,6 +146,7 @@ fun HomeFilteringBottomSheet(
text = R.string.change_filter_save,
cornerRadius = 10.dp,
modifier = Modifier
.padding(horizontal = 24.dp)
.padding(top = 51.dp),
Comment on lines 147 to 150
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

엇 데이트피커에는 패딩 값을 빼달라는 의미였습니당..!!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

가 아니라 버튼에 반영한 거였군요!!

onButtonClick = {
currentGrade?.let { grade ->
Expand Down
Loading