Merge pull request #165 from TEAM-Cherrish/fix/#164-treatmentqa2

fix/ #164 QA 수정 완료

Author: y-eonee

Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/SelectTreatment/SelectTreatmentView.swift

@@ -76,12 +76,10 @@ extension SelectTreatmentView {
             VStack(alignment: .leading, spacing: 0){
 
                     TypographyText("시술 일정을 추가해볼게요.", style: .title1_sb_18, color: .gray1000)
-                        .frame(height: 27.adjustedH)
+                        .frame(height: 30.adjustedH)
                     TypographyText("이미 생각해둔 시술이 있나요?", style: .title1_sb_18, color: .gray1000)
-                        .frame(height: 27.adjustedH)
+                        .frame(height: 30.adjustedH)
 
-               
-                
                 Spacer()
                     .frame(height: 4.adjustedH)
                 TypographyText("시술을 선택하셨는지 확인할게요.", style: .body1_r_14, color: .gray700)

Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/NoTreatment/NoTreatmentFilterView.swift

@@ -10,6 +10,18 @@ import SwiftUI
 struct NoTreatmentFilterView: View {
     @ObservedObject var viewModel: NoTreatmentViewModel
 
+    
+    private let itemHeight: CGFloat = 34.adjustedH
+    private let spacing: CGFloat = 8.adjustedH
+    private let maxVisibleCount = 3
+    
+    private var scrollViewHeight: CGFloat {
+        let count = min(viewModel.selectedTreatments.count, maxVisibleCount)
+        let contentHeight = CGFloat(count) * itemHeight + CGFloat(max(count - 1, 0)) * spacing
+        return contentHeight + 24.adjustedH + 40.adjustedH
+    }
+    
+    
     var body: some View {
         VStack(spacing: 0) {
             TitleHeaderView(title: viewModel.selectedCategory?.title ?? "")
@@ -29,16 +41,19 @@ struct NoTreatmentFilterView: View {
                             } else {
                                 viewModel.addTreatment(treatment)
 
-                            }   
+                            }
                         }
                     )
                     .padding(.horizontal, 25.adjustedW)
 
                 }
                 Spacer()
-                    .frame(height: 198.adjustedH)
+                    .frame(
+                        height: viewModel.selectedTreatments.isEmpty ?
+                        24.adjustedH : scrollViewHeight.adjustedH + 24.adjustedH
+                    )
             }
-           
+            
         }
         .task {
             await viewModel.fetchNoTreatments()
@@ -58,7 +73,7 @@ private struct TitleHeaderView: View {
                     TypographyText("관련 시술 리스트", style: .title1_sb_18, color: .gray1000)
                         .frame(height: 27.adjustedH)
                     Spacer()
-
+                    
                 }
 
 
@@ -93,6 +108,6 @@ private struct TitleHeaderView: View {
                 .gray500()
         }
         .frame(height: 105.adjustedH    )
-          
+        
     }
 }

Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/Treatment/TreatmentFilterView.swift

@@ -9,19 +9,31 @@ import SwiftUI
 
 struct TreatmentFilterView: View {
     @ObservedObject var viewModel: TreatmentViewModel
+    
+    private let itemHeight: CGFloat = 34.adjustedH
+    private let spacing: CGFloat = 8.adjustedH
+    private let maxVisibleCount = 3
+    
+    private var scrollViewHeight: CGFloat {
+        let count = min(viewModel.selectedTreatments.count, maxVisibleCount)
+        let contentHeight = CGFloat(count) * itemHeight + CGFloat(max(count - 1, 0)) * spacing
+        return contentHeight + 24.adjustedH + 40.adjustedH
+    }
+    
     var body: some View {
         VStack(spacing: 0) {
             TreatmentSearchBarTextField(
                 text: $viewModel.searchText,
                 onTap: {
                     Task {
-                       try await viewModel.fetchTreatments()
+                        try await viewModel.fetchTreatments()
                     }
                 },
                 isDisabled: false
             )
             .padding(.horizontal, 25.adjustedW)
-            .padding(.bottom, 8.adjustedH)
+            Spacer()
+                .frame(height: 8.adjustedH)
             ScrollView(.vertical, showsIndicators: false) {
                 HStack(alignment: .top,spacing: 4) {
                     TypographyText("◎", style: .body3_r_12, color: .gray600)
@@ -33,14 +45,15 @@ struct TreatmentFilterView: View {
                             color: .gray600
                         )
                         .lineLimit(2)
-                        
                     }
-                    
                     Spacer()
-                    
                 }
                 .frame(height: 34.adjustedH)
                 .padding(.horizontal, 25.adjustedW)
+                
+                Spacer()
+                    .frame(height: 20.adjustedH)
+                
                 if viewModel.treatments.isEmpty {
                     Spacer()
                         .frame(height: 148.adjustedH)
@@ -62,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
+                    )
             }
 
         }
@@ -71,7 +87,7 @@ struct TreatmentFilterView: View {
                 try await viewModel.fetchTreatments()
             }
         }
-       
+        
     }
 }
 

Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/ViewModel/NoTreatment/NoTreatmentViewModel.swift

@@ -113,6 +113,10 @@ final class NoTreatmentViewModel: ObservableObject{
     }
 
     func isDateTextFieldNotEmpty() -> Bool {
+        guard let scheduledDate = calendarTreatmentFlowState.selectedDate else {
+            return false
+        }
+        
         guard !year.isEmpty, !month.isEmpty, !day.isEmpty else {
             Task { @MainActor in
                 updateWarning(state: .none)
@@ -133,14 +137,28 @@ final class NoTreatmentViewModel: ObservableObject{
             return false
         }
 
+        
         let today = Calendar.current.startOfDay(for: Date())
+        
         if date < today {
-            updateWarning(state: .pastDate)
-            return false
+            if date < scheduledDate {
+                updateWarning(state: .pastDate)
+                return false
+            }
+            
+        } else {
+            if date < scheduledDate {
+                if date < today {
+                    updateWarning(state: .pastDate)
+                }
+                updateWarning(state: .beforeProcedureDate)
+                 return false
+            }
         }
-        
+    
         updateWarning(state: .none)
         return true
+
     }
 
 

Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/ViewModel/Treatment/TreatmentViewModel.swift

@@ -104,6 +104,10 @@ final class TreatmentViewModel: ObservableObject{
     }
 
     func isDateTextFieldNotEmpty() -> Bool {
+        guard let scheduledDate = calendarTreatmentFlowState.selectedDate else {
+            return false
+        }
+        
         guard !year.isEmpty, !month.isEmpty, !day.isEmpty else {
             Task { @MainActor in
                 updateWarning(state: .none)
@@ -124,14 +128,28 @@ final class TreatmentViewModel: ObservableObject{
             return false
         }
 
+        
         let today = Calendar.current.startOfDay(for: Date())
+        
         if date < today {
-            updateWarning(state: .pastDate)
-            return false
+            if date < scheduledDate {
+                updateWarning(state: .pastDate)
+                return false
+            }
+            
+        } else {
+            if date < scheduledDate {
+                if date < today {
+                    updateWarning(state: .pastDate)
+                }
+                updateWarning(state: .beforeProcedureDate)
+                 return false
+            }
         }
-        
+    
         updateWarning(state: .none)
         return true
+
     }