Skip to content

Commit

Permalink
Remove SpeziScheduler Dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
nriedman committed Apr 4, 2024
1 parent f0c3c60 commit e88cd11
Show file tree
Hide file tree
Showing 14 changed files with 8 additions and 474 deletions.
60 changes: 0 additions & 60 deletions ENGAGEHF.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
objects = {

/* Begin PBXBuildFile section */
27FA29902A388E9B009CAC45 /* ModalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27FA298F2A388E9B009CAC45 /* ModalView.swift */; };
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 /* ENGAGEHFTestingSetup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F4E23822989D51F0013F3D9 /* ENGAGEHFTestingSetup.swift */; };
Expand All @@ -20,7 +18,6 @@
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 */; };
2FBD738C2A3BD150004228E7 /* SpeziScheduler in Frameworks */ = {isa = PBXBuildFile; productRef = 2FBD738B2A3BD150004228E7 /* SpeziScheduler */; };
2FC3439029EE6346002D773C /* SocialSupportQuestionnaire.json in Resources */ = {isa = PBXBuildFile; fileRef = 2FE5DC5529EDD811004B9AB4 /* SocialSupportQuestionnaire.json */; };
2FC3439129EE6349002D773C /* AppIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 2FE5DC2A29EDD78D004B9AB4 /* AppIcon.png */; };
2FC3439229EE634B002D773C /* ConsentDocument.md in Resources */ = {isa = PBXBuildFile; fileRef = 2FE5DC2C29EDD78E004B9AB4 /* ConsentDocument.md */; };
Expand All @@ -36,12 +33,6 @@
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 */; };
2FE5DC4E29EDD7FA004B9AB4 /* ScheduleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FE5DC4829EDD7FA004B9AB4 /* ScheduleView.swift */; };
2FE5DC4F29EDD7FA004B9AB4 /* EventContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FE5DC4929EDD7FA004B9AB4 /* EventContext.swift */; };
2FE5DC5029EDD7FA004B9AB4 /* EventContextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FE5DC4A29EDD7FA004B9AB4 /* EventContextView.swift */; };
2FE5DC5129EDD7FA004B9AB4 /* ENGAGEHFTaskContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FE5DC4B29EDD7FA004B9AB4 /* ENGAGEHFTaskContext.swift */; };
2FE5DC5229EDD7FA004B9AB4 /* ENGAGEHFScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FE5DC4C29EDD7FA004B9AB4 /* ENGAGEHFScheduler.swift */; };
2FE5DC5329EDD7FA004B9AB4 /* Bundle+Questionnaire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FE5DC4D29EDD7FA004B9AB4 /* Bundle+Questionnaire.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 */; };
Expand Down Expand Up @@ -92,7 +83,6 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
27FA298F2A388E9B009CAC45 /* ModalView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalView.swift; sourceTree = "<group>"; };
2F4E237D2989A2FE0013F3D9 /* LaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LaunchTests.swift; sourceTree = "<group>"; };
2F4E23822989D51F0013F3D9 /* ENGAGEHFTestingSetup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ENGAGEHFTestingSetup.swift; sourceTree = "<group>"; };
2F5E32BC297E05EA003432F8 /* ENGAGEHFDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ENGAGEHFDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -115,12 +105,6 @@
2FE5DC4229EDD7F2004B9AB4 /* Binding+Negate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Binding+Negate.swift"; sourceTree = "<group>"; };
2FE5DC4329EDD7F2004B9AB4 /* Bundle+Image.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Bundle+Image.swift"; sourceTree = "<group>"; };
2FE5DC4429EDD7F2004B9AB4 /* CodableArray+RawRepresentable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CodableArray+RawRepresentable.swift"; sourceTree = "<group>"; };
2FE5DC4829EDD7FA004B9AB4 /* ScheduleView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScheduleView.swift; sourceTree = "<group>"; };
2FE5DC4929EDD7FA004B9AB4 /* EventContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventContext.swift; sourceTree = "<group>"; };
2FE5DC4A29EDD7FA004B9AB4 /* EventContextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventContextView.swift; sourceTree = "<group>"; };
2FE5DC4B29EDD7FA004B9AB4 /* ENGAGEHFTaskContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ENGAGEHFTaskContext.swift; sourceTree = "<group>"; };
2FE5DC4C29EDD7FA004B9AB4 /* ENGAGEHFScheduler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ENGAGEHFScheduler.swift; sourceTree = "<group>"; };
2FE5DC4D29EDD7FA004B9AB4 /* Bundle+Questionnaire.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Bundle+Questionnaire.swift"; sourceTree = "<group>"; };
2FE5DC5529EDD811004B9AB4 /* SocialSupportQuestionnaire.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = SocialSupportQuestionnaire.json; sourceTree = "<group>"; };
2FE5DCAC29EE6107004B9AB4 /* AccountOnboarding.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountOnboarding.swift; sourceTree = "<group>"; };
2FF53D8C2A8729D600042B76 /* ENGAGEHFStandard.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ENGAGEHFStandard.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -164,8 +148,6 @@
2FE5DC7229EDD8D3004B9AB4 /* SpeziHealthKit in Frameworks */,
2F49B7762980407C00BCB272 /* Spezi in Frameworks */,
2FE5DC8F29EDD980004B9AB4 /* SpeziViews in Frameworks */,
2F3D4ABC2A4E7C290068FB2F /* SpeziScheduler in Frameworks */,
2FBD738C2A3BD150004228E7 /* SpeziScheduler in Frameworks */,
2FE5DC7929EDD8E6004B9AB4 /* SpeziFirestore in Frameworks */,
2FE5DC7729EDD8E6004B9AB4 /* SpeziFirebaseConfiguration in Frameworks */,
);
Expand Down Expand Up @@ -234,20 +216,6 @@
path = Resources;
sourceTree = "<group>";
};
2FE5DC3B29EDD7D0004B9AB4 /* Schedule */ = {
isa = PBXGroup;
children = (
2FE5DC4D29EDD7FA004B9AB4 /* Bundle+Questionnaire.swift */,
2FE5DC4929EDD7FA004B9AB4 /* EventContext.swift */,
2FE5DC4A29EDD7FA004B9AB4 /* EventContextView.swift */,
2FE5DC4829EDD7FA004B9AB4 /* ScheduleView.swift */,
2FE5DC4C29EDD7FA004B9AB4 /* ENGAGEHFScheduler.swift */,
2FE5DC4B29EDD7FA004B9AB4 /* ENGAGEHFTaskContext.swift */,
27FA298F2A388E9B009CAC45 /* ModalView.swift */,
);
path = Schedule;
sourceTree = "<group>";
};
2FE5DC3C29EDD7DA004B9AB4 /* SharedContext */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -309,7 +277,6 @@
4DB025B52BBDE8EC002D2545 /* Dashboard */,
A9720E412ABB68B300872D23 /* Account */,
2FE5DC2829EDD398004B9AB4 /* Onboarding */,
2FE5DC3B29EDD7D0004B9AB4 /* Schedule */,
2FE5DC2729EDD38D004B9AB4 /* Contacts */,
2FE5DC3C29EDD7DA004B9AB4 /* SharedContext */,
2FE5DC3D29EDD7E4004B9AB4 /* Helper */,
Expand Down Expand Up @@ -383,8 +350,6 @@
2FE5DC8929EDD972004B9AB4 /* SpeziLocalStorage */,
2FE5DC8B29EDD972004B9AB4 /* SpeziSecureStorage */,
2FE5DC8E29EDD980004B9AB4 /* SpeziViews */,
2FBD738B2A3BD150004228E7 /* SpeziScheduler */,
2F3D4ABB2A4E7C290068FB2F /* SpeziScheduler */,
2FE5DC8029EDD91D004B9AB4 /* SpeziOnboarding */,
2FB099AE2A875DF100B20952 /* FirebaseAuth */,
2FB099B02A875DF100B20952 /* FirebaseFirestore */,
Expand Down Expand Up @@ -485,7 +450,6 @@
2FE5DC9029EDD9C3004B9AB4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
2FE5DC9729EDD9D9004B9AB4 /* XCRemoteSwiftPackageReference "XCTestExtensions" */,
2FE5DC9A29EDD9EF004B9AB4 /* XCRemoteSwiftPackageReference "XCTHealthKit" */,
2F3D4ABA2A4E7C290068FB2F /* XCRemoteSwiftPackageReference "SpeziScheduler" */,
97F466E62A76BBEE005DC9B4 /* XCRemoteSwiftPackageReference "SpeziOnboarding" */,
2FB099B42A875E2B00B20952 /* XCRemoteSwiftPackageReference "HealthKitOnFHIR" */,
5661551B2AB8384200209B80 /* XCRemoteSwiftPackageReference "swift-package-list" */,
Expand Down Expand Up @@ -546,7 +510,6 @@
2FE5DC3529EDD7CA004B9AB4 /* Consent.swift in Sources */,
2FE5DC4529EDD7F2004B9AB4 /* Binding+Negate.swift in Sources */,
2FC975A82978F11A00BA99FE /* Home.swift in Sources */,
2FE5DC4E29EDD7FA004B9AB4 /* ScheduleView.swift in Sources */,
4DB025D52BBF2E08002D2545 /* Dashboard.swift in Sources */,
A9DFE8A92ABE551400428242 /* AccountButton.swift in Sources */,
2FE5DC3729EDD7CA004B9AB4 /* OnboardingFlow.swift in Sources */,
Expand All @@ -556,18 +519,12 @@
A9720E432ABB68CC00872D23 /* AccountSetupHeader.swift in Sources */,
2FE5DC4029EDD7EE004B9AB4 /* FeatureFlags.swift in Sources */,
2FE5DC4629EDD7F2004B9AB4 /* Bundle+Image.swift in Sources */,
2FE5DC4F29EDD7FA004B9AB4 /* EventContext.swift in Sources */,
2FE5DC5029EDD7FA004B9AB4 /* EventContextView.swift in Sources */,
2F4E23832989D51F0013F3D9 /* ENGAGEHFTestingSetup.swift in Sources */,
2FE5DC5329EDD7FA004B9AB4 /* Bundle+Questionnaire.swift in Sources */,
2FE5DC5129EDD7FA004B9AB4 /* ENGAGEHFTaskContext.swift in Sources */,
2F5E32BD297E05EA003432F8 /* ENGAGEHFDelegate.swift in Sources */,
2FE5DC5229EDD7FA004B9AB4 /* ENGAGEHFScheduler.swift in Sources */,
A9FE7AD02AA39BAB0077B045 /* AccountSheet.swift in Sources */,
653A2551283387FE005D4D48 /* ENGAGEHF.swift in Sources */,
2FE5DC3629EDD7CA004B9AB4 /* HealthKitPermissions.swift in Sources */,
2F65B44E2A3B8B0600A36932 /* NotificationPermissions.swift in Sources */,
27FA29902A388E9B009CAC45 /* ModalView.swift in Sources */,
2FE5DC2629EDD38A004B9AB4 /* Contacts.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -1073,14 +1030,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";
Expand Down Expand Up @@ -1220,11 +1169,6 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
2F3D4ABB2A4E7C290068FB2F /* SpeziScheduler */ = {
isa = XCSwiftPackageProductDependency;
package = 2F3D4ABA2A4E7C290068FB2F /* XCRemoteSwiftPackageReference "SpeziScheduler" */;
productName = SpeziScheduler;
};
2F49B7752980407B00BCB272 /* Spezi */ = {
isa = XCSwiftPackageProductDependency;
package = 2F49B7742980407B00BCB272 /* XCRemoteSwiftPackageReference "Spezi" */;
Expand Down Expand Up @@ -1255,10 +1199,6 @@
package = 2FB099B42A875E2B00B20952 /* XCRemoteSwiftPackageReference "HealthKitOnFHIR" */;
productName = HealthKitOnFHIR;
};
2FBD738B2A3BD150004228E7 /* SpeziScheduler */ = {
isa = XCSwiftPackageProductDependency;
productName = SpeziScheduler;
};
2FE5DC6329EDD883004B9AB4 /* SpeziAccount */ = {
isa = XCSwiftPackageProductDependency;
package = 2FE5DC6229EDD883004B9AB4 /* XCRemoteSwiftPackageReference "SpeziAccount" */;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"originHash" : "7791f7520d86b9b987dab37c9b90dab7fe5795363615aa359655357df18d38c1",
"originHash" : "84060c25a97a757bf3045128a2563021282283c70a9cb6009941a41298deef92",
"pins" : [
{
"identity" : "abseil-cpp-binary",
Expand Down Expand Up @@ -253,15 +253,6 @@
"version" : "1.1.0"
}
},
{
"identity" : "spezischeduler",
"kind" : "remoteSourceControl",
"location" : "https://github.com/StanfordSpezi/SpeziScheduler.git",
"state" : {
"revision" : "eed3980f20b01a788720c869010e3fe2fbfcd1fd",
"version" : "0.8.2"
}
},
{
"identity" : "spezistorage",
"kind" : "remoteSourceControl",
Expand Down
2 changes: 0 additions & 2 deletions ENGAGEHF/ENGAGEHFDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import SpeziFirebaseStorage
import SpeziFirestore
import SpeziHealthKit
import SpeziOnboarding
import SpeziScheduler
import SwiftUI


Expand Down Expand Up @@ -50,7 +49,6 @@ class ENGAGEHFDelegate: SpeziAppDelegate {
healthKit
}

ENGAGEHFScheduler()
OnboardingDataSource()
}
}
Expand Down
2 changes: 0 additions & 2 deletions ENGAGEHF/Home.swift
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ struct HomeView: View {

return HomeView()
.previewWith(standard: ENGAGEHFStandard()) {
ENGAGEHFScheduler()
AccountConfiguration(building: details, active: MockUserIdPasswordAccountService())
}
}
Expand All @@ -60,7 +59,6 @@ struct HomeView: View {
CommandLine.arguments.append("--disableFirebase")
return HomeView()
.previewWith(standard: ENGAGEHFStandard()) {
ENGAGEHFScheduler()
AccountConfiguration {
MockUserIdPasswordAccountService()
}
Expand Down
7 changes: 0 additions & 7 deletions ENGAGEHF/Onboarding/NotificationPermissions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@
//

import SpeziOnboarding
import SpeziScheduler
import SwiftUI


struct NotificationPermissions: View {
@Environment(ENGAGEHFScheduler.self) private var scheduler
@Environment(OnboardingNavigationPath.self) private var onboardingNavigationPath

@State private var notificationProcessing = false
Expand Down Expand Up @@ -45,8 +43,6 @@ struct NotificationPermissions: View {
// Notification Authorization is not available in the preview simulator.
if ProcessInfo.processInfo.isPreviewSimulator {
try await _Concurrency.Task.sleep(for: .seconds(5))
} else {
try await scheduler.requestLocalNotificationAuthorization()
}
} catch {
print("Could not request notification permissions.")
Expand All @@ -70,8 +66,5 @@ struct NotificationPermissions: View {
OnboardingStack {
NotificationPermissions()
}
.previewWith {
ENGAGEHFScheduler()
}
}
#endif
6 changes: 0 additions & 6 deletions ENGAGEHF/Onboarding/OnboardingFlow.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import SwiftUI
/// Displays an multi-step onboarding flow for the ENGAGEHF.
struct OnboardingFlow: View {
@Environment(HealthKit.self) private var healthKitDataSource
@Environment(ENGAGEHFScheduler.self) private var scheduler

@AppStorage(StorageKeys.onboardingFlowComplete) private var completedOnboardingFlow = false

Expand Down Expand Up @@ -54,9 +53,6 @@ struct OnboardingFlow: View {
NotificationPermissions()
}
}
.task {
localNotificationAuthorization = await scheduler.localNotificationAuthorization
}
.interactiveDismissDisabled(!completedOnboardingFlow)
}
}
Expand All @@ -72,8 +68,6 @@ struct OnboardingFlow: View {
AccountConfiguration {
MockUserIdPasswordAccountService()
}

ENGAGEHFScheduler()
}
}
#endif
7 changes: 7 additions & 0 deletions ENGAGEHF/Resources/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
}
},
"COMPLETED_TASK_LABEL %@" : {
"extractionState" : "stale",
"localizations" : {
"en" : {
"stringUnit" : {
Expand Down Expand Up @@ -313,6 +314,7 @@
}
},
"SCHEDULE_LIST_TITLE" : {
"extractionState" : "stale",
"localizations" : {
"en" : {
"stringUnit" : {
Expand All @@ -323,6 +325,7 @@
}
},
"TASK_CONTEXT_ACTION_QUESTIONNAIRE" : {
"extractionState" : "stale",
"localizations" : {
"en" : {
"stringUnit" : {
Expand All @@ -333,6 +336,7 @@
}
},
"TASK_CONTEXT_ACTION_TEST" : {
"extractionState" : "stale",
"localizations" : {
"en" : {
"stringUnit" : {
Expand All @@ -343,6 +347,7 @@
}
},
"TASK_LABEL %@" : {
"extractionState" : "stale",
"localizations" : {
"en" : {
"stringUnit" : {
Expand All @@ -353,6 +358,7 @@
}
},
"TASK_SOCIAL_SUPPORT_QUESTIONNAIRE_DESCRIPTION" : {
"extractionState" : "stale",
"localizations" : {
"en" : {
"stringUnit" : {
Expand All @@ -363,6 +369,7 @@
}
},
"TASK_SOCIAL_SUPPORT_QUESTIONNAIRE_TITLE" : {
"extractionState" : "stale",
"localizations" : {
"en" : {
"stringUnit" : {
Expand Down
26 changes: 0 additions & 26 deletions ENGAGEHF/Schedule/Bundle+Questionnaire.swift

This file was deleted.

Loading

0 comments on commit e88cd11

Please sign in to comment.