commit f8481fd70b402dc8670851dcd49206b647b59fbb · bretton.dev/coves-mobile

+42 -5

lib/providers/feed_provider.dart

···

       6
       6
        
       import 'auth_provider.dart';

     

       7
       7
        
       import 'vote_provider.dart';

     

       8
       8
        
       

     

       9
       9
       +
       /// Feed types available in the app

     

       10
       10
       +
       enum FeedType {

     

       11
       11
       +
         /// All posts across the network

     

       12
       12
       +
         discover,

     

       13
       13
       +
       

     

       14
       14
       +
         /// Posts from subscribed communities (authenticated only)

     

       15
       15
       +
         forYou,

     

       16
       16
       +
       }

     

       17
       17
       +
       

     

       9
       18
        
       /// Feed Provider

     

       10
       19
        
       ///

     

       11
       20
        
       /// Manages feed state and fetching logic.

     
···

       53
       62
        
             if (kDebugMode) {

     

       54
       63
        
               debugPrint('🔒 User signed out - clearing feed');

     

       55
       64
        
             }

     

       65
       65
       +
             // Reset feed type to Discover since For You requires auth

     

       66
       66
       +
             _feedType = FeedType.discover;

     

       56
       67
        
             reset();

     

       57
       68
        
             // Automatically load the public discover feed

     

       58
       69
        
             loadFeed(refresh: true);

     
···

       80
       91
        
         // Feed configuration

     

       81
       92
        
         String _sort = 'hot';

     

       82
       93
        
         String? _timeframe;

     

       94
       94
       +
         FeedType _feedType = FeedType.discover;

     

       83
       95
        
       

     

       84
       96
        
         // Time update mechanism for periodic UI refreshes

     

       85
       97
        
         Timer? _timeUpdateTimer;

     
···

       94
       106
        
         String get sort => _sort;

     

       95
       107
        
         String? get timeframe => _timeframe;

     

       96
       108
        
         DateTime? get currentTime => _currentTime;

     

       109
       109
       +
         FeedType get feedType => _feedType;

     

       110
       110
       +
       

     

       111
       111
       +
         /// Check if For You feed is available (requires authentication)

     

       112
       112
       +
         bool get isForYouAvailable => _authProvider.isAuthenticated;

     

       97
       113
        
       

     

       98
       114
        
         /// Start periodic time updates for "time ago" strings

     

       99
       115
        
         ///

     
···

       130
       146
        
           }

     

       131
       147
        
         }

     

       132
       148
        
       

     

       133
       133
       -
         /// Load feed based on authentication state (business logic

     

       134
       134
       -
         /// encapsulation)

     

       149
       149
       +
         /// Load feed based on current feed type

     

       135
       150
        
         ///

     

       136
       151
        
         /// This method encapsulates the business logic of deciding which feed

     

       137
       137
       -
         /// to fetch. Previously this logic was in the UI layer (FeedScreen),

     

       138
       138
       -
         /// violating clean architecture.

     

       152
       152
       +
         /// to fetch based on the selected feed type.

     

       139
       153
        
         Future<void> loadFeed({bool refresh = false}) async {

     

       140
       140
       -
           if (_authProvider.isAuthenticated) {

     

       154
       154
       +
           // For You requires authentication - fall back to Discover if not

     

       155
       155
       +
           if (_feedType == FeedType.forYou && _authProvider.isAuthenticated) {

     

       141
       156
        
             await fetchTimeline(refresh: refresh);

     

       142
       157
        
           } else {

     

       143
       158
        
             await fetchDiscover(refresh: refresh);

     
···

       147
       162
        
           if (_posts.isNotEmpty && _timeUpdateTimer == null) {

     

       148
       163
        
             startTimeUpdates();

     

       149
       164
        
           }

     

       165
       165
       +
         }

     

       166
       166
       +
       

     

       167
       167
       +
         /// Switch feed type and reload

     

       168
       168
       +
         Future<void> setFeedType(FeedType type) async {

     

       169
       169
       +
           if (_feedType == type) {

     

       170
       170
       +
             return;

     

       171
       171
       +
           }

     

       172
       172
       +
       

     

       173
       173
       +
           // For You requires authentication

     

       174
       174
       +
           if (type == FeedType.forYou && !_authProvider.isAuthenticated) {

     

       175
       175
       +
             return;

     

       176
       176
       +
           }

     

       177
       177
       +
       

     

       178
       178
       +
           _feedType = type;

     

       179
       179
       +
           // Reset pagination state but keep posts visible until new feed loads

     

       180
       180
       +
           _cursor = null;

     

       181
       181
       +
           _hasMore = true;

     

       182
       182
       +
           _error = null;

     

       183
       183
       +
           notifyListeners();

     

       184
       184
       +
       

     

       185
       185
       +
           // Load new feed - old posts stay visible until new ones arrive

     

       186
       186
       +
           await loadFeed(refresh: true);

     

       150
       187
        
         }

     

       151
       188
        
       

     

       152
       189
        
         /// Common feed fetching logic (DRY principle - eliminates code

+162 -14

lib/screens/home/feed_screen.dart

···

       5
       5
        
       import '../../models/post.dart';

     

       6
       6
        
       import '../../providers/auth_provider.dart';

     

       7
       7
        
       import '../../providers/feed_provider.dart';

     

       8
       8
       +
       import '../../widgets/icons/bluesky_icons.dart';

     

       8
       9
        
       import '../../widgets/post_card.dart';

     

       9
       10
        
       

     

       11
       11
       +
       /// Header layout constants

     

       12
       12
       +
       const double _kHeaderHeight = 44;

     

       13
       13
       +
       const double _kTabUnderlineWidth = 28;

     

       14
       14
       +
       const double _kTabUnderlineHeight = 3;

     

       15
       15
       +
       const double _kHeaderContentPadding = _kHeaderHeight;

     

       16
       16
       +
       

     

       10
       17
        
       class FeedScreen extends StatefulWidget {

     

       11
       11
       -
         const FeedScreen({super.key});

     

       18
       18
       +
         const FeedScreen({super.key, this.onSearchTap});

     

       19
       19
       +
       

     

       20
       20
       +
         /// Callback when search icon is tapped (to switch to communities tab)

     

       21
       21
       +
         final VoidCallback? onSearchTap;

     

       12
       22
        
       

     

       13
       23
        
         @override

     

       14
       24
        
         State<FeedScreen> createState() => _FeedScreenState();

     
···

       63
       73
        
           );

     

       64
       74
        
           final isLoading = context.select<FeedProvider, bool>((p) => p.isLoading);

     

       65
       75
        
           final error = context.select<FeedProvider, String?>((p) => p.error);

     

       76
       76
       +
           final feedType = context.select<FeedProvider, FeedType>(

     

       77
       77
       +
             (p) => p.feedType,

     

       78
       78
       +
           );

     

       66
       79
        
       

     

       67
       80
        
           // IMPORTANT: This relies on FeedProvider creating new list instances

     

       68
       81
        
           // (_posts = [..._posts, ...response.feed]) rather than mutating in-place.

     
···

       80
       93
        
       

     

       81
       94
        
           return Scaffold(

     

       82
       95
        
             backgroundColor: AppColors.background,

     

       83
       83
       -
             appBar: AppBar(

     

       84
       84
       -
               backgroundColor: AppColors.background,

     

       85
       85
       -
               foregroundColor: AppColors.textPrimary,

     

       86
       86
       -
               title: Text(isAuthenticated ? 'Feed' : 'Explore'),

     

       87
       87
       -
               automaticallyImplyLeading: false,

     

       88
       88
       -
             ),

     

       89
       96
        
             body: SafeArea(

     

       90
       90
       -
               child: _buildBody(

     

       91
       91
       -
                 isLoading: isLoading,

     

       92
       92
       -
                 error: error,

     

       93
       93
       -
                 posts: posts,

     

       94
       94
       -
                 isLoadingMore: isLoadingMore,

     

       95
       95
       -
                 isAuthenticated: isAuthenticated,

     

       96
       96
       -
                 currentTime: currentTime,

     

       97
       97
       +
               child: Stack(

     

       98
       98
       +
                 children: [

     

       99
       99
       +
                   // Feed content (behind header)

     

       100
       100
       +
                   _buildBody(

     

       101
       101
       +
                     isLoading: isLoading,

     

       102
       102
       +
                     error: error,

     

       103
       103
       +
                     posts: posts,

     

       104
       104
       +
                     isLoadingMore: isLoadingMore,

     

       105
       105
       +
                     isAuthenticated: isAuthenticated,

     

       106
       106
       +
                     currentTime: currentTime,

     

       107
       107
       +
                   ),

     

       108
       108
       +
                   // Transparent header overlay

     

       109
       109
       +
                   _buildHeader(

     

       110
       110
       +
                     feedType: feedType,

     

       111
       111
       +
                     isAuthenticated: isAuthenticated,

     

       112
       112
       +
                   ),

     

       113
       113
       +
                 ],

     

       97
       114
        
               ),

     

       98
       115
        
             ),

     

       99
       116
        
           );

     

       100
       117
        
         }

     

       101
       118
        
       

     

       119
       119
       +
         Widget _buildHeader({

     

       120
       120
       +
           required FeedType feedType,

     

       121
       121
       +
           required bool isAuthenticated,

     

       122
       122
       +
         }) {

     

       123
       123
       +
           return Container(

     

       124
       124
       +
             height: _kHeaderHeight,

     

       125
       125
       +
             decoration: BoxDecoration(

     

       126
       126
       +
               // Gradient fade from solid to transparent

     

       127
       127
       +
               gradient: LinearGradient(

     

       128
       128
       +
                 begin: Alignment.topCenter,

     

       129
       129
       +
                 end: Alignment.bottomCenter,

     

       130
       130
       +
                 colors: [

     

       131
       131
       +
                   AppColors.background,

     

       132
       132
       +
                   AppColors.background.withValues(alpha: 0.8),

     

       133
       133
       +
                   AppColors.background.withValues(alpha: 0),

     

       134
       134
       +
                 ],

     

       135
       135
       +
                 stops: const [0.0, 0.6, 1.0],

     

       136
       136
       +
               ),

     

       137
       137
       +
             ),

     

       138
       138
       +
             padding: const EdgeInsets.symmetric(horizontal: 16),

     

       139
       139
       +
             child: Row(

     

       140
       140
       +
               children: [

     

       141
       141
       +
                 // Feed type tabs in the center

     

       142
       142
       +
                 Expanded(

     

       143
       143
       +
                   child: _buildFeedTypeTabs(

     

       144
       144
       +
                     feedType: feedType,

     

       145
       145
       +
                     isAuthenticated: isAuthenticated,

     

       146
       146
       +
                   ),

     

       147
       147
       +
                 ),

     

       148
       148
       +
                 // Search/Communities icon on the right

     

       149
       149
       +
                 if (widget.onSearchTap != null)

     

       150
       150
       +
                   Semantics(

     

       151
       151
       +
                     label: 'Navigate to Communities',

     

       152
       152
       +
                     button: true,

     

       153
       153
       +
                     child: InkWell(

     

       154
       154
       +
                       onTap: widget.onSearchTap,

     

       155
       155
       +
                       borderRadius: BorderRadius.circular(20),

     

       156
       156
       +
                       splashColor: AppColors.primary.withValues(alpha: 0.2),

     

       157
       157
       +
                       child: Padding(

     

       158
       158
       +
                         padding: const EdgeInsets.all(8),

     

       159
       159
       +
                         child: BlueSkyIcon.search(color: AppColors.textPrimary),

     

       160
       160
       +
                       ),

     

       161
       161
       +
                     ),

     

       162
       162
       +
                   ),

     

       163
       163
       +
               ],

     

       164
       164
       +
             ),

     

       165
       165
       +
           );

     

       166
       166
       +
         }

     

       167
       167
       +
       

     

       168
       168
       +
         Widget _buildFeedTypeTabs({

     

       169
       169
       +
           required FeedType feedType,

     

       170
       170
       +
           required bool isAuthenticated,

     

       171
       171
       +
         }) {

     

       172
       172
       +
           // If not authenticated, only show Discover

     

       173
       173
       +
           if (!isAuthenticated) {

     

       174
       174
       +
             return Center(

     

       175
       175
       +
               child: _buildFeedTypeTab(

     

       176
       176
       +
                 label: 'Discover',

     

       177
       177
       +
                 isActive: true,

     

       178
       178
       +
                 onTap: null,

     

       179
       179
       +
               ),

     

       180
       180
       +
             );

     

       181
       181
       +
           }

     

       182
       182
       +
       

     

       183
       183
       +
           // Authenticated: show both tabs side by side (TikTok style)

     

       184
       184
       +
           return Row(

     

       185
       185
       +
             mainAxisAlignment: MainAxisAlignment.center,

     

       186
       186
       +
             children: [

     

       187
       187
       +
               _buildFeedTypeTab(

     

       188
       188
       +
                 label: 'Discover',

     

       189
       189
       +
                 isActive: feedType == FeedType.discover,

     

       190
       190
       +
                 onTap: () => _switchToFeedType(FeedType.discover),

     

       191
       191
       +
               ),

     

       192
       192
       +
               const SizedBox(width: 24),

     

       193
       193
       +
               _buildFeedTypeTab(

     

       194
       194
       +
                 label: 'For You',

     

       195
       195
       +
                 isActive: feedType == FeedType.forYou,

     

       196
       196
       +
                 onTap: () => _switchToFeedType(FeedType.forYou),

     

       197
       197
       +
               ),

     

       198
       198
       +
             ],

     

       199
       199
       +
           );

     

       200
       200
       +
         }

     

       201
       201
       +
       

     

       202
       202
       +
         Widget _buildFeedTypeTab({

     

       203
       203
       +
           required String label,

     

       204
       204
       +
           required bool isActive,

     

       205
       205
       +
           required VoidCallback? onTap,

     

       206
       206
       +
         }) {

     

       207
       207
       +
           return Semantics(

     

       208
       208
       +
             label: '$label feed${isActive ? ', selected' : ''}',

     

       209
       209
       +
             button: true,

     

       210
       210
       +
             selected: isActive,

     

       211
       211
       +
             child: GestureDetector(

     

       212
       212
       +
               onTap: onTap,

     

       213
       213
       +
               behavior: HitTestBehavior.opaque,

     

       214
       214
       +
               child: Column(

     

       215
       215
       +
                 mainAxisSize: MainAxisSize.min,

     

       216
       216
       +
                 mainAxisAlignment: MainAxisAlignment.center,

     

       217
       217
       +
                 children: [

     

       218
       218
       +
                   Text(

     

       219
       219
       +
                     label,

     

       220
       220
       +
                     style: TextStyle(

     

       221
       221
       +
                       color: isActive

     

       222
       222
       +
                           ? AppColors.textPrimary

     

       223
       223
       +
                           : AppColors.textSecondary.withValues(alpha: 0.6),

     

       224
       224
       +
                       fontSize: 16,

     

       225
       225
       +
                       fontWeight: isActive ? FontWeight.w700 : FontWeight.w400,

     

       226
       226
       +
                     ),

     

       227
       227
       +
                   ),

     

       228
       228
       +
                   const SizedBox(height: 2),

     

       229
       229
       +
                   // Underline indicator (TikTok style)

     

       230
       230
       +
                   Container(

     

       231
       231
       +
                     width: _kTabUnderlineWidth,

     

       232
       232
       +
                     height: _kTabUnderlineHeight,

     

       233
       233
       +
                     decoration: BoxDecoration(

     

       234
       234
       +
                       color: isActive ? AppColors.textPrimary : Colors.transparent,

     

       235
       235
       +
                       borderRadius: BorderRadius.circular(2),

     

       236
       236
       +
                     ),

     

       237
       237
       +
                   ),

     

       238
       238
       +
                 ],

     

       239
       239
       +
               ),

     

       240
       240
       +
             ),

     

       241
       241
       +
           );

     

       242
       242
       +
         }

     

       243
       243
       +
       

     

       244
       244
       +
         void _switchToFeedType(FeedType type) {

     

       245
       245
       +
           Provider.of<FeedProvider>(context, listen: false).setFeedType(type);

     

       246
       246
       +
         }

     

       247
       247
       +
       

     

       102
       248
        
         Widget _buildBody({

     

       103
       249
        
           required bool isLoading,

     

       104
       250
        
           required String? error,

     
···

       205
       351
        
             color: AppColors.primary,

     

       206
       352
        
             child: ListView.builder(

     

       207
       353
        
               controller: _scrollController,

     

       354
       354
       +
               // Add top padding so content isn't hidden behind transparent header

     

       355
       355
       +
               padding: const EdgeInsets.only(top: _kHeaderContentPadding),

     

       208
       356
        
               // Add extra item for loading indicator or pagination error

     

       209
       357
        
               itemCount: posts.length + (isLoadingMore || error != null ? 1 : 0),

     

       210
       358
        
               itemBuilder: (context, index) {

+24 -13

lib/screens/home/main_shell_screen.dart

···

       2
       2
        
       

     

       3
       3
        
       import '../../constants/app_colors.dart';

     

       4
       4
        
       import '../../widgets/icons/bluesky_icons.dart';

     

       5
       5
       +
       import 'communities_screen.dart';

     

       5
       6
        
       import 'create_post_screen.dart';

     

       6
       7
        
       import 'feed_screen.dart';

     

       7
       8
        
       import 'notifications_screen.dart';

     

       8
       9
        
       import 'profile_screen.dart';

     

       9
       9
       -
       import 'search_screen.dart';

     

       10
       10
        
       

     

       11
       11
        
       class MainShellScreen extends StatefulWidget {

     

       12
       12
        
         const MainShellScreen({super.key});

     
···

       17
       17
        
       

     

       18
       18
        
       class _MainShellScreenState extends State<MainShellScreen> {

     

       19
       19
        
         int _selectedIndex = 0;

     

       20
       20
       -
       

     

       21
       21
       -
         static const List<Widget> _screens = [

     

       22
       22
       -
           FeedScreen(),

     

       23
       23
       -
           SearchScreen(),

     

       24
       24
       -
           CreatePostScreen(),

     

       25
       25
       -
           NotificationsScreen(),

     

       26
       26
       -
           ProfileScreen(),

     

       27
       27
       -
         ];

     

       28
       20
        
       

     

       29
       21
        
         void _onItemTapped(int index) {

     

       30
       22
        
           setState(() {

     
···

       32
       24
        
           });

     

       33
       25
        
         }

     

       34
       26
        
       

     

       27
       27
       +
         void _onCommunitiesTap() {

     

       28
       28
       +
           setState(() {

     

       29
       29
       +
             _selectedIndex = 1; // Switch to communities tab

     

       30
       30
       +
           });

     

       31
       31
       +
         }

     

       32
       32
       +
       

     

       35
       33
        
         @override

     

       36
       34
        
         Widget build(BuildContext context) {

     

       37
       35
        
           return Scaffold(

     

       38
       38
       -
             body: _screens[_selectedIndex],

     

       36
       36
       +
             body: IndexedStack(

     

       37
       37
       +
               index: _selectedIndex,

     

       38
       38
       +
               children: [

     

       39
       39
       +
                 FeedScreen(onSearchTap: _onCommunitiesTap),

     

       40
       40
       +
                 const CommunitiesScreen(),

     

       41
       41
       +
                 const CreatePostScreen(),

     

       42
       42
       +
                 const NotificationsScreen(),

     

       43
       43
       +
                 const ProfileScreen(),

     

       44
       44
       +
               ],

     

       45
       45
       +
             ),

     

       39
       46
        
             bottomNavigationBar: Container(

     

       40
       47
        
               decoration: const BoxDecoration(

     

       41
       48
        
                 color: Color(0xFF0B0F14),

     
···

       48
       55
        
                     mainAxisAlignment: MainAxisAlignment.spaceAround,

     

       49
       56
        
                     children: [

     

       50
       57
        
                       _buildNavItem(0, 'home', 'Home'),

     

       51
       51
       -
                       _buildNavItem(1, 'search', 'Search'),

     

       58
       58
       +
                       _buildNavItem(1, 'communities', 'Communities'),

     

       52
       59
        
                       _buildNavItem(2, 'plus', 'Create'),

     

       53
       60
        
                       _buildNavItem(3, 'bell', 'Notifications'),

     

       54
       61
        
                       _buildNavItem(4, 'person', 'Me'),

     
···

       73
       80
        
             case 'home':

     

       74
       81
        
               icon = BlueSkyIcon.homeSimple(color: color);

     

       75
       82
        
               break;

     

       76
       76
       -
             case 'search':

     

       77
       77
       -
               icon = BlueSkyIcon.search(color: color);

     

       83
       83
       +
             case 'communities':

     

       84
       84
       +
               icon = Icon(

     

       85
       85
       +
                 isSelected ? Icons.workspaces : Icons.workspaces_outlined,

     

       86
       86
       +
                 color: color,

     

       87
       87
       +
                 size: 24,

     

       88
       88
       +
               );

     

       78
       89
        
               break;

     

       79
       90
        
             case 'plus':

     

       80
       91
        
               icon = BlueSkyIcon.plus(color: color);

+12 -8

lib/screens/home/search_screen.dart lib/screens/home/communities_screen.dart

···

       2
       2
        
       

     

       3
       3
        
       import '../../constants/app_colors.dart';

     

       4
       4
        
       

     

       5
       5
       -
       class SearchScreen extends StatelessWidget {

     

       6
       6
       -
         const SearchScreen({super.key});

     

       5
       5
       +
       class CommunitiesScreen extends StatelessWidget {

     

       6
       6
       +
         const CommunitiesScreen({super.key});

     

       7
       7
        
       

     

       8
       8
        
         @override

     

       9
       9
        
         Widget build(BuildContext context) {

     

       10
       10
        
           return Scaffold(

     

       11
       11
       -
             backgroundColor: const Color(0xFF0B0F14),

     

       11
       11
       +
             backgroundColor: AppColors.background,

     

       12
       12
        
             appBar: AppBar(

     

       13
       13
       -
               backgroundColor: const Color(0xFF0B0F14),

     

       13
       13
       +
               backgroundColor: AppColors.background,

     

       14
       14
        
               foregroundColor: Colors.white,

     

       15
       15
       -
               title: const Text('Search'),

     

       15
       15
       +
               title: const Text('Communities'),

     

       16
       16
        
               automaticallyImplyLeading: false,

     

       17
       17
        
             ),

     

       18
       18
        
             body: const Center(

     
···

       21
       21
        
                 child: Column(

     

       22
       22
        
                   mainAxisAlignment: MainAxisAlignment.center,

     

       23
       23
        
                   children: [

     

       24
       24
       -
                     Icon(Icons.search, size: 64, color: AppColors.primary),

     

       24
       24
       +
                     Icon(

     

       25
       25
       +
                       Icons.workspaces_outlined,

     

       26
       26
       +
                       size: 64,

     

       27
       27
       +
                       color: AppColors.primary,

     

       28
       28
       +
                     ),

     

       25
       29
        
                     SizedBox(height: 24),

     

       26
       30
        
                     Text(

     

       27
       27
       -
                       'Search',

     

       31
       31
       +
                       'Communities',

     

       28
       32
        
                       style: TextStyle(

     

       29
       33
        
                         fontSize: 28,

     

       30
       34
        
                         color: Colors.white,

     
···

       33
       37
        
                     ),

     

       34
       38
        
                     SizedBox(height: 16),

     

       35
       39
        
                     Text(

     

       36
       36
       -
                       'Search communities and conversations',

     

       40
       40
       +
                       'Discover and join communities',

     

       37
       41
        
                       style: TextStyle(fontSize: 16, color: Color(0xFFB6C2D2)),

     

       38
       42
        
                       textAlign: TextAlign.center,

     

       39
       43
        
                     ),