Skip to content

Commit

Permalink
[FEATURE] #125 : 일정 등록 / 수정 마진 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
tgyuuAn committed Feb 17, 2024
1 parent e78b1f3 commit ef01504
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 68 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ fun WappTextField(

TextField(
value = value,
onValueChange = { value -> onValueChanged(value) },
onValueChange = { newValue -> onValueChanged(newValue) },
colors = TextFieldDefaults.colors(
unfocusedContainerColor = WappTheme.colors.black25,
focusedContainerColor = WappTheme.colors.black25,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,81 +254,80 @@ private fun EventScheduleContent(
},
)
}
Column {
RegistrationTitle(
title = stringResource(id = R.string.event_schedule_title),
content = stringResource(id = R.string.event_schedule_content),
)

RegistrationTitle(
title = stringResource(id = R.string.event_schedule_title),
content = stringResource(id = R.string.event_schedule_content),
)

Column(
verticalArrangement = Arrangement.spacedBy(10.dp),
modifier = Modifier.padding(top = 40.dp),
) {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier
.padding(top = 40.dp)
.fillMaxWidth(),
Column(
verticalArrangement = Arrangement.spacedBy(10.dp),
modifier = Modifier.padding(top = 40.dp),
) {
Text(
text = stringResource(R.string.event_location),
style = WappTheme.typography.titleBold,
color = WappTheme.colors.white,
textAlign = TextAlign.Start,
modifier = Modifier.weight(2f),
)
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.fillMaxWidth(),
) {
Text(
text = stringResource(R.string.event_location),
style = WappTheme.typography.titleBold,
color = WappTheme.colors.white,
textAlign = TextAlign.Start,
modifier = Modifier.weight(2f),
)

RegistrationTextField(
value = location,
onValueChange = onLocationChanged,
placeholder = stringResource(R.string.event_location_hint),
textAlign = TextAlign.Center,
modifier = Modifier.weight(3f),
align = Alignment.Center,
)
}
RegistrationTextField(
value = location,
onValueChange = onLocationChanged,
placeholder = stringResource(R.string.event_location_hint),
textAlign = TextAlign.Center,
modifier = Modifier.weight(3f),
align = Alignment.Center,
)
}

DeadlineCard(
title = stringResource(R.string.start_date),
hint = startDate.format(DateUtil.yyyyMMddFormatter),
onCardClicked = {
onStartDatePickerStateChanged(true)
},
modifier = Modifier.padding(top = 20.dp),
)
DeadlineCard(
title = stringResource(R.string.start_date),
hint = startDate.format(DateUtil.yyyyMMddFormatter),
onCardClicked = {
onStartDatePickerStateChanged(true)
},
modifier = Modifier.padding(top = 20.dp),
)

DeadlineCard(
title = stringResource(R.string.start_time),
hint = startTime.format(DateUtil.HHmmFormatter),
onCardClicked = {
onStartTimePickerStateChanged(true)
},
modifier = Modifier.padding(top = 20.dp),
)
DeadlineCard(
title = stringResource(R.string.start_time),
hint = startTime.format(DateUtil.HHmmFormatter),
onCardClicked = {
onStartTimePickerStateChanged(true)
},
modifier = Modifier.padding(top = 20.dp),
)

DeadlineCard(
title = stringResource(R.string.end_date),
hint = endDate.format(DateUtil.yyyyMMddFormatter),
onCardClicked = {
onEndDatePickerStateChanged(true)
},
modifier = Modifier.padding(top = 20.dp),
)
DeadlineCard(
title = stringResource(R.string.end_date),
hint = endDate.format(DateUtil.yyyyMMddFormatter),
onCardClicked = {
onEndDatePickerStateChanged(true)
},
modifier = Modifier.padding(top = 20.dp),
)

DeadlineCard(
title = stringResource(R.string.end_time),
hint = endTime.format(DateUtil.HHmmFormatter),
onCardClicked = {
onEndTimePickerStateChanged(true)
},
modifier = Modifier.padding(top = 20.dp),
)
DeadlineCard(
title = stringResource(R.string.end_time),
hint = endTime.format(DateUtil.HHmmFormatter),
onCardClicked = {
onEndTimePickerStateChanged(true)
},
modifier = Modifier.padding(top = 20.dp),
)

Spacer(modifier = Modifier.weight(1f))
Spacer(modifier = Modifier.weight(1f))

WappButton(
onClick = onRegisterButtonClicked,
textRes = R.string.register_event,
)
WappButton(
onClick = onRegisterButtonClicked,
textRes = R.string.register_event,
)
}
}
}

0 comments on commit ef01504

Please sign in to comment.