From f076400773fc24cf4d72b5db4580c32789009b58 Mon Sep 17 00:00:00 2001 From: Lee Sohyeon Date: Tue, 21 May 2024 21:30:39 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Feat:=20Config=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EB=8D=94=EB=AF=B8=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=82=BD?= =?UTF-8?q?=EC=9E=85=20=EB=B0=8F=20MedicineSheetView=EC=97=90=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EC=97=B0=EA=B2=B0=20-=20Config=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EC=97=90=20=EB=8D=94=EB=AF=B8=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EC=82=BD=EC=9E=85=20-=20=EB=8D=94?= =?UTF-8?q?=EB=AF=B8=20=EB=8D=B0=EC=9D=B4=ED=84=B0=EB=A5=BC=20MedicineShee?= =?UTF-8?q?tView=EC=97=90=20=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MC2-Team3-Pilling/Model/Config.swift | 47 ++++++++++++------- .../View/MedicineSheetView.swift | 18 ++++--- .../View/OnboardingFirstView.swift | 3 +- 3 files changed, 44 insertions(+), 24 deletions(-) diff --git a/MC2-Team3-Pilling/Model/Config.swift b/MC2-Team3-Pilling/Model/Config.swift index 7772349..b2c07b3 100644 --- a/MC2-Team3-Pilling/Model/Config.swift +++ b/MC2-Team3-Pilling/Model/Config.swift @@ -17,12 +17,12 @@ class Config{ var color: Color { switch self { - case .notYet: - return .customGray - case .onePill, .twoPills: - return .customGreen - case .placebo: - return .white + case .notYet: + return .customGray + case .onePill, .twoPills: + return .customGreen + case .placebo: + return .white } } } @@ -36,16 +36,16 @@ class Config{ var description: String { switch self { - case .plantGrass: - return "잔디를 심어주세요" - case .limitTwoHours: - return "잔디는 2시간을 초과하지 않게 심어주세요!" - case .plantTwoGrass: - return "2개의 잔디를 심어주세요" - case .grassGrowingWell: - return "잔디가 잘 자라고 있어요!" - case .notRecording: - return "기록을 안하고 계신가요?" + case .plantGrass: + return "잔디를 심어주세요" + case .limitTwoHours: + return "잔디는 2시간을 초과하지 않게 심어주세요!" + case .plantTwoGrass: + return "2개의 잔디를 심어주세요" + case .grassGrowingWell: + return "잔디가 잘 자라고 있어요!" + case .notRecording: + return "기록을 안하고 계신가요?" } } } @@ -75,12 +75,25 @@ class Config{ func AlarmStringToDate(dateString: String) -> Date? { let format = "HH:mm" let dateFormatter = DateFormatter() - dateFormatter.timeZone = TimeZone.current + dateFormatter.timeZone = TimeZone.current dateFormatter.dateFormat = format return dateFormatter.date(from: dateString) } + static let dummyPillInfos: [PillInfo] = [ + PillInfo(pillName: "머시론정", intakeDay: 24, placeboDay: 4), + PillInfo(pillName: "야즈", intakeDay: 21, placeboDay: 7), + PillInfo(pillName: "마이보라", intakeDay: 28, placeboDay: 0), + PillInfo(pillName: "디미아", intakeDay: 24, placeboDay: 4), + PillInfo(pillName: "클레라", intakeDay: 21, placeboDay: 7), + PillInfo(pillName: "벨라라", intakeDay: 21, placeboDay: 7), + PillInfo(pillName: "레보니아", intakeDay: 28, placeboDay: 0), + PillInfo(pillName: "디안느35", intakeDay: 21, placeboDay: 7), + PillInfo(pillName: "로젠정", intakeDay: 24, placeboDay: 4), + PillInfo(pillName: "센시발", intakeDay: 28, placeboDay: 0) + ] + } let myArray: [Int] = [1, 2 , 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3] diff --git a/MC2-Team3-Pilling/View/MedicineSheetView.swift b/MC2-Team3-Pilling/View/MedicineSheetView.swift index ddc5d1e..0f010ef 100644 --- a/MC2-Team3-Pilling/View/MedicineSheetView.swift +++ b/MC2-Team3-Pilling/View/MedicineSheetView.swift @@ -6,25 +6,31 @@ struct MedicineSheetView: View { @Binding var showingMedicineSheet: Bool // @State var showingMedicineSheet = false + @Binding var selectedPill: PillInfo? + let BirthControlNames = [ "쎄스콘정", "미뉴렛정", "에이리스정", "머시론정", "마이보라", "미니보라30","트리퀄라", "멜리안정", "센스리베정", "디어미정", "야스민정", "야즈정","클래라정"] - var filteredBirthControl: [String] { + var filteredBirthControl: [PillInfo] { if searchText.isEmpty { - BirthControlNames + return Config.dummyPillInfos } else { - BirthControlNames.filter{ $0.localizedStandardContains(searchText) } + return Config.dummyPillInfos.filter{ $0.pillName.localizedStandardContains(searchText) } } } var body: some View { NavigationView { VStack { - List(filteredBirthControl, id: \.self) { - birthControl in - Text(birthControl) + List(filteredBirthControl) { pill in + Button(action: { + selectedPill = pill + showingMedicineSheet = false + }) { + Text(pill.pillName) + } } .searchable(text: $searchText) } //리스트의 스타일 수정 diff --git a/MC2-Team3-Pilling/View/OnboardingFirstView.swift b/MC2-Team3-Pilling/View/OnboardingFirstView.swift index e5c14b1..fa20aa2 100644 --- a/MC2-Team3-Pilling/View/OnboardingFirstView.swift +++ b/MC2-Team3-Pilling/View/OnboardingFirstView.swift @@ -3,6 +3,7 @@ import SwiftUI struct OnboardingFirstView: View { @State private var showingMedicineSheet = false + @State private var selectedPill: PillInfo? var body: some View { @@ -48,7 +49,7 @@ struct OnboardingFirstView: View { .padding([.leading, .trailing], 16) .sheet(isPresented: $showingMedicineSheet){ // MedicineSheetView(showingMedicineSheet: true) - MedicineSheetView(showingMedicineSheet: $showingMedicineSheet) + MedicineSheetView(showingMedicineSheet: $showingMedicineSheet, selectedPill: $selectedPill) .presentationDetents([.medium]) } From 701ca8c6a829b48c013c3387e197378fa78fbec3 Mon Sep 17 00:00:00 2001 From: Lee Sohyeon Date: Wed, 22 May 2024 09:30:26 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Feat:=20Config=EC=97=90=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EC=97=B0=EA=B2=B0=20=EB=B0=8F=20=EC=8B=9C?= =?UTF-8?q?=EB=AE=AC=EC=97=90=EC=84=9C=20=ED=99=95=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MC2-Team3-Pilling/View/ChooseStatusView.swift | 6 +++--- MC2-Team3-Pilling/View/MedicineSheetView.swift | 11 +++++------ MC2-Team3-Pilling/View/OnboardingFirstView.swift | 8 ++++---- MC2-Team3-Pilling/View/OnboardingSecondView.swift | 8 ++++---- MC2-Team3-Pilling/View/PopoverView.swift | 4 ++-- MC2-Team3-Pilling/View/SettingView.swift | 4 ++-- 6 files changed, 20 insertions(+), 21 deletions(-) diff --git a/MC2-Team3-Pilling/View/ChooseStatusView.swift b/MC2-Team3-Pilling/View/ChooseStatusView.swift index 84d917e..3e4c329 100644 --- 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 index 0f010ef..411517c 100644 --- 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 index fa20aa2..c2dfbc0 100644 --- 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 index c02dd03..f9d0205 100644 --- 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 index 97198a8..5d691eb 100644 --- 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 index 9185269..be8d04f 100644 --- 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]) }) - + } } }