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.

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

Refactor/tgyuu/#150 #151

Merged
merged 5 commits into from
Mar 5, 2024
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,20 @@ data class Survey(
return "방금"
} else if (duration.toMinutes() < 60) {
val leftMinutes = duration.toMinutes().toString()
return leftMinutes + "λΆ„ μ „ μž‘μ„±"
return leftMinutes + "λΆ„ μ „"
}

if (duration.toHours() < 24) {
val leftHours = duration.toHours().toString()
return leftHours + "μ‹œκ°„ μ „ μž‘μ„±"
return leftHours + "μ‹œκ°„ μ „"
}

if (duration.toDays() < 31) {
val leftDays = duration.toDays().toString()
return leftDays + "일 μ „ μž‘μ„±"
return leftDays + "일 μ „"
}

return surveyedAt.format(yyyyMMddFormatter) + " μž‘μ„±"
return surveyedAt.format(yyyyMMddFormatter)
}

companion object {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ internal fun EventEditScreen(
.verticalScroll(scrollState)
.height(IntrinsicSize.Max)
.padding(paddingValues)
.padding(vertical = 16.dp),
.padding(top = 16.dp),
) {
WappSubTopBar(
titleRes = R.string.event_edit,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ internal fun EventRegistrationContent(
modifier = modifier
.fillMaxSize()
.addFocusCleaner(focusManager)
.padding(top = 40.dp),
.padding(top = 40.dp, bottom = 16.dp),
) {
AnimatedContent(
targetState = eventRegistrationState,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ internal fun NoticeScreen(
Column(
modifier = Modifier
.fillMaxSize()
.background(WappTheme.colors.black25),
.background(WappTheme.colors.black20),
) {
BottomSheetScaffold(
scaffoldState = scaffoldState,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ internal fun SurveyCheckScreen(

is SurveyCheckViewModel.SurveyListUiState.Success -> {
LazyColumn(
verticalArrangement = Arrangement.spacedBy(20.dp),
verticalArrangement = Arrangement.spacedBy(16.dp),
modifier = Modifier
.fillMaxSize()
.padding(start = 16.dp, end = 16.dp, bottom = 16.dp, top = 20.dp)
Expand Down