Skip to content

[Refactor/#322] 영어버전 알림시간 설정에서 TimePeriod가 바뀌지 않는 문제를 수정합니다. #325

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

Merged
SYAAINN merged 1 commit into from
Aug 26, 2025
Merged

[Refactor/#322] 영어버전 알림시간 설정에서 TimePeriod가 바뀌지 않는 문제를 수정합니다. #325

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
27 changes: 19 additions & 8 deletions ...dy/presentation/ui/setting/notificationsetting/component/NotificationSettingTimePicker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,21 @@ fun NotificationSettingTimePicker(
onDismissRequest: () -> Unit,
onConfirm: (TimePeriod, String, String) -> Unit,
) {
val amPmItemsLabel = TimePeriod.entries.map { it.getLabel() }
val amPmItems = remember { amPmItemsLabel }
val amPmEnumItems = listOf(TimePeriod.AM, TimePeriod.PM)
val amPmLabelItems = amPmEnumItems.map { it.getLabel() }

val hourItems = remember { (1..12).map { it.toString() } }
val minuteItems = remember { listOf("00", "10", "20", "30", "40", "50") }

val amPmPickerState = rememberPickerState()
val hourPickerState = rememberPickerState()
val minutePickerState = rememberPickerState()
val amPmPickerState = rememberPickerState().apply {
selectedItem = amPmLabelItems[1]
}
val hourPickerState = rememberPickerState().apply {
selectedItem = "9"
}
val minutePickerState = rememberPickerState().apply {
selectedItem = "30"
}

Surface(
modifier = Modifier
Expand Down Expand Up @@ -105,7 +112,7 @@ fun NotificationSettingTimePicker(
Spacer(Modifier.weight(1f))
ClodyPicker(
state = amPmPickerState,
items = amPmItems,
items = amPmLabelItems,
startIndex = 1,
visibleItemsCount = 3,
infiniteScroll = false,
Expand Down Expand Up @@ -138,8 +145,12 @@ fun NotificationSettingTimePicker(
}
ClodyButton(
onClick = {
val selectedPeriod = if (amPmPickerState.selectedItem == "오전") TimePeriod.AM else TimePeriod.PM
onConfirm(selectedPeriod, hourPickerState.selectedItem, minutePickerState.selectedItem)
val selectedLabel = amPmPickerState.selectedItem
val selectedPeriod = amPmEnumItems.getOrElse(amPmLabelItems.indexOf(selectedLabel)) { TimePeriod.PM }
val selectedHour = hourPickerState.selectedItem
val selectedMinute = minutePickerState.selectedItem

onConfirm(selectedPeriod, selectedHour, selectedMinute)
},
text = stringResource(R.string.bottom_sheet_notification_time_change_confirm),
enabled = true,
Expand Down