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

WeekendUpdate #11

Merged
merged 2 commits into from
Mar 29, 2023
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
26 changes: 13 additions & 13 deletions TemplateApplication/Supporting Files/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
// MARK: - Onboarding

// MARK: Welcome
"WELCOME_TITLE" = "Access\nClinical Trials";
"WELCOME_SUBTITLE" = "You deserve access to clinical trials.";
"WELCOME_TITLE" = "What We\nOffer";
"WELCOME_SUBTITLE" = "Own your health journey.";

"WELCOME_AREA1_TITLE" = "Access Your Health Records";
"WELCOME_AREA1_DESCRIPTION" = "We help you connect with your Health System to download your records.";
"WELCOME_AREA1_DESCRIPTION" = "We help you connect to your Health System(s) to download your records.";

"WELCOME_AREA2_TITLE" = "Search for Active Trials";
"WELCOME_AREA2_DESCRIPTION" = "Search ClinicalTrials.gov to find the right trial for you.";
Expand All @@ -26,19 +26,19 @@

// MARK: Interesting Modules
"INTERESTING_MODULES_TITLE" = "How It Works";
"INTERESTING_MODULES_SUBTITLE" = "These are the steps to own your data and connect with trials that matter.";
"INTERESTING_MODULES_SUBTITLE" = "These are the steps to OwnYourData \nand connect with trials that matter.";

"INTERESTING_MODULES_AREA1_TITLE" = "Download Your Records";
"INTERESTING_MODULES_AREA1_DESCRIPTION" = "Select your health system and download your health records to your phone.";
"INTERESTING_MODULES_AREA1_DESCRIPTION" = "Select your health system(s) and download your health records to your phone.";

"INTERESTING_MODULES_AREA2_TITLE" = "Add Relevant Documents";
"INTERESTING_MODULES_AREA2_DESCRIPTION" = "Scan important records with the camera on your phone to complete the records.";
"INTERESTING_MODULES_AREA2_DESCRIPTION" = "Scan important records with the camera on your phone to complete your records.";

"INTERESTING_MODULES_AREA3_TITLE" = "Discover Clinical Trials";
"INTERESTING_MODULES_AREA3_DESCRIPTION" = "Search ClinicalTrials.gov to find trials that match your needs.";
"INTERESTING_MODULES_AREA3_DESCRIPTION" = "Find clinical trials supported by the National Cancer Institute.";

"INTERESTING_MODULES_AREA4_TITLE" = "Share Your Data";
"INTERESTING_MODULES_AREA4_DESCRIPTION" = "Share all or selective health data via PDF with family or providers.";
"INTERESTING_MODULES_AREA4_DESCRIPTION" = "Control what you share and who you share it with.";

"INTERESTING_MODULES_BUTTON" = "Register";

Expand All @@ -52,20 +52,20 @@

// MARK: Account
"ACCOUNT_TITLE" = "Your Account";
"ACCOUNT_SUBTITLE" = "The Template Application demonstrates the usage of the Firebase Account Module.";
"ACCOUNT_SETUP_DESCRIPTION" = "The login and sign up buttons use the Account Login and SignUp views.";
"ACCOUNT_SIGNED_IN_DESCRIPTION" = "You are successfully signed in with the following account:";
"ACCOUNT_SUBTITLE" = "Create an account with OwnYourData so we can help you. We don't see or store any of your health data. We only store your name and email address.";
"ACCOUNT_SETUP_DESCRIPTION" = "We respect your privacy. All data storage and sharing happens directly from your phone.";
"ACCOUNT_SIGNED_IN_DESCRIPTION" = "You signed in with the following account:";
"ACCOUNT_NEXT" = "Next";
"ACCOUNT_SIGN_UP" = "Sign Up";
"ACCOUNT_LOGIN" = "Login";

"USER_VIEW_LOADING" = "Loading user information ...";

"LOGIN_TITLE" = "Login";
"LOGIN_SUBTITLE" = "The Template Application demonstrates the usage of the Firebase Account Module to enable different authentication services, including an email and password-based login.";
"LOGIN_SUBTITLE" = "Take control of your health journey with OwnYourData!";

"SIGN_UP_TITLE" = "Sign Up";
"SIGN_UP_SUBTITLE" = "Sign up with OwnYourData to start collecting your health data, looking for clinical trials and sharing with anyone YOU want.";
"SIGN_UP_SUBTITLE" = "Join OwnYourData to easily gather all your health information, discover clinical trials, and securely share your data with chosen providers, putting you in control of your health care journey.";


// MARK: HealthKit
Expand Down
2 changes: 1 addition & 1 deletion TemplateApplication/Tabs/AddDataView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ struct AddDataView: View {
Spacer()
OwnYourDataSection(
title: "Connect to \nHealth System",
buttonTitle: "Select Health System",
buttonTitle: "Add Health System",
destination: AddRecordInstructView()
)
OwnYourDataSection(
Expand Down
2 changes: 1 addition & 1 deletion TemplateApplication/Tabs/Home.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ struct Home: View {
.multilineTextAlignment(.center)
Spacer()
OwnYourDataButton(
title: "Records",
title: "Health Records",
destination: ViewRecordsView()
)
OwnYourDataButton(
Expand Down
11 changes: 1 addition & 10 deletions TemplateApplication/Tabs/ShareView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,11 @@ struct ShareView: View {
buttonTitle: "Scanned Documents",
destination: DocumentGallery()
)
OwnYourDataButton(
title: "Apple Health Documents",
action: {
guard let url = URL(string: "x-apple-health://") else {
fatalError("Could not create a Health App URL")
}
openURL(url)
}
)
}
}
.padding(.bottom, 30)
}
}
}


struct ShareView_Previews: PreviewProvider {
Expand Down
2 changes: 1 addition & 1 deletion TemplateApplicationUITests/OnboardingTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ class OnboardingTests: XCTestCase {
func testOnboardingFlow() throws {
let app = XCUIApplication()

XCTAssertTrue(app.staticTexts["Access\nClinical Trials"].waitForExistence(timeout: 5))
XCTAssertTrue(app.staticTexts["What We\nOffer"].waitForExistence(timeout: 5))
}
}