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.

Sign up for GitHub

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

changes to icons and description on welcome page #5

Merged
merged 5 commits into from
Jan 23, 2024
Merged

changes to icons and description on welcome page #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
98291cd
changes to icons and description on welcome page
tulika-jha Jan 14, 2024
7cd4515
adding text and symbol changes to second onboarding view
tulika-jha Jan 16, 2024
ac14ae8
Merge branch 'main' into tulika-assignment1-task2
tulika-jha Jan 20, 2024
7956d93
fixing welcome page and switching to automatic extraction state
tulika-jha Jan 20, 2024
38a1ca1
change of extraction state to automatic
tulika-jha Jan 21, 2024
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
16 changes: 12 additions & 4 deletions Stronger/Onboarding/Welcome.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,35 +21,43 @@ struct Welcome: View {
areas: [
OnboardingInformationView.Content(
icon: {
Image(systemName: "apps.iphone")
Image(systemName: "fork.knife")
philippzagar marked this conversation as resolved.
Show resolved Hide resolved
.accessibilityHidden(true)
},
title: "WELCOME_AREA1_TITLE",
description: "WELCOME_AREA1_DESCRIPTION"
),
OnboardingInformationView.Content(
icon: {
Image(systemName: "shippingbox.fill")
Image(systemName: "figure.strengthtraining.functional")
.accessibilityHidden(true)
},
title: "WELCOME_AREA2_TITLE",
description: "WELCOME_AREA2_DESCRIPTION"
),
OnboardingInformationView.Content(
icon: {
Image(systemName: "list.bullet.clipboard.fill")
Image(systemName: "figure.run")
.accessibilityHidden(true)
},
title: "WELCOME_AREA3_TITLE",
description: "WELCOME_AREA3_DESCRIPTION"
),
OnboardingInformationView.Content(
philippzagar marked this conversation as resolved.
Show resolved Hide resolved
icon: {
Image(systemName: "list.bullet.clipboard.fill")
.accessibilityHidden(true)
},
title: "WELCOME_AREA4_TITLE",
description: "WELCOME_AREA4_DESCRIPTION"
)
],
actionText: "WELCOME_BUTTON",
action: {
onboardingNavigationPath.nextStep()
}
)
.padding(.top, 24)
.padding(.top, 10)
}
}

Expand Down
59 changes: 41 additions & 18 deletions Stronger/Resources/Localizable.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "The onboarding module allows you to build an onboarding flow like this one."
"value" : "To help track your daily protein intake."
}
}
}
Expand All @@ -190,7 +190,7 @@
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Onboarding"
"value" : "Pro-ChatBot"
}
}
}
Expand All @@ -200,7 +200,7 @@
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "The application uses HL7 FHIR to provide a common standard to encode data gathered by the application."
"value" : "To help you meet your resistance training goals."
}
}
}
Expand All @@ -210,7 +210,7 @@
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "HL7 FHIR"
"value" : "Resistance Training tracker"
}
}
}
Expand All @@ -220,7 +220,7 @@
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "The contact module allows you to display contact information in your application."
"value" : "To help you meet your aerobic exercise goals."
}
}
}
Expand All @@ -230,7 +230,7 @@
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Contact"
"value" : "Aerobics tracker"
}
}
}
Expand All @@ -240,7 +240,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" : "Watch exercise videos, get tailored diet plans, sign-up for online consultation or share your experiences with the community."
}
}
}
Expand All @@ -250,7 +250,7 @@
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "HealthKit Data Source"
"value" : "Resources"
}
}
}
Expand All @@ -270,7 +270,7 @@
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Here are a few Spezi modules that are interesting to know about ..."
"value" : "Elevate your strength game with Stronger, where seamless protein tracking meets powerful resistance training, sculpting a stronger you every day."
}
}
}
Expand All @@ -281,10 +281,13 @@
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Interesting Modules"
"value" : "Features"
}
}
}
},
"Key" : {
philippzagar marked this conversation as resolved.
Show resolved Hide resolved

},
"LELAND_STANFORD_BIO" : {
"localizations" : {
Expand Down Expand Up @@ -454,7 +457,7 @@
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "The Spezi Framework builds the foundation of this application."
"value" : "Track your daily protein intake here."
}
}
}
Expand All @@ -464,7 +467,7 @@
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "The Spezi Framework"
"value" : "Pro-ChatBot"
}
}
}
Expand All @@ -474,7 +477,7 @@
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Spezi uses the Swift Package Manager to import it as a dependency."
"value" : "Track your resistance training journey here."
}
}
}
Expand All @@ -484,7 +487,7 @@
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Swift Package Manager"
"value" : "Resistance training tracker"
}
}
}
Expand All @@ -494,7 +497,7 @@
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Spezi offers several modules including HealthKit integration, questionnaires, and more ..."
"value" : "Track your aerobic exercise journey here."
}
}
}
Expand All @@ -504,7 +507,27 @@
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Spezi Modules"
"value" : "Aerobics tracker"
}
}
}
},
"WELCOME_AREA4_DESCRIPTION" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Find tailored diet plans, exercise videos and more."
}
}
}
},
"WELCOME_AREA4_TITLE" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Resources"
}
}
}
Expand All @@ -524,7 +547,7 @@
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "This application demonstrates several Spezi features & modules."
"value" : "Welcome to Stronger, your new companion to post-menopausal fitness."
}
}
}
Expand All @@ -535,7 +558,7 @@
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Spezi\nStronger"
"value" : "Stronger"
}
}
}
Expand Down