refactor: separate reload timeline function

poppingmoon · Oct 28, 2024 · 6b9f8c1 · 6b9f8c1
1 parent f83897a
commit 6b9f8c1
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 43 deletions.
diff --git a/lib/util/reload_timeline.dart b/lib/util/reload_timeline.dart
@@ -0,0 +1,25 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+import '../model/tab_settings.dart';
+import '../provider/api/timeline_notes_after_note_notifier_provider.dart';
+import '../provider/api/timeline_notes_notifier_provider.dart';
+import '../provider/streaming/timeline_stream_notifier.dart';
+import '../provider/streaming/web_socket_channel_provider.dart';
+import '../provider/timeline_center_notifier_provider.dart';
+import '../provider/timeline_last_viewed_note_id_notifier_provider.dart';
+
+Future<void> reloadTimeline(WidgetRef ref, TabSettings tabSettings) async {
+  if (!tabSettings.disableStreaming) {
+    ref.invalidate(webSocketChannelProvider(tabSettings.account));
+  }
+  ref.read(timelineCenterNotifierProvider(tabSettings).notifier).reset();
+  await Future.wait([
+    ref.refresh(timelineNotesAfterNoteNotifierProvider(tabSettings).future),
+    ref.refresh(timelineNotesNotifierProvider(tabSettings).future),
+    ref
+        .read(timelineLastViewedNoteIdNotifierProvider(tabSettings).notifier)
+        .saveFromDate(DateTime.now()),
+    if (!tabSettings.disableStreaming)
+      ref.read(timelineStreamNotifierProvider(tabSettings).notifier).connect(),
+  ]);
+}
diff --git a/lib/view/widget/timeline_list_view.dart b/lib/view/widget/timeline_list_view.dart
@@ -13,10 +13,10 @@ import '../../provider/api/timeline_notes_notifier_provider.dart';
 import '../../provider/general_settings_notifier_provider.dart';
 import '../../provider/streaming/incoming_message_provider.dart';
 import '../../provider/streaming/timeline_stream_notifier.dart';
-import '../../provider/streaming/web_socket_channel_provider.dart';
 import '../../provider/timeline_center_notifier_provider.dart';
 import '../../provider/timeline_last_viewed_note_id_notifier_provider.dart';
 import '../../provider/timeline_scroll_controller_provider.dart';
+import '../../util/reload_timeline.dart';
 import 'notifications_list_view.dart';
 import 'pagination_bottom_widget.dart';
 import 'timeline_note.dart';
@@ -217,27 +217,7 @@ class TimelineListView extends HookConsumerWidget {
     );
 
     return RefreshIndicator(
-      onRefresh: () async {
-        if (!tabSettings.disableStreaming) {
-          ref.invalidate(webSocketChannelProvider(tabSettings.account));
-        }
-        ref.read(timelineCenterNotifierProvider(tabSettings).notifier).reset();
-        await Future.wait([
-          ref.refresh(
-            timelineNotesAfterNoteNotifierProvider(tabSettings).future,
-          ),
-          ref.refresh(timelineNotesNotifierProvider(tabSettings).future),
-          ref
-              .read(
-                timelineLastViewedNoteIdNotifierProvider(tabSettings).notifier,
-              )
-              .saveFromDate(DateTime.now()),
-          if (!tabSettings.disableStreaming)
-            ref
-                .read(timelineStreamNotifierProvider(tabSettings).notifier)
-                .connect(),
-        ]);
-      },
+      onRefresh: () => reloadTimeline(ref, tabSettings),
       notificationPredicate: (_) =>
           nextNotes.valueOrNull?.isLastLoaded ?? false,
       child: Center(

diff --git a/lib/view/widget/timeline_menu.dart b/lib/view/widget/timeline_menu.dart
@@ -8,12 +8,10 @@ import '../../model/id.dart';
 import '../../model/tab_settings.dart';
 import '../../model/tab_type.dart';
 import '../../provider/api/i_notifier_provider.dart';
-import '../../provider/api/timeline_notes_after_note_notifier_provider.dart';
-import '../../provider/api/timeline_notes_notifier_provider.dart';
-import '../../provider/streaming/web_socket_channel_provider.dart';
 import '../../provider/timeline_center_notifier_provider.dart';
 import '../../provider/timeline_last_viewed_note_id_notifier_provider.dart';
 import '../../util/pick_date_time.dart';
+import '../../util/reload_timeline.dart';
 
 class TimelineMenu extends ConsumerWidget {
   const TimelineMenu({super.key, required this.tabSettings});
@@ -226,24 +224,7 @@ class TimelineMenu extends ConsumerWidget {
               Card(
                 clipBehavior: Clip.hardEdge,
                 child: InkWell(
-                  onTap: () {
-                    ref
-                        .read(
-                          timelineCenterNotifierProvider(tabSettings).notifier,
-                        )
-                        .reset();
-                    ref.invalidate(webSocketChannelProvider(account));
-                    ref.invalidate(
-                      timelineNotesAfterNoteNotifierProvider(tabSettings),
-                    );
-                    ref.invalidate(timelineNotesNotifierProvider(tabSettings));
-                    ref
-                        .read(
-                          timelineLastViewedNoteIdNotifierProvider(tabSettings)
-                              .notifier,
-                        )
-                        .saveFromDate(DateTime.now());
-                  },
+                  onTap: () => reloadTimeline(ref, tabSettings),
                   child: Column(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: [