commit f478d5f8e69677e07c5f96f6b73d4a88b7b46fe2 · bretton.dev/coves-mobile

+49

lib/main.dart

···

       5
       5
        
       import 'package:provider/provider.dart';

     

       6
       6
        
       

     

       7
       7
        
       import 'config/oauth_config.dart';

     

       8
       8
       +
       import 'models/post.dart';

     

       8
       9
        
       import 'providers/auth_provider.dart';

     

       10
       10
       +
       import 'providers/comments_provider.dart';

     

       9
       11
        
       import 'providers/feed_provider.dart';

     

       10
       12
        
       import 'providers/vote_provider.dart';

     

       11
       13
        
       import 'screens/auth/login_screen.dart';

     

       12
       14
        
       import 'screens/home/main_shell_screen.dart';

     

       15
       15
       +
       import 'screens/home/post_detail_screen.dart';

     

       13
       16
        
       import 'screens/landing_screen.dart';

     

       14
       17
        
       import 'services/streamable_service.dart';

     

       15
       18
        
       import 'services/vote_service.dart';

     

       19
       19
       +
       import 'widgets/loading_error_states.dart';

     

       16
       20
        
       

     

       17
       21
        
       void main() async {

     

       18
       22
        
         WidgetsFlutterBinding.ensureInitialized();

     
···

       65
       69
        
                       );

     

       66
       70
        
                 },

     

       67
       71
        
               ),

     

       72
       72
       +
               ChangeNotifierProxyProvider2<AuthProvider, VoteProvider,

     

       73
       73
       +
                   CommentsProvider>(

     

       74
       74
       +
                 create:

     

       75
       75
       +
                     (context) => CommentsProvider(

     

       76
       76
       +
                       authProvider,

     

       77
       77
       +
                       voteProvider: context.read<VoteProvider>(),

     

       78
       78
       +
                       voteService: voteService,

     

       79
       79
       +
                     ),

     

       80
       80
       +
                 update: (context, auth, vote, previous) {

     

       81
       81
       +
                   // Reuse existing provider to maintain state across rebuilds

     

       82
       82
       +
                   return previous ??

     

       83
       83
       +
                       CommentsProvider(

     

       84
       84
       +
                         auth,

     

       85
       85
       +
                         voteProvider: vote,

     

       86
       86
       +
                         voteService: voteService,

     

       87
       87
       +
                       );

     

       88
       88
       +
                 },

     

       89
       89
       +
               ),

     

       68
       90
        
               // StreamableService for video embeds

     

       69
       91
        
               Provider<StreamableService>(create: (_) => StreamableService()),

     

       70
       92
        
             ],

     
···

       90
       112
        
               useMaterial3: true,

     

       91
       113
        
             ),

     

       92
       114
        
             routerConfig: _createRouter(authProvider),

     

       115
       115
       +
             restorationScopeId: 'app',

     

       93
       116
        
             debugShowCheckedModeBanner: false,

     

       94
       117
        
           );

     

       95
       118
        
         }

     
···

       104
       127
        
             GoRoute(

     

       105
       128
        
               path: '/feed',

     

       106
       129
        
               builder: (context, state) => const MainShellScreen(),

     

       130
       130
       +
             ),

     

       131
       131
       +
             GoRoute(

     

       132
       132
       +
               path: '/post/:postUri',

     

       133
       133
       +
               builder: (context, state) {

     

       134
       134
       +
                 // Extract post from state.extra

     

       135
       135
       +
                 final post = state.extra as FeedViewPost?;

     

       136
       136
       +
       

     

       137
       137
       +
                 // If no post provided via extra, show user-friendly error

     

       138
       138
       +
                 if (post == null) {

     

       139
       139
       +
                   if (kDebugMode) {

     

       140
       140
       +
                     print('⚠️ PostDetailScreen: No post provided in route extras');

     

       141
       141
       +
                   }

     

       142
       142
       +
                   // Show not found screen with option to go back

     

       143
       143
       +
                   return NotFoundError(

     

       144
       144
       +
                     title: 'Post Not Found',

     

       145
       145
       +
                     message:

     

       146
       146
       +
                         'This post could not be loaded. It may have been deleted or the link is invalid.',

     

       147
       147
       +
                     onBackPressed: () {

     

       148
       148
       +
                       // Navigate back to feed

     

       149
       149
       +
                       context.go('/feed');

     

       150
       150
       +
                     },

     

       151
       151
       +
                   );

     

       152
       152
       +
                 }

     

       153
       153
       +
       

     

       154
       154
       +
                 return PostDetailScreen(post: post);

     

       155
       155
       +
               },

     

       107
       156
        
             ),

     

       108
       157
        
           ],

     

       109
       158
        
           refreshListenable: authProvider,

+154 -44

lib/widgets/post_card.dart

···

       1
       1
        
       import 'package:cached_network_image/cached_network_image.dart';

     

       2
       2
        
       import 'package:flutter/foundation.dart';

     

       3
       3
        
       import 'package:flutter/material.dart';

     

       4
       4
       +
       import 'package:go_router/go_router.dart';

     

       4
       5
        
       import 'package:provider/provider.dart';

     

       5
       6
        
       

     

       6
       7
        
       import '../constants/app_colors.dart';

     
···

       25
       26
        
       /// - Periodic updates of time strings

     

       26
       27
        
       /// - Deterministic testing without DateTime.now()

     

       27
       28
        
       class PostCard extends StatelessWidget {

     

       28
       28
       -
         const PostCard({required this.post, this.currentTime, super.key});

     

       29
       29
       +
         const PostCard({

     

       30
       30
       +
           required this.post,

     

       31
       31
       +
           this.currentTime,

     

       32
       32
       +
           this.showCommentButton = true,

     

       33
       33
       +
           this.disableNavigation = false,

     

       34
       34
       +
           super.key,

     

       35
       35
       +
         });

     

       29
       36
        
       

     

       30
       37
        
         final FeedViewPost post;

     

       31
       38
        
         final DateTime? currentTime;

     

       39
       39
       +
         final bool showCommentButton;

     

       40
       40
       +
         final bool disableNavigation;

     

       41
       41
       +
       

     

       42
       42
       +
         /// Check if this post should be clickable

     

       43
       43
       +
         /// Only text posts (no embeds or non-video/link embeds) are clickable

     

       44
       44
       +
         bool get _isClickable {

     

       45
       45
       +
           // If navigation is explicitly disabled (e.g., on detail screen), not clickable

     

       46
       46
       +
           if (disableNavigation) {

     

       47
       47
       +
             return false;

     

       48
       48
       +
           }

     

       49
       49
       +
       

     

       50
       50
       +
           final embed = post.post.embed;

     

       51
       51
       +
       

     

       52
       52
       +
           // If no embed, it's a text-only post - clickable

     

       53
       53
       +
           if (embed == null) {

     

       54
       54
       +
             return true;

     

       55
       55
       +
           }

     

       56
       56
       +
       

     

       57
       57
       +
           // If embed exists, check if it's a video or link type

     

       58
       58
       +
           final external = embed.external;

     

       59
       59
       +
           if (external == null) {

     

       60
       60
       +
             return true; // No external embed, clickable

     

       61
       61
       +
           }

     

       62
       62
       +
       

     

       63
       63
       +
           final embedType = external.embedType;

     

       64
       64
       +
       

     

       65
       65
       +
           // Video and video-stream posts should NOT be clickable (they have their own tap handling)

     

       66
       66
       +
           if (embedType == 'video' || embedType == 'video-stream') {

     

       67
       67
       +
             return false;

     

       68
       68
       +
           }

     

       69
       69
       +
       

     

       70
       70
       +
           // Link embeds should NOT be clickable (they have their own link handling)

     

       71
       71
       +
           if (embedType == 'link') {

     

       72
       72
       +
             return false;

     

       73
       73
       +
           }

     

       74
       74
       +
       

     

       75
       75
       +
           // All other types are clickable

     

       76
       76
       +
           return true;

     

       77
       77
       +
         }

     

       78
       78
       +
       

     

       79
       79
       +
         void _navigateToDetail(BuildContext context) {

     

       80
       80
       +
           // Navigate to post detail screen

     

       81
       81
       +
           // Use URI-encoded version of the post URI for the URL path

     

       82
       82
       +
           // Pass the full post object via extras

     

       83
       83
       +
           final encodedUri = Uri.encodeComponent(post.post.uri);

     

       84
       84
       +
           context.push('/post/$encodedUri', extra: post);

     

       85
       85
       +
         }

     

       32
       86
        
       

     

       33
       87
        
         @override

     

       34
       88
        
         Widget build(BuildContext context) {

     
···

       81
       135
        
                   ),

     

       82
       136
        
                   const SizedBox(height: 8),

     

       83
       137
        
       

     

       84
       84
       -
                   // Post title

     

       85
       85
       -
                   if (post.post.title != null) ...[

     

       86
       86
       -
                     Text(

     

       87
       87
       -
                       post.post.title!,

     

       88
       88
       -
                       style: const TextStyle(

     

       89
       89
       -
                         color: AppColors.textPrimary,

     

       90
       90
       -
                         fontSize: 16,

     

       91
       91
       -
                         fontWeight: FontWeight.w400,

     

       138
       138
       +
                   // Wrap content in InkWell if clickable (text-only posts)

     

       139
       139
       +
                   if (_isClickable)

     

       140
       140
       +
                     InkWell(

     

       141
       141
       +
                       onTap: () => _navigateToDetail(context),

     

       142
       142
       +
                       child: Column(

     

       143
       143
       +
                         crossAxisAlignment: CrossAxisAlignment.start,

     

       144
       144
       +
                         children: [

     

       145
       145
       +
                           // Post title

     

       146
       146
       +
                           if (post.post.title != null) ...[

     

       147
       147
       +
                             Text(

     

       148
       148
       +
                               post.post.title!,

     

       149
       149
       +
                               style: const TextStyle(

     

       150
       150
       +
                                 color: AppColors.textPrimary,

     

       151
       151
       +
                                 fontSize: 16,

     

       152
       152
       +
                                 fontWeight: FontWeight.w400,

     

       153
       153
       +
                               ),

     

       154
       154
       +
                             ),

     

       155
       155
       +
                           ],

     

       156
       156
       +
       

     

       157
       157
       +
                           // Spacing after title (only if we have text)

     

       158
       158
       +
                           if (post.post.title != null && post.post.text.isNotEmpty)

     

       159
       159
       +
                             const SizedBox(height: 8),

     

       160
       160
       +
       

     

       161
       161
       +
                           // Post text body preview

     

       162
       162
       +
                           if (post.post.text.isNotEmpty) ...[

     

       163
       163
       +
                             Container(

     

       164
       164
       +
                               padding: const EdgeInsets.all(10),

     

       165
       165
       +
                               decoration: BoxDecoration(

     

       166
       166
       +
                                 color: AppColors.backgroundSecondary,

     

       167
       167
       +
                                 borderRadius: BorderRadius.circular(8),

     

       168
       168
       +
                               ),

     

       169
       169
       +
                               child: Text(

     

       170
       170
       +
                                 post.post.text,

     

       171
       171
       +
                                 style: TextStyle(

     

       172
       172
       +
                                   color: AppColors.textPrimary.withValues(alpha: 0.7),

     

       173
       173
       +
                                   fontSize: 13,

     

       174
       174
       +
                                   height: 1.4,

     

       175
       175
       +
                                 ),

     

       176
       176
       +
                                 maxLines: 5,

     

       177
       177
       +
                                 overflow: TextOverflow.ellipsis,

     

       178
       178
       +
                               ),

     

       179
       179
       +
                             ),

     

       180
       180
       +
                           ],

     

       181
       181
       +
                         ],

     

       92
       182
        
                       ),

     

       93
       93
       -
                     ),

     

       94
       94
       -
                   ],

     

       183
       183
       +
                     )

     

       184
       184
       +
                   else

     

       185
       185
       +
                     // Non-clickable content (video/link posts)

     

       186
       186
       +
                     Column(

     

       187
       187
       +
                       crossAxisAlignment: CrossAxisAlignment.start,

     

       188
       188
       +
                       children: [

     

       189
       189
       +
                         // Post title

     

       190
       190
       +
                         if (post.post.title != null) ...[

     

       191
       191
       +
                           Text(

     

       192
       192
       +
                             post.post.title!,

     

       193
       193
       +
                             style: const TextStyle(

     

       194
       194
       +
                               color: AppColors.textPrimary,

     

       195
       195
       +
                               fontSize: 16,

     

       196
       196
       +
                               fontWeight: FontWeight.w400,

     

       197
       197
       +
                             ),

     

       198
       198
       +
                           ),

     

       199
       199
       +
                         ],

     

       95
       200
        
       

     

       96
       96
       -
                   // Spacing after title (only if we have content below)

     

       97
       97
       -
                   if (post.post.title != null &&

     

       98
       98
       -
                       (post.post.embed?.external != null ||

     

       99
       99
       -
                           post.post.text.isNotEmpty))

     

       100
       100
       -
                     const SizedBox(height: 8),

     

       201
       201
       +
                         // Spacing after title (only if we have content below)

     

       202
       202
       +
                         if (post.post.title != null &&

     

       203
       203
       +
                             (post.post.embed?.external != null ||

     

       204
       204
       +
                                 post.post.text.isNotEmpty))

     

       205
       205
       +
                           const SizedBox(height: 8),

     

       101
       206
        
       

     

       102
       102
       -
                   // Embed (link preview)

     

       103
       103
       -
                   if (post.post.embed?.external != null) ...[

     

       104
       104
       -
                     _EmbedCard(

     

       105
       105
       -
                       embed: post.post.embed!.external!,

     

       106
       106
       -
                       streamableService: context.read<StreamableService>(),

     

       107
       107
       -
                     ),

     

       108
       108
       -
                     const SizedBox(height: 8),

     

       109
       109
       -
                   ],

     

       207
       207
       +
                         // Embed (link preview)

     

       208
       208
       +
                         if (post.post.embed?.external != null) ...[

     

       209
       209
       +
                           _EmbedCard(

     

       210
       210
       +
                             embed: post.post.embed!.external!,

     

       211
       211
       +
                             streamableService: context.read<StreamableService>(),

     

       212
       212
       +
                           ),

     

       213
       213
       +
                           const SizedBox(height: 8),

     

       214
       214
       +
                         ],

     

       110
       215
        
       

     

       111
       111
       -
                   // Post text body preview

     

       112
       112
       -
                   if (post.post.text.isNotEmpty) ...[

     

       113
       113
       -
                     Container(

     

       114
       114
       -
                       padding: const EdgeInsets.all(10),

     

       115
       115
       -
                       decoration: BoxDecoration(

     

       116
       116
       -
                         color: AppColors.backgroundSecondary,

     

       117
       117
       -
                         borderRadius: BorderRadius.circular(8),

     

       118
       118
       -
                       ),

     

       119
       119
       -
                       child: Text(

     

       120
       120
       -
                         post.post.text,

     

       121
       121
       -
                         style: TextStyle(

     

       122
       122
       -
                           color: AppColors.textPrimary.withValues(alpha: 0.7),

     

       123
       123
       -
                           fontSize: 13,

     

       124
       124
       -
                           height: 1.4,

     

       125
       125
       -
                         ),

     

       126
       126
       -
                         maxLines: 5,

     

       127
       127
       -
                         overflow: TextOverflow.ellipsis,

     

       128
       128
       -
                       ),

     

       216
       216
       +
                         // Post text body preview

     

       217
       217
       +
                         if (post.post.text.isNotEmpty) ...[

     

       218
       218
       +
                           Container(

     

       219
       219
       +
                             padding: const EdgeInsets.all(10),

     

       220
       220
       +
                             decoration: BoxDecoration(

     

       221
       221
       +
                               color: AppColors.backgroundSecondary,

     

       222
       222
       +
                               borderRadius: BorderRadius.circular(8),

     

       223
       223
       +
                             ),

     

       224
       224
       +
                             child: Text(

     

       225
       225
       +
                               post.post.text,

     

       226
       226
       +
                               style: TextStyle(

     

       227
       227
       +
                                 color: AppColors.textPrimary.withValues(alpha: 0.7),

     

       228
       228
       +
                                 fontSize: 13,

     

       229
       229
       +
                                 height: 1.4,

     

       230
       230
       +
                               ),

     

       231
       231
       +
                               maxLines: 5,

     

       232
       232
       +
                               overflow: TextOverflow.ellipsis,

     

       233
       233
       +
                             ),

     

       234
       234
       +
                           ),

     

       235
       235
       +
                         ],

     

       236
       236
       +
                       ],

     

       129
       237
        
                     ),

     

       130
       130
       -
                   ],

     

       131
       238
        
       

     

       132
       239
        
                   // External link (if present)

     

       133
       240
        
                   if (post.post.embed?.external != null) ...[

     
···

       139
       246
        
                   const SizedBox(height: 4),

     

       140
       247
        
       

     

       141
       248
        
                   // Action buttons row

     

       142
       142
       -
                   PostCardActions(post: post),

     

       249
       249
       +
                   PostCardActions(

     

       250
       250
       +
                     post: post,

     

       251
       251
       +
                     showCommentButton: showCommentButton,

     

       252
       252
       +
                   ),

     

       143
       253
        
                 ],

     

       144
       254
        
               ),

     

       145
       255
        
             ),