Feat/#93 다운타임 모달뷰 구현 #98
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
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 |
|---|---|---|
|
|
@@ -30,67 +30,70 @@ struct TargetDdaySettingView: View { | |
| @Binding var day: String | ||
|
|
||
| var body: some View { | ||
| ScrollView(.vertical, showsIndicators: false) { | ||
| VStack { | ||
| Spacer() | ||
| .frame(height: 50.adjustedH) | ||
|
|
||
| HStack(spacing:0){ | ||
| VStack(alignment: .leading, spacing: 0) { | ||
| TypographyText("회복을 계획할 때 고려해야 할", style: .title1_sb_18, color: .gray1000) | ||
|
|
||
| TypographyText("중요한 일정이 있나요?", style: .title1_sb_18, color: .gray1000) | ||
|
|
||
| } | ||
|
|
||
| Spacer() | ||
| } | ||
| .frame(height: 54.adjustedH) | ||
|
|
||
| Spacer() | ||
| .frame(height: 40) | ||
|
|
||
| HStack(spacing: 12.adjustedW) { | ||
| ForEach(DdayState.allCases, id: \.self) { state in | ||
| SelectionChip( | ||
| title: state.title, | ||
| isSelected: Binding( | ||
| get: { | ||
| dDayState == state | ||
| }, | ||
| set: {isSelected in | ||
| guard isSelected else { | ||
| return | ||
| } | ||
| dDayState = state | ||
| } | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| Spacer() | ||
| .frame(height: 56.adjustedH) | ||
|
|
||
| if let state = dDayState { | ||
| HStack(spacing: 0) { | ||
| switch state { | ||
| case .yes: | ||
| TypographyText("언제까지 회복이 완료되면 좋을까요?", style: .title1_sb_18, color: .gray1000) | ||
| case .no: | ||
| TypographyText("대략적인 회복 목표일을 정해볼까요?", style: .title1_sb_18, color: .gray1000) | ||
|
Comment on lines
+79
to
+81
|
||
| } | ||
|
|
||
| Spacer() | ||
|
|
||
| } | ||
| .frame(height: 27.adjustedH) | ||
|
|
||
| Spacer() | ||
| .frame(height: 24.adjustedH) | ||
|
|
||
| DateTextBox(year: $year, month: $month, day: $day) | ||
| } | ||
| } | ||
| } | ||
| .scrollDismissesKeyboard(.interactively) | ||
| } | ||
| } | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -67,7 +67,20 @@ struct NoTreatmentView: View { | |
| NoTreatmentFilterView(viewModel: viewModel) | ||
|
|
||
| case .downTimeSetting: | ||
| DownTimeSettingView( | ||
| treatments: viewModel.selectedTreatments, | ||
| setday: ( | ||
| viewModel.toInt( | ||
| viewModel.year | ||
| ), | ||
| viewModel.toInt( | ||
| viewModel.month | ||
| ), | ||
| viewModel.toInt( | ||
| viewModel.day | ||
| ) | ||
| ), today: viewModel.today | ||
| ) | ||
| } | ||
| } | ||
|
|
||
|
|
||
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,6 +32,16 @@ final class NoTreatmentViewModel: ObservableObject{ | |
| } | ||
| } | ||
|
|
||
| var today: (year: Int, month: Int, day: Int) { | ||
| let calendar = Calendar.current | ||
| let now = Date() | ||
| return ( | ||
| calendar.component(.year, from: now), | ||
| calendar.component(.month, from: now), | ||
| calendar.component(.day, from: now) | ||
| ) | ||
| } | ||
|
|
||
| func next() { | ||
| state.next() | ||
| } | ||
|
|
@@ -40,6 +50,10 @@ final class NoTreatmentViewModel: ObservableObject{ | |
| state.previous() | ||
| } | ||
|
|
||
| func toInt(_ value: String) -> Int { | ||
| Int(value) ?? 0 | ||
| } | ||
|
|
||
| func isDateTextFieldNotEmpty() -> Bool { | ||
| guard !year.isEmpty, !month.isEmpty, !day.isEmpty else { | ||
| return false | ||
|
|
||
Oops, something went wrong.
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.
Self를id로 사용하면 속성 변경 시 SwiftUI가 아이템 동일성을 잃을 수 있습니다.var id: Self { self }는 모든 속성이 동일해야 같은 아이템으로 인식됩니다. 속성이 변경되면 SwiftUI가 이를 새 아이템으로 간주하여 리스트 애니메이션이나 상태 유지에 문제가 발생할 수 있습니다.안정적인 식별자(예:
UUID또는 고유한name)를 사용하는 것이 권장됩니다.🛠️ 제안된 수정
또는
name이 고유하다면:🤖 Prompt for AI Agents
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.
id도 self 쓰나용??