Removed ObserverUtils

Author: epou

lib/app.dart

@@ -10,7 +10,6 @@ import 'package:mosquito_alert_app/features/onboarding/presentation/state/onboar
 import 'package:mosquito_alert_app/screens/layout_page.dart';
 import 'package:mosquito_alert_app/core/localizations/MyLocalizations.dart';
 import 'package:mosquito_alert_app/core/localizations/MyLocalizationsDelegate.dart';
-import 'package:mosquito_alert_app/core/utils/ObserverUtils.dart';
 import 'package:mosquito_alert_app/core/utils/style.dart';
 import 'package:overlay_support/overlay_support.dart';
 import 'package:provider/provider.dart';
@@ -37,14 +36,6 @@ class AppShell extends StatelessWidget {
 }
 
 class MyApp extends StatelessWidget {
-  static FirebaseAnalyticsObserver analyticsObserver =
-      FirebaseAnalyticsObserver(
-        analytics: FirebaseAnalytics.instance,
-        routeFilter: (route) {
-          return route is PageRoute && route.settings.name != '/';
-        },
-      );
-
   const MyApp({super.key, required this.apiConnection});
 
   final InternetConnection apiConnection;
@@ -125,9 +116,13 @@ class MyApp extends StatelessWidget {
             primaryColorLight: Style.colorPrimary,
           ),
           navigatorKey: navigatorKey,
-          navigatorObservers: <NavigatorObserver>[
-            analyticsObserver,
-            ObserverUtils.routeObserver,
+          navigatorObservers: [
+            FirebaseAnalyticsObserver(
+              analytics: FirebaseAnalytics.instance,
+              routeFilter: (route) {
+                return route is PageRoute && route.settings.name != '/';
+              },
+            ),
           ],
           builder: (context, child) {
             return AppShell(apiConnection: apiConnection, child: child!);

lib/core/utils/ObserverUtils.dart

@@ -13,7 +13,6 @@ import 'package:mosquito_alert_app/features/notifications/presentation/widgets/n
 import 'package:mosquito_alert_app/features/user/presentation/state/user_provider.dart';
 import 'package:mosquito_alert_app/screens/widgets/custom_drawer.dart';
 import 'package:mosquito_alert_app/core/localizations/MyLocalizations.dart';
-import 'package:mosquito_alert_app/core/utils/ObserverUtils.dart';
 import 'package:provider/provider.dart';
 import 'package:mosquito_alert_app/features/settings/presentation/pages/settings_page.dart';
 import 'package:mosquito_alert_app/screens/home_page.dart';
@@ -26,8 +25,7 @@ class LayoutPage extends StatefulWidget {
   _LayoutPageState createState() => _LayoutPageState();
 }
 
-class _LayoutPageState extends State<LayoutPage>
-    with RouteAware, WidgetsBindingObserver {
+class _LayoutPageState extends State<LayoutPage> with WidgetsBindingObserver {
   int _selectedDrawerIndex = 0;
 
   late final NotificationProvider notificationProvider;
@@ -42,17 +40,10 @@ class _LayoutPageState extends State<LayoutPage>
 
   @override
   void dispose() {
-    ObserverUtils.routeObserver.unsubscribe(this);
     WidgetsBinding.instance.removeObserver(this);
     super.dispose();
   }
 
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    ObserverUtils.routeObserver.subscribe(this, ModalRoute.of(context)!);
-  }
-
   // Called when app lifecycle state changes
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {