Revert "Fix: Search and Notifications render inside shell (bottom nav stays visible), remove duplicate nav"

This reverts commit d3aa09424e.

sojorn_app/lib/routes/app_routes.dart

@@ -21,7 +21,6 @@ import '../screens/discover/discover_screen.dart';
 import '../screens/secure_chat/secure_chat_full_screen.dart';
 import '../screens/secure_chat/secure_chat_loader_screen.dart';
 import '../screens/post/threaded_conversation_screen.dart';
-import '../screens/notifications/notifications_screen.dart';
 
 /// App routing config (GoRouter).
 class AppRoutes {
@@ -94,16 +93,6 @@ class AppRoutes {
               GoRoute(
                 path: homeAlias,
                 builder: (_, __) => const FeedPersonalScreen(),
-                routes: [
-                  GoRoute(
-                    path: 'notifications',
-                    builder: (_, __) => const NotificationsScreen(),
-                  ),
-                  GoRoute(
-                    path: 'discover',
-                    builder: (_, __) => const DiscoverScreen(),
-                  ),
-                ],
               ),
             ],
           ),

sojorn_app/lib/screens/home/home_shell.dart

@@ -256,7 +256,13 @@ class _HomeShellState extends ConsumerState<HomeShell> with WidgetsBindingObserv
         IconButton(
           icon: Icon(Icons.search, color: AppTheme.navyBlue),
           tooltip: 'Discover',
-          onPressed: () => context.go('/home/discover'),
+          onPressed: () {
+            Navigator.of(context).push(
+              MaterialPageRoute(
+                builder: (_) => const DiscoverScreen(),
+              ),
+            );
+          },
         ),
         IconButton(
           icon: Consumer(
@@ -293,7 +299,13 @@ class _HomeShellState extends ConsumerState<HomeShell> with WidgetsBindingObserv
             },
           ),
           tooltip: 'Notifications',
-          onPressed: () => context.go('/home/notifications'),
+          onPressed: () {
+            Navigator.of(context).push(
+              MaterialPageRoute(
+                builder: (_) => const NotificationsScreen(),
+              ),
+            );
+          },
         ),
         const SizedBox(width: 4),
       ],

sojorn_app/lib/screens/notifications/notifications_screen.dart

@@ -6,9 +6,13 @@ import 'package:timeago/timeago.dart' as timeago;
 import '../../models/notification.dart';
 import '../../providers/api_provider.dart';
 import '../../theme/app_theme.dart';
+import '../../widgets/app_scaffold.dart';
 import '../../widgets/media/signed_media_image.dart';
 import '../profile/viewable_profile_screen.dart';
 import '../post/post_detail_screen.dart';
+import '../search/search_screen.dart';
+import '../discover/discover_screen.dart';
+import '../secure_chat/secure_chat_full_screen.dart';
 import 'package:go_router/go_router.dart';
 import '../../services/notification_service.dart';
 
@@ -348,71 +352,66 @@ class _NotificationsScreenState extends ConsumerState<NotificationsScreen> {
     }
   }
 
+  void _navigateHome() {
+    Navigator.of(context).pop();
+  }
+
+  void _navigateSearch() {
+    Navigator.of(context).pushReplacement(
+      MaterialPageRoute(builder: (_) => const DiscoverScreen()),
+    );
+  }
+
+  void _navigateChat() {
+    Navigator.of(context).pushReplacement(
+      MaterialPageRoute(
+        builder: (_) => const SecureChatFullScreen(),
+        fullscreenDialog: true,
+      ),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     final canArchiveAll = _activeTabIndex == 0 && _notifications.isNotEmpty;
 
     return DefaultTabController(
       length: 2,
-      child: Column(
+      child: AppScaffold(
-        children: [
+        title: 'Activity',
-          // Header row with back button, title, and archive all
+        leading: const SizedBox.shrink(),
-          Material(
+        actions: [
-            color: AppTheme.scaffoldBg,
+          if (canArchiveAll)
-            child: Padding(
+            TextButton(
-              padding: const EdgeInsets.only(left: 4, right: 8, top: 4),
+              onPressed: _archiveAllNotifications,
-              child: Row(
+              child: Text(
-                children: [
+                'Archive All',
-                  IconButton(
+                style: AppTheme.textTheme.labelMedium?.copyWith(
-                    icon: Icon(Icons.arrow_back, color: AppTheme.navyBlue),
+                  color: AppTheme.egyptianBlue,
-                    onPressed: () => context.go('/home'),
+                  fontWeight: FontWeight.w600,
-                  ),
+                ),
-                  Text(
-                    'Activity',
-                    style: AppTheme.textTheme.titleLarge?.copyWith(
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                  const Spacer(),
-                  if (canArchiveAll)
-                    TextButton(
-                      onPressed: _archiveAllNotifications,
-                      child: Text(
-                        'Archive All',
-                        style: AppTheme.textTheme.labelMedium?.copyWith(
-                          color: AppTheme.egyptianBlue,
-                          fontWeight: FontWeight.w600,
-                        ),
-                      ),
-                    ),
-                ],
               ),
             ),
-          ),
+        ],
-          // Tab bar
+        bottom: TabBar(
-          Material(
+          onTap: (index) {
-            color: AppTheme.scaffoldBg,
+            if (index != _activeTabIndex) {
-            child: TabBar(
+              setState(() {
-              onTap: (index) {
+                _activeTabIndex = index;
-                if (index != _activeTabIndex) {
+              });
-                  setState(() {
+              _loadNotifications(refresh: true);
-                    _activeTabIndex = index;
+            }
-                  });
+          },
-                  _loadNotifications(refresh: true);
+          indicatorColor: AppTheme.egyptianBlue,
-                }
+          labelColor: AppTheme.egyptianBlue,
-              },
+          unselectedLabelColor: AppTheme.egyptianBlue.withOpacity(0.5),
-              indicatorColor: AppTheme.egyptianBlue,
+          tabs: const [
-              labelColor: AppTheme.egyptianBlue,
+            Tab(text: 'Active'),
-              unselectedLabelColor: AppTheme.egyptianBlue.withOpacity(0.5),
+            Tab(text: 'Archived'),
-              tabs: const [
+          ],
-                Tab(text: 'Active'),
+        ),
-                Tab(text: 'Archived'),
+        bottomNavigationBar: _buildBottomNav(),
-              ],
+        body: _error != null
-            ),
-          ),
-          // Content
-          Expanded(
-            child: _error != null
             ? _ErrorState(
                 message: _error!,
                 onRetry: () => _loadNotifications(refresh: true),
@@ -486,8 +485,86 @@ class _NotificationsScreenState extends ConsumerState<NotificationsScreen> {
                       },
                     ),
                   ),
+      ),
+    );
+  }
+
+  Widget _buildBottomNav() {
+    return Container(
+      decoration: BoxDecoration(
+        color: AppTheme.scaffoldBg,
+        border: Border(
+          top: BorderSide(
+            color: AppTheme.egyptianBlue.withOpacity(0.1),
+            width: 0.5,
           ),
-        ],
+        ),
+      ),
+      child: SafeArea(
+        top: false,
+        child: Padding(
+          padding: const EdgeInsets.symmetric(vertical: 8),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceAround,
+            children: [
+              _buildNavItem(
+                icon: Icons.home_outlined,
+                label: 'Home',
+                onTap: _navigateHome,
+              ),
+              _buildNavItem(
+                icon: Icons.search,
+                label: 'Discover',
+                onTap: _navigateSearch,
+              ),
+              _buildNavItem(
+                icon: Icons.notifications,
+                label: 'Activity',
+                isActive: true,
+                onTap: () {},
+              ),
+              _buildNavItem(
+                icon: Icons.chat_bubble_outline,
+                label: 'Chat',
+                onTap: _navigateChat,
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildNavItem({
+    required IconData icon,
+    required String label,
+    required VoidCallback onTap,
+    bool isActive = false,
+  }) {
+    return InkWell(
+      onTap: onTap,
+      borderRadius: BorderRadius.circular(12),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Icon(
+              icon,
+              color: isActive ? AppTheme.navyBlue : Colors.grey,
+              size: 26,
+            ),
+            const SizedBox(height: 2),
+            Text(
+              label,
+              style: TextStyle(
+                fontSize: 10,
+                color: isActive ? AppTheme.navyBlue : Colors.grey,
+                fontWeight: isActive ? FontWeight.w600 : FontWeight.normal,
+              ),
+            ),
+          ],
+        ),
       ),
     );
   }