Feat: Config에 데이터 연결 및 시뮬에서 확인

DeveloperAcademy-POSTECH · May 22, 2024 · 701ca8c · 701ca8c
1 parent f076400
commit 701ca8c
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 21 deletions.
diff --git a/MC2-Team3-Pilling/View/ChooseStatusView.swift b/MC2-Team3-Pilling/View/ChooseStatusView.swift
@@ -36,9 +36,9 @@ struct ChooseStatusView: View {
             }
             .pickerStyle(.segmented)
             // selection Print 되는 값 확인
-//            .onChange(of: selectedNum) { newValue in
-//                print("Selected number: \(newValue)")
-//            }
+            //            .onChange(of: selectedNum) { newValue in
+            //                print("Selected number: \(newValue)")
+            //            }
 
             // 복용시간 버튼
             Button(action: {

diff --git a/MC2-Team3-Pilling/View/MedicineSheetView.swift b/MC2-Team3-Pilling/View/MedicineSheetView.swift
@@ -3,8 +3,7 @@ import SwiftUI
 
 struct MedicineSheetView: View {
     @State private var searchText = ""
-    @Binding var showingMedicineSheet: Bool
-//    @State var showingMedicineSheet = false
+    //    @Binding var showingMedicineSheet: Bool
 
     @Binding var selectedPill: PillInfo?
 
@@ -27,7 +26,7 @@ struct MedicineSheetView: View {
                 List(filteredBirthControl) { pill in
                     Button(action: {
                         selectedPill = pill
-                        showingMedicineSheet = false
+                        //                        showingMedicineSheet = false
                     }) {
                         Text(pill.pillName)
                     }
@@ -43,7 +42,7 @@ struct MedicineSheetView: View {
 
         // footer button
         Button(action: {
-            self.showingMedicineSheet = false
+            //            self.showingMedicineSheet = false
         }, label: {
             Text("설정완료!")
                 .largeBold()
@@ -84,7 +83,7 @@ extension View {
 
 
 #Preview {
-
-//    MedicineSheetView()
+    
+    //    MedicineSheetView()
     OnboardingFirstView()
 }
diff --git a/MC2-Team3-Pilling/View/OnboardingFirstView.swift b/MC2-Team3-Pilling/View/OnboardingFirstView.swift
@@ -48,8 +48,8 @@ struct OnboardingFirstView: View {
             .foregroundColor(.secondary)
             .padding([.leading, .trailing], 16)
             .sheet(isPresented: $showingMedicineSheet){
-//                MedicineSheetView(showingMedicineSheet: true)
-                MedicineSheetView(showingMedicineSheet: $showingMedicineSheet, selectedPill: $selectedPill)
+                MedicineSheetView(selectedPill: $selectedPill)
+                //                MedicineSheetView(showingMedicineSheet: $showingMedicineSheet, selectedPill: $selectedPill)
                     .presentationDetents([.medium])
             }
 
@@ -79,7 +79,7 @@ struct OnboardingFirstView: View {
         // footer button
         Button(action: {
             //            OnboardingView02()
-
+            
         }, label: {
             Text("다음으로")
                 .largeBold()
@@ -91,7 +91,7 @@ struct OnboardingFirstView: View {
         .foregroundColor(.black)
         .padding()
     }
-
+    
 }
 
 #Preview {

diff --git a/MC2-Team3-Pilling/View/OnboardingSecondView.swift b/MC2-Team3-Pilling/View/OnboardingSecondView.swift
@@ -34,17 +34,17 @@ struct OnboardingSecondView: View {
 
             Button(action: {
             }, label: {
-
+                
                 ZStack{
                     HStack {
                         Image(systemName: "clock")
                         Text("복용 시간")
                             .secondaryTitle()
                         Spacer()
-
+                        
                     }
                     DatePicker("", selection: $alarmTime, displayedComponents: .hourAndMinute)
-
+                    
                 }
                 .padding([.leading, .trailing], 20)
 
@@ -61,7 +61,7 @@ struct OnboardingSecondView: View {
                 Toggle("소리 알람여부추가", isOn: $alarmToggle)
                     .regular()
                     .padding(.bottom, 2)
-                    
+
 
 
                 HStack {

diff --git a/MC2-Team3-Pilling/View/PopoverView.swift b/MC2-Team3-Pilling/View/PopoverView.swift
@@ -38,7 +38,7 @@ struct PopoverView: View {
 
                 }
                 .frame(width: 45, height: 45)
-
+                
                 Text("피임약 2알 복용")
             }
             .padding(.bottom)
@@ -64,7 +64,7 @@ struct PopoverView: View {
                             .stroke(Color.green,lineWidth: 3)
 
                     )
-
+                
                 Text("현재")
             }
         }

diff --git a/MC2-Team3-Pilling/View/SettingView.swift b/MC2-Team3-Pilling/View/SettingView.swift
@@ -39,7 +39,7 @@ struct SettingView: View {
                 }
                 Section("알림") {
                     DatePicker("시간", selection: $selectedAlarmTime, displayedComponents: .hourAndMinute)
-                        
+
                     Toggle("알람", isOn: $isSoundOn)
 
                 }
@@ -49,7 +49,7 @@ struct SettingView: View {
                 Text("Pills")
                     .presentationDetents([.height(300), .large])
             })
-
+            
         }
     }
 }