[#145] 시트에 툴바를 통해 cancel, confirm 버튼을 구성한다 #153
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| // | ||
| // SheetToolbar.swift | ||
| // DevLog | ||
| // | ||
| // Created by 최윤진 on 2/27/26. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| struct SheetToolbar: ToolbarContent { | ||
| let onCancel: () -> Void | ||
| let onConfirm: () -> Void | ||
| let isConfirmEnabled: Bool | ||
|
|
||
| init( | ||
| onCancel: @escaping () -> Void, | ||
| onConfirm: @escaping () -> Void, | ||
| isConfirmEnabled: Bool = true | ||
| ) { | ||
| self.onCancel = onCancel | ||
| self.onConfirm = onConfirm | ||
| self.isConfirmEnabled = isConfirmEnabled | ||
| } | ||
|
|
||
| var body: some ToolbarContent { | ||
| if #available(iOS 26.0, *) { | ||
| ToolbarItem(placement: .topBarLeading) { | ||
| Button(role: .cancel) { | ||
| onCancel() | ||
| } | ||
| } | ||
|
|
||
| ToolbarItem(placement: .topBarTrailing) { | ||
| Button(role: .confirm) { | ||
| onConfirm() | ||
| } | ||
| .disabled(!isConfirmEnabled) | ||
| } | ||
| } else { | ||
| ToolbarItem(placement: .topBarLeading) { | ||
| Button { | ||
| onCancel() | ||
| } label: { | ||
| Text("취소") | ||
| } | ||
| } | ||
|
|
||
| ToolbarItem(placement: .topBarTrailing) { | ||
| Button { | ||
| onConfirm() | ||
| } label: { | ||
| Text("확인") | ||
| .bold() | ||
| } | ||
| .disabled(!isConfirmEnabled) | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -74,7 +74,6 @@ struct TodoDetailView: View { | |
| viewModel.send(.setShowEditor(true)) | ||
| } label: { | ||
| Text("수정") | ||
| } | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -46,7 +46,16 @@ struct TodoEditorView: View { | |
| .navigationTitle(viewModel.navigationTitle) | ||
| .navigationBarTitleDisplayMode(.inline) | ||
| .toolbarBackground(.background, for: .navigationBar) | ||
| .toolbar { | ||
| SheetToolbar( | ||
| onCancel: { dismiss() }, | ||
| onConfirm: { | ||
| onSubmit?(viewModel.upsertTodo()) | ||
| dismiss() | ||
| }, | ||
| isConfirmEnabled: viewModel.state.isValidToSave | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -306,10 +315,13 @@ private struct TagEditor<Content: View>: View { | |
| tag = "" | ||
| } label: { | ||
| Image(systemName: "plus") | ||
| .font(.largeTitle) | ||
| .foregroundStyle(Color.white) | ||
| } | ||
| .adaptiveButtonStyle( | ||
| shape: .circle, | ||
| color: (!tag.isEmpty && !tags.contains(tag)) ? Color.blue : .gray.opacity(0.4) | ||
| ) | ||
| .disabled(tag.isEmpty || tags.contains(tag)) | ||
| } | ||
| } | ||
|
|
@@ -344,7 +356,7 @@ private struct DueDatePicker<Content: View>: View { | |
| ) | ||
| .labelsHidden() | ||
| .datePickerStyle(.graphical) | ||
| .presentationDragIndicator(.visible) | ||
| .presentationDetents([.height(height)]) | ||
| .background { | ||
| GeometryReader { geometry in | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -123,7 +123,7 @@ struct PushNotificationListView: View { | |
| } label: { | ||
| Text("정렬: \(viewModel.state.query.sortOrder.title)") | ||
| } | ||
| .adaptiveButtonStyle(color: viewModel.state.query.sortOrder == .oldest ? .blue : .clear) | ||
|
|
||
| Menu { | ||
| ForEach(PushNotificationQuery.TimeFilter.availableOptions, id: \.id) { option in | ||
|
|
@@ -144,14 +144,15 @@ struct PushNotificationListView: View { | |
| } label: { | ||
| Text("기간") | ||
| } | ||
| .adaptiveButtonStyle(color: viewModel.state.query.timeFilter == .none ? .clear : .blue) | ||
|
|
||
| Button { | ||
| viewModel.send(.toggleUnreadOnly) | ||
| } label: { | ||
| Text("읽지 않음") | ||
| .foregroundStyle(viewModel.state.query.unreadOnly ? .white : Color(.label)) | ||
| } | ||
| .adaptiveButtonStyle(color: viewModel.state.query.unreadOnly ? .blue : .clear) | ||
| } | ||
| } | ||
| .scrollIndicators(.never) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,7 +32,7 @@ struct PushNotificationSettingsView: View { | |
| if viewModel.state.pushNotificationHour == hour && | ||
| viewModel.state.pushNotificationMinute == 0 { | ||
| Image(systemName: "checkmark") | ||
| .foregroundStyle(Color.blue) | ||
| } | ||
| } | ||
| .contentShape(Rectangle()) | ||
|
|
@@ -48,7 +48,7 @@ struct PushNotificationSettingsView: View { | |
| .foregroundStyle(.secondary) | ||
| if viewModel.state.pushNotificationMinute != 0 { | ||
| Image(systemName: "checkmark") | ||
| .foregroundStyle(Color.blue) | ||
| } | ||
| } | ||
| .contentShape(Rectangle()) | ||
|
|
@@ -88,7 +88,12 @@ struct PushNotificationSettingsView: View { | |
| .presentationDetents([.height(viewModel.state.sheetHeight)]) | ||
| .onAppear { UIDatePicker.appearance().minuteInterval = 5 } | ||
| .onDisappear { UIDatePicker.appearance().minuteInterval = 1 /* 기본값으로 복원 */ } | ||
| .toolbar { | ||
| SheetToolbar( | ||
| onCancel: { viewModel.send(.rollbackUpdate) }, | ||
| onConfirm: { viewModel.send(.confirmUpdate) } | ||
| ) | ||
| } | ||
| .background( | ||
| GeometryReader { geometry in | ||
| Color.clear.onAppear { | ||
|
|
@@ -100,40 +105,6 @@ struct PushNotificationSettingsView: View { | |
| } | ||
| } | ||
|
|
||
| private func formattedTimeString(_ date: Date) -> String { | ||
| let minuteValue = Calendar.current.component(.minute, from: date) | ||
| let formatStyle: Date.FormatStyle = .dateTime.hour(.twoDigits(amPM: .wide)) | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
iOS 26.0 버전 체크는 현재 및 가까운 미래의 OS에서 항상
false를 반환하므로else블록의 코드만 실행됩니다.Button(role:)은 iOS 15.0부터 사용 가능하므로, 만약 iOS 버전을 기준으로 분기하려는 의도였다면if #available(iOS 15.0, *)과 같이 더 낮은 버전으로 수정해야 합니다.만약
visionOS를 지원하기 위한 코드라면,#if os(visionOS)전처리기 매크로를 사용하거나if #available(visionOS 1.0, *)으로 확인하는 것이 더 정확합니다. 다른 파일에서glassEffect와 같은visionOS전용 API를 사용하는 것으로 보아 후자일 가능성이 높아 보입니다.잘못된 버전 체크는 의도한 UI가 표시되지 않는 버그를 유발할 수 있으므로 수정이 필요합니다.