feat(#677): remove privacy screen based on lifecycle (not working on …

…Android)
hpi-dhc · Dec 18, 2023 · b50cc83 · b50cc83
1 parent e056b0f
commit b50cc83
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 70 deletions.
diff --git a/app/lib/common/pages/privacy/privacy.dart b/app/lib/common/pages/privacy/privacy.dart
diff --git a/app/lib/common/routing/router.dart b/app/lib/common/routing/router.dart
@@ -7,7 +7,6 @@ import '../../report/module.dart';
 import '../../search/module.dart';
 import '../../settings/module.dart';
 import '../pages/main/main.dart';
-import '../pages/privacy/privacy.dart';
 
 part 'router.gr.dart';
 
@@ -17,7 +16,6 @@ part 'router.gr.dart';
     drugSelectionRoutes,
     loginRoutes,
     onboardingRoutes,
-    privacyRoutes,
     AutoRoute(
       path: 'main',
       page: MainPage,

diff --git a/app/lib/common/widgets/app.dart b/app/lib/common/widgets/app.dart
@@ -20,29 +20,26 @@ class PharMeApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return LifecycleObserver(
-      appRouter: _appRouter,
-      child: MaterialApp.router(
-        debugShowCheckedModeBanner: false,
-        routeInformationParser: _appRouter.defaultRouteParser(),
-        routerDelegate: _appRouter.delegate(
-          initialDeepLink: !_isLoggedIn
-            ? 'login'
-            : !_onboardingDone
-              ? 'onboarding'
-              : !_initialDrugSelectionDone
-                ? 'drugselection'
-                : 'main',
-        ),
-        theme: PharMeTheme.light,
-        localizationsDelegates: [
-          AppLocalizations.delegate,
-          GlobalMaterialLocalizations.delegate,
-          GlobalWidgetsLocalizations.delegate,
-          GlobalCupertinoLocalizations.delegate,
-        ],
-        supportedLocales: [Locale('en', '')],
+    return MaterialApp.router(
+      debugShowCheckedModeBanner: false,
+      routeInformationParser: _appRouter.defaultRouteParser(),
+      routerDelegate: _appRouter.delegate(
+        initialDeepLink: !_isLoggedIn
+          ? 'login'
+          : !_onboardingDone
+            ? 'onboarding'
+            : !_initialDrugSelectionDone
+              ? 'drugselection'
+              : 'main',
       ),
+      theme: PharMeTheme.light,
+      localizationsDelegates: [
+        AppLocalizations.delegate,
+        GlobalMaterialLocalizations.delegate,
+        GlobalWidgetsLocalizations.delegate,
+        GlobalCupertinoLocalizations.delegate,
+      ],
+      supportedLocales: [Locale('en', '')],
     );
   }
 }
diff --git a/app/lib/common/widgets/lifecycle_observer.dart b/app/lib/common/widgets/lifecycle_observer.dart
diff --git a/app/lib/common/widgets/module.dart b/app/lib/common/widgets/module.dart
@@ -4,7 +4,6 @@ export 'drug_list/builder.dart';
 export 'drug_list/cubit.dart';
 export 'headings.dart';
 export 'indicators.dart';
-export 'lifecycle_observer.dart';
 export 'page_scaffold.dart';
 export 'pharme_logo_page.dart';
 export 'radiant_gradient_mask.dart';