Skip to content

[#28] PushNotificationSettingsView에서 선택한 시간과 체크박스가 일치하지 않는 현상을 해결한다 #34

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
opficdev merged 1 commit into from
Jan 31, 2026
Merged

[#28] PushNotificationSettingsView에서 선택한 시간과 체크박스가 일치하지 않는 현상을 해결한다 #34

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
3 changes: 3 additions & 0 deletions DevLog/Presentation/ViewModel/PushNotificationSettingsViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ final class PushNotificationSettingsViewModel: Store {
var pushNotificationHour: Int {
Calendar.current.component(.hour, from: pushNotificationTime)
}
var pushNotificationMinute: Int {
Calendar.current.component(.minute, from: pushNotificationTime)
}
}

enum Action {
Expand Down
6 changes: 0 additions & 6 deletions DevLog/Resource/Localizable.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,12 +307,6 @@
},
"어제" : {

},
"오전 %lld시" : {

},
"오후 %lld시" : {

},
"완료" : {

Expand Down
25 changes: 14 additions & 11 deletions DevLog/UI/Setting/PushNotificationSettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,28 @@ struct PushNotificationSettingsView: View {
})
Section {
ForEach([9, 15, 18, 21], id: \.self) { hour in
HStack {
Text((hour < 12 ? "오전 \(hour)시" : "오후 \(hour - 12)시"))
Spacer()
if viewModel.state.pushNotificationHour == hour {
Image(systemName: "checkmark")
.foregroundStyle(Color.accentColor)
if let date = Calendar.current.date(bySettingHour: hour, minute: 0, second: 0, of: Date()) {
HStack {
Text(formattedTimeString(date))
Spacer()
if viewModel.state.pushNotificationHour == hour &&
viewModel.state.pushNotificationMinute == 0 {
Image(systemName: "checkmark")
.foregroundStyle(Color.accentColor)
}
}
.contentShape(Rectangle())
.onTapGesture {
viewModel.send(.setPushNotificationHour(hour))
}
}
.contentShape(Rectangle())
.onTapGesture {
viewModel.send(.setPushNotificationHour(hour))
}
}
HStack {
Text("사용자 설정")
Spacer()
Text(formattedTimeString(viewModel.state.pushNotificationTime))
.foregroundStyle(.secondary)
if ![9, 15, 18, 21].contains(viewModel.state.pushNotificationHour) {
if viewModel.state.pushNotificationMinute != 0 {
Image(systemName: "checkmark")
.foregroundStyle(Color.accentColor)
}
Expand Down