refactor: successfully refactored app navigation. It now utilizes a StatefulShellRoute managed by a new AppShell widget (lib/app/view/app_shell.dart) which employs flutter_adaptive_scaffold for responsive navigation.

Author: fulleni

lib/account/view/account_page.dart

@@ -45,7 +45,7 @@ class _AccountView extends StatelessWidget {
     final l10n = context.l10n;
     // Watch AppBloc for user details and authentication status
     final user = context.watch<AppBloc>().state.user;
-    final status = user.authenticationStatus; // Use status from User model
+    final status = user.authenticationStatus;
 
     // Determine if the user is anonymous
     final isAnonymous = status == AuthenticationStatus.anonymous;
@@ -61,8 +61,10 @@ class _AccountView extends StatelessWidget {
           const SizedBox(height: 24),
 
           // --- Action Tiles ---
+          _buildNotificationsTile(context),
+          const Divider(),
           _buildSettingsTile(context),
-          const Divider(), // Visual separator
+          const Divider(),
           if (isAnonymous)
             _buildBackupTile(context) // Show Backup CTA for anonymous
           else
@@ -144,7 +146,6 @@ class _AccountView extends StatelessWidget {
         style: TextStyle(color: Theme.of(context).colorScheme.error),
       ),
       onTap: () {
-        // Add the logout event to the AccountBloc
         context.read<AccountBloc>().add(const AccountLogoutRequested());
         // Global redirect will be handled by AppBloc/GoRouter
       },
@@ -155,7 +156,7 @@ class _AccountView extends StatelessWidget {
   Widget _buildBackupTile(BuildContext context) {
     final l10n = context.l10n;
     return ListTile(
-      leading: const Icon(Icons.link), // Icon suggesting connection/linking
+      leading: const Icon(Icons.link),
       title: Text(l10n.accountConnectPrompt),
       subtitle: Text(l10n.accountConnectBenefit),
       isThreeLine: true, // Allow more space for subtitle
@@ -170,6 +171,20 @@ class _AccountView extends StatelessWidget {
     );
   }
 
+  /// Builds the ListTile for navigating to Notifications.
+  Widget _buildNotificationsTile(BuildContext context) {
+    final l10n = context.l10n;
+    return ListTile(
+      leading: const Icon(Icons.notifications_outlined),
+      title: Text(l10n.accountNotificationsTile),
+      trailing: const Icon(Icons.chevron_right), // Suggests navigation
+      onTap: () {
+        // Navigate to the new notifications route (placeholder)
+        context.goNamed(Routes.notificationsName);
+      },
+    );
+  }
+
   /// Helper to convert AuthenticationStatus enum to a display string.
   String _authenticationStatusToString(
     BuildContext context,

lib/app/view/app_shell.dart

@@ -0,0 +1,95 @@
+//
+// ignore_for_file: lines_longer_than_80_chars
+
+import 'package:flutter/material.dart';
+import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart';
+import 'package:go_router/go_router.dart';
+import 'package:ht_main/l10n/l10n.dart';
+
+/// A responsive scaffold shell for the main application sections.
+///
+/// Uses [AdaptiveScaffold] to provide appropriate navigation
+/// (bottom bar, rail, or drawer) based on screen size.
+class AppShell extends StatelessWidget {
+  /// Creates an [AppShell].
+  ///
+  /// Requires a [navigationShell] to manage the nested navigators
+  /// for each section.
+  const AppShell({required this.navigationShell, super.key});
+
+  /// The [StatefulNavigationShell] provided by [GoRouter] for managing nested
+  /// navigators in a stateful way.
+  final StatefulNavigationShell navigationShell;
+
+  // Corrected callback signature if needed, though the original looks standard.
+  // Let's ensure the AdaptiveScaffold call uses the correct signature.
+  // The primary issue was likely the missing import.
+
+  void _goBranch(int index) {
+    // Navigate to the corresponding branch using the index.
+    // The `saveState` parameter is crucial for preserving the state
+    // of each navigation branch (e.g., scroll position).
+    navigationShell.goBranch(
+      index,
+      // Navigate to the initial location of the branch if the user taps
+      // the same active destination again. Otherwise, defaults to false.
+      initialLocation: index == navigationShell.currentIndex,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = context.l10n;
+
+    return AdaptiveScaffold(
+      // Use the index from the navigationShell to sync the selected destination.
+      selectedIndex: navigationShell.currentIndex,
+      // Callback when a destination is selected.
+      // Ensure the parameter type is explicitly int.
+      onSelectedIndexChange: _goBranch,
+      // Define the navigation destinations.
+      destinations: [
+        const NavigationDestination(
+          // Make const
+          icon: Icon(Icons.article_outlined),
+          selectedIcon: Icon(Icons.article),
+          label: l10n.bottomNavFeedLabel, // Placeholder until generated
+        ),
+        const NavigationDestination(
+          // Make const
+          icon: Icon(Icons.search_outlined),
+          selectedIcon: Icon(Icons.search),
+          label: l10n.bottomNavSearchLabel, // Placeholder until generated
+        ),
+        const NavigationDestination(
+          // Make const
+          icon: Icon(Icons.account_circle_outlined),
+          selectedIcon: Icon(Icons.account_circle),
+          label: l10n.bottomNavAccountLabel, // Placeholder until generated
+        ),
+      ],
+      // The body displays the widget tree for the currently selected branch.
+      // The [NavigationShell] widget handles building the appropriate page.
+      body: (_) => navigationShell,
+
+      // Optional: Configure small screen navigation type (defaults to bottomNav)
+      // smallBreakpoint: const WidthPlatformBreakpoint(end: 700),
+      // smallBuilder: (_, __) => AdaptiveScaffold.standardBottomNavigationBar(
+      //   destinations: destinations,
+      // ),
+
+      // Optional: Configure medium screen navigation type (defaults to navRail)
+      // mediumBreakpoint: const WidthPlatformBreakpoint(begin: 700, end: 1000),
+      // mediumBuilder: (_, __, ___) => AdaptiveScaffold.standardNavigationRail(
+      //   destinations: destinations,
+      //   // leading: const Icon(Icons.menu), // Example leading widget
+      // ),
+
+      // Optional: Configure large screen navigation type (defaults to drawer)
+      // largeBreakpoint: const WidthPlatformBreakpoint(begin: 1000),
+      // largeBuilder: (_, __, ___) => AdaptiveScaffold.standardNavigationDrawer(
+      //   destinations: destinations,
+      // ),
+    );
+  }
+}

lib/headlines-feed/view/headlines_feed_page.dart

@@ -1,11 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:go_router/go_router.dart';
 import 'package:ht_headlines_repository/ht_headlines_repository.dart';
 import 'package:ht_main/headlines-feed/bloc/headlines_feed_bloc.dart';
 import 'package:ht_main/headlines-feed/widgets/headline_item_widget.dart';
 import 'package:ht_main/l10n/l10n.dart';
-import 'package:ht_main/router/routes.dart';
 import 'package:ht_main/shared/constants/constants.dart';
 import 'package:ht_main/shared/widgets/failure_state_widget.dart';
 import 'package:ht_main/shared/widgets/loading_state_widget.dart';
@@ -75,38 +73,14 @@ class _HeadlinesFeedViewState extends State<_HeadlinesFeedView> {
 
     return Scaffold(
       appBar: AppBar(
-        leadingWidth: 100,
-        leading: Row(
-          mainAxisSize: MainAxisSize.min, // Keep icons close together
-          children: [
-            IconButton(
-              icon: const Icon(Icons.account_circle_outlined),
-              selectedIcon: const Icon(Icons.account_circle_rounded),
-              onPressed: () {
-                // Navigate to the Account page
-                context.goNamed(Routes.accountName);
-              },
-            ),
-            IconButton(
-              icon: const Icon(Icons.notifications_none),
-              selectedIcon: const Icon(Icons.notifications_rounded),
-              onPressed: () {},
-            ),
-          ],
-        ),
+        // Removed leadingWidth and leading Row
         title: Text(
-          'HT', // Consider localizing this if needed
+          'HT', // TODO(fulleni): Localize this title
           style: textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
         ),
         centerTitle: true,
         actions: [
-          const SizedBox(width: AppSpacing.sm),
-          IconButton(
-            icon: const Icon(Icons.search),
-            onPressed: () {
-              context.goNamed(Routes.searchName);
-            },
-          ),
+          // Removed Search IconButton
           BlocBuilder<HeadlinesFeedBloc, HeadlinesFeedState>(
             builder: (context, state) {
               var isFilterApplied = false;
@@ -138,7 +112,7 @@ class _HeadlinesFeedViewState extends State<_HeadlinesFeedView> {
                         width: AppSpacing.sm,
                         height: AppSpacing.sm,
                         decoration: BoxDecoration(
-                          color: colorScheme.primary, // Use variable
+                          color: colorScheme.primary,
                           shape: BoxShape.circle,
                         ),
                       ),
@@ -160,9 +134,7 @@ class _HeadlinesFeedViewState extends State<_HeadlinesFeedView> {
                 headline: l10n.headlinesFeedLoadingHeadline,
                 subheadline: l10n.headlinesFeedLoadingSubheadline,
               );
-            // this silentcase will never be reached
-            // it here just to fullfill the Exhaustiveness
-            // Checking os the sealed state.
+
             case HeadlinesFeedLoadingSilently():
               // This case is technically unreachable due to buildWhen,
               // but required for exhaustive switch.
@@ -177,7 +149,7 @@ class _HeadlinesFeedViewState extends State<_HeadlinesFeedView> {
                 // Use ListView.separated for consistent spacing
                 child: ListView.separated(
                   controller: _scrollController,
-                  // Add vertical padding within the list
+
                   padding: const EdgeInsets.only(
                     top: AppSpacing.md,
                     bottom: AppSpacing.xxl,
@@ -259,14 +231,14 @@ class _HeadlinesFilterBottomSheetState
         child: SingleChildScrollView(
           child: Column(
             mainAxisSize: MainAxisSize.min,
-            crossAxisAlignment: CrossAxisAlignment.stretch, // Stretch buttons
+            crossAxisAlignment: CrossAxisAlignment.stretch,
             children: [
               Text(
                 l10n.headlinesFeedFilterTitle,
                 style: Theme.of(context).textTheme.titleLarge,
                 textAlign: TextAlign.center,
               ),
-              const SizedBox(height: AppSpacing.xl), // Increased spacing
+              const SizedBox(height: AppSpacing.xl),
               // Category Dropdown
               DropdownButtonFormField<String>(
                 decoration: InputDecoration(

lib/l10n/arb/app_ar.arb

@@ -259,5 +259,21 @@
     "accountConnectBenefit": "لحفظ تفضيلاتك وسجل القراءة عبر الأجهزة.",
     "@accountConnectBenefit": {
         "description": "عنوان فرعي يشرح فائدة ربط حساب مجهول"
+    },
+    "bottomNavFeedLabel": "الموجز",
+    "@bottomNavFeedLabel": {
+        "description": "Label for the Feed item in the bottom navigation bar"
+    },
+    "bottomNavSearchLabel": "بحث",
+    "@bottomNavSearchLabel": {
+        "description": "Label for the Search item in the bottom navigation bar"
+    },
+    "bottomNavAccountLabel": "الحساب",
+    "@bottomNavAccountLabel": {
+        "description": "Label for the Account item in the bottom navigation bar"
+    },
+    "accountNotificationsTile": "الإشعارات",
+    "@accountNotificationsTile": {
+        "description": "Title for the notifications navigation tile in the account page"
     }
 }

lib/l10n/arb/app_en.arb

@@ -259,5 +259,21 @@
     "accountConnectBenefit": "Save your preferences and reading history across devices.",
     "@accountConnectBenefit": {
         "description": "Subtitle explaining the benefit of connecting an anonymous account"
+    },
+    "bottomNavFeedLabel": "Feed",
+    "@bottomNavFeedLabel": {
+        "description": "Label for the Feed item in the bottom navigation bar"
+    },
+    "bottomNavSearchLabel": "Search",
+    "@bottomNavSearchLabel": {
+        "description": "Label for the Search item in the bottom navigation bar"
+    },
+    "bottomNavAccountLabel": "Account",
+    "@bottomNavAccountLabel": {
+        "description": "Label for the Account item in the bottom navigation bar"
+    },
+    "accountNotificationsTile": "Notifications",
+    "@accountNotificationsTile": {
+        "description": "Title for the notifications navigation tile in the account page"
     }
 }