Skip to content

Commit

Permalink
feature/task1-adjust-contacts (#3)
Browse files Browse the repository at this point in the history
# Update Contact Info + App Icon

## ♻️ Current situation & Problem
- The application required an app icon update, accent color update to
align with app icon color scheme, and contact information update for the
project contacts.


## ⚙️ Release Notes 
- No new features added, only visual changes. Contact view information
for three main contacts changed to only allow for email contact and
website viewing.


## 📚 Documentation
- No need to update documentation, only smaller visual changes


## ✅ Testing
- Updated text within prior working version of app, visual changes


## 📝 Code of Conduct & Contributing Guidelines 

By submitting creating this pull request, you agree to follow our [Code
of
Conduct](https://github.com/CS342/.github/blob/main/CODE_OF_CONDUCT.md)
and [Contributing
Guidelines](https://github.com/CS342/.github/blob/main/CONTRIBUTING.md):
- [x] I agree to follow the [Code of
Conduct](https://github.com/CS342/.github/blob/main/CODE_OF_CONDUCT.md)
and [Contributing
Guidelines](https://github.com/CS342/.github/blob/main/CONTRIBUTING.md).
  • Loading branch information
bryant-jimenez authored Jan 22, 2024
1 parent 1d168bf commit eca33c2
Show file tree
Hide file tree
Showing 6 changed files with 101 additions and 25 deletions.
4 changes: 0 additions & 4 deletions Behavior.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 @@ -107,7 +106,6 @@
2FC94CD4298B0A1D009C8209 /* Behavior.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = Behavior.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 Down Expand Up @@ -241,7 +239,6 @@
653A255428338800005D4D48 /* Assets.xcassets */,
2FA0BFEC2ACC977500E0EF83 /* Localizable.xcstrings */,
2FE5DC2C29EDD78E004B9AB4 /* ConsentDocument.md */,
2FE5DC2A29EDD78D004B9AB4 /* AppIcon.png */,
2FE5DC5529EDD811004B9AB4 /* SocialSupportQuestionnaire.json */,
);
path = Resources;
Expand Down Expand Up @@ -522,7 +519,6 @@
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 */,
Expand Down
69 changes: 51 additions & 18 deletions Behavior/Contacts/Contacts.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,64 @@ struct Contacts: View {
let contacts = [
Contact(
name: PersonNameComponents(
givenName: "Leland",
familyName: "Stanford"
givenName: "Matthew",
familyName: "Jörke,"
),
image: Image(systemName: "figure.wave.circle"), // swiftlint:disable:this accessibility_label_for_image
title: "University Founder",
description: String(localized: "LELAND_STANFORD_BIO"),
image: Image(systemName: "person.crop.circle"), // swiftlint:disable:this accessibility_label_for_image
title: "PhD Student",
description: String(localized: "MATTHEW_JOERKE_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"
return address
}(),
contactOptions: [
.call("+1 (650) 723-2300"),
.text("+1 (650) 723-2300"),
.email(addresses: ["[email protected]"]),
.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://stanford.edu") {
if let url = URL(string: "https://matthewjoerke.com/") {
UIApplication.shared.open(url)
}
}
)
]
),
Contact(
name: PersonNameComponents(
givenName: "Emma",
familyName: "Brunskill"
),
image: Image(systemName: "person.crop.circle"), // swiftlint:disable:this accessibility_label_for_image
title: "Associate Professor (Tenured)",
description: String(localized: "EMMA_BRUNSKILL_BIO"),
organization: "Stanford University",
contactOptions: [
.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://cs.stanford.edu/people/ebrun/") {
UIApplication.shared.open(url)
}
}
)
]
),
Contact(
name: PersonNameComponents(
givenName: "James",
familyName: "Landay,"
),
image: Image(systemName: "person.crop.circle"), // swiftlint:disable:this accessibility_label_for_image
title: "Professor of Computer Science",
description: String(localized: "JAMES_LANDAY_BIO"),
organization: "Stanford University",
contactOptions: [
.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/james-landay") {
UIApplication.shared.open(url)
}
}
Expand Down
Binary file removed Behavior/Resources/AppIcon.png
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,33 @@
{
"colors" : [
{
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "1.000",
"green" : "0.526",
"red" : "0.981"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "1.000",
"green" : "0.526",
"red" : "0.981"
}
},
"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.
26 changes: 23 additions & 3 deletions Behavior/Resources/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,16 @@
}
}
},
"EMMA_BRUNSKILL_BIO" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Emma Brunskill is an associate tenured professor in the Computer Science Department at Stanford University. Prof. Brunskill's goal is to create AI systems that learn from few samples to robustly make good decisions, motivated by our applications to healthcare and education. Their lab is part of the Stanford AI Lab, the Stanford Statistical ML group, and AI Safety @Stanford. Prof. Brunskill was previously an assistant professor at Carnegie Mellon University, whose work has been honored by early faculty career awards (National Science Foundation, Office of Naval Research, Microsoft Research (1 of 7 worldwide) ). Their work, together with their amazing lab members, has received several best research paper nominations (CHI, EDMx3) and awards (UAI, RLDM, ITS). They are privileged to serve on the International Machine Learning Society (which coordinates ICML) Board, the Khan Academy Research Advisory Board, the Stanford Faculty Women's Forum Steering Committee, and previously served on the Women in Machine Learning (WIML) board."
}
}
}
},
"HEALTHKIT_PERMISSIONS_BUTTON" : {
"localizations" : {
"en" : {
Expand Down Expand Up @@ -286,12 +296,12 @@
}
}
},
"LELAND_STANFORD_BIO" : {
"JAMES_LANDAY_BIO" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Amasa Leland Stanford (March 9, 1824 – June 21, 1893) was an American industrialist and politician. [...] He and his wife Jane were also the founders of Stanford University, which they named after their late son.\n[https://en.wikipedia.org/wiki/Leland_Stanford]"
"value" : "James Landay is a Professor of Computer Science and the Anand Rajaraman and Venky Harinarayan Professor in the School of Engineering at Stanford University. He specializes in human-computer interaction. Landay is the co-founder and Vice-Director of the Stanford Institute for Human-centered Artificial Intelligence (HAI). Prior to joining Stanford, Landay was a Professor of Information Science at Cornell Tech in New York City for one year and a Professor of Computer Science & Engineering at the University of Washington for 10 years. Landay received his BS in EECS from UC Berkeley in 1990, and MS and PhD in Computer Science from Carnegie Mellon University in 1993 and 1996, respectively. His PhD dissertation was the first to demonstrate the use of sketching in user interface design tools."
}
}
}
Expand All @@ -306,6 +316,16 @@
}
}
},
"MATTHEW_JOERKE_BIO" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Matthew is a fourth year PhD student at Stanford University, where he is co-advised by Prof. Emma Brunskill and Prof. James Landay. His research is at the intersection of human-computer interaction and machine learning, with an emphasis on studying and designing technology to promote wellbeing."
}
}
}
},
"MOCK_WEB_SERVICE_TAB_TITLE" : {
"comment" : "MARK: - Mock Upload Data Storage Provider",
"localizations" : {
Expand Down Expand Up @@ -542,4 +562,4 @@
}
},
"version" : "1.0"
}
}

0 comments on commit eca33c2

Please sign in to comment.