Fix/#151 QA 반영 #155
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
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 |
|---|---|---|
|
|
@@ -79,6 +79,15 @@ struct NoTreatmentView: View { | |
|
|
||
| case .treatmentFilter: | ||
| NoTreatmentFilterView(viewModel: viewModel) | ||
| .overlay(alignment: .bottom) { | ||
| if viewModel.state == .treatmentFilter, !viewModel.selectedTreatments.isEmpty { | ||
| SelectedTreatmentSheetView( | ||
| selectedTreatments: viewModel.selectedTreatments, | ||
| removeTreatment: viewModel.removeTreatment(_:) | ||
| ) | ||
|
|
||
| } | ||
| } | ||
|
Comment on lines
+82
to
+90
There was a problem hiding this comment. 🧹 Nitpick | 🔵 Trivial 중복 상태 체크 제거 권장
♻️ 제안된 수정 NoTreatmentFilterView(viewModel: viewModel)
.overlay(alignment: .bottom) {
- if viewModel.state == .treatmentFilter, !viewModel.selectedTreatments.isEmpty {
+ if !viewModel.selectedTreatments.isEmpty {
SelectedTreatmentSheetView(
selectedTreatments: viewModel.selectedTreatments,
removeTreatment: viewModel.removeTreatment(_:)
)
-
}
}🤖 Prompt for AI Agents |
||
|
|
||
| case .downTimeSetting: | ||
| DownTimeSettingView( | ||
|
|
@@ -101,13 +110,6 @@ struct NoTreatmentView: View { | |
| @ViewBuilder | ||
| private func bottomView() -> some View { | ||
| VStack(spacing: 0) { | ||
| CherrishButton( | ||
| title: "다음", | ||
| type: .large, | ||
|
|
@@ -157,28 +159,33 @@ private struct TreatmentSelectedCategory: View { | |
| style: .title1_sb_18, | ||
| color: .gray1000 | ||
| ) | ||
| .frame(height: 27.adjustedH) | ||
|
|
||
| TypographyText( | ||
| "외모 고민은 무엇인가요?", | ||
| style: .title1_sb_18, | ||
| color: .gray1000 | ||
| ) | ||
| .frame(height: 27.adjustedH) | ||
| Spacer() | ||
| .frame(height: 4.adjustedH) | ||
| TypographyText( | ||
| "선택한 고민을 기준으로 시술 정보를 정리해줘요.", | ||
| style: .body1_m_14, | ||
| color: .gray700 | ||
| ) | ||
| .frame(height: 20.adjustedH) | ||
|
|
||
| } | ||
| .frame(height: 78.adjustedH) | ||
|
|
||
| Spacer() | ||
| } | ||
| .padding(.horizontal, 34.adjustedW) | ||
|
|
||
| ScrollView(.vertical, showsIndicators:false) { | ||
| Spacer() | ||
| .frame(height: 40.adjustedH) | ||
| LazyVGrid(columns: columns, spacing: 12.adjustedH) { | ||
| ForEach(viewModel.categories, id: \.id) { category in | ||
| SelectionChip( | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -51,28 +51,45 @@ struct SelectedTreatmentSheetView: View { | |
| y: -5 | ||
| ) | ||
| ZStack { | ||
| ScrollViewReader { proxy in | ||
| ScrollView(.vertical, showsIndicators: false) { | ||
| VStack(spacing: spacing) { | ||
| if selectedTreatments.count > 3 { | ||
| scrollViewTopMarkerView | ||
| .allowsHitTesting(false) | ||
| } | ||
| ForEach(selectedTreatments, id: \.id) { treatment in | ||
| TreatmentRowView( | ||
| displayMode: .summary, | ||
| treatmentEntity: treatment, | ||
| isSelected: .constant(true), | ||
| action: { removeTreatment(treatment) } | ||
| ) | ||
| .id(treatment.id) | ||
| .frame(height: itemHeight) | ||
| } | ||
| .padding(.horizontal, 24.5.adjustedW) | ||
|
Comment on lines
+70
to
+71
There was a problem hiding this comment. 🧹 Nitpick | 🔵 Trivial 🧩 Analysis chain🏁 Script executed: find . -name "SelectedTreatmentSheetView.swift" -type fRepository: TEAM-Cherrish/Cherrish-iOS Length of output: 175 🏁 Script executed: # Check the context around lines 70-71 in the file
sed -n '60,80p' Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/SelectedTreatmentSheetView.swiftRepository: TEAM-Cherrish/Cherrish-iOS Length of output: 1132 🏁 Script executed: # Run the verification script to check padding patterns with TreatmentRowView
rg -n "TreatmentRowView" --type swift -A 5 -B 5Repository: TEAM-Cherrish/Cherrish-iOS Length of output: 8805 🏁 Script executed: # Check padding application in DownTimeSettingView
sed -n '30,50p' Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/DownTimeSettingView.swiftRepository: TEAM-Cherrish/Cherrish-iOS Length of output: 1016 🏁 Script executed: # Check padding application in TreatmentFilterView
sed -n '45,65p' Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/Treatment/TreatmentFilterView.swiftRepository: TEAM-Cherrish/Cherrish-iOS Length of output: 1036 🏁 Script executed: # Check padding application in NoTreatmentFilterView
sed -n '15,35p' Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/NoTreatment/NoTreatmentFilterView.swiftRepository: TEAM-Cherrish/Cherrish-iOS Length of output: 1042
🤖 Prompt for AI Agents |
||
|
|
||
| if selectedTreatments.count > 3 { | ||
| scrollViewBottomMarkerView | ||
| .allowsHitTesting(false) | ||
| } | ||
|
|
||
| Color.clear | ||
| .frame(height: 1) | ||
| .id("scrollBottom") | ||
| } | ||
| .padding(.vertical, 14.adjustedH) | ||
| } | ||
| .onChange(of: selectedTreatments.count) { oldCount, newCount in | ||
| if newCount > oldCount { | ||
| withAnimation { | ||
| proxy.scrollTo("scrollBottom", anchor: .bottom) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if selectedTreatments.count > 3 { | ||
| GradientBox(isTop: true) | ||
| .frame(height: 42.adjustedH) | ||
|
|
@@ -86,12 +103,10 @@ struct SelectedTreatmentSheetView: View { | |
| .opacity(shouldShowGradientBottom ? 1 : 0) | ||
| .frame(maxHeight: .infinity, alignment: .bottom) | ||
| } | ||
| } | ||
| .background(.gray0) | ||
| .frame(height: scrollViewHeight) | ||
|
|
||
| .coordinateSpace(name: "SelectedTreatmentScroll") | ||
| .onPreferenceChange(ScrollTopPreferenceKey.self) { minY in | ||
| if initialTopGlobalY == nil { initialTopGlobalY = minY } | ||
|
|
@@ -100,7 +115,9 @@ struct SelectedTreatmentSheetView: View { | |
| .onPreferenceChange(ScrollBottomPreferenceKey.self) { height in | ||
| bottomOffsetY = height | ||
| } | ||
|
|
||
| } | ||
|
|
||
| } | ||
| } | ||
|
|
||
|
|
||
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.
🧹 Nitpick | 🔵 Trivial
레이아웃 구조가 명확합니다
명시적인 높이 프레임을 사용하여 일관된 레이아웃을 구현했습니다. 코드 내 불필요한 빈 줄(74, 79-80행)을 정리하면 가독성이 향상됩니다.
♻️ 코드 정리 제안
private var titleView: some View { HStack(spacing: 0) { VStack(alignment: .leading, spacing: 0){ - TypographyText("시술 일정을 추가해볼게요.", style: .title1_sb_18, color: .gray1000) .frame(height: 27.adjustedH) TypographyText("이미 생각해둔 시술이 있나요?", style: .title1_sb_18, color: .gray1000) .frame(height: 27.adjustedH) - - - Spacer() .frame(height: 4.adjustedH) TypographyText("시술을 선택하셨는지 확인할게요.", style: .body1_r_14, color: .gray700) .frame(height: 20.adjustedH) } .frame(height: 78.adjustedH) Spacer() } }📝 Committable suggestion
🤖 Prompt for AI Agents