refactor: use GoRouter with refreshListenable

- Router creation moved to createRouter
- AppBloc stream used for refreshListenable
- Improved redirect logic with debug prints

Author: fulleni

lib/app/view/app.dart

@@ -1,58 +1,99 @@
+// Required for StreamSubscription
+
 import 'package:flex_color_scheme/flex_color_scheme.dart';
+// Required for Listenable
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart'; // Import GoRouter
 import 'package:google_fonts/google_fonts.dart';
 import 'package:ht_authentication_repository/ht_authentication_repository.dart';
 import 'package:ht_headlines_repository/ht_headlines_repository.dart';
 import 'package:ht_main/app/bloc/app_bloc.dart';
 import 'package:ht_main/l10n/l10n.dart';
+// Import the createRouter function and the helper stream
+import 'package:ht_main/router/go_router_refresh_stream.dart';
 import 'package:ht_main/router/router.dart';
+// Routes class is still needed if createRouter uses it, which it does
 
 class App extends StatelessWidget {
   const App({
     required HtHeadlinesRepository htHeadlinesRepository,
     required HtAuthenticationRepository htAuthenticationRepository,
+    // AppBloc is no longer passed in constructor
     super.key,
   })  : _htHeadlinesRepository = htHeadlinesRepository,
         _htAuthenticationRepository = htAuthenticationRepository;
 
   final HtHeadlinesRepository _htHeadlinesRepository;
   final HtAuthenticationRepository _htAuthenticationRepository;
+  // No longer storing AppBloc instance here
 
   @override
   Widget build(BuildContext context) {
+    // Provide repositories globally
     return MultiRepositoryProvider(
       providers: [
         RepositoryProvider.value(value: _htHeadlinesRepository),
         RepositoryProvider.value(value: _htAuthenticationRepository),
       ],
-      child: MultiBlocProvider(
-        providers: [
-          BlocProvider(
-            create: (context) => AppBloc(
-              authenticationRepository:
-                  context.read<HtAuthenticationRepository>(),
-            ),
-          ),
-        ],
+      // Create AppBloc here using BlocProvider
+      child: BlocProvider(
+        create: (context) => AppBloc(
+          authenticationRepository: context.read<HtAuthenticationRepository>(),
+        ),
+        // _AppView now reads AppBloc from context
         child: const _AppView(),
       ),
     );
   }
 }
 
-class _AppView extends StatelessWidget {
-  const _AppView();
+// Change _AppView to StatefulWidget to manage GoRouter lifecycle
+class _AppView extends StatefulWidget {
+  const _AppView(); // No longer needs appBloc passed
+
+  @override
+  State<_AppView> createState() => _AppViewState();
+}
+
+class _AppViewState extends State<_AppView> {
+  // Store the router and the refresh stream listener
+  late final GoRouter _router;
+  late final GoRouterRefreshStream _refreshListener;
+
+  @override
+  void initState() {
+    super.initState();
+    // Get the AppBloc instance from the BlocProvider above
+    final appBloc = context.read<AppBloc>();
+    // Create the refresh listener using the AppBloc stream
+    _refreshListener = GoRouterRefreshStream(appBloc.stream);
+    // Create the router instance by calling the function from router.dart
+    _router = createRouter(refreshListenable: _refreshListener);
+  }
+
+  @override
+  void dispose() {
+    // Dispose the refresh listener when the widget is disposed
+    _refreshListener.dispose();
+    super.dispose();
+  }
 
   @override
   Widget build(BuildContext context) {
+    // Use BlocBuilder to react to theme changes from AppBloc
     return BlocBuilder<AppBloc, AppState>(
+      // Use buildWhen for optimization if only theme affects MaterialApp
+      buildWhen: (previous, current) => previous.themeMode != current.themeMode,
       builder: (context, state) {
         return MaterialApp.router(
           debugShowCheckedModeBanner: false,
-          theme:
-              state.themeMode == ThemeMode.light ? lightTheme() : darkTheme(),
-          routerConfig: appRouter,
+          // Apply theme based on AppBloc state
+          themeMode: state.themeMode,
+          theme: lightTheme(),
+          darkTheme: darkTheme(),
+          // Use the router created and stored in the state
+          routerConfig: _router,
           localizationsDelegates: AppLocalizations.localizationsDelegates,
           supportedLocales: AppLocalizations.supportedLocales,
         );
@@ -61,16 +102,17 @@ class _AppView extends StatelessWidget {
   }
 }
 
+// --- Themes (unchanged) ---
 ThemeData lightTheme() {
   return FlexThemeData.light(
-    scheme: FlexScheme.material,
+    scheme: FlexScheme.greyLaw,
     fontFamily: GoogleFonts.notoSans().fontFamily,
   );
 }
 
 ThemeData darkTheme() {
   return FlexThemeData.dark(
-    scheme: FlexScheme.material,
+    scheme: FlexScheme.greyLaw,
     fontFamily: GoogleFonts.notoSans().fontFamily,
   );
 }

lib/authentication/view/authentication_page.dart

@@ -12,20 +12,19 @@ class AuthenticationPage extends StatelessWidget {
       create: (context) => AuthenticationBloc(
         authenticationRepository: context.read<HtAuthenticationRepository>(),
       ),
-      child:  _AuthenticationView(),
+      child: _AuthenticationView(),
     );
   }
 }
 
 class _AuthenticationView extends StatelessWidget {
   _AuthenticationView();
 
-    final _emailController = TextEditingController();
-    final _passwordController = TextEditingController();
+  final _emailController = TextEditingController();
+  final _passwordController = TextEditingController();
 
   @override
   Widget build(BuildContext context) {
-
     return Scaffold(
       body: SafeArea(
         child: BlocBuilder<AuthenticationBloc, AuthenticationState>(
@@ -48,7 +47,8 @@ class _AuthenticationView extends StatelessWidget {
                   children: [
                     const Text(
                       'Sign In',
-                      style: TextStyle(fontSize: 24, fontWeight: FontWeight.bold),
+                      style:
+                          TextStyle(fontSize: 24, fontWeight: FontWeight.bold),
                     ),
                     const SizedBox(height: 32),
                     TextFormField(
@@ -96,9 +96,9 @@ class _AuthenticationView extends StatelessWidget {
                     const SizedBox(height: 16),
                     ElevatedButton(
                       onPressed: () {
-                        context
-                            .read<AuthenticationBloc>()
-                            .add(const AuthenticationAnonymousSignInRequested());
+                        context.read<AuthenticationBloc>().add(
+                              const AuthenticationAnonymousSignInRequested(),
+                            );
                       },
                       child: const Text('Sign In Anonymously'),
                     ),

lib/main.dart

@@ -7,24 +7,34 @@ import 'package:ht_authentication_repository/ht_authentication_repository.dart';
 import 'package:ht_headlines_firestore/ht_headlines_firestore.dart';
 import 'package:ht_headlines_repository/ht_headlines_repository.dart';
 import 'package:ht_main/app/app.dart';
+// No longer importing AppBloc here
 import 'package:ht_main/bloc_observer.dart';
 import 'package:ht_main/firebase_options.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
   Bloc.observer = const AppBlocObserver();
-  final firestore = FirebaseFirestore.instance;
-  final headlinesClient = HtHeadlinesFirestore(firestore: firestore);
-  final headlinesRepository = HtHeadlinesRepository(client: headlinesClient);
+
+  // --- Instantiate Repositories ---
+  // 1. Authentication Repository
   final authenticationClient = HtAuthenticationFirebase();
   final authenticationRepository = HtAuthenticationRepository(
     authenticationClient: authenticationClient,
   );
+
+  // 2. Headlines Repository
+  final firestore = FirebaseFirestore.instance;
+  final headlinesClient = HtHeadlinesFirestore(firestore: firestore);
+  final headlinesRepository = HtHeadlinesRepository(client: headlinesClient);
+  // --- End Instantiation ---
+
   runApp(
+    // Pass only repositories to the App widget
     App(
       htAuthenticationRepository: authenticationRepository,
       htHeadlinesRepository: headlinesRepository,
+      // AppBloc instance is no longer created or passed here
     ),
   );
 }

lib/router/go_router_refresh_stream.dart

@@ -0,0 +1,31 @@
+import 'dart:async';
+import 'package:flutter/foundation.dart';
+
+/// Helper class to convert a Stream to a Listenable for GoRouter.
+///
+/// Every time the "stream" receives an event, this [ChangeNotifier] notifies
+/// its listeners, causing GoRouter to re-evaluate its routes and redirects
+/// when used with `refreshListenable`.
+class GoRouterRefreshStream extends ChangeNotifier {
+  /// Creates a [GoRouterRefreshStream].
+  GoRouterRefreshStream(Stream<dynamic> stream) {
+    // Notify listeners immediately to ensure initial state is considered.
+    // Although GoRouter likely handles initial state, this ensures consistency.
+    notifyListeners();
+    // Subscribe to the stream. Use asBroadcastStream to allow multiple
+    // listeners if needed elsewhere, though typically only GoRouter
+    // listens here.
+    _subscription = stream.asBroadcastStream().listen(
+          (dynamic _) => notifyListeners(), // Notify on every stream event
+        );
+  }
+
+  late final StreamSubscription<dynamic> _subscription;
+
+  /// Cancels the stream subscription when this notifier is disposed.
+  @override
+  void dispose() {
+    _subscription.cancel();
+    super.dispose();
+  }
+}