From 07f8cd2455fda3d05282abe60e57661af20ece1c Mon Sep 17 00:00:00 2001
From: nyne <me@nyne.dev>
Date: Tue, 10 Dec 2024 14:45:48 +0800
Subject: [PATCH] improve explore page loading

---
 lib/components/comic.dart   | 15 +++++++++++
 lib/pages/explore_page.dart | 50 ++++++++++++++++++++++++++++++-------
 2 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/lib/components/comic.dart b/lib/components/comic.dart
index 2c6b457..ddccd21 100644
--- a/lib/components/comic.dart
+++ b/lib/components/comic.dart
@@ -832,6 +832,7 @@ class ComicList extends StatefulWidget {
     this.errorLeading,
     this.menuBuilder,
     this.controller,
+    this.refreshHandlerCallback,
   });
 
   final Future<Res<List<Comic>>> Function(int page)? loadPage;
@@ -848,6 +849,8 @@ class ComicList extends StatefulWidget {
 
   final ScrollController? controller;
 
+  final void Function(VoidCallback c)? refreshHandlerCallback;
+
   @override
   State<ComicList> createState() => ComicListState();
 }
@@ -892,10 +895,22 @@ class ComicListState extends State<ComicList> {
     PageStorage.of(context).writeState(context, state);
   }
 
+  void refresh() {
+    _data.clear();
+    _page = 1;
+    _maxPage = null;
+    _error = null;
+    _nextUrl = null;
+    _loading.clear();
+    storeState();
+    setState(() {});
+  }
+
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
     restoreState(PageStorage.of(context).readState(context));
+    widget.refreshHandlerCallback?.call(refresh);
   }
 
   void remove(Comic c) {
diff --git a/lib/pages/explore_page.dart b/lib/pages/explore_page.dart
index 5528aa3..519f8c5 100644
--- a/lib/pages/explore_page.dart
+++ b/lib/pages/explore_page.dart
@@ -242,12 +242,12 @@ class _SingleExplorePageState extends StateWithController<_SingleExplorePage>
 
   late final String comicSourceKey;
 
-  int key = 0;
-
   bool _wantKeepAlive = true;
 
   var scrollController = ScrollController();
 
+  VoidCallback? refreshHandler;
+
   void onSettingsChanged() {
     var explorePages = appdata.settings["explore_pages"];
     if (!explorePages.contains(widget.title)) {
@@ -283,24 +283,33 @@ class _SingleExplorePageState extends StateWithController<_SingleExplorePage>
     super.build(context);
     if (data.loadMultiPart != null) {
       return _MultiPartExplorePage(
-        key: PageStorageKey(key),
+        key: const PageStorageKey("comic_list"),
         data: data,
         controller: scrollController,
         comicSourceKey: comicSourceKey,
+        refreshHandlerCallback: (c) {
+          refreshHandler = c;
+        },
       );
     } else if (data.loadPage != null || data.loadNext != null) {
       return ComicList(
         loadPage: data.loadPage,
         loadNext: data.loadNext,
-        key: PageStorageKey(key),
+        key: const PageStorageKey("comic_list"),
         controller: scrollController,
+        refreshHandlerCallback: (c) {
+          refreshHandler = c;
+        },
       );
     } else if (data.loadMixed != null) {
       return _MixedExplorePage(
         data,
         comicSourceKey,
-        key: ValueKey(key),
+        key: const PageStorageKey("comic_list"),
         controller: scrollController,
+        refreshHandlerCallback: (c) {
+          refreshHandler = c;
+        },
       );
     } else {
       return const Center(
@@ -314,9 +323,7 @@ class _SingleExplorePageState extends StateWithController<_SingleExplorePage>
 
   @override
   void refresh() {
-    setState(() {
-      key++;
-    });
+    refreshHandler?.call();
   }
 
   @override
@@ -338,7 +345,7 @@ class _SingleExplorePageState extends StateWithController<_SingleExplorePage>
 
 class _MixedExplorePage extends StatefulWidget {
   const _MixedExplorePage(this.data, this.sourceKey,
-      {super.key, this.controller});
+      {super.key, this.controller, required this.refreshHandlerCallback});
 
   final ExplorePageData data;
 
@@ -346,12 +353,24 @@ class _MixedExplorePage extends StatefulWidget {
 
   final ScrollController? controller;
 
+  final void Function(VoidCallback c) refreshHandlerCallback;
+
   @override
   State<_MixedExplorePage> createState() => _MixedExplorePageState();
 }
 
 class _MixedExplorePageState
     extends MultiPageLoadingState<_MixedExplorePage, Object> {
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    widget.refreshHandlerCallback(refresh);
+  }
+
+  void refresh() {
+    reset();
+  }
+
   Iterable<Widget> buildSlivers(BuildContext context, List<Object> data) sync* {
     List<Comic> cache = [];
     for (var part in data) {
@@ -470,6 +489,7 @@ class _MultiPartExplorePage extends StatefulWidget {
     required this.data,
     required this.controller,
     required this.comicSourceKey,
+    required this.refreshHandlerCallback,
   });
 
   final ExplorePageData data;
@@ -478,6 +498,8 @@ class _MultiPartExplorePage extends StatefulWidget {
 
   final String comicSourceKey;
 
+  final void Function(VoidCallback c) refreshHandlerCallback;
+
   @override
   State<_MultiPartExplorePage> createState() => _MultiPartExplorePageState();
 }
@@ -508,6 +530,15 @@ class _MultiPartExplorePageState extends State<_MultiPartExplorePage> {
     PageStorage.of(context).writeState(context, state);
   }
 
+  void refresh() {
+    setState(() {
+      loading = true;
+      message = null;
+      parts = null;
+    });
+    storeState();
+  }
+
   @override
   void initState() {
     super.initState();
@@ -518,6 +549,7 @@ class _MultiPartExplorePageState extends State<_MultiPartExplorePage> {
   void didChangeDependencies() {
     super.didChangeDependencies();
     restoreState(PageStorage.of(context).readState(context));
+    widget.refreshHandlerCallback(refresh);
   }
 
   void load() async {