diff --git a/app/assets/images/onboarding/1.png b/app/assets/images/onboarding/1.png deleted file mode 100644 index 4f936cf93..000000000 Binary files a/app/assets/images/onboarding/1.png and /dev/null differ diff --git a/app/assets/images/onboarding/2.png b/app/assets/images/onboarding/2.png deleted file mode 100644 index 134a97fcb..000000000 Binary files a/app/assets/images/onboarding/2.png and /dev/null differ diff --git a/app/assets/images/onboarding/3.png b/app/assets/images/onboarding/3.png deleted file mode 100644 index 5a0c97cef..000000000 Binary files a/app/assets/images/onboarding/3.png and /dev/null differ diff --git a/app/assets/images/onboarding/4.png b/app/assets/images/onboarding/4.png deleted file mode 100644 index be48658e5..000000000 Binary files a/app/assets/images/onboarding/4.png and /dev/null differ diff --git a/app/assets/images/onboarding/5.png b/app/assets/images/onboarding/5.png deleted file mode 100644 index 296932ac7..000000000 Binary files a/app/assets/images/onboarding/5.png and /dev/null differ diff --git a/app/assets/images/onboarding/DataProtection.png b/app/assets/images/onboarding/DataProtection.png new file mode 100644 index 000000000..73bc78b1a Binary files /dev/null and b/app/assets/images/onboarding/DataProtection.png differ diff --git a/app/assets/images/onboarding/DataProtection.svg b/app/assets/images/onboarding/DataProtection.svg new file mode 100644 index 000000000..f890e115d --- /dev/null +++ b/app/assets/images/onboarding/DataProtection.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + diff --git a/app/assets/images/onboarding/DrugReaction.png b/app/assets/images/onboarding/DrugReaction.png new file mode 100644 index 000000000..c561de4fb Binary files /dev/null and b/app/assets/images/onboarding/DrugReaction.png differ diff --git a/app/assets/images/onboarding/DrugReaction.svg b/app/assets/images/onboarding/DrugReaction.svg new file mode 100644 index 000000000..e6fb25eb4 --- /dev/null +++ b/app/assets/images/onboarding/DrugReaction.svg @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/onboarding/GenomePower.png b/app/assets/images/onboarding/GenomePower.png new file mode 100644 index 000000000..c1f325575 Binary files /dev/null and b/app/assets/images/onboarding/GenomePower.png differ diff --git a/app/assets/images/onboarding/GenomePower.svg b/app/assets/images/onboarding/GenomePower.svg new file mode 100644 index 000000000..48e139c05 --- /dev/null +++ b/app/assets/images/onboarding/GenomePower.svg @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/onboarding/OutlinedLogo.png b/app/assets/images/onboarding/OutlinedLogo.png new file mode 100644 index 000000000..a4f82232e Binary files /dev/null and b/app/assets/images/onboarding/OutlinedLogo.png differ diff --git a/app/assets/images/onboarding/svg/1.svg b/app/assets/images/onboarding/OutlinedLogo.svg similarity index 53% rename from app/assets/images/onboarding/svg/1.svg rename to app/assets/images/onboarding/OutlinedLogo.svg index 45040e609..80d7af235 100644 --- a/app/assets/images/onboarding/svg/1.svg +++ b/app/assets/images/onboarding/OutlinedLogo.svg @@ -1,14 +1,14 @@ - - - - - - - - - - - - - - - + id="g1798" + transform="matrix(1.0845586,0,0,1.0845586,-50.214964,-51.394661)" + inkscape:export-filename="./OutlinedLogo.png" + inkscape:export-xdpi="82.863243" + inkscape:export-ydpi="82.863243"> + d="M 585.74811,335.71135 335.71226,585.7472 c -76.91737,76.91635 -76.91686,201.62188 5.1e-4,278.53823 76.91685,76.9214 201.6239,76.9214 278.53976,0 L 864.28634,614.25161 c 76.9214,-76.91534 76.91634,-201.6229 0,-278.54026 -76.91635,-76.91685 -201.62188,-76.91685 -278.53823,0 z" + fill="#ffffff" + stroke="#221f73" + stroke-width="8.37649" + id="path136-3" + style="fill:none;stroke:#ffffff;stroke-width:63.4307;stroke-dasharray:none" + clip-path="none" + mask="none" /> + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/onboarding/Tailored.png b/app/assets/images/onboarding/Tailored.png new file mode 100644 index 000000000..a702ee3f1 Binary files /dev/null and b/app/assets/images/onboarding/Tailored.png differ diff --git a/app/assets/images/onboarding/Tailored.svg b/app/assets/images/onboarding/Tailored.svg new file mode 100644 index 000000000..fb46d96c2 --- /dev/null +++ b/app/assets/images/onboarding/Tailored.svg @@ -0,0 +1,83 @@ + + + + + + + + + + diff --git a/app/assets/images/onboarding/svg/2.svg b/app/assets/images/onboarding/svg/2.svg deleted file mode 100644 index dadf48c09..000000000 --- a/app/assets/images/onboarding/svg/2.svg +++ /dev/null @@ -1,770 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/images/onboarding/svg/3.svg b/app/assets/images/onboarding/svg/3.svg deleted file mode 100644 index d21f52c29..000000000 --- a/app/assets/images/onboarding/svg/3.svg +++ /dev/null @@ -1,1327 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/images/onboarding/svg/4.svg b/app/assets/images/onboarding/svg/4.svg deleted file mode 100644 index ed7dc6a3e..000000000 --- a/app/assets/images/onboarding/svg/4.svg +++ /dev/null @@ -1,466 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ? - - - - diff --git a/app/assets/images/onboarding/svg/5.svg b/app/assets/images/onboarding/svg/5.svg deleted file mode 100644 index 52727758d..000000000 --- a/app/assets/images/onboarding/svg/5.svg +++ /dev/null @@ -1,725 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/images/pgx_faq.svg b/app/assets/images/pgx_faq.svg deleted file mode 100644 index f9fc8e107..000000000 --- a/app/assets/images/pgx_faq.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/lib/onboarding/pages/onboarding.dart b/app/lib/onboarding/pages/onboarding.dart index 4885714ec..8073c1a71 100644 --- a/app/lib/onboarding/pages/onboarding.dart +++ b/app/lib/onboarding/pages/onboarding.dart @@ -7,19 +7,19 @@ class OnboardingPage extends HookWidget { final _pages = [ OnboardingSubPage( - illustrationPath: 'assets/images/onboarding/1.png', + illustrationPath: 'assets/images/onboarding/OutlinedLogo.png', getHeader: (context) => context.l10n.onboarding_1_header, getText: (context) => context.l10n.onboarding_1_text, color: PharMeTheme.sinaiCyan, ), OnboardingSubPage( - illustrationPath: 'assets/images/onboarding/2.png', + illustrationPath: 'assets/images/onboarding/DrugReaction.png', getHeader: (context) => context.l10n.onboarding_2_header, getText: (context) => context.l10n.onboarding_2_text, color: PharMeTheme.sinaiMagenta, ), OnboardingSubPage( - illustrationPath: 'assets/images/onboarding/3.png', + illustrationPath: 'assets/images/onboarding/GenomePower.png', getHeader: (context) => context.l10n.onboarding_3_header, getText: (context) => context.l10n.onboarding_3_text, color: PharMeTheme.sinaiPurple, @@ -29,13 +29,13 @@ class OnboardingPage extends HookWidget { ), ), OnboardingSubPage( - illustrationPath: 'assets/images/onboarding/4.png', + illustrationPath: 'assets/images/onboarding/Tailored.png', getHeader: (context) => context.l10n.onboarding_4_header, getText: (context) => context.l10n.onboarding_4_already_tested_text, color: Colors.grey.shade600, ), OnboardingSubPage( - illustrationPath: 'assets/images/onboarding/5.png', + illustrationPath: 'assets/images/onboarding/DataProtection.png', getHeader: (context) => context.l10n.onboarding_5_header, getText: (context) => context.l10n.onboarding_5_text, color: PharMeTheme.sinaiCyan, @@ -253,7 +253,7 @@ class OnboardingSubPage extends StatelessWidget { widthFactor: 0.75, child: Image.asset( illustrationPath, - width: 320, + height: 200, ), ), ),