Merge pull request #68 from DeveloperAcademy-POSTECH/feat/#42

Feat/#42 SettingView DataBinding
DeveloperAcademy-POSTECH · May 23, 2024 · 80f85e2 · 80f85e2
2 parents 4aa8910 + 418990a
commit 80f85e2
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 9 deletions.
diff --git a/MC2-Team3-Pilling.xcodeproj/xcshareddata/xcschemes/MC2-Team3-Pilling.xcscheme b/MC2-Team3-Pilling.xcodeproj/xcshareddata/xcschemes/MC2-Team3-Pilling.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1530"
-   version = "1.7">
+   version = "1.8">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES"

diff --git a/MC2-Team3-Pilling/Extentsion/model+extension.swift b/MC2-Team3-Pilling/Extentsion/model+extension.swift
@@ -24,6 +24,7 @@ extension Config{
         dateFormatter.dateFormat = format
         return dateFormatter.string(from: date)
     }
+
     static func StringToDate(dateString: String,format:String) -> Date? {
 
             let dateFormatter = DateFormatter()

diff --git a/MC2-Team3-Pilling/View/MedicineSheetView.swift b/MC2-Team3-Pilling/View/MedicineSheetView.swift
@@ -1,5 +1,6 @@
 
 import SwiftUI
+import SwiftData
 
 struct MedicineSheetView: View {
     @State private var searchText = ""
@@ -8,6 +9,7 @@ struct MedicineSheetView: View {
 
     @Environment(\.presentationMode) var presentationMode
     @Binding var selectedPill: PillInfo?
+    @Query var user:[UserInfo]
 
     //    let BirthControlNames = [
     //        "쎄스콘정", "미뉴렛정", "에이리스정", "머시론정",
@@ -28,9 +30,11 @@ struct MedicineSheetView: View {
                     List(filteredBirthControl) { pill in
                         Button(action: {
                             selectedPill = pill
+
                             print(pill.pillName)
 
                             if selectedPill == pill {
+                                user.first?.curPill?.pillInfo=selectedPill!
                                 self.presentationMode.wrappedValue.dismiss()
                             }
 

diff --git a/MC2-Team3-Pilling/View/SettingView.swift b/MC2-Team3-Pilling/View/SettingView.swift
@@ -6,21 +6,20 @@
 //
 
 import SwiftUI
+import SwiftData
 
 struct SettingView: View {
-    @State private var selectedAlarmTime = Date.now
+    @Environment(\.modelContext) private var modelContext
+    @Query var user:[UserInfo]
+
+    @State private var selectedAlarmTime = Date()
     @State private var isSoundOn = false
-    //    @State private var selectedPill = 0
+//    @State private var selectedPill = 0
     @Binding var selectedPill: PillInfo?
     @State private var isShowingPills = false
     @Binding var showingMedicineSheet: Bool
 
 
-
-
-
-    //    let pills = [(name: "야즈", type: "24일/4일"), (name: "머쉬론", type: "21일/7일")]
-
     var body: some View {
         NavigationStack {
             Form {
@@ -40,7 +39,7 @@ struct SettingView: View {
 
                     NavigationLink(destination: MedicineSheetView(showingMedicineSheet: $showingMedicineSheet, selectedPill: $selectedPill)) {
                         HStack {
-                            Text("Select Pill")
+                            Text("약 선택")
                             Spacer()
                             if let pill = selectedPill {
                                 Text(pill.pillName)
@@ -55,11 +54,29 @@ struct SettingView: View {
 
                 Section("알림") {
                     DatePicker("시간", selection: $selectedAlarmTime, displayedComponents: .hourAndMinute)
+                        .onChange(of: selectedAlarmTime) { oldValue, newValue in
+                            let newValueToString = Config.DateToString(date: newValue, format: Hourformat)
+                            user.first?.scheduleTime = newValueToString
+                            print(newValueToString)
+                        }
 
                     Toggle("알람", isOn: $isSoundOn)
+                        .onChange(of: isSoundOn) { oldValue, newValueAlarm in
+                            user.first?.isAlarm = newValueAlarm
+                        }
+                    // Optional, unWrapped
 
                 }
             }
+            .onAppear{
+                if let userInfo = user.first {
+                    selectedPill = userInfo.curPill?.pillInfo
+                    selectedAlarmTime = Config.StringToDate(dateString: userInfo.scheduleTime, format: Hourformat)!
+//                    selectedAlarmTime = Config.DateToString(date: selectedAlarmTime, format: Hourformat)
+                    isSoundOn = userInfo.isAlarm
+                }
+
+            }
             .navigationTitle("Settings")
             //            .sheet(isPresented: $isShowingPills, content: {
             //                Text("Pills")