Skip to content

Commit

Permalink
Location Access (#20)
Browse files Browse the repository at this point in the history 
# Location Access

## ♻️ Current situation & Problem
*Link any open issues or pull requests (PRs) related to this PR. Please
ensure that all non-trivial PRs are first tracked and discussed in an
existing GitHub issue or discussion.*


## ⚙️ Release Notes 
*Add a bullet point list summary of the feature and possible migration
guides if this is a breaking change so this section can be added to the
release notes.*
*Include code snippets that provide examples of the feature implemented
or links to the documentation if it appends or changes the public
interface.*


## 📚 Documentation
*Please ensure that you properly document any additions in conformance
to [Spezi Documentation
Guide](https://github.com/StanfordSpezi/.github/blob/main/DOCUMENTATIONGUIDE.md).*
*You can use this section to describe your solution, but we encourage
contributors to document your reasoning and changes using in-line
documentation.*


## ✅ Testing
*Please ensure that the PR meets the testing requirements set by CodeCov
and that new functionality is appropriately tested.*
*This section describes important information about the tests and why
some elements might not be testable.*


### Code of Conduct & Contributing Guidelines 

By submitting creating this pull request, you agree to follow our [Code
of
Conduct](https://github.com/StanfordBDHG/.github/blob/main/CODE_OF_CONDUCT.md)
and [Contributing
Guidelines](https://github.com/StanfordBDHG/.github/blob/main/CONTRIBUTING.md):
- [ ] I agree to follow the [Code of
Conduct](https://github.com/StanfordBDHG/.github/blob/main/CODE_OF_CONDUCT.md)
and [Contributing
Guidelines](https://github.com/StanfordBDHG/.github/blob/main/CONTRIBUTING.md).

---------

Co-authored-by: Grace Perrin <[email protected]>
  • Loading branch information
@PSchmiedmayer @gracehp1
PSchmiedmayer and gracehp1 authored May 14, 2024
1 parent 3165d7f commit 24a3063
Show file tree
Hide file tree
Showing 9 changed files with 284 additions and 63 deletions.
37 changes: 31 additions & 6 deletions OwnYourData.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
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 */; };
2FCDFF7C2BF33E5400158BDE /* SpeziLocation in Frameworks */ = {isa = PBXBuildFile; productRef = 2FCDFF7B2BF33E5400158BDE /* SpeziLocation */; };
2FCDFF7F2BF33ED800158BDE /* LocationPermissions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FCDFF7E2BF33ED800158BDE /* LocationPermissions.swift */; };
2FCDFF822BF3417300158BDE /* TrialView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FCDFF812BF3417300158BDE /* TrialView.swift */; };
2FE5DC3529EDD7CA004B9AB4 /* Consent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FE5DC2F29EDD7CA004B9AB4 /* Consent.swift */; };
2FE5DC3629EDD7CA004B9AB4 /* HealthKitPermissions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FE5DC3029EDD7CA004B9AB4 /* HealthKitPermissions.swift */; };
2FE5DC3729EDD7CA004B9AB4 /* OnboardingFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FE5DC3129EDD7CA004B9AB4 /* OnboardingFlow.swift */; };
Expand Down Expand Up @@ -146,6 +149,8 @@
2FAEC07F297F583900C11C42 /* OwnYourData.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = OwnYourData.entitlements; sourceTree = "<group>"; };
2FC94CD4298B0A1D009C8209 /* OwnYourData.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = OwnYourData.xctestplan; sourceTree = "<group>"; };
2FC975A72978F11A00BA99FE /* Home.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Home.swift; sourceTree = "<group>"; };
2FCDFF7E2BF33ED800158BDE /* LocationPermissions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationPermissions.swift; sourceTree = "<group>"; };
2FCDFF812BF3417300158BDE /* TrialView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrialView.swift; sourceTree = "<group>"; };
2FE5DC2C29EDD78E004B9AB4 /* ConsentDocument.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = ConsentDocument.md; sourceTree = "<group>"; };
2FE5DC2F29EDD7CA004B9AB4 /* Consent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Consent.swift; sourceTree = "<group>"; };
2FE5DC3029EDD7CA004B9AB4 /* HealthKitPermissions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HealthKitPermissions.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -192,6 +197,7 @@
2FB099B12A875DF100B20952 /* FirebaseFirestore in Frameworks */,
2F31CE882B91D6E9002B0B29 /* OpenAPIClient in Frameworks */,
A9D83F962B083794000D0C78 /* SpeziFirebaseAccountStorage in Frameworks */,
2FCDFF7C2BF33E5400158BDE /* SpeziLocation in Frameworks */,
2FB099B62A875E2B00B20952 /* HealthKitOnFHIR in Frameworks */,
2F42E9C22B91B70F00D88DB7 /* SpeziFHIRHealthKit in Frameworks */,
2FE5DC8A29EDD972004B9AB4 /* SpeziLocalStorage in Frameworks */,
Expand Down Expand Up @@ -256,6 +262,7 @@
isa = PBXGroup;
children = (
2F42E9E62B91BB8300D88DB7 /* ClinicalTrialsView.swift */,
2FCDFF812BF3417300158BDE /* TrialView.swift */,
2F42E9E52B91BB8300D88DB7 /* WebView.swift */,
2F38F39F2BE805090002E7D5 /* NICTrialsAPIDateFormatter.swift */,
2F38F3A42BE8BC890002E7D5 /* TrialDetail+Identifiable.swift */,
Expand Down Expand Up @@ -303,6 +310,7 @@
children = (
2FE5DC3129EDD7CA004B9AB4 /* OnboardingFlow.swift */,
2FE5DC3429EDD7CA004B9AB4 /* Welcome.swift */,
2FCDFF7E2BF33ED800158BDE /* LocationPermissions.swift */,
2FE5DCAC29EE6107004B9AB4 /* AccountOnboarding.swift */,
2F42EA0D2B91CD7100D88DB7 /* OpenAIAPIKey.swift */,
2FE5DC2F29EDD7CA004B9AB4 /* Consent.swift */,
Expand Down Expand Up @@ -478,6 +486,7 @@
2F42E9C32B91B70F00D88DB7 /* SpeziFHIRLLM */,
2F42E9C52B91B70F00D88DB7 /* SpeziFHIRMockPatients */,
2F31CE872B91D6E9002B0B29 /* OpenAPIClient */,
2FCDFF7B2BF33E5400158BDE /* SpeziLocation */,
);
productName = OwnYourData;
productReference = 653A254D283387FE005D4D48 /* OwnYourData.app */;
Expand Down Expand Up @@ -572,6 +581,7 @@
2F42E9B92B91B6EE00D88DB7 /* XCRemoteSwiftPackageReference "SpeziLLM" */,
2F42E9BE2B91B70F00D88DB7 /* XCRemoteSwiftPackageReference "SpeziFHIR" */,
2F31CE862B91D6E9002B0B29 /* XCLocalSwiftPackageReference "NCIClinicalTrialsSearchAPI" */,
2FCDFF7A2BF33E5400158BDE /* XCRemoteSwiftPackageReference "SpeziLocation" */,
);
productRefGroup = 653A254E283387FE005D4D48 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -647,6 +657,7 @@
2F42E9DE2B91BB2500D88DB7 /* PDFView.swift in Sources */,
2F38F3A02BE805090002E7D5 /* NICTrialsAPIDateFormatter.swift in Sources */,
2F42E9F42B91BBF300D88DB7 /* Instructions.swift in Sources */,
2FCDFF7F2BF33ED800158BDE /* LocationPermissions.swift in Sources */,
2F42EA112B91CF6F00D88DB7 /* ResourceSelection.swift in Sources */,
2F42EA052B91C24700D88DB7 /* ExportPackage.swift in Sources */,
2F42E9E72B91BB8300D88DB7 /* WebView.swift in Sources */,
Expand All @@ -672,6 +683,7 @@
2F4E23832989D51F0013F3D9 /* OwnYourDataTestingSetup.swift in Sources */,
2F42E9DC2B91BB2500D88DB7 /* DocumentManager.swift in Sources */,
2F42E9E02B91BB2500D88DB7 /* PDFListDetailView.swift in Sources */,
2FCDFF822BF3417300158BDE /* TrialView.swift in Sources */,
2F38F3A52BE8BC890002E7D5 /* TrialDetail+Identifiable.swift in Sources */,
2F42E9FA2B91BDD300D88DB7 /* InstructionsView.swift in Sources */,
56F6F2A02AB441930022FE5A /* ContributionsList.swift in Sources */,
Expand Down Expand Up @@ -807,8 +819,8 @@
INFOPLIST_KEY_NSHealthClinicalHealthRecordsShareUsageDescription = "The OwnYourData app needs access to your health records to display them in the application.";
INFOPLIST_KEY_NSHealthShareUsageDescription = "The OwnYourData uses the step count to demonstrate Spezi's integration with HealthKit.";
INFOPLIST_KEY_NSHealthUpdateUsageDescription = "The OwnYourData uses the step count to demonstrate Spezi's integration with HealthKit.";
INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "This message should never appear. Please adjust this when you start using location information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect.";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "This message should never appear. Please adjust this when you start using location information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect.";
INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "The OwnYourData app uses location to determine trial matching close to your current location.";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "The OwnYourData app uses location to determine trial matching close to your current location.";
INFOPLIST_KEY_NSMicrophoneUsageDescription = "This message should never appear. Please adjust this when you start using microphone information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect.";
INFOPLIST_KEY_NSMotionUsageDescription = "This message should never appear. Please adjust this when you start using motion information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect.";
INFOPLIST_KEY_NSSpeechRecognitionUsageDescription = "This message should never appear. Please adjust this when you start using speecg information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect.";
Expand Down Expand Up @@ -1010,8 +1022,8 @@
INFOPLIST_KEY_NSHealthClinicalHealthRecordsShareUsageDescription = "The OwnYourData app needs access to your health records to display them in the application.";
INFOPLIST_KEY_NSHealthShareUsageDescription = "The OwnYourData uses the step count to demonstrate Spezi's integration with HealthKit.";
INFOPLIST_KEY_NSHealthUpdateUsageDescription = "The OwnYourData uses the step count to demonstrate Spezi's integration with HealthKit.";
INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "This message should never appear. Please adjust this when you start using location information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect.";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "This message should never appear. Please adjust this when you start using location information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect.";
INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "The OwnYourData app uses location to determine trial matching close to your current location.";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "The OwnYourData app uses location to determine trial matching close to your current location.";
INFOPLIST_KEY_NSMicrophoneUsageDescription = "This message should never appear. Please adjust this when you start using microphone information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect.";
INFOPLIST_KEY_NSMotionUsageDescription = "This message should never appear. Please adjust this when you start using motion information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect.";
INFOPLIST_KEY_NSSpeechRecognitionUsageDescription = "This message should never appear. Please adjust this when you start using speecg information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect.";
Expand Down Expand Up @@ -1058,8 +1070,8 @@
INFOPLIST_KEY_NSHealthClinicalHealthRecordsShareUsageDescription = "The OwnYourData app needs access to your health records to display them in the application.";
INFOPLIST_KEY_NSHealthShareUsageDescription = "The OwnYourData uses the step count to demonstrate Spezi's integration with HealthKit.";
INFOPLIST_KEY_NSHealthUpdateUsageDescription = "The OwnYourData uses the step count to demonstrate Spezi's integration with HealthKit.";
INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "This message should never appear. Please adjust this when you start using location information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect.";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "This message should never appear. Please adjust this when you start using location information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect.";
INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "The OwnYourData app uses location to determine trial matching close to your current location.";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "The OwnYourData app uses location to determine trial matching close to your current location.";
INFOPLIST_KEY_NSMicrophoneUsageDescription = "This message should never appear. Please adjust this when you start using microphone information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect.";
INFOPLIST_KEY_NSMotionUsageDescription = "This message should never appear. Please adjust this when you start using motion information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect.";
INFOPLIST_KEY_NSSpeechRecognitionUsageDescription = "This message should never appear. Please adjust this when you start using speecg information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect.";
Expand Down Expand Up @@ -1246,6 +1258,14 @@
minimumVersion = 0.2.4;
};
};
2FCDFF7A2BF33E5400158BDE /* XCRemoteSwiftPackageReference "SpeziLocation" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/vishnuravi/SpeziLocation";
requirement = {
kind = revision;
revision = 76c24a5f60ed889a9ebe5b972f203e6330a5a86a;
};
};
2FE5DC6229EDD883004B9AB4 /* XCRemoteSwiftPackageReference "SpeziAccount" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/StanfordSpezi/SpeziAccount.git";
Expand Down Expand Up @@ -1396,6 +1416,11 @@
package = 2FB099B42A875E2B00B20952 /* XCRemoteSwiftPackageReference "HealthKitOnFHIR" */;
productName = HealthKitOnFHIR;
};
2FCDFF7B2BF33E5400158BDE /* SpeziLocation */ = {
isa = XCSwiftPackageProductDependency;
package = 2FCDFF7A2BF33E5400158BDE /* XCRemoteSwiftPackageReference "SpeziLocation" */;
productName = SpeziLocation;
};
2FE5DC6329EDD883004B9AB4 /* SpeziAccount */ = {
isa = XCSwiftPackageProductDependency;
package = 2FE5DC6229EDD883004B9AB4 /* XCRemoteSwiftPackageReference "SpeziAccount" */;
Expand Down
17 changes: 13 additions & 4 deletions OwnYourData.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@
"repositoryURL": "https://github.com/google/GoogleUtilities.git",
"state": {
"branch": null,
"revision": "8e5d57ed87057cd7b0e4e8f474d9e78f73eb85f7",
"version": "7.13.2"
"revision": "57a1d307f42df690fdef2637f3e5b776da02aad6",
"version": "7.13.3"
}
},
{
Expand Down Expand Up @@ -195,8 +195,8 @@
"repositoryURL": "https://github.com/StanfordSpezi/SpeziAccount.git",
"state": {
"branch": null,
"revision": "83f505c69865d5aaacf71fd5ae8d2ffb8c3187d8",
"version": "1.2.3"
"revision": "2de07209430fe7b13c44790eab948b30482fcb9d",
"version": "1.2.4"
}
},
{
Expand Down Expand Up @@ -253,6 +253,15 @@
"version": "0.8.1"
}
},
{
"package": "SpeziLocation",
"repositoryURL": "https://github.com/vishnuravi/SpeziLocation",
"state": {
"branch": null,
"revision": "76c24a5f60ed889a9ebe5b972f203e6330a5a86a",
"version": null
}
},
{
"package": "SpeziOnboarding",
"repositoryURL": "https://github.com/StanfordSpezi/SpeziOnboarding",
Expand Down
2 changes: 1 addition & 1 deletion OwnYourData.xcodeproj/xcshareddata/xcschemes/OwnYourData.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
</CommandLineArgument>
<CommandLineArgument
argument = "--skipOnboarding"
isEnabled = "YES">
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "--testSchedule"
Expand Down
Loading

0 comments on commit 24a3063

Please sign in to comment.