Merge pull request #581 from hpi-dhc/issue/578-change-log-in-flow-for…

…-study

Change log-in flow for study

app/integration_test/settings_test.dart

@@ -47,15 +47,6 @@ void main() {
       await tester.tap(find.text(context.l10n.action_cancel));
       await tester.pumpAndSettle();
 
-      // test onboarding button
-      await tester.tap(find.text(context.l10n.settings_page_onboarding));
-      await tester.pumpAndSettle();
-
-      expect(find.text(context.l10n.onboarding_1_header), findsOneWidget);
-
-      await context.router.root.pop();
-      await tester.pumpAndSettle();
-
       // test about us
       await tester.tap(find.text(context.l10n.settings_page_about_us));
       await tester.pumpAndSettle();

app/ios/Podfile.lock

@@ -60,7 +60,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
-  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
   flutter_share: 4be0208963c60b537e6255ed2ce1faae61cd9ac2
   flutter_web_auth: 09a0abd245f1a07a3ff4dcf1247a048d89ee12a9
@@ -73,4 +73,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
 
-COCOAPODS: 1.10.0
+COCOAPODS: 1.11.3

app/lib/common/routing/router.dart

@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 
 import '../../faq/module.dart';
 import '../../login/module.dart';
-import '../../onboarding/module.dart';
 import '../../report/module.dart';
 import '../../search/module.dart';
 import '../../settings/module.dart';
@@ -15,7 +14,6 @@ part 'router.gr.dart';
   replaceInRouteName: 'Page,Route',
   routes: [
     loginRoutes,
-    onboardingRoutes,
     AutoRoute(
       path: 'main',
       page: MainPage,

app/lib/common/widgets/app.dart

@@ -15,7 +15,7 @@ class PharMeApp extends StatelessWidget {
       debugShowCheckedModeBanner: false,
       routeInformationParser: _appRouter.defaultRouteParser(),
       routerDelegate: _appRouter.delegate(
-        initialDeepLink: _isLoggedIn ? 'main' : 'onboarding',
+        initialDeepLink: _isLoggedIn ? 'main' : 'login',
       ),
       theme: PharMeTheme.light,
       localizationsDelegates: [

app/lib/l10n/app_en.arb

@@ -102,27 +102,10 @@
   "nav_more": "More",
   "tab_more": "More",
 
-  "onboarding_get_started": "Get started",
-  "onboarding_next": "Next",
-  "onboarding_prev": "Back",
-  "onboarding_1_header": "Welcome to PharMe",
-  "onboarding_1_text": "Your genome has more influence on your life than you might think!\nMore than 90% of people are vulnerable to unintended drug reactions.\n\nUse PharMe to find out about yours.",
-  "onboarding_2_header": "One size does not fit all",
-  "onboarding_2_text": "Your body reacts to drugs uniquely.\n\nDrugs that are effective for a majority of people can be toxic to you.",
-  "onboarding_3_header": "Genome power unlocked to improve human health",
-  "onboarding_3_text": "PharMe warns about unintended drug responses according to your genome.\nThis enables you to avoid drugs that are ineffective or have side-effects.",
-  "onboarding_3_disclaimer": "We DO NOT recommend drugs for specific symptoms or illnesses!",
-  "onboarding_4_header": "Tailored to your genome",
-  "onboarding_4_text": "For PharMe to work, you need to get your genetics tested at a lab. You don't need an account to use PharMe: You can just sign in to the lab's website through our app.",
-  "onboarding_4_button": "Find out more about gene tests here.",
-  "onboarding_5_header": "We care about your data protection",
-  "onboarding_5_text": "After signing in to the lab, your genetic data is sent straight onto your phone.\n\nOur servers know nothing about you, neither your identity nor your genetics.",
-
   "settings_page_account_settings": "Account Settings",
   "settings_page_delete_data": "Delete App Data",
   "settings_page_delete_data_text": "Are you sure that you want to delete all app data? This also includes your genomic data.",
   "settings_page_more": "More",
-  "settings_page_onboarding": "Onboarding",
   "settings_page_about_us": "About us",
   "settings_page_about_us_text": "PharMe was created as a bachelors project at Hasso-Plattner-Institut (HPI) Potsdam. The aim of the project is to provide a proof of concept for digital health apps that use pharmacogenomic information for health improvements. We collaborate with the Digital Health chair at HPI and health professionals from Mount Sinai hospital in New York.",
   "settings_page_privacy_policy": "Privacy policy",