From 55a748181aa1178452ec487c181f3e891753638a Mon Sep 17 00:00:00 2001 From: Philipp Zagar Date: Sat, 30 Mar 2024 23:14:42 -0700 Subject: [PATCH] Remove more unnecessary files --- Intake.xcodeproj/project.pbxproj | 248 +++--------------- .../xcshareddata/swiftpm/Package.resolved | 213 +-------------- .../AddAllergy.swift | 0 .../AllergyLLMAssistant.swift | 0 .../AllergyRecords.swift | 0 .../ReactionPDF.swift | 0 .../ReactionSectionView.swift | 0 .../ReactionView.swift | 0 .../LLMAssistantView.swift | 0 .../LLMInteraction.swift | 0 .../LLMOnboardingView.swift | 0 .../OpenAI/LLMOpenAITokenOnboarding.swift | 0 .../SummaryView.swift | 0 .../ExportView+ShareSheet.swift | 0 .../{Export => ExportView}/ExportView.swift | 0 .../ScrollablePDF.swift | 0 .../{HomeViews.swift => LoadLastButton.swift} | 55 ---- Intake/HomeView/SettingsButton.swift | 31 +++ Intake/HomeView/StartButton.swift | 43 +++ .../MedicalHistoryLLMAssistant.swift | 0 .../MedicalHistoryView.swift | 0 .../IntakeDosage.swift | 0 .../IntakeMedication.swift | 0 .../IntakeMedicationInstance.swift | 0 .../IntakeMedicationViewModel.swift | 0 .../MedicationContentView.swift | 0 .../MedicationLLMAssistant.swift | 0 .../ResourceSelection.swift | 0 .../SettingsView.swift | 0 .../MenstrualHistory.swift | 0 .../SmokingHistory.swift | 0 .../SurgeryLLMAssistant.swift | 0 .../SurgeryView.swift | 0 33 files changed, 113 insertions(+), 477 deletions(-) rename Intake/{Allergy Records => AllergyView}/AddAllergy.swift (100%) rename Intake/{Allergy Records => AllergyView}/AllergyLLMAssistant.swift (100%) rename Intake/{Allergy Records => AllergyView}/AllergyRecords.swift (100%) rename Intake/{Allergy Records => AllergyView}/ReactionPDF.swift (100%) rename Intake/{Allergy Records => AllergyView}/ReactionSectionView.swift (100%) rename Intake/{Allergy Records => AllergyView}/ReactionView.swift (100%) rename Intake/{ChiefComplaint => ChiefComplaintView}/LLMAssistantView.swift (100%) rename Intake/{ChiefComplaint => ChiefComplaintView}/LLMInteraction.swift (100%) rename Intake/{ChiefComplaint => ChiefComplaintView}/LLMOnboardingView.swift (100%) rename Intake/{ChiefComplaint => ChiefComplaintView}/OpenAI/LLMOpenAITokenOnboarding.swift (100%) rename Intake/{ChiefComplaint => ChiefComplaintView}/SummaryView.swift (100%) rename Intake/{Export => ExportView}/ExportView+ShareSheet.swift (100%) rename Intake/{Export => ExportView}/ExportView.swift (100%) rename Intake/{Export => ExportView}/ScrollablePDF.swift (100%) rename Intake/HomeView/{HomeViews.swift => LoadLastButton.swift} (55%) create mode 100644 Intake/HomeView/SettingsButton.swift create mode 100644 Intake/HomeView/StartButton.swift rename Intake/{Medical History => MedicalHistoryView}/MedicalHistoryLLMAssistant.swift (100%) rename Intake/{Medical History => MedicalHistoryView}/MedicalHistoryView.swift (100%) rename Intake/{Medication View => MedicationView}/IntakeDosage.swift (100%) rename Intake/{Medication View => MedicationView}/IntakeMedication.swift (100%) rename Intake/{Medication View => MedicationView}/IntakeMedicationInstance.swift (100%) rename Intake/{Medication View => MedicationView}/IntakeMedicationViewModel.swift (100%) rename Intake/{Medication View => MedicationView}/MedicationContentView.swift (100%) rename Intake/{Medication View => MedicationView}/MedicationLLMAssistant.swift (100%) rename Intake/{Settings => SettingsView}/ResourceSelection.swift (100%) rename Intake/{Settings => SettingsView}/SettingsView.swift (100%) rename Intake/{SocialHistory => SocialHistoryView}/MenstrualHistory.swift (100%) rename Intake/{SocialHistory => SocialHistoryView}/SmokingHistory.swift (100%) rename Intake/{Surgery => SurgeryView}/SurgeryLLMAssistant.swift (100%) rename Intake/{Surgery => SurgeryView}/SurgeryView.swift (100%) diff --git a/Intake.xcodeproj/project.pbxproj b/Intake.xcodeproj/project.pbxproj index 88dab95..f3fdd1d 100644 --- a/Intake.xcodeproj/project.pbxproj +++ b/Intake.xcodeproj/project.pbxproj @@ -8,16 +8,12 @@ /* Begin PBXBuildFile section */ 2F1AC9DF2B4E840E00C24973 /* Intake.docc in Sources */ = {isa = PBXBuildFile; fileRef = 2F1AC9DE2B4E840E00C24973 /* Intake.docc */; }; - 2F3D4ABC2A4E7C290068FB2F /* SpeziScheduler in Frameworks */ = {isa = PBXBuildFile; productRef = 2F3D4ABB2A4E7C290068FB2F /* SpeziScheduler */; }; 2F49B7762980407C00BCB272 /* Spezi in Frameworks */ = {isa = PBXBuildFile; productRef = 2F49B7752980407B00BCB272 /* Spezi */; }; 2F4E237E2989A2FE0013F3D9 /* LaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F4E237D2989A2FE0013F3D9 /* LaunchTests.swift */; }; 2F4E23832989D51F0013F3D9 /* IntakeTestingSetup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F4E23822989D51F0013F3D9 /* IntakeTestingSetup.swift */; }; 2F5E32BD297E05EA003432F8 /* IntakeDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E32BC297E05EA003432F8 /* IntakeDelegate.swift */; }; 2F6025CB29BBE70F0045459E /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 2F6025CA29BBE70F0045459E /* GoogleService-Info.plist */; }; 2FA0BFED2ACC977500E0EF83 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 2FA0BFEC2ACC977500E0EF83 /* Localizable.xcstrings */; }; - 2FB099AF2A875DF100B20952 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 2FB099AE2A875DF100B20952 /* FirebaseAuth */; }; - 2FB099B12A875DF100B20952 /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = 2FB099B02A875DF100B20952 /* FirebaseFirestore */; }; - 2FB099B32A875DF100B20952 /* FirebaseFirestoreSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 2FB099B22A875DF100B20952 /* FirebaseFirestoreSwift */; }; 2FB099B62A875E2B00B20952 /* HealthKitOnFHIR in Frameworks */ = {isa = PBXBuildFile; productRef = 2FB099B52A875E2B00B20952 /* HealthKitOnFHIR */; }; 2FC3439229EE634B002D773C /* ConsentDocument.md in Resources */ = {isa = PBXBuildFile; fileRef = 2FE5DC2C29EDD78E004B9AB4 /* ConsentDocument.md */; }; 2FC975A82978F11A00BA99FE /* Home.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FC975A72978F11A00BA99FE /* Home.swift */; }; @@ -31,19 +27,12 @@ 2FE5DC4529EDD7F2004B9AB4 /* Binding+Negate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FE5DC4229EDD7F2004B9AB4 /* Binding+Negate.swift */; }; 2FE5DC4629EDD7F2004B9AB4 /* Bundle+Image.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FE5DC4329EDD7F2004B9AB4 /* Bundle+Image.swift */; }; 2FE5DC4729EDD7F2004B9AB4 /* CodableArray+RawRepresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FE5DC4429EDD7F2004B9AB4 /* CodableArray+RawRepresentable.swift */; }; - 2FE5DC6429EDD883004B9AB4 /* SpeziAccount in Frameworks */ = {isa = PBXBuildFile; productRef = 2FE5DC6329EDD883004B9AB4 /* SpeziAccount */; }; - 2FE5DC6729EDD894004B9AB4 /* SpeziContact in Frameworks */ = {isa = PBXBuildFile; productRef = 2FE5DC6629EDD894004B9AB4 /* SpeziContact */; }; 2FE5DC7229EDD8D3004B9AB4 /* SpeziHealthKit in Frameworks */ = {isa = PBXBuildFile; productRef = 2FE5DC7129EDD8D3004B9AB4 /* SpeziHealthKit */; }; - 2FE5DC7529EDD8E6004B9AB4 /* SpeziFirebaseAccount in Frameworks */ = {isa = PBXBuildFile; productRef = 2FE5DC7429EDD8E6004B9AB4 /* SpeziFirebaseAccount */; }; - 2FE5DC7729EDD8E6004B9AB4 /* SpeziFirebaseConfiguration in Frameworks */ = {isa = PBXBuildFile; productRef = 2FE5DC7629EDD8E6004B9AB4 /* SpeziFirebaseConfiguration */; }; - 2FE5DC7929EDD8E6004B9AB4 /* SpeziFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = 2FE5DC7829EDD8E6004B9AB4 /* SpeziFirestore */; }; - 2FE5DC8429EDD934004B9AB4 /* SpeziQuestionnaire in Frameworks */ = {isa = PBXBuildFile; productRef = 2FE5DC8329EDD934004B9AB4 /* SpeziQuestionnaire */; }; 2FE5DC8A29EDD972004B9AB4 /* SpeziLocalStorage in Frameworks */ = {isa = PBXBuildFile; productRef = 2FE5DC8929EDD972004B9AB4 /* SpeziLocalStorage */; }; 2FE5DC8C29EDD972004B9AB4 /* SpeziSecureStorage in Frameworks */ = {isa = PBXBuildFile; productRef = 2FE5DC8B29EDD972004B9AB4 /* SpeziSecureStorage */; }; 2FE5DC8F29EDD980004B9AB4 /* SpeziViews in Frameworks */ = {isa = PBXBuildFile; productRef = 2FE5DC8E29EDD980004B9AB4 /* SpeziViews */; }; 2FE5DC9929EDD9D9004B9AB4 /* XCTestExtensions in Frameworks */ = {isa = PBXBuildFile; productRef = 2FE5DC9829EDD9D9004B9AB4 /* XCTestExtensions */; }; 2FE5DC9C29EDD9EF004B9AB4 /* XCTHealthKit in Frameworks */ = {isa = PBXBuildFile; productRef = 2FE5DC9B29EDD9EF004B9AB4 /* XCTHealthKit */; }; - 2FF53D8B2A8725DE00042B76 /* SpeziMockWebService in Frameworks */ = {isa = PBXBuildFile; productRef = 2FF53D8A2A8725DE00042B76 /* SpeziMockWebService */; }; 2FF53D8D2A8729D600042B76 /* IntakeStandard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FF53D8C2A8729D600042B76 /* IntakeStandard.swift */; }; 3C89F66D2B9D948B00A4F52D /* PatientInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C89F66C2B9D948B00A4F52D /* PatientInfo.swift */; }; 3CD23D612BA137D500AB9914 /* Intake.docc in Sources */ = {isa = PBXBuildFile; fileRef = 3CD23D602BA137D500AB9914 /* Intake.docc */; }; @@ -62,7 +51,6 @@ 51A360142B9648A7004E7E12 /* SurgeryLLMAssistant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51A360132B9648A7004E7E12 /* SurgeryLLMAssistant.swift */; }; 51A360162B965819004E7E12 /* AllergyLLMAssistant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51A360152B965819004E7E12 /* AllergyLLMAssistant.swift */; }; 51A360182B9659AE004E7E12 /* MedicalHistoryLLMAssistant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51A360172B9659AE004E7E12 /* MedicalHistoryLLMAssistant.swift */; }; - 5661551D2AB8384200209B80 /* SwiftPackageList in Frameworks */ = {isa = PBXBuildFile; productRef = 5661551C2AB8384200209B80 /* SwiftPackageList */; }; 5A0C1A192B69691000120506 /* SpeziFHIR in Frameworks */ = {isa = PBXBuildFile; productRef = 5A0C1A182B69691000120506 /* SpeziFHIR */; }; 5A0C1A1B2B69691000120506 /* SpeziFHIRHealthKit in Frameworks */ = {isa = PBXBuildFile; productRef = 5A0C1A1A2B69691000120506 /* SpeziFHIRHealthKit */; }; 5A2B9F7A2B69AE2C005CA63F /* MedicalHistoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A2B9F792B69AE2C005CA63F /* MedicalHistoryView.swift */; }; @@ -93,11 +81,10 @@ 9701570E2BB925DE00335713 /* DataStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9701570D2BB925DE00335713 /* DataStore.swift */; }; 970157102BB9260400335713 /* HealthDataModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9701570F2BB9260400335713 /* HealthDataModels.swift */; }; 970157122BB9266400335713 /* NavigationHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 970157112BB9266400335713 /* NavigationHelpers.swift */; }; - 970157182BB929FC00335713 /* HomeViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 970157172BB929FC00335713 /* HomeViews.swift */; }; + 970157182BB929FC00335713 /* SettingsButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 970157172BB929FC00335713 /* SettingsButton.swift */; }; 9733CFC62A8066DE001B7ABC /* SpeziOnboarding in Frameworks */ = {isa = PBXBuildFile; productRef = 2FE5DC8029EDD91D004B9AB4 /* SpeziOnboarding */; }; - 9739A0C62AD7B5730084BEA5 /* FirebaseStorage in Frameworks */ = {isa = PBXBuildFile; productRef = 9739A0C52AD7B5730084BEA5 /* FirebaseStorage */; }; - 97D73D6A2AD860AD00B47FA0 /* SpeziFirebaseStorage in Frameworks */ = {isa = PBXBuildFile; productRef = 97D73D692AD860AD00B47FA0 /* SpeziFirebaseStorage */; }; - A9D83F962B083794000D0C78 /* SpeziFirebaseAccountStorage in Frameworks */ = {isa = PBXBuildFile; productRef = A9D83F952B083794000D0C78 /* SpeziFirebaseAccountStorage */; }; + 97FE2EA42BB93582006A3B8E /* StartButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97FE2EA32BB93582006A3B8E /* StartButton.swift */; }; + 97FE2EA62BB935A2006A3B8E /* LoadLastButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97FE2EA52BB935A2006A3B8E /* LoadLastButton.swift */; }; ACBC9D1D2BA2B3F6003E2581 /* AllergyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACBC9D1C2BA2B3F6003E2581 /* AllergyTests.swift */; }; ACDF32ED2B9D0F4300B127E2 /* MenstrualHistory.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACFFA1D02B8FD8BB0006E6D4 /* MenstrualHistory.swift */; }; ACF862BE2B96E29600ACBA1E /* ExportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACF862BD2B96E29600ACBA1E /* ExportView.swift */; }; @@ -207,8 +194,10 @@ 9701570D2BB925DE00335713 /* DataStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataStore.swift; sourceTree = ""; }; 9701570F2BB9260400335713 /* HealthDataModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HealthDataModels.swift; sourceTree = ""; }; 970157112BB9266400335713 /* NavigationHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationHelpers.swift; sourceTree = ""; }; - 970157172BB929FC00335713 /* HomeViews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViews.swift; sourceTree = ""; }; + 970157172BB929FC00335713 /* SettingsButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsButton.swift; sourceTree = ""; }; 97FE2E9F2BB93182006A3B8E /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; + 97FE2EA32BB93582006A3B8E /* StartButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartButton.swift; sourceTree = ""; }; + 97FE2EA52BB935A2006A3B8E /* LoadLastButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoadLastButton.swift; sourceTree = ""; }; ACBC9D1C2BA2B3F6003E2581 /* AllergyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllergyTests.swift; sourceTree = ""; }; ACF862BD2B96E29600ACBA1E /* ExportView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExportView.swift; sourceTree = ""; }; ACFFA1CD2B8FD7190006E6D4 /* SmokingHistory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmokingHistory.swift; sourceTree = ""; }; @@ -227,34 +216,19 @@ files = ( F42AB1D22B6379B5002E13A6 /* SpeziLLM in Frameworks */, 9733CFC62A8066DE001B7ABC /* SpeziOnboarding in Frameworks */, - 2FE5DC6429EDD883004B9AB4 /* SpeziAccount in Frameworks */, F42AB1D42B6379B5002E13A6 /* SpeziLLMLocal in Frameworks */, - 2FB099AF2A875DF100B20952 /* FirebaseAuth in Frameworks */, - 97D73D6A2AD860AD00B47FA0 /* SpeziFirebaseStorage in Frameworks */, 51805C182B81898700D17109 /* SpeziMedication in Frameworks */, F42AB1D82B6379B5002E13A6 /* SpeziLLMOpenAI in Frameworks */, - 2FE5DC6729EDD894004B9AB4 /* SpeziContact in Frameworks */, 5A0C1A1B2B69691000120506 /* SpeziFHIRHealthKit in Frameworks */, 5A0C1A192B69691000120506 /* SpeziFHIR in Frameworks */, - 2FE5DC8429EDD934004B9AB4 /* SpeziQuestionnaire in Frameworks */, - 2FB099B32A875DF100B20952 /* FirebaseFirestoreSwift in Frameworks */, - 5661551D2AB8384200209B80 /* SwiftPackageList in Frameworks */, - 2FB099B12A875DF100B20952 /* FirebaseFirestore in Frameworks */, - A9D83F962B083794000D0C78 /* SpeziFirebaseAccountStorage in Frameworks */, F42AB1D62B6379B5002E13A6 /* SpeziLLMLocalDownload in Frameworks */, 2FB099B62A875E2B00B20952 /* HealthKitOnFHIR in Frameworks */, 2FE5DC8A29EDD972004B9AB4 /* SpeziLocalStorage in Frameworks */, 2FE5DC8C29EDD972004B9AB4 /* SpeziSecureStorage in Frameworks */, - 2FE5DC7529EDD8E6004B9AB4 /* SpeziFirebaseAccount in Frameworks */, - 9739A0C62AD7B5730084BEA5 /* FirebaseStorage in Frameworks */, - 2FF53D8B2A8725DE00042B76 /* SpeziMockWebService in Frameworks */, 2FE5DC7229EDD8D3004B9AB4 /* SpeziHealthKit in Frameworks */, 2F49B7762980407C00BCB272 /* Spezi in Frameworks */, 2FE5DC8F29EDD980004B9AB4 /* SpeziViews in Frameworks */, 5A2B9F8A2B69E0AF005CA63F /* SpeziFHIRMockPatients in Frameworks */, - 2F3D4ABC2A4E7C290068FB2F /* SpeziScheduler in Frameworks */, - 2FE5DC7929EDD8E6004B9AB4 /* SpeziFirestore in Frameworks */, - 2FE5DC7729EDD8E6004B9AB4 /* SpeziFirebaseConfiguration in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -342,16 +316,16 @@ path = PatientView; sourceTree = ""; }; - 511827942B740191002033A0 /* Surgery */ = { + 511827942B740191002033A0 /* SurgeryView */ = { isa = PBXGroup; children = ( 511827952B740191002033A0 /* SurgeryView.swift */, 51A360132B9648A7004E7E12 /* SurgeryLLMAssistant.swift */, ); - path = Surgery; + path = SurgeryView; sourceTree = ""; }; - 519E830A2B7C4F1600A2D92D /* Medication View */ = { + 519E830A2B7C4F1600A2D92D /* MedicationView */ = { isa = PBXGroup; children = ( 51805C112B81853700D17109 /* IntakeMedication.swift */, @@ -361,25 +335,25 @@ 51A027662B82CDA300A195C8 /* MedicationContentView.swift */, 51A3600F2B944517004E7E12 /* MedicationLLMAssistant.swift */, ); - path = "Medication View"; + path = MedicationView; sourceTree = ""; }; - 5A2B9F762B69AE07005CA63F /* Medical History */ = { + 5A2B9F762B69AE07005CA63F /* MedicalHistoryView */ = { isa = PBXGroup; children = ( 5A2B9F792B69AE2C005CA63F /* MedicalHistoryView.swift */, 51A360172B9659AE004E7E12 /* MedicalHistoryLLMAssistant.swift */, ); - path = "Medical History"; + path = MedicalHistoryView; sourceTree = ""; }; - 5A2B9F832B69E06B005CA63F /* Settings */ = { + 5A2B9F832B69E06B005CA63F /* SettingsView */ = { isa = PBXGroup; children = ( 5A2B9F842B69E06B005CA63F /* SettingsView.swift */, 5A2B9F852B69E06B005CA63F /* ResourceSelection.swift */, ); - path = Settings; + path = SettingsView; sourceTree = ""; }; 5A2B9F8D2B69E286005CA63F /* Mock Data */ = { @@ -410,7 +384,7 @@ path = MockPatients; sourceTree = ""; }; - 5A2B9FB32B6AFE1F005CA63F /* Allergy Records */ = { + 5A2B9FB32B6AFE1F005CA63F /* AllergyView */ = { isa = PBXGroup; children = ( 5A2B9FB52B6AFE5D005CA63F /* AllergyRecords.swift */, @@ -421,7 +395,7 @@ 5AEA5F462B93034A00F1577A /* ReactionPDF.swift */, 51A360152B965819004E7E12 /* AllergyLLMAssistant.swift */, ); - path = "Allergy Records"; + path = AllergyView; sourceTree = ""; }; 653A2544283387FE005D4D48 = { @@ -453,16 +427,16 @@ 9701570B2BB925CC00335713 /* Models */, 2FE5DC2829EDD398004B9AB4 /* Onboarding */, 970157162BB929DB00335713 /* HomeView */, - F42AB1DA2B637C5F002E13A6 /* ChiefComplaint */, + F42AB1DA2B637C5F002E13A6 /* ChiefComplaintView */, 3C89F6682B9D939500A4F52D /* PatientView */, - 511827942B740191002033A0 /* Surgery */, - 5A2B9FB32B6AFE1F005CA63F /* Allergy Records */, - 519E830A2B7C4F1600A2D92D /* Medication View */, - 5A2B9F762B69AE07005CA63F /* Medical History */, - AC2A17272B70684D00F560D0 /* SocialHistory */, + 511827942B740191002033A0 /* SurgeryView */, + 5A2B9FB32B6AFE1F005CA63F /* AllergyView */, + 519E830A2B7C4F1600A2D92D /* MedicationView */, + 5A2B9F762B69AE07005CA63F /* MedicalHistoryView */, + AC2A17272B70684D00F560D0 /* SocialHistoryView */, + ACF862BC2B96E28400ACBA1E /* ExportView */, + 5A2B9F832B69E06B005CA63F /* SettingsView */, 5A2B9F8D2B69E286005CA63F /* Mock Data */, - ACF862BC2B96E28400ACBA1E /* Export */, - 5A2B9F832B69E06B005CA63F /* Settings */, 2FE5DC3D29EDD7E4004B9AB4 /* Helper */, 2FE5DC3C29EDD7DA004B9AB4 /* SharedContext */, 2FE5DC2D29EDD792004B9AB4 /* Resources */, @@ -518,31 +492,33 @@ 970157162BB929DB00335713 /* HomeView */ = { isa = PBXGroup; children = ( - 970157172BB929FC00335713 /* HomeViews.swift */, + 97FE2EA52BB935A2006A3B8E /* LoadLastButton.swift */, + 970157172BB929FC00335713 /* SettingsButton.swift */, + 97FE2EA32BB93582006A3B8E /* StartButton.swift */, ); path = HomeView; sourceTree = ""; }; - AC2A17272B70684D00F560D0 /* SocialHistory */ = { + AC2A17272B70684D00F560D0 /* SocialHistoryView */ = { isa = PBXGroup; children = ( ACFFA1D02B8FD8BB0006E6D4 /* MenstrualHistory.swift */, ACFFA1CD2B8FD7190006E6D4 /* SmokingHistory.swift */, ); - path = SocialHistory; + path = SocialHistoryView; sourceTree = ""; }; - ACF862BC2B96E28400ACBA1E /* Export */ = { + ACF862BC2B96E28400ACBA1E /* ExportView */ = { isa = PBXGroup; children = ( 5AEA5F3A2B90081B00F1577A /* ScrollablePDF.swift */, ACF862BD2B96E29600ACBA1E /* ExportView.swift */, 970157082BB924BF00335713 /* ExportView+ShareSheet.swift */, ); - path = Export; + path = ExportView; sourceTree = ""; }; - F42AB1DA2B637C5F002E13A6 /* ChiefComplaint */ = { + F42AB1DA2B637C5F002E13A6 /* ChiefComplaintView */ = { isa = PBXGroup; children = ( F42AB1E12B637CAC002E13A6 /* OpenAI */, @@ -551,7 +527,7 @@ F42AB1DE2B637C9C002E13A6 /* LLMInteraction.swift */, F42AB1EB2B6DBF20002E13A6 /* SummaryView.swift */, ); - path = ChiefComplaint; + path = ChiefComplaintView; sourceTree = ""; }; F42AB1E12B637CAC002E13A6 /* OpenAI */ = { @@ -582,27 +558,12 @@ name = Intake; packageProductDependencies = ( 2F49B7752980407B00BCB272 /* Spezi */, - 2FE5DC6329EDD883004B9AB4 /* SpeziAccount */, - 2FE5DC6629EDD894004B9AB4 /* SpeziContact */, 2FE5DC7129EDD8D3004B9AB4 /* SpeziHealthKit */, - 2FE5DC7429EDD8E6004B9AB4 /* SpeziFirebaseAccount */, - 2FE5DC7629EDD8E6004B9AB4 /* SpeziFirebaseConfiguration */, - 2FE5DC7829EDD8E6004B9AB4 /* SpeziFirestore */, - 2FE5DC8329EDD934004B9AB4 /* SpeziQuestionnaire */, 2FE5DC8929EDD972004B9AB4 /* SpeziLocalStorage */, 2FE5DC8B29EDD972004B9AB4 /* SpeziSecureStorage */, 2FE5DC8E29EDD980004B9AB4 /* SpeziViews */, - 2F3D4ABB2A4E7C290068FB2F /* SpeziScheduler */, 2FE5DC8029EDD91D004B9AB4 /* SpeziOnboarding */, - 2FF53D8A2A8725DE00042B76 /* SpeziMockWebService */, - 2FB099AE2A875DF100B20952 /* FirebaseAuth */, - 2FB099B02A875DF100B20952 /* FirebaseFirestore */, - 2FB099B22A875DF100B20952 /* FirebaseFirestoreSwift */, 2FB099B52A875E2B00B20952 /* HealthKitOnFHIR */, - 5661551C2AB8384200209B80 /* SwiftPackageList */, - 9739A0C52AD7B5730084BEA5 /* FirebaseStorage */, - 97D73D692AD860AD00B47FA0 /* SpeziFirebaseStorage */, - A9D83F952B083794000D0C78 /* SpeziFirebaseAccountStorage */, F42AB1D12B6379B5002E13A6 /* SpeziLLM */, F42AB1D32B6379B5002E13A6 /* SpeziLLMLocal */, F42AB1D52B6379B5002E13A6 /* SpeziLLMLocalDownload */, @@ -690,21 +651,13 @@ mainGroup = 653A2544283387FE005D4D48; packageReferences = ( 2F49B7742980407B00BCB272 /* XCRemoteSwiftPackageReference "Spezi" */, - 2FE5DC6229EDD883004B9AB4 /* XCRemoteSwiftPackageReference "SpeziAccount" */, - 2FE5DC6529EDD894004B9AB4 /* XCRemoteSwiftPackageReference "SpeziContact" */, 2FE5DC7029EDD8D3004B9AB4 /* XCRemoteSwiftPackageReference "SpeziHealthKit" */, - 2FE5DC7329EDD8E6004B9AB4 /* XCRemoteSwiftPackageReference "SpeziFirebase" */, - 2FE5DC8229EDD934004B9AB4 /* XCRemoteSwiftPackageReference "SpeziQuestionnaire" */, 2FE5DC8829EDD972004B9AB4 /* XCRemoteSwiftPackageReference "SpeziStorage" */, 2FE5DC8D29EDD980004B9AB4 /* XCRemoteSwiftPackageReference "SpeziViews" */, - 2FE5DC9029EDD9C3004B9AB4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, 2FE5DC9729EDD9D9004B9AB4 /* XCRemoteSwiftPackageReference "XCTestExtensions" */, 2FE5DC9A29EDD9EF004B9AB4 /* XCRemoteSwiftPackageReference "XCTHealthKit" */, - 2F3D4ABA2A4E7C290068FB2F /* XCRemoteSwiftPackageReference "SpeziScheduler" */, 97F466E62A76BBEE005DC9B4 /* XCRemoteSwiftPackageReference "SpeziOnboarding" */, - 2FE750CA2A87240100723EAE /* XCRemoteSwiftPackageReference "SpeziMockWebService" */, 2FB099B42A875E2B00B20952 /* XCRemoteSwiftPackageReference "HealthKitOnFHIR" */, - 5661551B2AB8384200209B80 /* XCRemoteSwiftPackageReference "swift-package-list" */, F42AB1D02B6379B5002E13A6 /* XCRemoteSwiftPackageReference "SpeziLLM" */, 5A0C1A162B69667B00120506 /* XCRemoteSwiftPackageReference "SpeziFHIR" */, 51805C162B81898700D17109 /* XCRemoteSwiftPackageReference "SpeziMedication" */, @@ -786,6 +739,8 @@ F42AB1DF2B637C9D002E13A6 /* LLMInteraction.swift in Sources */, 51A360162B965819004E7E12 /* AllergyLLMAssistant.swift in Sources */, 3C89F66D2B9D948B00A4F52D /* PatientInfo.swift in Sources */, + 97FE2EA62BB935A2006A3B8E /* LoadLastButton.swift in Sources */, + 97FE2EA42BB93582006A3B8E /* StartButton.swift in Sources */, 2FE5DC3829EDD7CA004B9AB4 /* InterestingModules.swift in Sources */, 2FE5DC3529EDD7CA004B9AB4 /* Consent.swift in Sources */, 51A360182B9659AE004E7E12 /* MedicalHistoryLLMAssistant.swift in Sources */, @@ -803,7 +758,7 @@ 2FE5DC4629EDD7F2004B9AB4 /* Bundle+Image.swift in Sources */, 51A360142B9648A7004E7E12 /* SurgeryLLMAssistant.swift in Sources */, ACFFA1CE2B8FD7190006E6D4 /* SmokingHistory.swift in Sources */, - 970157182BB929FC00335713 /* HomeViews.swift in Sources */, + 970157182BB929FC00335713 /* SettingsButton.swift in Sources */, F42AB1DC2B637C8C002E13A6 /* LLMOnboardingView.swift in Sources */, 5A2B9F872B69E06B005CA63F /* ResourceSelection.swift in Sources */, 2F4E23832989D51F0013F3D9 /* IntakeTestingSetup.swift in Sources */, @@ -1372,14 +1327,6 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - 2F3D4ABA2A4E7C290068FB2F /* XCRemoteSwiftPackageReference "SpeziScheduler" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/StanfordSpezi/SpeziScheduler.git"; - requirement = { - kind = upToNextMinorVersion; - minimumVersion = 0.8.0; - }; - }; 2F49B7742980407B00BCB272 /* XCRemoteSwiftPackageReference "Spezi" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/StanfordSpezi/Spezi"; @@ -1396,22 +1343,6 @@ minimumVersion = 0.2.4; }; }; - 2FE5DC6229EDD883004B9AB4 /* XCRemoteSwiftPackageReference "SpeziAccount" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/StanfordSpezi/SpeziAccount.git"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 1.1.0; - }; - }; - 2FE5DC6529EDD894004B9AB4 /* XCRemoteSwiftPackageReference "SpeziContact" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/StanfordSpezi/SpeziContact.git"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 1.0.0; - }; - }; 2FE5DC7029EDD8D3004B9AB4 /* XCRemoteSwiftPackageReference "SpeziHealthKit" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/StanfordSpezi/SpeziHealthKit.git"; @@ -1420,22 +1351,6 @@ minimumVersion = 0.5.0; }; }; - 2FE5DC7329EDD8E6004B9AB4 /* XCRemoteSwiftPackageReference "SpeziFirebase" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/StanfordSpezi/SpeziFirebase.git"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 1.0.0; - }; - }; - 2FE5DC8229EDD934004B9AB4 /* XCRemoteSwiftPackageReference "SpeziQuestionnaire" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/StanfordSpezi/SpeziQuestionnaire.git"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 1.0.0; - }; - }; 2FE5DC8829EDD972004B9AB4 /* XCRemoteSwiftPackageReference "SpeziStorage" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/StanfordSpezi/SpeziStorage.git"; @@ -1452,14 +1367,6 @@ minimumVersion = 1.0.0; }; }; - 2FE5DC9029EDD9C3004B9AB4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 10.17.0; - }; - }; 2FE5DC9729EDD9D9004B9AB4 /* XCRemoteSwiftPackageReference "XCTestExtensions" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/StanfordBDHG/XCTestExtensions.git"; @@ -1476,14 +1383,6 @@ minimumVersion = 0.3.5; }; }; - 2FE750CA2A87240100723EAE /* XCRemoteSwiftPackageReference "SpeziMockWebService" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/StanfordSpezi/SpeziMockWebService.git"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 1.0.0; - }; - }; 51805C162B81898700D17109 /* XCRemoteSwiftPackageReference "SpeziMedication" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/StanfordSpezi/SpeziMedication.git"; @@ -1527,76 +1426,26 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 2F3D4ABB2A4E7C290068FB2F /* SpeziScheduler */ = { - isa = XCSwiftPackageProductDependency; - package = 2F3D4ABA2A4E7C290068FB2F /* XCRemoteSwiftPackageReference "SpeziScheduler" */; - productName = SpeziScheduler; - }; 2F49B7752980407B00BCB272 /* Spezi */ = { isa = XCSwiftPackageProductDependency; package = 2F49B7742980407B00BCB272 /* XCRemoteSwiftPackageReference "Spezi" */; productName = Spezi; }; - 2FB099AE2A875DF100B20952 /* FirebaseAuth */ = { - isa = XCSwiftPackageProductDependency; - package = 2FE5DC9029EDD9C3004B9AB4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; - productName = FirebaseAuth; - }; - 2FB099B02A875DF100B20952 /* FirebaseFirestore */ = { - isa = XCSwiftPackageProductDependency; - package = 2FE5DC9029EDD9C3004B9AB4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; - productName = FirebaseFirestore; - }; - 2FB099B22A875DF100B20952 /* FirebaseFirestoreSwift */ = { - isa = XCSwiftPackageProductDependency; - package = 2FE5DC9029EDD9C3004B9AB4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; - productName = FirebaseFirestoreSwift; - }; 2FB099B52A875E2B00B20952 /* HealthKitOnFHIR */ = { isa = XCSwiftPackageProductDependency; package = 2FB099B42A875E2B00B20952 /* XCRemoteSwiftPackageReference "HealthKitOnFHIR" */; productName = HealthKitOnFHIR; }; - 2FE5DC6329EDD883004B9AB4 /* SpeziAccount */ = { - isa = XCSwiftPackageProductDependency; - package = 2FE5DC6229EDD883004B9AB4 /* XCRemoteSwiftPackageReference "SpeziAccount" */; - productName = SpeziAccount; - }; - 2FE5DC6629EDD894004B9AB4 /* SpeziContact */ = { - isa = XCSwiftPackageProductDependency; - package = 2FE5DC6529EDD894004B9AB4 /* XCRemoteSwiftPackageReference "SpeziContact" */; - productName = SpeziContact; - }; 2FE5DC7129EDD8D3004B9AB4 /* SpeziHealthKit */ = { isa = XCSwiftPackageProductDependency; package = 2FE5DC7029EDD8D3004B9AB4 /* XCRemoteSwiftPackageReference "SpeziHealthKit" */; productName = SpeziHealthKit; }; - 2FE5DC7429EDD8E6004B9AB4 /* SpeziFirebaseAccount */ = { - isa = XCSwiftPackageProductDependency; - package = 2FE5DC7329EDD8E6004B9AB4 /* XCRemoteSwiftPackageReference "SpeziFirebase" */; - productName = SpeziFirebaseAccount; - }; - 2FE5DC7629EDD8E6004B9AB4 /* SpeziFirebaseConfiguration */ = { - isa = XCSwiftPackageProductDependency; - package = 2FE5DC7329EDD8E6004B9AB4 /* XCRemoteSwiftPackageReference "SpeziFirebase" */; - productName = SpeziFirebaseConfiguration; - }; - 2FE5DC7829EDD8E6004B9AB4 /* SpeziFirestore */ = { - isa = XCSwiftPackageProductDependency; - package = 2FE5DC7329EDD8E6004B9AB4 /* XCRemoteSwiftPackageReference "SpeziFirebase" */; - productName = SpeziFirestore; - }; 2FE5DC8029EDD91D004B9AB4 /* SpeziOnboarding */ = { isa = XCSwiftPackageProductDependency; package = 97F466E62A76BBEE005DC9B4 /* XCRemoteSwiftPackageReference "SpeziOnboarding" */; productName = SpeziOnboarding; }; - 2FE5DC8329EDD934004B9AB4 /* SpeziQuestionnaire */ = { - isa = XCSwiftPackageProductDependency; - package = 2FE5DC8229EDD934004B9AB4 /* XCRemoteSwiftPackageReference "SpeziQuestionnaire" */; - productName = SpeziQuestionnaire; - }; 2FE5DC8929EDD972004B9AB4 /* SpeziLocalStorage */ = { isa = XCSwiftPackageProductDependency; package = 2FE5DC8829EDD972004B9AB4 /* XCRemoteSwiftPackageReference "SpeziStorage" */; @@ -1622,21 +1471,11 @@ package = 2FE5DC9A29EDD9EF004B9AB4 /* XCRemoteSwiftPackageReference "XCTHealthKit" */; productName = XCTHealthKit; }; - 2FF53D8A2A8725DE00042B76 /* SpeziMockWebService */ = { - isa = XCSwiftPackageProductDependency; - package = 2FE750CA2A87240100723EAE /* XCRemoteSwiftPackageReference "SpeziMockWebService" */; - productName = SpeziMockWebService; - }; 51805C172B81898700D17109 /* SpeziMedication */ = { isa = XCSwiftPackageProductDependency; package = 51805C162B81898700D17109 /* XCRemoteSwiftPackageReference "SpeziMedication" */; productName = SpeziMedication; }; - 5661551C2AB8384200209B80 /* SwiftPackageList */ = { - isa = XCSwiftPackageProductDependency; - package = 5661551B2AB8384200209B80 /* XCRemoteSwiftPackageReference "swift-package-list" */; - productName = SwiftPackageList; - }; 566155212AB83CF200209B80 /* SwiftPackageListJSONPlugin */ = { isa = XCSwiftPackageProductDependency; package = 5661551B2AB8384200209B80 /* XCRemoteSwiftPackageReference "swift-package-list" */; @@ -1657,21 +1496,6 @@ package = 5A0C1A162B69667B00120506 /* XCRemoteSwiftPackageReference "SpeziFHIR" */; productName = SpeziFHIRMockPatients; }; - 9739A0C52AD7B5730084BEA5 /* FirebaseStorage */ = { - isa = XCSwiftPackageProductDependency; - package = 2FE5DC9029EDD9C3004B9AB4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; - productName = FirebaseStorage; - }; - 97D73D692AD860AD00B47FA0 /* SpeziFirebaseStorage */ = { - isa = XCSwiftPackageProductDependency; - package = 2FE5DC7329EDD8E6004B9AB4 /* XCRemoteSwiftPackageReference "SpeziFirebase" */; - productName = SpeziFirebaseStorage; - }; - A9D83F952B083794000D0C78 /* SpeziFirebaseAccountStorage */ = { - isa = XCSwiftPackageProductDependency; - package = 2FE5DC7329EDD8E6004B9AB4 /* XCRemoteSwiftPackageReference "SpeziFirebase" */; - productName = SpeziFirebaseAccountStorage; - }; F42AB1D12B6379B5002E13A6 /* SpeziLLM */ = { isa = XCSwiftPackageProductDependency; package = F42AB1D02B6379B5002E13A6 /* XCRemoteSwiftPackageReference "SpeziLLM" */; diff --git a/Intake.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Intake.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 25996fa..75070c0 100644 --- a/Intake.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Intake.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,24 +1,6 @@ { - "originHash" : "cdbe60a3382a8a962c7fcc00210e56e13314cb3e246d0e01fe8e25a1268623d8", + "originHash" : "32b57526de16a25fdf6722befe657da59ae2666c82d4cc175cdf34510a1f05b8", "pins" : [ - { - "identity" : "abseil-cpp-binary", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/abseil-cpp-binary.git", - "state" : { - "revision" : "df308b8b46607675f2b9ec8e569109008f9155ce", - "version" : "1.2022062300.1" - } - }, - { - "identity" : "app-check", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/app-check.git", - "state" : { - "revision" : "3e464dad87dad2d29bb29a97836789bf0f8f67d2", - "version" : "10.18.1" - } - }, { "identity" : "fhirmodels", "kind" : "remoteSourceControl", @@ -28,60 +10,6 @@ "version" : "0.5.0" } }, - { - "identity" : "firebase-ios-sdk", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/firebase-ios-sdk.git", - "state" : { - "revision" : "be49849dcba96f2b5ee550d4eceb2c0fa27dade4", - "version" : "10.22.1" - } - }, - { - "identity" : "googleappmeasurement", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/GoogleAppMeasurement.git", - "state" : { - "revision" : "482cfa4e5880f0a29f66ecfd60c5a62af28bd1f0", - "version" : "10.22.1" - } - }, - { - "identity" : "googledatatransport", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/GoogleDataTransport.git", - "state" : { - "revision" : "a637d318ae7ae246b02d7305121275bc75ed5565", - "version" : "9.4.0" - } - }, - { - "identity" : "googleutilities", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/GoogleUtilities.git", - "state" : { - "revision" : "26c898aed8bed13b8a63057ee26500abbbcb8d55", - "version" : "7.13.1" - } - }, - { - "identity" : "grpc-binary", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/grpc-binary.git", - "state" : { - "revision" : "ea4cb5cc0c39c732b85386263116d2e2fdbbdc61", - "version" : "1.49.2" - } - }, - { - "identity" : "gtm-session-fetcher", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/gtm-session-fetcher.git", - "state" : { - "revision" : "76135c9f4e1ac85459d5fec61b6f76ac47ab3a4c", - "version" : "3.3.1" - } - }, { "identity" : "healthkitonfhir", "kind" : "remoteSourceControl", @@ -91,24 +19,6 @@ "version" : "0.2.6" } }, - { - "identity" : "interop-ios-for-google-sdks", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/interop-ios-for-google-sdks.git", - "state" : { - "revision" : "2d12673670417654f08f5f90fdd62926dc3a2648", - "version" : "100.0.0" - } - }, - { - "identity" : "leveldb", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/leveldb.git", - "state" : { - "revision" : "43aaef65e0c665daadf848761d560e446d350d3d", - "version" : "1.22.4" - } - }, { "identity" : "llama.cpp", "kind" : "remoteSourceControl", @@ -118,15 +28,6 @@ "version" : "0.2.1" } }, - { - "identity" : "nanopb", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/nanopb.git", - "state" : { - "revision" : "b7e1104502eca3a213b46303391ca4d3bc8ddec1", - "version" : "2.30910.0" - } - }, { "identity" : "openai", "kind" : "remoteSourceControl", @@ -136,33 +37,6 @@ "version" : "0.2.6" } }, - { - "identity" : "promises", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/promises.git", - "state" : { - "revision" : "540318ecedd63d883069ae7f1ed811a2df00b6ac", - "version" : "2.4.0" - } - }, - { - "identity" : "researchkit", - "kind" : "remoteSourceControl", - "location" : "https://github.com/StanfordBDHG/ResearchKit", - "state" : { - "revision" : "64512d0a0a5cc3e9d5b3fc5217c54f11d0dc044c", - "version" : "2.2.28" - } - }, - { - "identity" : "researchkitonfhir", - "kind" : "remoteSourceControl", - "location" : "https://github.com/StanfordBDHG/ResearchKitOnFHIR", - "state" : { - "revision" : "7c2efdcb17796fc9ee686900304dbbe9dd4aaf85", - "version" : "1.1.2" - } - }, { "identity" : "spezi", "kind" : "remoteSourceControl", @@ -172,15 +46,6 @@ "version" : "1.2.3" } }, - { - "identity" : "speziaccount", - "kind" : "remoteSourceControl", - "location" : "https://github.com/StanfordSpezi/SpeziAccount.git", - "state" : { - "revision" : "a7d289ef3be54de62b25dc92e8f7ff1a0f093906", - "version" : "1.2.1" - } - }, { "identity" : "spezichat", "kind" : "remoteSourceControl", @@ -190,15 +55,6 @@ "version" : "0.1.9" } }, - { - "identity" : "spezicontact", - "kind" : "remoteSourceControl", - "location" : "https://github.com/StanfordSpezi/SpeziContact.git", - "state" : { - "revision" : "494b776f8c98d771e4a609a1fb706097dba4c030", - "version" : "1.0.0" - } - }, { "identity" : "spezifhir", "kind" : "remoteSourceControl", @@ -208,15 +64,6 @@ "version" : "0.6.0" } }, - { - "identity" : "spezifirebase", - "kind" : "remoteSourceControl", - "location" : "https://github.com/StanfordSpezi/SpeziFirebase.git", - "state" : { - "revision" : "e05e665b7da39aa399ecd7fba393aab49b8f3034", - "version" : "1.0.1" - } - }, { "identity" : "spezifoundation", "kind" : "remoteSourceControl", @@ -240,8 +87,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/StanfordSpezi/SpeziLLM", "state" : { - "revision" : "ca379106637c69fd0138360643d0129176a8ca6b", - "version" : "0.7.1" + "revision" : "dc37b91ed55c9d50eaf58e645d454cb62e3681d1", + "version" : "0.7.2" } }, { @@ -253,15 +100,6 @@ "version" : "0.4.1" } }, - { - "identity" : "spezimockwebservice", - "kind" : "remoteSourceControl", - "location" : "https://github.com/StanfordSpezi/SpeziMockWebService.git", - "state" : { - "revision" : "b18067d3499e630bbd995ef05a296ef8fdd42528", - "version" : "1.0.0" - } - }, { "identity" : "spezionboarding", "kind" : "remoteSourceControl", @@ -271,24 +109,6 @@ "version" : "1.1.1" } }, - { - "identity" : "speziquestionnaire", - "kind" : "remoteSourceControl", - "location" : "https://github.com/StanfordSpezi/SpeziQuestionnaire.git", - "state" : { - "revision" : "f9d9b6d99bb1e00bda2974b440dca8367733d591", - "version" : "1.1.0" - } - }, - { - "identity" : "spezischeduler", - "kind" : "remoteSourceControl", - "location" : "https://github.com/StanfordSpezi/SpeziScheduler.git", - "state" : { - "revision" : "eed3980f20b01a788720c869010e3fe2fbfcd1fd", - "version" : "0.8.2" - } - }, { "identity" : "spezispeech", "kind" : "remoteSourceControl", @@ -316,15 +136,6 @@ "version" : "1.3.1" } }, - { - "identity" : "swift-argument-parser", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-argument-parser", - "state" : { - "revision" : "c8ed701b513cf5177118a175d85fbbbcd707ab41", - "version" : "1.3.0" - } - }, { "identity" : "swift-collections", "kind" : "remoteSourceControl", @@ -334,24 +145,6 @@ "version" : "1.1.0" } }, - { - "identity" : "swift-package-list", - "kind" : "remoteSourceControl", - "location" : "https://github.com/FelixHerrmann/swift-package-list", - "state" : { - "revision" : "412180a72b9a1f8262213c16459e3533b0385ea5", - "version" : "3.1.0" - } - }, - { - "identity" : "swift-protobuf", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-protobuf.git", - "state" : { - "revision" : "65e8f29b2d63c4e38e736b25c27b83e012159be8", - "version" : "1.25.2" - } - }, { "identity" : "xctestextensions", "kind" : "remoteSourceControl", diff --git a/Intake/Allergy Records/AddAllergy.swift b/Intake/AllergyView/AddAllergy.swift similarity index 100% rename from Intake/Allergy Records/AddAllergy.swift rename to Intake/AllergyView/AddAllergy.swift diff --git a/Intake/Allergy Records/AllergyLLMAssistant.swift b/Intake/AllergyView/AllergyLLMAssistant.swift similarity index 100% rename from Intake/Allergy Records/AllergyLLMAssistant.swift rename to Intake/AllergyView/AllergyLLMAssistant.swift diff --git a/Intake/Allergy Records/AllergyRecords.swift b/Intake/AllergyView/AllergyRecords.swift similarity index 100% rename from Intake/Allergy Records/AllergyRecords.swift rename to Intake/AllergyView/AllergyRecords.swift diff --git a/Intake/Allergy Records/ReactionPDF.swift b/Intake/AllergyView/ReactionPDF.swift similarity index 100% rename from Intake/Allergy Records/ReactionPDF.swift rename to Intake/AllergyView/ReactionPDF.swift diff --git a/Intake/Allergy Records/ReactionSectionView.swift b/Intake/AllergyView/ReactionSectionView.swift similarity index 100% rename from Intake/Allergy Records/ReactionSectionView.swift rename to Intake/AllergyView/ReactionSectionView.swift diff --git a/Intake/Allergy Records/ReactionView.swift b/Intake/AllergyView/ReactionView.swift similarity index 100% rename from Intake/Allergy Records/ReactionView.swift rename to Intake/AllergyView/ReactionView.swift diff --git a/Intake/ChiefComplaint/LLMAssistantView.swift b/Intake/ChiefComplaintView/LLMAssistantView.swift similarity index 100% rename from Intake/ChiefComplaint/LLMAssistantView.swift rename to Intake/ChiefComplaintView/LLMAssistantView.swift diff --git a/Intake/ChiefComplaint/LLMInteraction.swift b/Intake/ChiefComplaintView/LLMInteraction.swift similarity index 100% rename from Intake/ChiefComplaint/LLMInteraction.swift rename to Intake/ChiefComplaintView/LLMInteraction.swift diff --git a/Intake/ChiefComplaint/LLMOnboardingView.swift b/Intake/ChiefComplaintView/LLMOnboardingView.swift similarity index 100% rename from Intake/ChiefComplaint/LLMOnboardingView.swift rename to Intake/ChiefComplaintView/LLMOnboardingView.swift diff --git a/Intake/ChiefComplaint/OpenAI/LLMOpenAITokenOnboarding.swift b/Intake/ChiefComplaintView/OpenAI/LLMOpenAITokenOnboarding.swift similarity index 100% rename from Intake/ChiefComplaint/OpenAI/LLMOpenAITokenOnboarding.swift rename to Intake/ChiefComplaintView/OpenAI/LLMOpenAITokenOnboarding.swift diff --git a/Intake/ChiefComplaint/SummaryView.swift b/Intake/ChiefComplaintView/SummaryView.swift similarity index 100% rename from Intake/ChiefComplaint/SummaryView.swift rename to Intake/ChiefComplaintView/SummaryView.swift diff --git a/Intake/Export/ExportView+ShareSheet.swift b/Intake/ExportView/ExportView+ShareSheet.swift similarity index 100% rename from Intake/Export/ExportView+ShareSheet.swift rename to Intake/ExportView/ExportView+ShareSheet.swift diff --git a/Intake/Export/ExportView.swift b/Intake/ExportView/ExportView.swift similarity index 100% rename from Intake/Export/ExportView.swift rename to Intake/ExportView/ExportView.swift diff --git a/Intake/Export/ScrollablePDF.swift b/Intake/ExportView/ScrollablePDF.swift similarity index 100% rename from Intake/Export/ScrollablePDF.swift rename to Intake/ExportView/ScrollablePDF.swift diff --git a/Intake/HomeView/HomeViews.swift b/Intake/HomeView/LoadLastButton.swift similarity index 55% rename from Intake/HomeView/HomeViews.swift rename to Intake/HomeView/LoadLastButton.swift index 6292b9c..374f77c 100644 --- a/Intake/HomeView/HomeViews.swift +++ b/Intake/HomeView/LoadLastButton.swift @@ -9,39 +9,6 @@ import SwiftUI -struct StartButton: View { - @Binding var navigationPath: NavigationPath - - - var body: some View { - Button(action: { - if FeatureFlags.testMedication { - navigationPath.append(NavigationViews.medication) - } else if FeatureFlags.testAllergy { - navigationPath.append(NavigationViews.allergies) - } else if FeatureFlags.testMenstrual { - navigationPath.append(NavigationViews.menstrual) - } else if FeatureFlags.testSmoking { - navigationPath.append(NavigationViews.smoking) - } else if FeatureFlags.testSurgery { - navigationPath.append(NavigationViews.surgical) - } else if FeatureFlags.testCondition { - navigationPath.append(NavigationViews.medical) - } else { - navigationPath.append(NavigationViews.general) - } - }) { - Text("Create New Form") - .font(.headline) - .fontWeight(.bold) - .foregroundColor(.white) - .padding() - .background(Color.blue) - .cornerRadius(10) - }.accessibilityIdentifier("Create New Form") - } -} - struct LoadLastButton: View { @Binding var navigationPath: NavigationPath @Binding var disabled: Bool @@ -92,25 +59,3 @@ struct LoadLastButton: View { return nil } } - - -struct SettingsButton: View { - @Binding var showSettings: Bool - - - var body: some View { - Button( - action: { - showSettings.toggle() - }, - label: { - Image(systemName: "gear") - .resizable() - .aspectRatio(contentMode: .fit) - .frame(width: 30, height: 30) - .foregroundColor(.blue) - .accessibilityLabel("SETTINGS") - } - ) - } -} diff --git a/Intake/HomeView/SettingsButton.swift b/Intake/HomeView/SettingsButton.swift new file mode 100644 index 0000000..c4a1ab1 --- /dev/null +++ b/Intake/HomeView/SettingsButton.swift @@ -0,0 +1,31 @@ +// +// This source file is part of the Intake based on the Stanford Spezi Template Application project +// +// SPDX-FileCopyrightText: 2023 Stanford University +// +// SPDX-License-Identifier: MIT +// + +import SwiftUI + + +struct SettingsButton: View { + @Binding var showSettings: Bool + + + var body: some View { + Button( + action: { + showSettings.toggle() + }, + label: { + Image(systemName: "gear") + .resizable() + .aspectRatio(contentMode: .fit) + .frame(width: 30, height: 30) + .foregroundColor(.blue) + .accessibilityLabel("SETTINGS") + } + ) + } +} diff --git a/Intake/HomeView/StartButton.swift b/Intake/HomeView/StartButton.swift new file mode 100644 index 0000000..f8fcd3c --- /dev/null +++ b/Intake/HomeView/StartButton.swift @@ -0,0 +1,43 @@ +// +// This source file is part of the Intake based on the Stanford Spezi Template Application project +// +// SPDX-FileCopyrightText: 2023 Stanford University +// +// SPDX-License-Identifier: MIT +// + +import SwiftUI + + +struct StartButton: View { + @Binding var navigationPath: NavigationPath + + + var body: some View { + Button(action: { + if FeatureFlags.testMedication { + navigationPath.append(NavigationViews.medication) + } else if FeatureFlags.testAllergy { + navigationPath.append(NavigationViews.allergies) + } else if FeatureFlags.testMenstrual { + navigationPath.append(NavigationViews.menstrual) + } else if FeatureFlags.testSmoking { + navigationPath.append(NavigationViews.smoking) + } else if FeatureFlags.testSurgery { + navigationPath.append(NavigationViews.surgical) + } else if FeatureFlags.testCondition { + navigationPath.append(NavigationViews.medical) + } else { + navigationPath.append(NavigationViews.general) + } + }) { + Text("Create New Form") + .font(.headline) + .fontWeight(.bold) + .foregroundColor(.white) + .padding() + .background(Color.blue) + .cornerRadius(10) + }.accessibilityIdentifier("Create New Form") + } +} diff --git a/Intake/Medical History/MedicalHistoryLLMAssistant.swift b/Intake/MedicalHistoryView/MedicalHistoryLLMAssistant.swift similarity index 100% rename from Intake/Medical History/MedicalHistoryLLMAssistant.swift rename to Intake/MedicalHistoryView/MedicalHistoryLLMAssistant.swift diff --git a/Intake/Medical History/MedicalHistoryView.swift b/Intake/MedicalHistoryView/MedicalHistoryView.swift similarity index 100% rename from Intake/Medical History/MedicalHistoryView.swift rename to Intake/MedicalHistoryView/MedicalHistoryView.swift diff --git a/Intake/Medication View/IntakeDosage.swift b/Intake/MedicationView/IntakeDosage.swift similarity index 100% rename from Intake/Medication View/IntakeDosage.swift rename to Intake/MedicationView/IntakeDosage.swift diff --git a/Intake/Medication View/IntakeMedication.swift b/Intake/MedicationView/IntakeMedication.swift similarity index 100% rename from Intake/Medication View/IntakeMedication.swift rename to Intake/MedicationView/IntakeMedication.swift diff --git a/Intake/Medication View/IntakeMedicationInstance.swift b/Intake/MedicationView/IntakeMedicationInstance.swift similarity index 100% rename from Intake/Medication View/IntakeMedicationInstance.swift rename to Intake/MedicationView/IntakeMedicationInstance.swift diff --git a/Intake/Medication View/IntakeMedicationViewModel.swift b/Intake/MedicationView/IntakeMedicationViewModel.swift similarity index 100% rename from Intake/Medication View/IntakeMedicationViewModel.swift rename to Intake/MedicationView/IntakeMedicationViewModel.swift diff --git a/Intake/Medication View/MedicationContentView.swift b/Intake/MedicationView/MedicationContentView.swift similarity index 100% rename from Intake/Medication View/MedicationContentView.swift rename to Intake/MedicationView/MedicationContentView.swift diff --git a/Intake/Medication View/MedicationLLMAssistant.swift b/Intake/MedicationView/MedicationLLMAssistant.swift similarity index 100% rename from Intake/Medication View/MedicationLLMAssistant.swift rename to Intake/MedicationView/MedicationLLMAssistant.swift diff --git a/Intake/Settings/ResourceSelection.swift b/Intake/SettingsView/ResourceSelection.swift similarity index 100% rename from Intake/Settings/ResourceSelection.swift rename to Intake/SettingsView/ResourceSelection.swift diff --git a/Intake/Settings/SettingsView.swift b/Intake/SettingsView/SettingsView.swift similarity index 100% rename from Intake/Settings/SettingsView.swift rename to Intake/SettingsView/SettingsView.swift diff --git a/Intake/SocialHistory/MenstrualHistory.swift b/Intake/SocialHistoryView/MenstrualHistory.swift similarity index 100% rename from Intake/SocialHistory/MenstrualHistory.swift rename to Intake/SocialHistoryView/MenstrualHistory.swift diff --git a/Intake/SocialHistory/SmokingHistory.swift b/Intake/SocialHistoryView/SmokingHistory.swift similarity index 100% rename from Intake/SocialHistory/SmokingHistory.swift rename to Intake/SocialHistoryView/SmokingHistory.swift diff --git a/Intake/Surgery/SurgeryLLMAssistant.swift b/Intake/SurgeryView/SurgeryLLMAssistant.swift similarity index 100% rename from Intake/Surgery/SurgeryLLMAssistant.swift rename to Intake/SurgeryView/SurgeryLLMAssistant.swift diff --git a/Intake/Surgery/SurgeryView.swift b/Intake/SurgeryView/SurgeryView.swift similarity index 100% rename from Intake/Surgery/SurgeryView.swift rename to Intake/SurgeryView/SurgeryView.swift