commit f64bb4934ba80f6525f94dfacf365f5306ef876b · bretton.dev/coves-mobile

+119 -10

lib/screens/compose/reply_screen.dart

···

       1
       1
        
       import 'dart:async';

     

       2
       2
        
       import 'dart:math' as math;

     

       3
       3
        
       

     

       4
       4
       +
       import 'package:flutter/foundation.dart';

     

       4
       5
        
       import 'package:flutter/material.dart';

     

       5
       6
        
       import 'package:flutter/services.dart';

     

       6
       7
        
       import 'package:provider/provider.dart';

     
···

       8
       9
        
       import '../../constants/app_colors.dart';

     

       9
       10
        
       import '../../models/comment.dart';

     

       10
       11
        
       import '../../models/post.dart';

     

       12
       12
       +
       import '../../providers/auth_provider.dart';

     

       11
       13
        
       import '../../providers/comments_provider.dart';

     

       12
       14
        
       import '../../widgets/comment_thread.dart';

     

       13
       15
        
       import '../../widgets/post_card.dart';

     
···

       32
       34
        
           this.post,

     

       33
       35
        
           this.comment,

     

       34
       36
        
           required this.onSubmit,

     

       37
       37
       +
           required this.commentsProvider,

     

       35
       38
        
           super.key,

     

       36
       39
        
         }) : assert(

     

       37
       40
        
                (post != null) != (comment != null),

     
···

       47
       50
        
         /// Callback when user submits reply

     

       48
       51
        
         final Future<void> Function(String content) onSubmit;

     

       49
       52
        
       

     

       53
       53
       +
         /// CommentsProvider for draft save/restore and time updates

     

       54
       54
       +
         final CommentsProvider commentsProvider;

     

       55
       55
       +
       

     

       50
       56
        
         @override

     

       51
       57
        
         State<ReplyScreen> createState() => _ReplyScreenState();

     

       52
       58
        
       }

     
···

       58
       64
        
         bool _hasText = false;

     

       59
       65
        
         bool _isKeyboardOpening = false;

     

       60
       66
        
         bool _isSubmitting = false;

     

       67
       67
       +
         bool _authInvalidated = false;

     

       61
       68
        
         double _lastKeyboardHeight = 0;

     

       62
       69
        
         Timer? _bannerDismissTimer;

     

       63
       70
        
       

     
···

       68
       75
        
           _textController.addListener(_onTextChanged);

     

       69
       76
        
           _focusNode.addListener(_onFocusChanged);

     

       70
       77
        
       

     

       71
       71
       -
           // Autofocus with delay (Thunder approach - let screen render first)

     

       72
       72
       -
           Future.delayed(const Duration(milliseconds: 300), () {

     

       78
       78
       +
           // Restore draft and autofocus after frame is built

     

       79
       79
       +
           WidgetsBinding.instance.addPostFrameCallback((_) {

     

       73
       80
        
             if (mounted) {

     

       74
       74
       -
               _isKeyboardOpening = true;

     

       75
       75
       -
               _focusNode.requestFocus();

     

       81
       81
       +
               _setupAuthListener();

     

       82
       82
       +
               _restoreDraft();

     

       83
       83
       +
       

     

       84
       84
       +
               // Autofocus with delay (Thunder approach - let screen render first)

     

       85
       85
       +
               Future.delayed(const Duration(milliseconds: 300), () {

     

       86
       86
       +
                 if (mounted) {

     

       87
       87
       +
                   _isKeyboardOpening = true;

     

       88
       88
       +
                   _focusNode.requestFocus();

     

       89
       89
       +
                 }

     

       90
       90
       +
               });

     

       76
       91
        
             }

     

       77
       92
        
           });

     

       78
       93
        
         }

     

       79
       94
        
       

     

       95
       95
       +
         void _setupAuthListener() {

     

       96
       96
       +
           try {

     

       97
       97
       +
             context.read<AuthProvider>().addListener(_onAuthChanged);

     

       98
       98
       +
           } on Exception {

     

       99
       99
       +
             // AuthProvider may not be available (e.g., tests)

     

       100
       100
       +
           }

     

       101
       101
       +
         }

     

       102
       102
       +
       

     

       103
       103
       +
         void _onAuthChanged() {

     

       104
       104
       +
           if (!mounted || _authInvalidated) return;

     

       105
       105
       +
       

     

       106
       106
       +
           try {

     

       107
       107
       +
             final authProvider = context.read<AuthProvider>();

     

       108
       108
       +
             if (!authProvider.isAuthenticated) {

     

       109
       109
       +
               _authInvalidated = true;

     

       110
       110
       +
               if (mounted) {

     

       111
       111
       +
                 Navigator.of(context).pop();

     

       112
       112
       +
               }

     

       113
       113
       +
             }

     

       114
       114
       +
           } on Exception {

     

       115
       115
       +
             // AuthProvider may not be available

     

       116
       116
       +
           }

     

       117
       117
       +
         }

     

       118
       118
       +
       

     

       119
       119
       +
         /// Restore draft text if available for this reply context

     

       120
       120
       +
         void _restoreDraft() {

     

       121
       121
       +
           try {

     

       122
       122
       +
             final commentsProvider = context.read<CommentsProvider>();

     

       123
       123
       +
             final ourParentUri = widget.comment?.comment.uri;

     

       124
       124
       +
       

     

       125
       125
       +
             // Get draft for this specific parent URI

     

       126
       126
       +
             final draft = commentsProvider.getDraft(parentUri: ourParentUri);

     

       127
       127
       +
       

     

       128
       128
       +
             if (draft.isNotEmpty) {

     

       129
       129
       +
               _textController.text = draft;

     

       130
       130
       +
               setState(() {

     

       131
       131
       +
                 _hasText = true;

     

       132
       132
       +
               });

     

       133
       133
       +
             }

     

       134
       134
       +
           } on Exception catch (e) {

     

       135
       135
       +
             // CommentsProvider might not be available (e.g., during testing)

     

       136
       136
       +
             if (kDebugMode) {

     

       137
       137
       +
               debugPrint('📝 Draft not restored: $e');

     

       138
       138
       +
             }

     

       139
       139
       +
           }

     

       140
       140
       +
         }

     

       141
       141
       +
       

     

       80
       142
        
         void _onFocusChanged() {

     

       81
       143
        
           // When text field gains focus, scroll to bottom as keyboard opens

     

       82
       144
        
           if (_focusNode.hasFocus) {

     
···

       87
       149
        
         @override

     

       88
       150
        
         void didChangeMetrics() {

     

       89
       151
        
           super.didChangeMetrics();

     

       152
       152
       +
           // Guard against being called after widget is deactivated

     

       153
       153
       +
           // (can happen during keyboard animation while navigating away)

     

       154
       154
       +
           if (!mounted) return;

     

       155
       155
       +
       

     

       90
       156
        
           final keyboardHeight = View.of(context).viewInsets.bottom;

     

       91
       157
        
       

     

       92
       158
        
           // Detect keyboard closing and unfocus text field

     
···

       120
       186
        
         @override

     

       121
       187
        
         void dispose() {

     

       122
       188
        
           _bannerDismissTimer?.cancel();

     

       189
       189
       +
           try {

     

       190
       190
       +
             context.read<AuthProvider>().removeListener(_onAuthChanged);

     

       191
       191
       +
           } on Exception {

     

       192
       192
       +
             // AuthProvider may not be available

     

       193
       193
       +
           }

     

       123
       194
        
           WidgetsBinding.instance.removeObserver(this);

     

       124
       195
        
           _textController.dispose();

     

       125
       196
        
           _focusNode.dispose();

     
···

       137
       208
        
         }

     

       138
       209
        
       

     

       139
       210
        
         Future<void> _handleSubmit() async {

     

       211
       211
       +
           if (_authInvalidated) {

     

       212
       212
       +
             return;

     

       213
       213
       +
           }

     

       214
       214
       +
       

     

       140
       215
        
           final content = _textController.text.trim();

     

       141
       216
        
           if (content.isEmpty) {

     

       142
       217
        
             return;

     
···

       152
       227
        
       

     

       153
       228
        
           try {

     

       154
       229
        
             await widget.onSubmit(content);

     

       230
       230
       +
             // Clear draft on success

     

       231
       231
       +
             try {

     

       232
       232
       +
               if (mounted) {

     

       233
       233
       +
                 final parentUri = widget.comment?.comment.uri;

     

       234
       234
       +
                 context.read<CommentsProvider>().clearDraft(parentUri: parentUri);

     

       235
       235
       +
               }

     

       236
       236
       +
             } on Exception catch (e) {

     

       237
       237
       +
               // CommentsProvider might not be available

     

       238
       238
       +
               if (kDebugMode) {

     

       239
       239
       +
                 debugPrint('📝 Draft not cleared: $e');

     

       240
       240
       +
               }

     

       241
       241
       +
             }

     

       155
       242
        
             // Pop screen after successful submission

     

       156
       243
        
             if (mounted) {

     

       157
       244
        
               Navigator.of(context).pop();

     
···

       213
       300
        
         }

     

       214
       301
        
       

     

       215
       302
        
         void _handleCancel() {

     

       303
       303
       +
           // Save draft before closing (if text is not empty)

     

       304
       304
       +
           _saveDraft();

     

       216
       305
        
           Navigator.of(context).pop();

     

       217
       306
        
         }

     

       218
       307
        
       

     

       308
       308
       +
         /// Save current text as draft

     

       309
       309
       +
         void _saveDraft() {

     

       310
       310
       +
           try {

     

       311
       311
       +
             final commentsProvider = context.read<CommentsProvider>();

     

       312
       312
       +
             commentsProvider.saveDraft(

     

       313
       313
       +
               _textController.text,

     

       314
       314
       +
               parentUri: widget.comment?.comment.uri,

     

       315
       315
       +
             );

     

       316
       316
       +
           } on Exception catch (e) {

     

       317
       317
       +
             // CommentsProvider might not be available

     

       318
       318
       +
             if (kDebugMode) {

     

       319
       319
       +
               debugPrint('📝 Draft not saved: $e');

     

       320
       320
       +
             }

     

       321
       321
       +
           }

     

       322
       322
       +
         }

     

       323
       323
       +
       

     

       219
       324
        
         @override

     

       220
       325
        
         Widget build(BuildContext context) {

     

       221
       221
       -
           return GestureDetector(

     

       222
       222
       -
             onTap: () {

     

       223
       223
       -
               // Dismiss keyboard when tapping outside

     

       224
       224
       -
               FocusManager.instance.primaryFocus?.unfocus();

     

       225
       225
       -
             },

     

       226
       226
       -
             child: Scaffold(

     

       326
       326
       +
           // Provide CommentsProvider to descendant widgets (Consumer in _ContextPreview)

     

       327
       327
       +
           return ChangeNotifierProvider.value(

     

       328
       328
       +
             value: widget.commentsProvider,

     

       329
       329
       +
             child: GestureDetector(

     

       330
       330
       +
               onTap: () {

     

       331
       331
       +
                 // Dismiss keyboard when tapping outside

     

       332
       332
       +
                 FocusManager.instance.primaryFocus?.unfocus();

     

       333
       333
       +
               },

     

       334
       334
       +
               child: Scaffold(

     

       227
       335
        
               backgroundColor: AppColors.background,

     

       228
       336
        
               resizeToAvoidBottomInset: false, // Thunder approach

     

       229
       337
        
               appBar: AppBar(

     
···

       303
       411
        
                   ),

     

       304
       412
        
                 ],

     

       305
       413
        
               ),

     

       414
       414
       +
             ),

     

       306
       415
        
             ),

     

       307
       416
        
           );

     

       308
       417
        
         }

+23 -8

lib/screens/home/focused_thread_screen.dart

···

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

     

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

     

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

     

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

     

       7
       8
        
       import '../../widgets/comment_card.dart';

     

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

     

       9
       10
        
       import '../../widgets/status_bar_overlay.dart';

     
···

       25
       26
        
       /// any collapsed state is reset. This is by design - it allows users to

     

       26
       27
        
       /// explore deep threads without their collapse choices persisting across

     

       27
       28
        
       /// navigation, keeping the focused view clean and predictable.

     

       29
       29
       +
       ///

     

       30
       30
       +
       /// ## Provider Sharing

     

       31
       31
       +
       /// Receives the parent's CommentsProvider for draft text preservation and

     

       32
       32
       +
       /// consistent vote state display.

     

       28
       33
        
       class FocusedThreadScreen extends StatelessWidget {

     

       29
       34
        
         const FocusedThreadScreen({

     

       30
       35
        
           required this.thread,

     

       31
       36
        
           required this.ancestors,

     

       32
       37
        
           required this.onReply,

     

       38
       38
       +
           required this.commentsProvider,

     

       33
       39
        
           super.key,

     

       34
       40
        
         });

     

       35
       41
        
       

     
···

       42
       48
        
         /// Callback when user replies to a comment

     

       43
       49
        
         final Future<void> Function(String content, ThreadViewComment parent) onReply;

     

       44
       50
        
       

     

       51
       51
       +
         /// Parent's CommentsProvider for draft preservation and vote state

     

       52
       52
       +
         final CommentsProvider commentsProvider;

     

       53
       53
       +
       

     

       45
       54
        
         @override

     

       46
       55
        
         Widget build(BuildContext context) {

     

       47
       47
       -
           return Scaffold(

     

       48
       48
       -
             backgroundColor: AppColors.background,

     

       49
       49
       -
             body: _FocusedThreadBody(

     

       50
       50
       -
               thread: thread,

     

       51
       51
       -
               ancestors: ancestors,

     

       52
       52
       -
               onReply: onReply,

     

       56
       56
       +
           // Expose parent's CommentsProvider for ReplyScreen draft access

     

       57
       57
       +
           return ChangeNotifierProvider.value(

     

       58
       58
       +
             value: commentsProvider,

     

       59
       59
       +
             child: Scaffold(

     

       60
       60
       +
               backgroundColor: AppColors.background,

     

       61
       61
       +
               body: _FocusedThreadBody(

     

       62
       62
       +
                 thread: thread,

     

       63
       63
       +
                 ancestors: ancestors,

     

       64
       64
       +
                 onReply: onReply,

     

       65
       65
       +
               ),

     

       53
       66
        
             ),

     

       54
       67
        
           );

     

       55
       68
        
         }

     
···

       126
       139
        
       

     

       127
       140
        
           Navigator.of(context).push(

     

       128
       141
        
             MaterialPageRoute<void>(

     

       129
       129
       -
               builder: (context) => ReplyScreen(

     

       142
       142
       +
               builder: (navigatorContext) => ReplyScreen(

     

       130
       143
        
                 comment: comment,

     

       131
       144
        
                 onSubmit: (content) => widget.onReply(content, comment),

     

       145
       145
       +
                 commentsProvider: context.read<CommentsProvider>(),

     

       132
       146
        
               ),

     

       133
       147
        
             ),

     

       134
       148
        
           );

     
···

       141
       155
        
         ) {

     

       142
       156
        
           Navigator.of(context).push(

     

       143
       157
        
             MaterialPageRoute<void>(

     

       144
       144
       -
               builder: (context) => FocusedThreadScreen(

     

       158
       158
       +
               builder: (navigatorContext) => FocusedThreadScreen(

     

       145
       159
        
                 thread: thread,

     

       146
       160
        
                 ancestors: ancestors,

     

       147
       161
        
                 onReply: widget.onReply,

     

       162
       162
       +
                 commentsProvider: context.read<CommentsProvider>(),

     

       148
       163
        
               ),

     

       149
       164
        
             ),

     

       150
       165
        
           );

+268 -111

lib/screens/home/post_detail_screen.dart

···

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

     

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

     

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

     

       3
       4
        
       import 'package:flutter/services.dart';

     

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

     
···

       10
       11
        
       import '../../providers/auth_provider.dart';

     

       11
       12
        
       import '../../providers/comments_provider.dart';

     

       12
       13
        
       import '../../providers/vote_provider.dart';

     

       14
       14
       +
       import '../../services/comments_provider_cache.dart';

     

       13
       15
        
       import '../../utils/community_handle_utils.dart';

     

       14
       16
        
       import '../../utils/error_messages.dart';

     

       15
       17
        
       import '../../widgets/comment_thread.dart';

     
···

       48
       50
        
         final ScrollController _scrollController = ScrollController();

     

       49
       51
        
         final GlobalKey _commentsHeaderKey = GlobalKey();

     

       50
       52
        
       

     

       51
       51
       -
         // Current sort option

     

       52
       52
       -
         String _currentSort = 'hot';

     

       53
       53
       +
         // Cached provider from CommentsProviderCache

     

       54
       54
       +
         late CommentsProvider _commentsProvider;

     

       55
       55
       +
         CommentsProviderCache? _commentsCache;

     

       56
       56
       +
       

     

       57
       57
       +
         // Track initialization state

     

       58
       58
       +
         bool _isInitialized = false;

     

       59
       59
       +
       

     

       60
       60
       +
         // Track if provider has been invalidated (e.g., by sign-out)

     

       61
       61
       +
         bool _providerInvalidated = false;

     

       53
       62
        
       

     

       54
       63
        
         @override

     

       55
       64
        
         void initState() {

     

       56
       65
        
           super.initState();

     

       57
       57
       -
       

     

       58
       58
       -
           // Initialize scroll controller for pagination

     

       59
       66
        
           _scrollController.addListener(_onScroll);

     

       60
       67
        
       

     

       61
       61
       -
           // Load comments after frame is built using provider from tree

     

       68
       68
       +
           // Initialize provider after frame is built

     

       62
       69
        
           WidgetsBinding.instance.addPostFrameCallback((_) {

     

       63
       70
        
             if (mounted) {

     

       64
       64
       -
               _loadComments();

     

       71
       71
       +
               _initializeProvider();

     

       72
       72
       +
               _setupAuthListener();

     

       73
       73
       +
             }

     

       74
       74
       +
           });

     

       75
       75
       +
         }

     

       76
       76
       +
       

     

       77
       77
       +
         /// Listen for auth state changes to handle sign-out

     

       78
       78
       +
         void _setupAuthListener() {

     

       79
       79
       +
           final authProvider = context.read<AuthProvider>();

     

       80
       80
       +
           authProvider.addListener(_onAuthChanged);

     

       81
       81
       +
         }

     

       82
       82
       +
       

     

       83
       83
       +
         /// Handle auth state changes (specifically sign-out)

     

       84
       84
       +
         void _onAuthChanged() {

     

       85
       85
       +
           if (!mounted) return;

     

       86
       86
       +
       

     

       87
       87
       +
           final authProvider = context.read<AuthProvider>();

     

       88
       88
       +
       

     

       89
       89
       +
           // If user signed out while viewing this screen, navigate back

     

       90
       90
       +
           // The CommentsProviderCache has already disposed our provider

     

       91
       91
       +
           if (!authProvider.isAuthenticated && _isInitialized && !_providerInvalidated) {

     

       92
       92
       +
             _providerInvalidated = true;

     

       93
       93
       +
       

     

       94
       94
       +
             if (kDebugMode) {

     

       95
       95
       +
               debugPrint('🚪 User signed out - cleaning up PostDetailScreen');

     

       96
       96
       +
             }

     

       97
       97
       +
       

     

       98
       98
       +
             // Remove listener from provider (it's disposed but this is safe)

     

       99
       99
       +
             try {

     

       100
       100
       +
               _commentsProvider.removeListener(_onProviderChanged);

     

       101
       101
       +
             } on Exception {

     

       102
       102
       +
               // Provider already disposed - expected

     

       103
       103
       +
             }

     

       104
       104
       +
       

     

       105
       105
       +
             // Navigate back to feed

     

       106
       106
       +
             if (mounted) {

     

       107
       107
       +
               Navigator.of(context).popUntil((route) => route.isFirst);

     

       108
       108
       +
             }

     

       109
       109
       +
           }

     

       110
       110
       +
         }

     

       111
       111
       +
       

     

       112
       112
       +
         /// Initialize provider from cache and restore state

     

       113
       113
       +
         void _initializeProvider() {

     

       114
       114
       +
           // Get or create provider from cache

     

       115
       115
       +
           final cache = context.read<CommentsProviderCache>();

     

       116
       116
       +
           _commentsCache = cache;

     

       117
       117
       +
           _commentsProvider = cache.acquireProvider(

     

       118
       118
       +
             postUri: widget.post.post.uri,

     

       119
       119
       +
             postCid: widget.post.post.cid,

     

       120
       120
       +
           );

     

       121
       121
       +
       

     

       122
       122
       +
           // Listen for changes to trigger rebuilds

     

       123
       123
       +
           _commentsProvider.addListener(_onProviderChanged);

     

       124
       124
       +
       

     

       125
       125
       +
           // Check if we already have cached data

     

       126
       126
       +
           if (_commentsProvider.comments.isNotEmpty) {

     

       127
       127
       +
             // Already have data - restore scroll position immediately

     

       128
       128
       +
             if (kDebugMode) {

     

       129
       129
       +
               debugPrint(

     

       130
       130
       +
                 '📦 Using cached comments (${_commentsProvider.comments.length})',

     

       131
       131
       +
               );

     

       132
       132
       +
             }

     

       133
       133
       +
             _restoreScrollPosition();

     

       134
       134
       +
       

     

       135
       135
       +
             // Background refresh if data is stale

     

       136
       136
       +
             if (_commentsProvider.isStale) {

     

       137
       137
       +
               if (kDebugMode) {

     

       138
       138
       +
                 debugPrint('🔄 Data stale, refreshing in background');

     

       139
       139
       +
               }

     

       140
       140
       +
               _commentsProvider.loadComments(refresh: true);

     

       65
       141
        
             }

     

       142
       142
       +
           } else {

     

       143
       143
       +
             // No cached data - load fresh

     

       144
       144
       +
             _commentsProvider.loadComments(refresh: true);

     

       145
       145
       +
           }

     

       146
       146
       +
       

     

       147
       147
       +
           setState(() {

     

       148
       148
       +
             _isInitialized = true;

     

       66
       149
        
           });

     

       67
       150
        
         }

     

       68
       151
        
       

     

       69
       152
        
         @override

     

       70
       153
        
         void dispose() {

     

       154
       154
       +
           // Remove auth listener

     

       155
       155
       +
           try {

     

       156
       156
       +
             context.read<AuthProvider>().removeListener(_onAuthChanged);

     

       157
       157
       +
           } on Exception {

     

       158
       158
       +
             // Context may not be valid during dispose

     

       159
       159
       +
           }

     

       160
       160
       +
       

     

       161
       161
       +
           // Release provider pin in cache (prevents LRU eviction disposing an active

     

       162
       162
       +
           // provider while this screen is in the navigation stack).

     

       163
       163
       +
           if (_isInitialized) {

     

       164
       164
       +
             try {

     

       165
       165
       +
               _commentsCache?.releaseProvider(widget.post.post.uri);

     

       166
       166
       +
             } on Exception {

     

       167
       167
       +
               // Cache may already be disposed

     

       168
       168
       +
             }

     

       169
       169
       +
           }

     

       170
       170
       +
       

     

       171
       171
       +
           // Remove provider listener if not already invalidated

     

       172
       172
       +
           if (_isInitialized && !_providerInvalidated) {

     

       173
       173
       +
             try {

     

       174
       174
       +
               _commentsProvider.removeListener(_onProviderChanged);

     

       175
       175
       +
             } on Exception {

     

       176
       176
       +
               // Provider may already be disposed

     

       177
       177
       +
             }

     

       178
       178
       +
           }

     

       71
       179
        
           _scrollController.dispose();

     

       72
       180
        
           super.dispose();

     

       73
       181
        
         }

     

       74
       182
        
       

     

       75
       75
       -
         /// Load comments for the current post

     

       76
       76
       -
         void _loadComments() {

     

       77
       77
       -
           context.read<CommentsProvider>().loadComments(

     

       78
       78
       -
             postUri: widget.post.post.uri,

     

       79
       79
       -
             postCid: widget.post.post.cid,

     

       80
       80
       -
             refresh: true,

     

       81
       81
       -
           );

     

       183
       183
       +
         /// Handle provider changes

     

       184
       184
       +
         void _onProviderChanged() {

     

       185
       185
       +
           if (mounted) {

     

       186
       186
       +
             setState(() {});

     

       187
       187
       +
           }

     

       82
       188
        
         }

     

       83
       189
        
       

     

       84
       84
       -
         /// Handle sort changes from dropdown

     

       85
       85
       -
         Future<void> _onSortChanged(String newSort) async {

     

       86
       86
       -
           final previousSort = _currentSort;

     

       190
       190
       +
         /// Restore scroll position from provider

     

       191
       191
       +
         void _restoreScrollPosition() {

     

       192
       192
       +
           final savedPosition = _commentsProvider.scrollPosition;

     

       193
       193
       +
           if (savedPosition <= 0) {

     

       194
       194
       +
             return;

     

       195
       195
       +
           }

     

       196
       196
       +
       

     

       197
       197
       +
           WidgetsBinding.instance.addPostFrameCallback((_) {

     

       198
       198
       +
             if (!mounted || !_scrollController.hasClients) {

     

       199
       199
       +
               return;

     

       200
       200
       +
             }

     

       87
       201
        
       

     

       88
       88
       -
           setState(() {

     

       89
       89
       -
             _currentSort = newSort;

     

       202
       202
       +
             final maxExtent = _scrollController.position.maxScrollExtent;

     

       203
       203
       +
             final targetPosition = savedPosition.clamp(0.0, maxExtent);

     

       204
       204
       +
       

     

       205
       205
       +
             if (targetPosition > 0) {

     

       206
       206
       +
               _scrollController.jumpTo(targetPosition);

     

       207
       207
       +
               if (kDebugMode) {

     

       208
       208
       +
                 debugPrint('📍 Restored scroll to $targetPosition (max: $maxExtent)');

     

       209
       209
       +
               }

     

       210
       210
       +
             }

     

       90
       211
        
           });

     

       212
       212
       +
         }

     

       91
       213
        
       

     

       92
       92
       -
           final commentsProvider = context.read<CommentsProvider>();

     

       93
       93
       -
           final success = await commentsProvider.setSortOption(newSort);

     

       214
       214
       +
         /// Handle sort changes from dropdown

     

       215
       215
       +
         Future<void> _onSortChanged(String newSort) async {

     

       216
       216
       +
           final success = await _commentsProvider.setSortOption(newSort);

     

       94
       217
        
       

     

       95
       95
       -
           // Show error snackbar and revert UI if sort change failed

     

       218
       218
       +
           // Show error snackbar if sort change failed

     

       96
       219
        
           if (!success && mounted) {

     

       97
       97
       -
             setState(() {

     

       98
       98
       -
               _currentSort = previousSort;

     

       99
       99
       -
             });

     

       100
       100
       -
       

     

       101
       220
        
             ScaffoldMessenger.of(context).showSnackBar(

     

       102
       221
        
               SnackBar(

     

       103
       222
        
                 content: const Text('Failed to change sort order. Please try again.'),

     
···

       118
       237
        
       

     

       119
       238
        
         /// Handle scroll for pagination

     

       120
       239
        
         void _onScroll() {

     

       240
       240
       +
           // Don't interact with disposed provider

     

       241
       241
       +
           if (_providerInvalidated) return;

     

       242
       242
       +
       

     

       243
       243
       +
           // Save scroll position to provider on every scroll event

     

       244
       244
       +
           if (_scrollController.hasClients) {

     

       245
       245
       +
             _commentsProvider.saveScrollPosition(_scrollController.position.pixels);

     

       246
       246
       +
           }

     

       247
       247
       +
       

     

       248
       248
       +
           // Load more comments when near bottom

     

       121
       249
        
           if (_scrollController.position.pixels >=

     

       122
       250
        
               _scrollController.position.maxScrollExtent - 200) {

     

       123
       123
       -
             context.read<CommentsProvider>().loadMoreComments();

     

       251
       251
       +
             _commentsProvider.loadMoreComments();

     

       124
       252
        
           }

     

       125
       253
        
         }

     

       126
       254
        
       

     

       127
       255
        
         /// Handle pull-to-refresh

     

       128
       256
        
         Future<void> _onRefresh() async {

     

       129
       129
       -
           final commentsProvider = context.read<CommentsProvider>();

     

       130
       130
       -
           await commentsProvider.refreshComments();

     

       257
       257
       +
           // Don't interact with disposed provider

     

       258
       258
       +
           if (_providerInvalidated) return;

     

       259
       259
       +
       

     

       260
       260
       +
           await _commentsProvider.refreshComments();

     

       131
       261
        
         }

     

       132
       262
        
       

     

       133
       263
        
         @override

     

       134
       264
        
         Widget build(BuildContext context) {

     

       135
       135
       -
           return Scaffold(

     

       136
       136
       -
             backgroundColor: AppColors.background,

     

       137
       137
       -
             body: _buildContent(),

     

       138
       138
       -
             bottomNavigationBar: _buildActionBar(),

     

       265
       265
       +
           // Show loading until provider is initialized

     

       266
       266
       +
           if (!_isInitialized) {

     

       267
       267
       +
             return const Scaffold(

     

       268
       268
       +
               backgroundColor: AppColors.background,

     

       269
       269
       +
               body: FullScreenLoading(),

     

       270
       270
       +
             );

     

       271
       271
       +
           }

     

       272
       272
       +
       

     

       273
       273
       +
           // If provider was invalidated (sign-out), show loading while navigating away

     

       274
       274
       +
           if (_providerInvalidated) {

     

       275
       275
       +
             return const Scaffold(

     

       276
       276
       +
               backgroundColor: AppColors.background,

     

       277
       277
       +
               body: FullScreenLoading(),

     

       278
       278
       +
             );

     

       279
       279
       +
           }

     

       280
       280
       +
       

     

       281
       281
       +
           // Provide the cached CommentsProvider to descendant widgets

     

       282
       282
       +
           return ChangeNotifierProvider.value(

     

       283
       283
       +
             value: _commentsProvider,

     

       284
       284
       +
             child: Scaffold(

     

       285
       285
       +
               backgroundColor: AppColors.background,

     

       286
       286
       +
               body: _buildContent(),

     

       287
       287
       +
               bottomNavigationBar: _buildActionBar(),

     

       288
       288
       +
             ),

     

       139
       289
        
           );

     

       140
       290
        
         }

     

       141
       291
        
       

     
···

       365
       515
        
           Navigator.of(context).push(

     

       366
       516
        
             MaterialPageRoute<void>(

     

       367
       517
        
               builder:

     

       368
       368
       -
                   (context) =>

     

       369
       369
       -
                       ReplyScreen(post: widget.post, onSubmit: _handleCommentSubmit),

     

       518
       518
       +
                   (context) => ReplyScreen(

     

       519
       519
       +
                     post: widget.post,

     

       520
       520
       +
                     onSubmit: _handleCommentSubmit,

     

       521
       521
       +
                     commentsProvider: _commentsProvider,

     

       522
       522
       +
                   ),

     

       370
       523
        
             ),

     

       371
       524
        
           );

     

       372
       525
        
         }

     

       373
       526
        
       

     

       374
       527
        
         /// Handle comment submission (reply to post)

     

       375
       528
        
         Future<void> _handleCommentSubmit(String content) async {

     

       376
       376
       -
           final commentsProvider = context.read<CommentsProvider>();

     

       377
       529
        
           final messenger = ScaffoldMessenger.of(context);

     

       378
       530
        
       

     

       379
       531
        
           try {

     

       380
       380
       -
             await commentsProvider.createComment(content: content);

     

       532
       532
       +
             await _commentsProvider.createComment(content: content);

     

       381
       533
        
       

     

       382
       534
        
             if (mounted) {

     

       383
       535
        
               messenger.showSnackBar(

     
···

       407
       559
        
           String content,

     

       408
       560
        
           ThreadViewComment parentComment,

     

       409
       561
        
         ) async {

     

       410
       410
       -
           final commentsProvider = context.read<CommentsProvider>();

     

       411
       562
        
           final messenger = ScaffoldMessenger.of(context);

     

       412
       563
        
       

     

       413
       564
        
           try {

     

       414
       414
       -
             await commentsProvider.createComment(

     

       565
       565
       +
             await _commentsProvider.createComment(

     

       415
       566
        
               content: content,

     

       416
       567
        
               parentComment: parentComment,

     

       417
       568
        
             );

     
···

       460
       611
        
                   (context) => ReplyScreen(

     

       461
       612
        
                     comment: comment,

     

       462
       613
        
                     onSubmit: (content) => _handleCommentReply(content, comment),

     

       614
       614
       +
                     commentsProvider: _commentsProvider,

     

       463
       615
        
                   ),

     

       464
       616
        
             ),

     

       465
       617
        
           );

     
···

       472
       624
        
         ) {

     

       473
       625
        
           Navigator.of(context).push(

     

       474
       626
        
             MaterialPageRoute<void>(

     

       475
       475
       -
               builder: (context) => FocusedThreadScreen(

     

       476
       476
       -
                 thread: thread,

     

       477
       477
       -
                 ancestors: ancestors,

     

       478
       478
       -
                 onReply: _handleCommentReply,

     

       479
       479
       -
               ),

     

       627
       627
       +
               builder:

     

       628
       628
       +
                   (context) => FocusedThreadScreen(

     

       629
       629
       +
                     thread: thread,

     

       630
       630
       +
                     ancestors: ancestors,

     

       631
       631
       +
                     onReply: _handleCommentReply,

     

       632
       632
       +
                     commentsProvider: _commentsProvider,

     

       633
       633
       +
                   ),

     

       480
       634
        
             ),

     

       481
       635
        
           );

     

       482
       636
        
         }

     
···

       539
       693
        
                         SliverSafeArea(

     

       540
       694
        
                           top: false,

     

       541
       695
        
                           sliver: SliverList(

     

       542
       542
       -
                         delegate: SliverChildBuilderDelegate(

     

       543
       543
       -
                           (context, index) {

     

       544
       544
       -
                             // Post card (index 0)

     

       545
       545
       -
                             if (index == 0) {

     

       546
       546
       -
                               return Column(

     

       547
       547
       -
                                 children: [

     

       548
       548
       -
                                   // Reuse PostCard (hide comment button in

     

       549
       549
       -
                                   // detail view)

     

       550
       550
       -
                                   // Use ValueListenableBuilder to only rebuild

     

       551
       551
       -
                                   // when time changes

     

       552
       552
       -
                                   _PostHeader(

     

       553
       553
       -
                                     post: widget.post,

     

       554
       554
       -
                                     currentTimeNotifier:

     

       555
       555
       -
                                         commentsProvider.currentTimeNotifier,

     

       556
       556
       -
                                   ),

     

       696
       696
       +
                             delegate: SliverChildBuilderDelegate(

     

       697
       697
       +
                               (context, index) {

     

       698
       698
       +
                                 // Post card (index 0)

     

       699
       699
       +
                                 if (index == 0) {

     

       700
       700
       +
                                   return Column(

     

       701
       701
       +
                                     children: [

     

       702
       702
       +
                                       // Reuse PostCard (hide comment button in

     

       703
       703
       +
                                       // detail view)

     

       704
       704
       +
                                       // Use ValueListenableBuilder to only rebuild

     

       705
       705
       +
                                       // when time changes

     

       706
       706
       +
                                       _PostHeader(

     

       707
       707
       +
                                         post: widget.post,

     

       708
       708
       +
                                         currentTimeNotifier:

     

       709
       709
       +
                                             commentsProvider.currentTimeNotifier,

     

       710
       710
       +
                                       ),

     

       711
       711
       +
       

     

       712
       712
       +
                                       // Visual divider before comments section

     

       713
       713
       +
                                       Container(

     

       714
       714
       +
                                         margin: const EdgeInsets.symmetric(

     

       715
       715
       +
                                           vertical: 16,

     

       716
       716
       +
                                         ),

     

       717
       717
       +
                                         height: 1,

     

       718
       718
       +
                                         color: AppColors.border,

     

       719
       719
       +
                                       ),

     

       557
       720
        
       

     

       558
       558
       -
                                   // Visual divider before comments section

     

       559
       559
       -
                                   Container(

     

       560
       560
       -
                                     margin: const EdgeInsets.symmetric(vertical: 16),

     

       561
       561
       -
                                     height: 1,

     

       562
       562
       -
                                     color: AppColors.border,

     

       563
       563
       -
                                   ),

     

       721
       721
       +
                                       // Comments header with sort dropdown

     

       722
       722
       +
                                       CommentsHeader(

     

       723
       723
       +
                                         key: _commentsHeaderKey,

     

       724
       724
       +
                                         commentCount: comments.length,

     

       725
       725
       +
                                         currentSort: commentsProvider.sort,

     

       726
       726
       +
                                         onSortChanged: _onSortChanged,

     

       727
       727
       +
                                       ),

     

       728
       728
       +
                                     ],

     

       729
       729
       +
                                   );

     

       730
       730
       +
                                 }

     

       564
       731
        
       

     

       565
       565
       -
                                   // Comments header with sort dropdown

     

       566
       566
       -
                                   CommentsHeader(

     

       567
       567
       -
                                     key: _commentsHeaderKey,

     

       568
       568
       -
                                     commentCount: comments.length,

     

       569
       569
       -
                                     currentSort: _currentSort,

     

       570
       570
       -
                                     onSortChanged: _onSortChanged,

     

       571
       571
       -
                                   ),

     

       572
       572
       -
                                 ],

     

       573
       573
       -
                               );

     

       574
       574
       -
                             }

     

       732
       732
       +
                                 // Loading indicator or error at the end

     

       733
       733
       +
                                 if (index == comments.length + 1) {

     

       734
       734
       +
                                   if (isLoadingMore) {

     

       735
       735
       +
                                     return const InlineLoading();

     

       736
       736
       +
                                   }

     

       737
       737
       +
                                   if (error != null) {

     

       738
       738
       +
                                     return InlineError(

     

       739
       739
       +
                                       message: ErrorMessages.getUserFriendly(error),

     

       740
       740
       +
                                       onRetry: () {

     

       741
       741
       +
                                         commentsProvider

     

       742
       742
       +
                                           ..clearError()

     

       743
       743
       +
                                           ..loadMoreComments();

     

       744
       744
       +
                                       },

     

       745
       745
       +
                                     );

     

       746
       746
       +
                                   }

     

       747
       747
       +
                                 }

     

       575
       748
        
       

     

       576
       576
       -
                             // Loading indicator or error at the end

     

       577
       577
       -
                             if (index == comments.length + 1) {

     

       578
       578
       -
                               if (isLoadingMore) {

     

       579
       579
       -
                                 return const InlineLoading();

     

       580
       580
       -
                               }

     

       581
       581
       -
                               if (error != null) {

     

       582
       582
       -
                                 return InlineError(

     

       583
       583
       -
                                   message: ErrorMessages.getUserFriendly(error),

     

       584
       584
       -
                                   onRetry: () {

     

       585
       585
       -
                                     commentsProvider

     

       586
       586
       -
                                       ..clearError()

     

       587
       587
       -
                                       ..loadMoreComments();

     

       588
       588
       -
                                   },

     

       749
       749
       +
                                 // Comment item - use existing CommentThread widget

     

       750
       750
       +
                                 final comment = comments[index - 1];

     

       751
       751
       +
                                 return _CommentItem(

     

       752
       752
       +
                                   comment: comment,

     

       753
       753
       +
                                   currentTimeNotifier:

     

       754
       754
       +
                                       commentsProvider.currentTimeNotifier,

     

       755
       755
       +
                                   onCommentTap: _openReplyToComment,

     

       756
       756
       +
                                   collapsedComments:

     

       757
       757
       +
                                       commentsProvider.collapsedComments,

     

       758
       758
       +
                                   onCollapseToggle: commentsProvider.toggleCollapsed,

     

       759
       759
       +
                                   onContinueThread: _onContinueThread,

     

       589
       760
        
                                 );

     

       590
       590
       -
                               }

     

       591
       591
       -
                             }

     

       592
       592
       -
       

     

       593
       593
       -
                             // Comment item - use existing CommentThread widget

     

       594
       594
       -
                             final comment = comments[index - 1];

     

       595
       595
       -
                             return _CommentItem(

     

       596
       596
       -
                               comment: comment,

     

       597
       597
       -
                               currentTimeNotifier:

     

       598
       598
       -
                                   commentsProvider.currentTimeNotifier,

     

       599
       599
       -
                               onCommentTap: _openReplyToComment,

     

       600
       600
       -
                               collapsedComments: commentsProvider.collapsedComments,

     

       601
       601
       -
                               onCollapseToggle: commentsProvider.toggleCollapsed,

     

       602
       602
       -
                               onContinueThread: _onContinueThread,

     

       603
       603
       -
                             );

     

       604
       604
       -
                           },

     

       605
       605
       -
                           childCount:

     

       606
       606
       -
                               1 +

     

       607
       607
       -
                               comments.length +

     

       608
       608
       -
                               (isLoadingMore || error != null ? 1 : 0),

     

       761
       761
       +
                               },

     

       762
       762
       +
                               childCount:

     

       763
       763
       +
                                   1 +

     

       764
       764
       +
                                   comments.length +

     

       765
       765
       +
                                   (isLoadingMore || error != null ? 1 : 0),

     

       766
       766
       +
                             ),

     

       767
       767
       +
                           ),

     

       609
       768
        
                         ),

     

       610
       610
       -
                       ),

     

       769
       769
       +
                       ],

     

       611
       770
        
                     ),

     

       612
       612
       -
                   ],

     

       613
       613
       -
                 ),

     

       614
       614
       -
               ),

     

       771
       771
       +
                   ),

     

       615
       772
        
                   // Prevents content showing through transparent status bar

     

       616
       773
        
                   const StatusBarOverlay(),

     

       617
       774
        
                 ],

     
···

       677
       834
        
         final Set<String> collapsedComments;

     

       678
       835
        
         final void Function(String uri)? onCollapseToggle;

     

       679
       836
        
         final void Function(ThreadViewComment, List<ThreadViewComment>)?

     

       680
       680
       -
             onContinueThread;

     

       837
       837
       +
         onContinueThread;

     

       681
       838
        
       

     

       682
       839
        
         @override

     

       683
       840
        
         Widget build(BuildContext context) {