refactor: The BLoCs for the headlines details and account page are now provided at the GoRouter level. The BlocProvider has been removed from the individual pages, and the HeadlinesFilterPage is now correctly accessing the HeadlinesFeedBloc from the context.

Author: fulleni

analysis_options.yaml

@@ -1,6 +1,7 @@
 analyzer:
   errors:
     avoid_catches_without_on_clauses: ignore
+    lines_longer_than_80_chars: ignore
 include: package:very_good_analysis/analysis_options.7.0.0.yaml
 linter:
   rules:

lib/account/view/account_page.dart

@@ -8,27 +8,14 @@ import 'package:ht_main/l10n/l10n.dart';
 import 'package:ht_main/router/routes.dart';
 import 'package:ht_main/shared/constants/app_spacing.dart';
 
-/// {@template account_page}
-/// Page widget for the Account feature.
-/// Provides the [AccountBloc] to its descendants.
-/// {@endtemplate}
-class AccountPage extends StatelessWidget {
-  /// {@macro account_page}
-  const AccountPage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return const _AccountView();
-  }
-}
 
 /// {@template account_view}
 /// Displays the user's account information and actions.
 /// Adapts UI based on authentication status (authenticated vs. anonymous).
 /// {@endtemplate}
-class _AccountView extends StatelessWidget {
+class AccountPage extends StatelessWidget {
   /// {@macro account_view}
-  const _AccountView();
+  const AccountPage({super.key});
 
   @override
   Widget build(BuildContext context) {

lib/authentication/view/authentication_page.dart

@@ -4,7 +4,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
-import 'package:ht_authentication_repository/ht_authentication_repository.dart';
 import 'package:ht_main/authentication/bloc/authentication_bloc.dart';
 import 'package:ht_main/l10n/l10n.dart';
 import 'package:ht_main/router/routes.dart';
@@ -38,41 +37,6 @@ class AuthenticationPage extends StatelessWidget {
   /// Whether this page is being shown in the account linking context.
   final bool isLinkingContext;
 
-  @override
-  Widget build(BuildContext context) {
-    // Provide the BLoC here if it's not already provided higher up
-    // For this refactor, assuming it's provided by the route or App setup
-    return BlocProvider(
-      // Ensure BLoC is created only once per instance of this page if needed
-      // If BLoC needs to persist across navigations, provide it higher up.
-      create:
-          (context) => AuthenticationBloc(
-            authenticationRepository:
-                context.read<HtAuthenticationRepository>(),
-          ),
-      child: _AuthenticationView(
-        headline: headline,
-        subHeadline: subHeadline,
-        showAnonymousButton: showAnonymousButton,
-        isLinkingContext: isLinkingContext,
-      ),
-    );
-  }
-}
-
-class _AuthenticationView extends StatelessWidget {
-  const _AuthenticationView({
-    required this.headline,
-    required this.subHeadline,
-    required this.showAnonymousButton,
-    required this.isLinkingContext,
-  });
-
-  final String headline;
-  final String subHeadline;
-  final bool showAnonymousButton;
-  final bool isLinkingContext;
-
   @override
   Widget build(BuildContext context) {
     final l10n = context.l10n;

lib/headline-details/view/headline_details_page.dart

@@ -1,10 +1,9 @@
 //
-// ignore_for_file: avoid_redundant_argument_values, lines_longer_than_80_chars
+// ignore_for_file: avoid_redundant_argument_values
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:ht_headlines_client/ht_headlines_client.dart';
-import 'package:ht_headlines_repository/ht_headlines_repository.dart';
 import 'package:ht_main/headline-details/bloc/headline_details_bloc.dart';
 import 'package:ht_main/l10n/l10n.dart';
 import 'package:ht_main/shared/shared.dart';
@@ -16,27 +15,6 @@ class HeadlineDetailsPage extends StatelessWidget {
 
   final String headlineId;
 
-  static Route<void> route({required String headlineId}) {
-    return MaterialPageRoute<void>(
-      builder: (_) => HeadlineDetailsPage(headlineId: headlineId),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocProvider(
-      create:
-          (context) => HeadlineDetailsBloc(
-            headlinesRepository: context.read<HtHeadlinesRepository>(),
-          )..add(HeadlineDetailsRequested(headlineId: headlineId)),
-      child: const _HeadlineDetailsView(),
-    );
-  }
-}
-
-class _HeadlineDetailsView extends StatelessWidget {
-  const _HeadlineDetailsView();
-
   @override
   Widget build(BuildContext context) {
     final l10n = context.l10n;
@@ -63,7 +41,7 @@ class _HeadlineDetailsView extends StatelessWidget {
                 message: state.message,
                 onRetry: () {
                   context.read<HeadlineDetailsBloc>().add(
-                    HeadlineDetailsRequested(headlineId: '1'),
+                    HeadlineDetailsRequested(headlineId: headlineId),
                   );
                 },
               ),

lib/headlines-feed/view/headlines_feed_page.dart

@@ -15,40 +15,24 @@ import 'package:ht_main/shared/widgets/failure_state_widget.dart';
 import 'package:ht_main/shared/widgets/loading_state_widget.dart';
 // Import Source
 
-/// {@template headlines_feed_page}
-/// The main page displaying the feed of news headlines.
-///
-/// Provides the [HeadlinesFeedBloc] and renders the [_HeadlinesFeedView]
-/// which handles the UI based on the BLoC state.
-/// {@endtemplate}
-class HeadlinesFeedPage extends StatelessWidget {
-  /// {@macro headlines_feed_page}
-  const HeadlinesFeedPage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return const _HeadlinesFeedView();
-  }
-}
-
 /// {@template headlines_feed_view}
 /// The core view widget for the headlines feed.
 ///
 /// Handles displaying the list of headlines, loading states, error states,
 /// pagination (infinity scroll), and pull-to-refresh functionality. It also
 /// includes the AppBar with actions for notifications and filtering.
 /// {@endtemplate}
-class _HeadlinesFeedView extends StatefulWidget {
+class HeadlinesFeedPage extends StatefulWidget {
   /// {@macro headlines_feed_view}
-  const _HeadlinesFeedView();
+  const HeadlinesFeedPage({super.key});
 
   @override
-  State<_HeadlinesFeedView> createState() => _HeadlinesFeedViewState();
+  State<HeadlinesFeedPage> createState() => _HeadlinesFeedPageState();
 }
 
-/// State for the [_HeadlinesFeedView]. Manages the [ScrollController] for
+/// State for the [HeadlinesFeedPage]. Manages the [ScrollController] for
 /// pagination and listens to scroll events.
-class _HeadlinesFeedViewState extends State<_HeadlinesFeedView> {
+class _HeadlinesFeedPageState extends State<HeadlinesFeedPage> {
   final _scrollController = ScrollController();
 
   @override

lib/router/router.dart

@@ -1,5 +1,3 @@
-//
-// ignore_for_file: avoid_print, lines_longer_than_80_chars
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -12,9 +10,11 @@ import 'package:ht_main/account/bloc/account_bloc.dart';
 import 'package:ht_main/account/view/account_page.dart';
 import 'package:ht_main/app/bloc/app_bloc.dart';
 import 'package:ht_main/app/view/app_shell.dart';
+import 'package:ht_main/authentication/bloc/authentication_bloc.dart';
 import 'package:ht_main/authentication/view/authentication_page.dart';
 import 'package:ht_main/authentication/view/email_link_sent_page.dart';
 import 'package:ht_main/authentication/view/email_sign_in_page.dart';
+import 'package:ht_main/headline-details/bloc/headline_details_bloc.dart';
 import 'package:ht_main/headline-details/view/headline_details_page.dart';
 import 'package:ht_main/headlines-feed/bloc/headlines_feed_bloc.dart';
 import 'package:ht_main/headlines-feed/view/category_filter_page.dart'; // Import new page
@@ -234,11 +234,17 @@ GoRouter createRouter({
             showAnonymousButton = true; // Show anon button for initial sign-in
           }
 
-          return AuthenticationPage(
-            headline: headline,
-            subHeadline: subHeadline,
-            showAnonymousButton: showAnonymousButton,
-            isLinkingContext: isLinkingContext,
+          return BlocProvider(
+            create:
+                (context) => AuthenticationBloc(
+                  authenticationRepository: htAuthenticationRepository,
+                ),
+            child: AuthenticationPage(
+              headline: headline,
+              subHeadline: subHeadline,
+              showAnonymousButton: showAnonymousButton,
+              isLinkingContext: isLinkingContext,
+            ),
           );
         },
         routes: [
@@ -301,7 +307,13 @@ GoRouter createRouter({
                     name: Routes.articleDetailsName,
                     builder: (context, state) {
                       final id = state.pathParameters['id']!;
-                      return HeadlineDetailsPage(headlineId: id);
+                      return BlocProvider(
+                        create:
+                            (context) => HeadlineDetailsBloc(
+                              headlinesRepository: htHeadlinesRepository,
+                            )..add(HeadlineDetailsRequested(headlineId: id)),
+                        child: HeadlineDetailsPage(headlineId: id),
+                      );
                     },
                   ),
                   // Sub-route for notifications (placeholder) - MOVED HERE