Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to SpeziScheduler 1.0 #84

Merged
merged 12 commits into from
Nov 10, 2024
Merged

Update to SpeziScheduler 1.0 #84

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
847f397
Some drafts
Supereg Aug 29, 2024
3e4b549
Upgrade scheduler
Supereg Oct 17, 2024
b6ce14b
Dependencies
Supereg Oct 17, 2024
7e18972
Update to release versions
Supereg Oct 29, 2024
00b15f4
TabView customization and XCTSpeziAccount
Supereg Oct 30, 2024
d9e0cb3
Update visuals and docs
Supereg Oct 30, 2024
84ddfb5
Versions
Supereg Oct 30, 2024
af35b44
Update selected device
Supereg Oct 31, 2024
1faac38
Downgrade to 15.3 project format to make periphery work again
Supereg Oct 31, 2024
9f45a58
Add some periphery ignore comments
Supereg Oct 31, 2024
ab81f7d
Fix name
Supereg Oct 31, 2024
af6803f
Version bumps
Supereg Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 20 additions & 29 deletions TemplateApplication.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
2FE5DC4029EDD7EE004B9AB4 /* FeatureFlags.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FE5DC3E29EDD7ED004B9AB4 /* FeatureFlags.swift */; };
2FE5DC4129EDD7EE004B9AB4 /* StorageKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FE5DC3F29EDD7EE004B9AB4 /* StorageKeys.swift */; };
2FE5DC4E29EDD7FA004B9AB4 /* ScheduleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FE5DC4829EDD7FA004B9AB4 /* ScheduleView.swift */; };
2FE5DC5129EDD7FA004B9AB4 /* TemplateApplicationTaskContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FE5DC4B29EDD7FA004B9AB4 /* TemplateApplicationTaskContext.swift */; };
2FE5DC5229EDD7FA004B9AB4 /* TemplateApplicationScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FE5DC4C29EDD7FA004B9AB4 /* TemplateApplicationScheduler.swift */; };
2FE5DC5329EDD7FA004B9AB4 /* Bundle+Questionnaire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FE5DC4D29EDD7FA004B9AB4 /* Bundle+Questionnaire.swift */; };
2FE5DC6429EDD883004B9AB4 /* SpeziAccount in Frameworks */ = {isa = PBXBuildFile; productRef = 2FE5DC6329EDD883004B9AB4 /* SpeziAccount */; };
Expand All @@ -61,10 +60,11 @@
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 */; };
A92E4DF02BAA001100AC8DE8 /* OrderedCollections in Frameworks */ = {isa = PBXBuildFile; productRef = A92E4DEF2BAA001100AC8DE8 /* OrderedCollections */; };
A94DDFFD2CBD1190004930BD /* SpeziNotifications in Frameworks */ = {isa = PBXBuildFile; productRef = A94DDFFC2CBD1190004930BD /* SpeziNotifications */; };
A9720E432ABB68CC00872D23 /* AccountSetupHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9720E422ABB68CC00872D23 /* AccountSetupHeader.swift */; };
A98FF2B12CD131F500DFC949 /* EventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98FF2B02CD131F500DFC949 /* EventView.swift */; };
A9947BF02CC131ED0068AA8A /* SpeziSchedulerUI in Frameworks */ = {isa = PBXBuildFile; productRef = A9947BEF2CC131ED0068AA8A /* SpeziSchedulerUI */; };
A9947BF42CC142BD0068AA8A /* XCTSpeziNotifications in Frameworks */ = {isa = PBXBuildFile; productRef = A9947BF32CC142BD0068AA8A /* XCTSpeziNotifications */; };
A9A3DCC82C75CBBD00FC9B69 /* FirebaseConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9A3DCC72C75CB9A00FC9B69 /* FirebaseConfiguration.swift */; };
A9D83F962B083794000D0C78 /* SpeziFirebaseAccountStorage in Frameworks */ = {isa = PBXBuildFile; productRef = A9D83F952B083794000D0C78 /* SpeziFirebaseAccountStorage */; };
A9DFE8A92ABE551400428242 /* AccountButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9DFE8A82ABE551400428242 /* AccountButton.swift */; };
Expand Down Expand Up @@ -111,7 +111,6 @@
2FE5DC3E29EDD7ED004B9AB4 /* FeatureFlags.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeatureFlags.swift; sourceTree = "<group>"; };
2FE5DC3F29EDD7EE004B9AB4 /* StorageKeys.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StorageKeys.swift; sourceTree = "<group>"; };
2FE5DC4829EDD7FA004B9AB4 /* ScheduleView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScheduleView.swift; sourceTree = "<group>"; };
2FE5DC4B29EDD7FA004B9AB4 /* TemplateApplicationTaskContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TemplateApplicationTaskContext.swift; sourceTree = "<group>"; };
2FE5DC4C29EDD7FA004B9AB4 /* TemplateApplicationScheduler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TemplateApplicationScheduler.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>"; };
Expand All @@ -127,6 +126,7 @@
653A256B28338800005D4D48 /* SchedulerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SchedulerTests.swift; sourceTree = "<group>"; };
653A258928339462005D4D48 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
A9720E422ABB68CC00872D23 /* AccountSetupHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountSetupHeader.swift; sourceTree = "<group>"; };
A98FF2B02CD131F500DFC949 /* EventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventView.swift; sourceTree = "<group>"; };
A9A3DCC72C75CB9A00FC9B69 /* FirebaseConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirebaseConfiguration.swift; sourceTree = "<group>"; };
A9DFE8A82ABE551400428242 /* AccountButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountButton.swift; sourceTree = "<group>"; };
A9FE7ACF2AA39BAB0077B045 /* AccountSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountSheet.swift; sourceTree = "<group>"; };
Expand All @@ -153,7 +153,6 @@
2FE5DC8A29EDD972004B9AB4 /* SpeziLocalStorage in Frameworks */,
2FE5DC8C29EDD972004B9AB4 /* SpeziSecureStorage in Frameworks */,
2FE5DC7529EDD8E6004B9AB4 /* SpeziFirebaseAccount in Frameworks */,
A92E4DF02BAA001100AC8DE8 /* OrderedCollections in Frameworks */,
9739A0C62AD7B5730084BEA5 /* FirebaseStorage in Frameworks */,
2FE5DC7229EDD8D3004B9AB4 /* SpeziHealthKit in Frameworks */,
2F49B7762980407C00BCB272 /* Spezi in Frameworks */,
Expand All @@ -178,6 +177,7 @@
files = (
2FE5DC9929EDD9D9004B9AB4 /* XCTestExtensions in Frameworks */,
2FE5DC9C29EDD9EF004B9AB4 /* XCTHealthKit in Frameworks */,
A9947BF42CC142BD0068AA8A /* XCTSpeziNotifications in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -234,8 +234,8 @@
children = (
2FE5DC4D29EDD7FA004B9AB4 /* Bundle+Questionnaire.swift */,
2FE5DC4829EDD7FA004B9AB4 /* ScheduleView.swift */,
A98FF2B02CD131F500DFC949 /* EventView.swift */,
2FE5DC4C29EDD7FA004B9AB4 /* TemplateApplicationScheduler.swift */,
2FE5DC4B29EDD7FA004B9AB4 /* TemplateApplicationTaskContext.swift */,
);
path = Schedule;
sourceTree = "<group>";
Expand Down Expand Up @@ -374,7 +374,6 @@
9739A0C52AD7B5730084BEA5 /* FirebaseStorage */,
97D73D692AD860AD00B47FA0 /* SpeziFirebaseStorage */,
A9D83F952B083794000D0C78 /* SpeziFirebaseAccountStorage */,
A92E4DEF2BAA001100AC8DE8 /* OrderedCollections */,
56E708342BB06B7100B08F0A /* SpeziLicense */,
56E7083A2BB06F6F00B08F0A /* SwiftPackageList */,
A94DDFFC2CBD1190004930BD /* SpeziNotifications */,
Expand Down Expand Up @@ -421,6 +420,7 @@
packageProductDependencies = (
2FE5DC9829EDD9D9004B9AB4 /* XCTestExtensions */,
2FE5DC9B29EDD9EF004B9AB4 /* XCTHealthKit */,
A9947BF32CC142BD0068AA8A /* XCTSpeziNotifications */,
);
productName = TemplateApplicationUITests;
productReference = 653A256728338800005D4D48 /* TemplateApplicationUITests.xctest */;
Expand Down Expand Up @@ -473,7 +473,6 @@
97F466E62A76BBEE005DC9B4 /* XCRemoteSwiftPackageReference "SpeziOnboarding" */,
2FB099B42A875E2B00B20952 /* XCRemoteSwiftPackageReference "HealthKitOnFHIR" */,
5661551B2AB8384200209B80 /* XCRemoteSwiftPackageReference "swift-package-list" */,
A92E4DEE2BAA001100AC8DE8 /* XCRemoteSwiftPackageReference "swift-collections" */,
56E708332BB06B7100B08F0A /* XCRemoteSwiftPackageReference "SpeziLicense" */,
2F66D20D2BB723180010D555 /* XCRemoteSwiftPackageReference "SwiftLint" */,
A945FCD32C9C6BFA00B9EBC7 /* XCRemoteSwiftPackageReference "ResearchKitOnFHIR" */,
Expand Down Expand Up @@ -541,8 +540,8 @@
A9720E432ABB68CC00872D23 /* AccountSetupHeader.swift in Sources */,
2FE5DC4029EDD7EE004B9AB4 /* FeatureFlags.swift in Sources */,
2F4E23832989D51F0013F3D9 /* TemplateApplicationTestingSetup.swift in Sources */,
A98FF2B12CD131F500DFC949 /* EventView.swift in Sources */,
2FE5DC5329EDD7FA004B9AB4 /* Bundle+Questionnaire.swift in Sources */,
2FE5DC5129EDD7FA004B9AB4 /* TemplateApplicationTaskContext.swift in Sources */,
2F5E32BD297E05EA003432F8 /* TemplateApplicationDelegate.swift in Sources */,
2FE5DC5229EDD7FA004B9AB4 /* TemplateApplicationScheduler.swift in Sources */,
A9FE7AD02AA39BAB0077B045 /* AccountSheet.swift in Sources */,
Expand Down Expand Up @@ -1086,16 +1085,16 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/StanfordSpezi/SpeziScheduler.git";
requirement = {
branch = "feature/il-notifications-support";
kind = branch;
kind = upToNextMajorVersion;
minimumVersion = 1.0.0;
};
};
2F49B7742980407B00BCB272 /* XCRemoteSwiftPackageReference "Spezi" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/StanfordSpezi/Spezi.git";
requirement = {
branch = "feature/application-for-swiftui";
kind = branch;
kind = upToNextMajorVersion;
minimumVersion = 1.8.0;
};
};
2F66D20D2BB723180010D555 /* XCRemoteSwiftPackageReference "SwiftLint" */ = {
Expand All @@ -1118,8 +1117,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/StanfordSpezi/SpeziAccount.git";
requirement = {
branch = "feature/swift-syntax-6";
kind = branch;
kind = revision;
revision = 7ef29a7743c01a083ba69e93479e82d3be199ac0;
Supereg marked this conversation as resolved.
Show resolved Hide resolved
};
};
2FE5DC6529EDD894004B9AB4 /* XCRemoteSwiftPackageReference "SpeziContact" */ = {
Expand Down Expand Up @@ -1218,14 +1217,6 @@
minimumVersion = 1.2.1;
};
};
A92E4DEE2BAA001100AC8DE8 /* XCRemoteSwiftPackageReference "swift-collections" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/apple/swift-collections.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.1.0;
};
};
A945FCD32C9C6BFA00B9EBC7 /* XCRemoteSwiftPackageReference "ResearchKitOnFHIR" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/StanfordBDHG/ResearchKitOnFHIR.git";
Expand All @@ -1238,8 +1229,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/StanfordSpezi/SpeziNotifications.git";
requirement = {
branch = "feature/initial-version";
kind = branch;
kind = upToNextMajorVersion;
minimumVersion = 1.0.2;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down Expand Up @@ -1364,11 +1355,6 @@
package = 2FE5DC7329EDD8E6004B9AB4 /* XCRemoteSwiftPackageReference "SpeziFirebase" */;
productName = SpeziFirebaseStorage;
};
A92E4DEF2BAA001100AC8DE8 /* OrderedCollections */ = {
isa = XCSwiftPackageProductDependency;
package = A92E4DEE2BAA001100AC8DE8 /* XCRemoteSwiftPackageReference "swift-collections" */;
productName = OrderedCollections;
};
A94DDFFC2CBD1190004930BD /* SpeziNotifications */ = {
isa = XCSwiftPackageProductDependency;
package = A94DDFFB2CBD1190004930BD /* XCRemoteSwiftPackageReference "SpeziNotifications" */;
Expand All @@ -1379,6 +1365,11 @@
package = 2F3D4ABA2A4E7C290068FB2F /* XCRemoteSwiftPackageReference "SpeziScheduler" */;
productName = SpeziSchedulerUI;
};
A9947BF32CC142BD0068AA8A /* XCTSpeziNotifications */ = {
isa = XCSwiftPackageProductDependency;
package = A94DDFFB2CBD1190004930BD /* XCRemoteSwiftPackageReference "SpeziNotifications" */;
productName = XCTSpeziNotifications;
};
A9D83F952B083794000D0C78 /* SpeziFirebaseAccountStorage */ = {
isa = XCSwiftPackageProductDependency;
package = 2FE5DC7329EDD8E6004B9AB4 /* XCRemoteSwiftPackageReference "SpeziFirebase" */;
Expand Down
21 changes: 10 additions & 11 deletions TemplateApplication.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"originHash" : "99b228a3d90393197a05e59655cd0021e5d50f341ea80fb724e702b86d4f07e6",
"originHash" : "535d1ac32d9060c7199e495d8e2471567bc5aafc147837eb0e52b7102023c36b",
"pins" : [
{
"identity" : "abseil-cpp-binary",
Expand Down Expand Up @@ -186,17 +186,16 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/StanfordSpezi/Spezi.git",
"state" : {
"branch" : "feature/application-for-swiftui",
"revision" : "dd59b84ec9525942842ad9f355d05c40804b1a97"
"revision" : "4513a697572e8e1faea1e0ee52e6fad4b8d3dd8d",
"version" : "1.8.0"
}
},
{
"identity" : "speziaccount",
"kind" : "remoteSourceControl",
"location" : "https://github.com/StanfordSpezi/SpeziAccount.git",
"state" : {
"branch" : "feature/swift-syntax-6",
"revision" : "d2bfede6e4ac07e4dd5dc2d3dc3fa564de9226a6"
"revision" : "7ef29a7743c01a083ba69e93479e82d3be199ac0"
Supereg marked this conversation as resolved.
Show resolved Hide resolved
}
},
{
Expand Down Expand Up @@ -249,8 +248,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/StanfordSpezi/SpeziNotifications",
"state" : {
"branch" : "feature/initial-version",
"revision" : "535d4763882d24d56b58781977513de8c46b1823"
"revision" : "7f24fce6b969d0f1a7bcc0e228af1c01e55fb59f",
"version" : "1.0.2"
}
},
{
Expand All @@ -276,8 +275,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/StanfordSpezi/SpeziScheduler.git",
"state" : {
"branch" : "feature/il-notifications-support",
"revision" : "7ad6b40b39bf85536dcbd1b9ac8e8f8f3f86dbbd"
"branch" : "main",
"revision" : "7ba1ed88760f27cc6d80f75d2993a59f0823be04"
Supereg marked this conversation as resolved.
Show resolved Hide resolved
}
},
{
Expand All @@ -294,8 +293,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/StanfordSpezi/SpeziViews.git",
"state" : {
"branch" : "feature/additional-infrastructure",
"revision" : "7eb5c529ff266b50e05a620427ed2ef6d1da8e80"
"revision" : "f87514406bb57ae67d0040eec5454fff55104143",
"version" : "1.7.0"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion TemplateApplication/Account/AccountButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ struct AccountButton: View {


var body: some View {
Button("ACCOUNT_TITLE", systemImage: "person.crop.circle") {
Button("Your Account", systemImage: "person.crop.circle") {
isPresented = true
}
}
Expand Down
2 changes: 1 addition & 1 deletion TemplateApplication/Account/AccountSetupHeader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ struct AccountSetupHeader: View {

var body: some View {
VStack {
Text("ACCOUNT_TITLE")
Text("Your Account")
Supereg marked this conversation as resolved.
Show resolved Hide resolved
.font(.largeTitle)
.bold()
.padding(.bottom)
Expand Down
4 changes: 2 additions & 2 deletions TemplateApplication/Account/AccountSheet.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ struct AccountSheet: View {
NavigationLink {
ContributionsList(projectLicense: .mit)
} label: {
Text("LICENSE_INFO_TITLE")
Text("License Information")
}
}
} else {
Expand All @@ -52,7 +52,7 @@ struct AccountSheet: View {

var closeButton: some ToolbarContent {
ToolbarItem(placement: .cancellationAction) {
Button("CLOSE") {
Button("Close") {
dismiss()
}
}
Expand Down
2 changes: 1 addition & 1 deletion TemplateApplication/Contacts/Contacts.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ struct Contacts: View {
var body: some View {
NavigationStack {
ContactsList(contacts: contacts)
.navigationTitle(String(localized: "CONTACTS_NAVIGATION_TITLE"))
.navigationTitle("Contacts")
.toolbar {
if account != nil {
AccountButton(isPresented: $presentingAccount)
Expand Down
4 changes: 2 additions & 2 deletions TemplateApplication/Home.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ struct HomeView: View {

var body: some View {
TabView(selection: $selectedTab) {
Tab("SCHEDULE_TAB_TITLE", systemImage: "list.clipboard", value: .schedule) {
Tab("Schedule", systemImage: "list.clipboard", value: .schedule) {
ScheduleView(presentingAccount: $presentingAccount)
}
Tab("CONTACTS_TAB_TITLE", systemImage: "person.fill", value: .contact) {
Tab("Contacts", systemImage: "person.fill", value: .contact) {
Contacts(presentingAccount: $presentingAccount)
}
}
Expand Down
2 changes: 1 addition & 1 deletion TemplateApplication/Onboarding/AccountOnboarding.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ struct AccountOnboarding: View {
AccountSetupHeader()
} continue: {
OnboardingActionsView(
"ACCOUNT_NEXT",
"Next",
action: {
onboardingNavigationPath.nextStep()
}
Expand Down
4 changes: 2 additions & 2 deletions TemplateApplication/Onboarding/HealthKitPermissions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ struct HealthKitPermissions: View {
contentView: {
VStack {
OnboardingTitleView(
title: "HEALTHKIT_PERMISSIONS_TITLE",
title: "HealthKit Access",
subtitle: "HEALTHKIT_PERMISSIONS_SUBTITLE"
)
Spacer()
Expand All @@ -38,7 +38,7 @@ struct HealthKitPermissions: View {
}
}, actionView: {
OnboardingActionsView(
"HEALTHKIT_PERMISSIONS_BUTTON",
"Grant Access",
action: {
do {
healthKitProcessing = true
Expand Down
12 changes: 6 additions & 6 deletions TemplateApplication/Onboarding/InterestingModules.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,27 @@ struct InterestingModules: View {

var body: some View {
SequentialOnboardingView(
title: "INTERESTING_MODULES_TITLE",
title: "Interesting Modules",
subtitle: "INTERESTING_MODULES_SUBTITLE",
content: [
SequentialOnboardingView.Content(
title: "INTERESTING_MODULES_AREA1_TITLE",
title: "Onboarding",
description: "INTERESTING_MODULES_AREA1_DESCRIPTION"
),
SequentialOnboardingView.Content(
title: "INTERESTING_MODULES_AREA2_TITLE",
title: "HL7 FHIR",
description: "INTERESTING_MODULES_AREA2_DESCRIPTION"
),
SequentialOnboardingView.Content(
title: "INTERESTING_MODULES_AREA3_TITLE",
title: "Contact",
description: "INTERESTING_MODULES_AREA3_DESCRIPTION"
),
SequentialOnboardingView.Content(
title: "INTERESTING_MODULES_AREA4_TITLE",
title: "HealthKit Data Source",
description: "INTERESTING_MODULES_AREA4_DESCRIPTION"
)
],
actionText: "INTERESTING_MODULES_BUTTON",
actionText: "Next",
action: {
onboardingNavigationPath.nextStep()
}
Expand Down
6 changes: 3 additions & 3 deletions TemplateApplication/Onboarding/NotificationPermissions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ struct NotificationPermissions: View {
contentView: {
VStack {
OnboardingTitleView(
title: "NOTIFICATION_PERMISSIONS_TITLE",
subtitle: "NOTIFICATION_PERMISSIONS_SUBTITLE"
title: "Notifications",
subtitle: "Spezi Scheduler Notifications."
)
Spacer()
Image(systemName: "bell.square.fill")
Expand All @@ -39,7 +39,7 @@ struct NotificationPermissions: View {
}
}, actionView: {
OnboardingActionsView(
"NOTIFICATION_PERMISSIONS_BUTTON",
"Allow Notifications",
action: {
do {
notificationProcessing = true
Expand Down
Loading
Loading