diff --git a/Intake.xcodeproj/project.pbxproj b/Intake.xcodeproj/project.pbxproj index 858307f..3d4bcd3 100644 --- a/Intake.xcodeproj/project.pbxproj +++ b/Intake.xcodeproj/project.pbxproj @@ -23,7 +23,6 @@ 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 */; }; 2FC975A82978F11A00BA99FE /* Home.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FC975A72978F11A00BA99FE /* Home.swift */; }; 2FE5DC2629EDD38A004B9AB4 /* Contacts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FE5DC2529EDD38A004B9AB4 /* Contacts.swift */; }; @@ -107,7 +106,6 @@ 2FC94CD4298B0A1D009C8209 /* Intake.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = Intake.xctestplan; sourceTree = ""; }; 2FC975A72978F11A00BA99FE /* Home.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Home.swift; sourceTree = ""; }; 2FE5DC2529EDD38A004B9AB4 /* Contacts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Contacts.swift; sourceTree = ""; }; - 2FE5DC2A29EDD78D004B9AB4 /* AppIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AppIcon.png; sourceTree = ""; }; 2FE5DC2C29EDD78E004B9AB4 /* ConsentDocument.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = ConsentDocument.md; sourceTree = ""; }; 2FE5DC2F29EDD7CA004B9AB4 /* Consent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Consent.swift; sourceTree = ""; }; 2FE5DC3029EDD7CA004B9AB4 /* HealthKitPermissions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HealthKitPermissions.swift; sourceTree = ""; }; diff --git a/Intake/Contacts/Contacts.swift b/Intake/Contacts/Contacts.swift index 99a9404..8691811 100644 --- a/Intake/Contacts/Contacts.swift +++ b/Intake/Contacts/Contacts.swift @@ -16,12 +16,12 @@ struct Contacts: View { let contacts = [ Contact( name: PersonNameComponents( - givenName: "Leland", - familyName: "Stanford" + givenName: "Oliver O.", + familyName: "Aalami" ), - image: Image(systemName: "figure.wave.circle"), // swiftlint:disable:this accessibility_label_for_image - title: "University Founder", - description: String(localized: "LELAND_STANFORD_BIO"), + image: Image("ProfilePicture"), // swiftlint:disable:this accessibility_label_for_image + title: "CLINICAL PROFESSOR, SURGERY - VASCULAR SURGERY", + description: String(localized: "OLIVER_AALAMI_BIO"), organization: "Stanford University", address: { let address = CNMutablePostalAddress() @@ -29,18 +29,19 @@ struct Contacts: View { address.state = "CA" address.postalCode = "94305" address.city = "Stanford" - address.street = "450 Serra Mall" + address.street = "300 Pasteur Dr" + address.subAdministrativeArea = "Rm H3640 MC 5308" return address }(), contactOptions: [ - .call("+1 (650) 723-2300"), - .text("+1 (650) 723-2300"), - .email(addresses: ["contact@stanford.edu"]), + .call("+1 (650) 725-5227"), + .text("+1 (650) 725-5227"), + .email(addresses: ["aalami@stanford.edu"]), ContactOption( image: Image(systemName: "safari.fill"), // swiftlint:disable:this accessibility_label_for_image title: "Website", action: { - if let url = URL(string: "https://stanford.edu") { + if let url = URL(string: "https://profiles.stanford.edu/oliver-aalami") { UIApplication.shared.open(url) } } diff --git a/Intake/Resources/AppIcon.png b/Intake/Resources/AppIcon.png deleted file mode 100644 index 7414dd9..0000000 Binary files a/Intake/Resources/AppIcon.png and /dev/null differ diff --git a/Intake/Resources/Assets.xcassets/AccentColor.colorset/Contents.json b/Intake/Resources/Assets.xcassets/AccentColor.colorset/Contents.json index eb87897..7d89167 100644 --- a/Intake/Resources/Assets.xcassets/AccentColor.colorset/Contents.json +++ b/Intake/Resources/Assets.xcassets/AccentColor.colorset/Contents.json @@ -1,6 +1,33 @@ { "colors" : [ { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0.640", + "green" : "0.238", + "red" : "0.053" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0.910", + "green" : "1.000", + "red" : "0.685" + } + }, "idiom" : "universal" } ], diff --git a/Intake/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon.png b/Intake/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon.png index 7414dd9..c485b0a 100644 Binary files a/Intake/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon.png and b/Intake/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon.png differ diff --git a/Intake/Resources/Assets.xcassets/ProfilePicture.imageset/Contents.json b/Intake/Resources/Assets.xcassets/ProfilePicture.imageset/Contents.json new file mode 100644 index 0000000..feec583 --- /dev/null +++ b/Intake/Resources/Assets.xcassets/ProfilePicture.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "ProfilePicture.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "localizable" : true + } +} diff --git a/Intake/Resources/Assets.xcassets/ProfilePicture.imageset/Contents.json.license b/Intake/Resources/Assets.xcassets/ProfilePicture.imageset/Contents.json.license new file mode 100644 index 0000000..db20e1c --- /dev/null +++ b/Intake/Resources/Assets.xcassets/ProfilePicture.imageset/Contents.json.license @@ -0,0 +1,5 @@ +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 \ No newline at end of file diff --git a/Intake/Resources/Assets.xcassets/ProfilePicture.imageset/ProfilePicture.png b/Intake/Resources/Assets.xcassets/ProfilePicture.imageset/ProfilePicture.png new file mode 100644 index 0000000..5307a0c Binary files /dev/null and b/Intake/Resources/Assets.xcassets/ProfilePicture.imageset/ProfilePicture.png differ diff --git a/Intake/Resources/Assets.xcassets/ProfilePicture.imageset/ProfilePicture.png.license b/Intake/Resources/Assets.xcassets/ProfilePicture.imageset/ProfilePicture.png.license new file mode 100644 index 0000000..db20e1c --- /dev/null +++ b/Intake/Resources/Assets.xcassets/ProfilePicture.imageset/ProfilePicture.png.license @@ -0,0 +1,5 @@ +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 \ No newline at end of file diff --git a/Intake/Resources/Assets.xcassets/ProfilePicture.png b/Intake/Resources/Assets.xcassets/ProfilePicture.png new file mode 100644 index 0000000..5307a0c Binary files /dev/null and b/Intake/Resources/Assets.xcassets/ProfilePicture.png differ diff --git a/Intake/Resources/Assets.xcassets/ProfilePicture.png.license b/Intake/Resources/Assets.xcassets/ProfilePicture.png.license new file mode 100644 index 0000000..db20e1c --- /dev/null +++ b/Intake/Resources/Assets.xcassets/ProfilePicture.png.license @@ -0,0 +1,5 @@ +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 \ No newline at end of file diff --git a/Intake/Resources/Localizable.xcstrings b/Intake/Resources/Localizable.xcstrings index 78e63f6..d1f9872 100644 --- a/Intake/Resources/Localizable.xcstrings +++ b/Intake/Resources/Localizable.xcstrings @@ -287,6 +287,7 @@ } }, "LELAND_STANFORD_BIO" : { + "extractionState" : "stale", "localizations" : { "en" : { "stringUnit" : { @@ -317,6 +318,58 @@ } } }, + "NOTIFICATION_PERMISSIONS_BUTTON" : { + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Allow Notifications" + } + } + } + }, + "NOTIFICATION_PERMISSIONS_DESCRIPTION" : { + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "The Spezi Scheduler module enables to send out local notifications when a new event of a task is scheduled." + } + } + } + }, + "NOTIFICATION_PERMISSIONS_SUBTITLE" : { + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Spezi Scheduler Notifications." + } + } + } + }, + "NOTIFICATION_PERMISSIONS_TITLE" : { + "comment" : "MARK: Notifications", + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Notifications" + } + } + } + }, + "OLIVER_AALAMI_BIO" : { + "extractionState" : "manual", + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Dr. Oliver O. Aalami is a Clinical Professor of Surgery at Stanford University and a vascular surgeon based in Palo Alto, California. He is affiliated with Stanford Health Care and the VA Palo Alto Health Care System.\nDr. Aalami is also the Director of Biodesign for Digital Health at the Stanford Byers Center for Biodesign. He co-founded Spezi (formerly CardinalKit) and is passionate about clinically validating smartphone and smartwatch sensors in patients with cardiovascular disease." + } + } + } + }, "PROJECT_LICENSE_DESCRIPTION" : { "localizations" : { "en" : {