From 5dd829c12955eb2f9b73fc1488980ea880950099 Mon Sep 17 00:00:00 2001 From: Vishnu Ravi Date: Thu, 10 Oct 2024 19:04:13 -0400 Subject: [PATCH 1/4] Update onboarding flow --- MyHeartCounts/Resources/Localizable.xcstrings | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/MyHeartCounts/Resources/Localizable.xcstrings b/MyHeartCounts/Resources/Localizable.xcstrings index d598170..e2cb325 100644 --- a/MyHeartCounts/Resources/Localizable.xcstrings +++ b/MyHeartCounts/Resources/Localizable.xcstrings @@ -36,7 +36,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "The MyHeartCounts demonstrates the usage of the Firebase Account Module." + "value" : "Log In to the MyHeartCounts Study" } } } @@ -119,7 +119,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "This onboarding step allows you to customize the onboarding flow to explain how the application uses the HealhtKit data and allows a user to cusomize the selection." + "value" : "The data will be used to understand how your activity is related to your condition." } } } @@ -129,7 +129,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "Spezi can access data from HealthKit using the HealthKitDataSource module." + "value" : "The MyHeartCounts app will collect activity data from your phone and/or watch while you are enrolled in the study." } } } @@ -150,7 +150,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "The onboarding module allows you to build an onboarding flow like this one." + "value" : "Please make sure your keep your phone switched on and your Apple Watch on all day during the study." } } } @@ -291,7 +291,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "The Spezi Scheduler module enables to send out local notifications when a new event of a task is scheduled." + "value" : "The MyHeartCounts app will send you notifications to remind you to perform tasks." } } } @@ -301,7 +301,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "Spezi Scheduler Notifications." + "value" : "MyHeartCounts Notifications" } } } @@ -393,7 +393,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "The Spezi Framework builds the foundation of this application." + "value" : "We are asking you to join in a global study of cardiovascular health." } } } @@ -403,7 +403,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "The Spezi Framework" + "value" : "Join the Study" } } } @@ -413,7 +413,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "Spezi uses the Swift Package Manager to import it as a dependency." + "value" : "We make it easy to “donate” data about your physical activity and sleep, and assess your fitness and risk factors for a better heart." } } } @@ -423,7 +423,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "Swift Package Manager" + "value" : "Donate Your Data" } } } @@ -433,7 +433,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "Spezi offers several modules including HealthKit integration, questionnaires, and more ..." + "value" : "With your help we can make your heart count in the fight to stop heart disease and stroke." } } } @@ -443,7 +443,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "Spezi Modules" + "value" : "Protect Your Heart" } } } @@ -463,7 +463,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "This application demonstrates several Spezi features & modules." + "value" : "Welcome to the MyHeart Counts research study!" } } } @@ -474,7 +474,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "Spezi\nMyHeartCounts" + "value" : "MyHeartCounts" } } } From a0f6babd04a5df0fe327d5e24a2eaf118b8b756f Mon Sep 17 00:00:00 2001 From: Vishnu Ravi Date: Thu, 10 Oct 2024 19:15:04 -0400 Subject: [PATCH 2/4] Update icons, strings --- MyHeartCounts/Onboarding/Welcome.swift | 4 ++-- .../AccentColor.colorset/Contents.json | 9 +++++++++ MyHeartCounts/Resources/ConsentDocument.md | 2 +- MyHeartCounts/Resources/Localizable.xcstrings | 18 +++++++++--------- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/MyHeartCounts/Onboarding/Welcome.swift b/MyHeartCounts/Onboarding/Welcome.swift index 3fc563d..1971882 100644 --- a/MyHeartCounts/Onboarding/Welcome.swift +++ b/MyHeartCounts/Onboarding/Welcome.swift @@ -29,7 +29,7 @@ struct Welcome: View { ), OnboardingInformationView.Content( icon: { - Image(systemName: "shippingbox.fill") + Image(systemName: "applewatch") .accessibilityHidden(true) }, title: "WELCOME_AREA2_TITLE", @@ -37,7 +37,7 @@ struct Welcome: View { ), OnboardingInformationView.Content( icon: { - Image(systemName: "list.bullet.clipboard.fill") + Image(systemName: "heart.circle") .accessibilityHidden(true) }, title: "WELCOME_AREA3_TITLE", diff --git a/MyHeartCounts/Resources/Assets.xcassets/AccentColor.colorset/Contents.json b/MyHeartCounts/Resources/Assets.xcassets/AccentColor.colorset/Contents.json index eb87897..ea9f8e8 100644 --- a/MyHeartCounts/Resources/Assets.xcassets/AccentColor.colorset/Contents.json +++ b/MyHeartCounts/Resources/Assets.xcassets/AccentColor.colorset/Contents.json @@ -1,6 +1,15 @@ { "colors" : [ { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.082", + "green" : "0.082", + "red" : "0.549" + } + }, "idiom" : "universal" } ], diff --git a/MyHeartCounts/Resources/ConsentDocument.md b/MyHeartCounts/Resources/ConsentDocument.md index 5f9df6f..60891e7 100644 --- a/MyHeartCounts/Resources/ConsentDocument.md +++ b/MyHeartCounts/Resources/ConsentDocument.md @@ -1 +1 @@ -Spezi can render consent documents in the markdown format: This is a *markdown* **example**. +This is a placeholder for the consent document for the **MyHeartCounts** study. diff --git a/MyHeartCounts/Resources/Localizable.xcstrings b/MyHeartCounts/Resources/Localizable.xcstrings index e2cb325..9a8459e 100644 --- a/MyHeartCounts/Resources/Localizable.xcstrings +++ b/MyHeartCounts/Resources/Localizable.xcstrings @@ -150,7 +150,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "Please make sure your keep your phone switched on and your Apple Watch on all day during the study." + "value" : "This application will collect activity and sleep data to track your health." } } } @@ -160,7 +160,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "Onboarding" + "value" : "Health Data Collection" } } } @@ -170,7 +170,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "The application uses HL7 FHIR to provide a common standard to encode data gathered by the application." + "value" : "This application will provide surveys that you can take on a regular basis to track your heart health." } } } @@ -180,7 +180,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "HL7 FHIR" + "value" : "Surveys" } } } @@ -190,7 +190,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "The contact module allows you to display contact information in your application." + "value" : "This application contains an AI-based health coach to help you stay healthy." } } } @@ -200,7 +200,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "Contact" + "value" : "Coach" } } } @@ -210,7 +210,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "The HealthKit data source module allows you to fetch data from HealthKit and e.g. transform it to FHIR resources." + "value" : "This application will provide you information you can use to learn about heart health." } } } @@ -220,7 +220,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "HealthKit Data Source" + "value" : "Resources" } } } @@ -251,7 +251,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "Interesting Modules" + "value" : "About the Study" } } } From f77f39a3c8c79d18d563b96c13c9b0e0fdd5d776 Mon Sep 17 00:00:00 2001 From: Vishnu Ravi Date: Thu, 10 Oct 2024 19:29:48 -0400 Subject: [PATCH 3/4] Update schedule name --- MyHeartCounts/Home.swift | 2 +- MyHeartCounts/Resources/Localizable.xcstrings | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MyHeartCounts/Home.swift b/MyHeartCounts/Home.swift index 61a9136..e8daad3 100644 --- a/MyHeartCounts/Home.swift +++ b/MyHeartCounts/Home.swift @@ -31,7 +31,7 @@ struct HomeView: View { Contacts(presentingAccount: $presentingAccount) .tag(Tabs.contact) .tabItem { - Label("CONTACTS_TAB_TITLE", systemImage: "person.fill") + Label("CONTACTS_TAB_TITLE", systemImage: "phone") } } .sheet(isPresented: $presentingAccount) { diff --git a/MyHeartCounts/Resources/Localizable.xcstrings b/MyHeartCounts/Resources/Localizable.xcstrings index 9a8459e..535098f 100644 --- a/MyHeartCounts/Resources/Localizable.xcstrings +++ b/MyHeartCounts/Resources/Localizable.xcstrings @@ -322,7 +322,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "Schedule" + "value" : "Activities" } } } @@ -333,7 +333,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "Schedule" + "value" : "Activities" } } } @@ -373,7 +373,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "Please fill out the Social Support Questionnaire every day." + "value" : "Please fill out the Daily Check-In survey every day." } } } @@ -383,7 +383,7 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "Social Support Questionnaire" + "value" : "Daily Check-In" } } } From e48e629b36939f6e44c9f757b6c34be24943ffbd Mon Sep 17 00:00:00 2001 From: Vishnu Ravi Date: Thu, 10 Oct 2024 19:31:49 -0400 Subject: [PATCH 4/4] Fix workflows --- .github/workflows/build-and-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 1bc1ff3..51dd326 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -26,7 +26,7 @@ jobs: contents: read periphery: name: Periphery - uses: StanfordSpezi/.github/.github/workflows/periphery.yml@v2 + uses: StanfordBDHG/.github/.github/workflows/periphery.yml@v2 permissions: contents: read with: @@ -38,7 +38,7 @@ jobs: contents: read codeql: name: CodeQL - uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2 + uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2 permissions: security-events: write actions: read @@ -48,7 +48,7 @@ jobs: fastlanelane: codeql buildandtest: name: Build and Test - uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2 + uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2 permissions: contents: read with: