fix(cat-voices): When user locks app should be redirected to Discovery Page (#2255)

* feat(cat-voices): refactor session listener and app content handling for improved state management and navigation (#2240)

* feat(cat-voices): streamline app content structure and session listener for better readability and performance improvements

Author: LynxLynxx

catalyst_voices/apps/voices/lib/app/view/app_content.dart

@@ -71,17 +71,13 @@ final class _AppContent extends StatelessWidget {
         brightness: Brightness.dark,
       ),
       debugShowCheckedModeBanner: false,
-      builder: (context, child) {
-        return Scaffold(
-          primary: false,
-          backgroundColor: Colors.transparent,
-          body: AppActiveStateListener(
-            child: GlobalPrecacheImages(
-              child: GlobalSessionListener(
-                child: AppMobileAccessRestriction(
-                  child: AppSplashScreenManager(
-                    child: child ?? const SizedBox.shrink(),
-                  ),
+      builder: (_, child) {
+        return AppActiveStateListener(
+          child: GlobalPrecacheImages(
+            child: GlobalSessionListener(
+              child: AppMobileAccessRestriction(
+                child: AppSplashScreenManager(
+                  child: child ?? const SizedBox.shrink(),
                 ),
               ),
             ),

catalyst_voices/apps/voices/lib/app/view/app_session_listener.dart

@@ -1,27 +1,36 @@
+import 'package:catalyst_voices/routes/routes.dart';
 import 'package:catalyst_voices/widgets/snackbar/voices_snackbar.dart';
 import 'package:catalyst_voices/widgets/snackbar/voices_snackbar_type.dart';
 import 'package:catalyst_voices_assets/catalyst_voices_assets.dart';
 import 'package:catalyst_voices_blocs/catalyst_voices_blocs.dart';
 import 'package:catalyst_voices_localization/catalyst_voices_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
 
 /// Listens globally to a session and can show different
 /// snackBars when a session changes.
-class GlobalSessionListener extends StatelessWidget {
+class GlobalSessionListener extends StatefulWidget {
   final Widget child;
 
   const GlobalSessionListener({
     super.key,
     required this.child,
   });
 
+  @override
+  State<GlobalSessionListener> createState() => _GlobalSessionListenerState();
+}
+
+class _GlobalSessionListenerState extends State<GlobalSessionListener> {
+  String? _lastLocation;
+
   @override
   Widget build(BuildContext context) {
     return BlocListener<SessionCubit, SessionState>(
       listenWhen: _listenToSessionChangesWhen,
       listener: _onSessionChanged,
-      child: child,
+      child: widget.child,
     );
   }
 
@@ -34,6 +43,22 @@ class GlobalSessionListener extends StatelessWidget {
     return keychainUnlocked || keychainLocked;
   }
 
+  void _onLockedKeychain(BuildContext context) {
+    VoicesSnackBar(
+      type: VoicesSnackBarType.error,
+      behavior: SnackBarBehavior.floating,
+      icon: VoicesAssets.icons.lockClosed.buildIcon(),
+      title: context.l10n.lockSnackbarTitle,
+      message: context.l10n.lockSnackbarMessage,
+    ).show(context);
+
+    final routerContext = AppRouter.rootNavigatorKey.currentContext;
+    if (routerContext != null) {
+      _lastLocation = GoRouter.of(routerContext).state.uri.toString();
+      routerContext.go(const DiscoveryRoute().location);
+    }
+  }
+
   void _onSessionChanged(BuildContext context, SessionState state) {
     if (state.isActive) {
       _onUnlockedKeychain(context);
@@ -50,15 +75,10 @@ class GlobalSessionListener extends StatelessWidget {
       title: context.l10n.unlockSnackbarTitle,
       message: context.l10n.unlockSnackbarMessage,
     ).show(context);
-  }
 
-  void _onLockedKeychain(BuildContext context) {
-    VoicesSnackBar(
-      type: VoicesSnackBarType.error,
-      behavior: SnackBarBehavior.floating,
-      icon: VoicesAssets.icons.lockClosed.buildIcon(),
-      title: context.l10n.lockSnackbarTitle,
-      message: context.l10n.lockSnackbarMessage,
-    ).show(context);
+    final routerContext = AppRouter.rootNavigatorKey.currentContext;
+    if (_lastLocation != null && routerContext != null) {
+      routerContext.go(_lastLocation!);
+    }
   }
 }

catalyst_voices/apps/voices/lib/routes/app_router.dart

@@ -8,7 +8,7 @@ import 'package:go_router/go_router.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 
 abstract final class AppRouter {
-  static final _rootNavigatorKey = GlobalKey<NavigatorState>(
+  static final rootNavigatorKey = GlobalKey<NavigatorState>(
     debugLabel: 'rootNavigatorKey',
   );
 
@@ -18,7 +18,7 @@ abstract final class AppRouter {
     Listenable? refreshListenable,
   }) {
     return GoRouter(
-      navigatorKey: _rootNavigatorKey,
+      navigatorKey: rootNavigatorKey,
       initialLocation: initialLocation ?? Routes.initialLocation,
       redirect: (context, state) async => _guard(context, state, guards),
       observers: [