refactor(app): use ValueNotifier for auth status

- Replaced GoRouterRefreshStream
- Used ValueNotifier for status
- Simplified AppView state

Author: fulleni

lib/app/view/app.dart

@@ -1,118 +1,118 @@
-// 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:go_router/go_router.dart';
 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),
       ],
-      // Create AppBloc here using BlocProvider
       child: BlocProvider(
         create: (context) => AppBloc(
           authenticationRepository: context.read<HtAuthenticationRepository>(),
         ),
-        // _AppView now reads AppBloc from context
         child: const _AppView(),
       ),
     );
   }
 }
 
-// Change _AppView to StatefulWidget to manage GoRouter lifecycle
 class _AppView extends StatefulWidget {
-  const _AppView(); // No longer needs appBloc passed
+  const _AppView();
 
   @override
   State<_AppView> createState() => _AppViewState();
 }
 
 class _AppViewState extends State<_AppView> {
-  // Store the router and the refresh stream listener
+  // Store the router and the status notifier
   late final GoRouter _router;
-  late final GoRouterRefreshStream _refreshListener;
+  late final ValueNotifier<AppStatus> _statusNotifier;
 
   @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);
+
+    // Create the ValueNotifier, initialized with the current status
+    _statusNotifier = ValueNotifier<AppStatus>(appBloc.state.status);
+
+    // Create the router instance, passing the ValueNotifier as the listenable
+    _router = createRouter(authStatusNotifier: _statusNotifier);
   }
 
   @override
   void dispose() {
-    // Dispose the refresh listener when the widget is disposed
-    _refreshListener.dispose();
+    // Remove subscription cancellation
+    // _blocSubscription.cancel();
+    // Dispose the ValueNotifier
+    _statusNotifier.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,
-          // 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,
-        );
+    // Wrap the part of the tree that needs to react to AppBloc state changes
+    // (specifically for updating the ValueNotifier) with a BlocListener.
+    // The BlocBuilder remains for theme changes.
+    return BlocListener<AppBloc, AppState>(
+      // Only listen when the status actually changes
+      listenWhen: (previous, current) => previous.status != current.status,
+      listener: (context, state) {
+        // Update the ValueNotifier when the AppBloc status changes.
+        // This triggers the GoRouter's refreshListenable.
+        _statusNotifier.value = state.status;
       },
+      child: BlocBuilder<AppBloc, AppState>(
+        buildWhen: (previous, current) =>
+            previous.themeMode != current.themeMode,
+        builder: (context, state) {
+          return MaterialApp.router(
+            debugShowCheckedModeBanner: false,
+            themeMode: state.themeMode,
+            theme: lightTheme(),
+            darkTheme: darkTheme(),
+            routerConfig: _router,
+            localizationsDelegates: AppLocalizations.localizationsDelegates,
+            supportedLocales: AppLocalizations.supportedLocales,
+          );
+        },
+      ),
     );
   }
 }
 
-// --- Themes (unchanged) ---
 ThemeData lightTheme() {
   return FlexThemeData.light(
-    scheme: FlexScheme.greyLaw,
+    scheme: FlexScheme.material,
     fontFamily: GoogleFonts.notoSans().fontFamily,
   );
 }
 
 ThemeData darkTheme() {
   return FlexThemeData.dark(
-    scheme: FlexScheme.greyLaw,
+    scheme: FlexScheme.material,
     fontFamily: GoogleFonts.notoSans().fontFamily,
   );
 }

lib/router/go_router_refresh_stream.dart

@@ -11,23 +11,20 @@ import 'package:ht_main/headlines-feed/view/headlines_feed_page.dart';
 import 'package:ht_main/headlines-search/view/headlines_search_page.dart';
 import 'package:ht_main/router/routes.dart'; // Keep Routes
 
-// No longer defining a global router instance here.
-
 /// Creates and configures the GoRouter instance for the application.
 ///
-/// Requires a [refreshListenable] (typically based on AppBloc's stream)
-/// to trigger route re-evaluation when authentication state changes.
-GoRouter createRouter({required Listenable refreshListenable}) {
+/// Requires an [authStatusNotifier] to trigger route re-evaluation when
+/// authentication state changes.
+GoRouter createRouter({required ValueNotifier<AppStatus> authStatusNotifier}) {
   return GoRouter(
-    refreshListenable: refreshListenable,
+    refreshListenable: authStatusNotifier, 
     initialLocation: Routes.headlinesFeed,
     debugLogDiagnostics: true, // Enable verbose logging for debugging redirects
     // --- Redirect Logic ---
     redirect: (BuildContext context, GoRouterState state) {
       // Use context.read<AppBloc>() here. It's safe because refreshListenable
       // ensures this runs within a valid context after AppBloc state changes.
       final appStatus = context.read<AppBloc>().state.status;
-      // final user = context.read<AppBloc>().state.user; // AppState does not have user
       final currentLocation = state.matchedLocation;
 
       print(

lib/router/router.dart

@@ -1,6 +1,6 @@
 name: ht_main
 description: main headlines toolkit mobile app.
-version: 0.32.0
+version: 0.32.1
 publish_to: none
 repository: https://github.com/headlines-toolkit/ht-main
 environment: