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.

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

Task 1 tkanell #10

Merged
merged 10 commits into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions Stronger.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,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 */; };
Expand Down Expand Up @@ -59,6 +58,7 @@
2FE5DCB129EE6107004B9AB4 /* AccountOnboarding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FE5DCAC29EE6107004B9AB4 /* AccountOnboarding.swift */; };
2FF53D8B2A8725DE00042B76 /* SpeziMockWebService in Frameworks */ = {isa = PBXBuildFile; productRef = 2FF53D8A2A8725DE00042B76 /* SpeziMockWebService */; };
2FF53D8D2A8729D600042B76 /* StrongerStandard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FF53D8C2A8729D600042B76 /* StrongerStandard.swift */; };
405239E02B574BA500EEA67A /* AppIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 405239DF2B574BA500EEA67A /* AppIcon.png */; };
5661551D2AB8384200209B80 /* SwiftPackageList in Frameworks */ = {isa = PBXBuildFile; productRef = 5661551C2AB8384200209B80 /* SwiftPackageList */; };
566155292AB8447C00209B80 /* Package+LicenseType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566155282AB8447C00209B80 /* Package+LicenseType.swift */; };
5661552E2AB854C000209B80 /* PackageHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5661552D2AB854C000209B80 /* PackageHelper.swift */; };
Expand Down Expand Up @@ -107,7 +107,6 @@
2FC94CD4298B0A1D009C8209 /* Stronger.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = Stronger.xctestplan; sourceTree = "<group>"; };
2FC975A72978F11A00BA99FE /* Home.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Home.swift; sourceTree = "<group>"; };
2FE5DC2529EDD38A004B9AB4 /* Contacts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Contacts.swift; sourceTree = "<group>"; };
2FE5DC2A29EDD78D004B9AB4 /* AppIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AppIcon.png; 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 All @@ -128,6 +127,7 @@
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 /* StrongerStandard.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StrongerStandard.swift; sourceTree = "<group>"; };
405239DF2B574BA500EEA67A /* AppIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AppIcon.png; sourceTree = "<group>"; };
566155282AB8447C00209B80 /* Package+LicenseType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Package+LicenseType.swift"; sourceTree = "<group>"; };
5661552D2AB854C000209B80 /* PackageHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PackageHelper.swift; sourceTree = "<group>"; };
5680DD382AB8983D004E6D4A /* PackageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PackageCell.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -240,8 +240,8 @@
children = (
653A255428338800005D4D48 /* Assets.xcassets */,
2FA0BFEC2ACC977500E0EF83 /* Localizable.xcstrings */,
405239DF2B574BA500EEA67A /* AppIcon.png */,
2FE5DC2C29EDD78E004B9AB4 /* ConsentDocument.md */,
2FE5DC2A29EDD78D004B9AB4 /* AppIcon.png */,
2FE5DC5529EDD811004B9AB4 /* SocialSupportQuestionnaire.json */,
);
path = Resources;
Expand Down Expand Up @@ -522,10 +522,10 @@
buildActionMask = 2147483647;
files = (
2FC3439229EE634B002D773C /* ConsentDocument.md in Resources */,
2FC3439129EE6349002D773C /* AppIcon.png in Resources */,
653A255528338800005D4D48 /* Assets.xcassets in Resources */,
2FC3439029EE6346002D773C /* SocialSupportQuestionnaire.json in Resources */,
2FA0BFED2ACC977500E0EF83 /* Localizable.xcstrings in Resources */,
405239E02B574BA500EEA67A /* AppIcon.png in Resources */,
2F6025CB29BBE70F0045459E /* GoogleService-Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
47 changes: 40 additions & 7 deletions Stronger/Contacts/Contacts.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,64 @@
let contacts = [
Contact(
name: PersonNameComponents(
givenName: "Leland",
familyName: "Stanford"
givenName: "Mike",
familyName: "Baiocchi, PhD"
),
image: Image(systemName: "figure.wave.circle"), // swiftlint:disable:this accessibility_label_for_image
title: "University Founder",
description: String(localized: "LELAND_STANFORD_BIO"),
title: "Principal Investigator",
description: String(localized: "MICHAEL_BAIOCCHI_BIO"),
organization: "Stanford University",
address: {
let address = CNMutablePostalAddress()
address.country = "USA"
address.state = "CA"
address.postalCode = "94305"
address.city = "Stanford"
address.street = "450 Serra Mall"
address.street = "1265 Welch Road"
return address
}(),
contactOptions: [
.call("+1 (650) 723-2300"),
.text("+1 (650) 723-2300"),
.email(addresses: ["contact@stanford.edu"]),
.email(addresses: ["baiocchi@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/michael-baiocchi") {
UIApplication.shared.open(url)
}
}

Check warning on line 46 in Stronger/Contacts/Contacts.swift

View check run for this annotation

Codecov / codecov/patch

Stronger/Contacts/Contacts.swift#L43-L46

Added lines #L43 - L46 were not covered by tests
)
]
),
Contact(
name: PersonNameComponents(
givenName: "Marily",
familyName: "Oppezzo, PhD, MS, RDN, DipACLM"
),
image: Image(systemName: "figure.wave.circle"), // swiftlint:disable:this accessibility_label_for_image
title: "Principal Investigator",
description: String(localized: "MARILY_OPPEZZO_BIO"),
organization: "Stanford University",
address: {
let address = CNMutablePostalAddress()
address.country = "USA"
address.state = "CA"
address.postalCode = "94305"
address.city = "Stanford"
address.street = "Mail Code: 5411"
return address
}(),
contactOptions: [
.call("+1 (650) 723-2300"),
.text("+1 (650) 723-2300"),
.email(addresses: ["[email protected]"]),
ContactOption(
image: Image(systemName: "safari.fill"), // swiftlint:disable:this accessibility_label_for_image
title: "Website",
action: {
if let url = URL(string: "https://profiles.stanford.edu/marily-oppezzo") {

Check warning on line 76 in Stronger/Contacts/Contacts.swift

View check run for this annotation

Codecov / codecov/patch

Stronger/Contacts/Contacts.swift#L76

Added line #L76 was not covered by tests
UIApplication.shared.open(url)
}
}
Expand Down
Binary file modified Stronger/Resources/AppIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"colors" : [
{
"color" : {
"platform" : "universal",
"reference" : "systemRedColor"
},
"idiom" : "universal"
}
],
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions Stronger/Resources/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@

},
"LELAND_STANFORD_BIO" : {
"extractionState" : "stale",
"localizations" : {
"en" : {
"stringUnit" : {
Expand All @@ -309,6 +310,28 @@
}
}
},
"MARILY_OPPEZZO_BIO" : {
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Marily Oppezzo is a behavioral and learning scientist. She completed her doctorate in Educational Psychology at Stanford in 2013. She also is a registered dietitian and has her master's of nutritional science. She completed her dietetic internship at the Palo Alto Veterans Hospital, and currently consults as a sports dietitian for Stanford's Runsafe program. Her research interests leverage her interdisciplinary training, with a focus on how to get people to change to improve their health and well-being. Specifically, these areas include: using social media to motivate physical activity changes in those with or at risk for heart disease; culturally tailoring nutrition and physical activity recommendations and education materials for an Alaskan native population; how walking can be used to improve people's cognitive and creative thinking; and applying learning theories to medical education topics."
}
}
}
},
"MICHAEL_BAIOCCHI_BIO" : {
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Professor Baiocchi is a PhD statistician in Stanford University's Epidemiology and Population Health Department. He thinks a lot about behavioral interventions and how to rigorously evaluate if and how they work. Methodologically, his work focuses on creating statistically rigorous methods for causal inference that are transparent and easy to critique. He designed -- and was the principle investigator for -- two large randomized studies of interventions to prevent sexual assault in the settlements of Nairobi, Kenya."
}
}
}
},
"MOCK_WEB_SERVICE_TAB_TITLE" : {
"comment" : "MARK: - Mock Upload Data Storage Provider",
"localizations" : {
Expand Down
6 changes: 6 additions & 0 deletions Stronger/Resources/new_app_icon.jpeg.license
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

This source file is part of the Stronger based on the Stanford Spezi Template Application project

SPDX-FileCopyrightText: 2023 Stanford University

SPDX-License-Identifier: MIT