From 4e48b7371fce9a1c7a7921eca874dc307eb1d9bd Mon Sep 17 00:00:00 2001 From: JaeSunEo Date: Fri, 23 Jan 2026 21:15:31 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20#164=20=EC=9A=94=EA=B5=AC=20?= =?UTF-8?q?=EC=82=AC=ED=95=AD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Treatment/View/NoTreatment/NoTreatmentFilterView.swift | 5 ++++- .../Treatment/View/Treatment/TreatmentFilterView.swift | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/NoTreatment/NoTreatmentFilterView.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/NoTreatment/NoTreatmentFilterView.swift index e40803f5..9e1596c0 100644 --- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/NoTreatment/NoTreatmentFilterView.swift +++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/NoTreatment/NoTreatmentFilterView.swift @@ -50,7 +50,10 @@ struct NoTreatmentFilterView: View { } Spacer() - .frame(height: 198.adjustedH) + .frame( + height: viewModel.selectedTreatments.isEmpty ? + 24.adjustedH : scrollViewHeight.adjustedH + 24.adjustedH + ) } } diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/Treatment/TreatmentFilterView.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/Treatment/TreatmentFilterView.swift index 0e1dbffa..edf703d8 100644 --- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/Treatment/TreatmentFilterView.swift +++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/Treatment/TreatmentFilterView.swift @@ -75,7 +75,10 @@ struct TreatmentFilterView: View { .padding(.horizontal, 24.adjustedW) } Spacer() - .frame(height: 198.adjustedH) + .frame( + height: viewModel.selectedTreatments.isEmpty ? + 24.adjustedH : scrollViewHeight.adjustedH + 24.adjustedH + ) } } From 9b3a5da81c38e776561f9e8aa2f630f411c79e96 Mon Sep 17 00:00:00 2001 From: JaeSunEo Date: Fri, 23 Jan 2026 21:19:47 +0900 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20#164=20=EC=A4=84=20=EB=B0=94?= =?UTF-8?q?=EA=BF=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/NoTreatment/NoTreatmentFilterView.swift | 8 ++++---- .../Treatment/View/Treatment/TreatmentFilterView.swift | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/NoTreatment/NoTreatmentFilterView.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/NoTreatment/NoTreatmentFilterView.swift index 9e1596c0..6b9a22fa 100644 --- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/NoTreatment/NoTreatmentFilterView.swift +++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/NoTreatment/NoTreatmentFilterView.swift @@ -51,13 +51,13 @@ struct NoTreatmentFilterView: View { } Spacer() .frame( - height: viewModel.selectedTreatments.isEmpty ? - 24.adjustedH : scrollViewHeight.adjustedH + 24.adjustedH - ) + height: viewModel.selectedTreatments.isEmpty ? + 24.adjustedH : scrollViewHeight.adjustedH + 24.adjustedH + ) } } - + } .task { await viewModel.fetchNoTreatments() diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/Treatment/TreatmentFilterView.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/Treatment/TreatmentFilterView.swift index edf703d8..de1be552 100644 --- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/Treatment/TreatmentFilterView.swift +++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/Treatment/TreatmentFilterView.swift @@ -76,9 +76,9 @@ struct TreatmentFilterView: View { } Spacer() .frame( - height: viewModel.selectedTreatments.isEmpty ? - 24.adjustedH : scrollViewHeight.adjustedH + 24.adjustedH - ) + height: viewModel.selectedTreatments.isEmpty ? + 24.adjustedH : scrollViewHeight.adjustedH + 24.adjustedH + ) } }