diff --git a/lib/common/widgets/http_error.dart b/lib/common/widgets/http_error.dart index e31c9260..47bb733d 100644 --- a/lib/common/widgets/http_error.dart +++ b/lib/common/widgets/http_error.dart @@ -5,17 +5,15 @@ class HttpError extends StatelessWidget { const HttpError({ this.isSliver = true, this.errMsg, - this.callback, + this.onReload, this.btnText, - this.extraWidget, super.key, }); final bool isSliver; final String? errMsg; - final Function()? callback; + final VoidCallback? onReload; final String? btnText; - final Widget? extraWidget; @override Widget build(BuildContext context) { @@ -46,15 +44,9 @@ class HttpError extends StatelessWidget { style: Theme.of(context).textTheme.titleSmall, ), ), - if (extraWidget != null) ...[ - const SizedBox(height: 10), - extraWidget!, - const SizedBox(height: 5), - ], - if (callback != null) ...[ - if (extraWidget == null) const SizedBox(height: 20), + if (onReload != null) FilledButton.tonal( - onPressed: callback, + onPressed: onReload, style: ButtonStyle( backgroundColor: WidgetStateProperty.resolveWith((states) { return Theme.of(context).colorScheme.primary.withAlpha(20); @@ -65,7 +57,6 @@ class HttpError extends StatelessWidget { style: TextStyle(color: Theme.of(context).colorScheme.primary), ), ), - ], SizedBox(height: 40 + MediaQuery.paddingOf(context).bottom), ], ); diff --git a/lib/common/widgets/loading_widget.dart b/lib/common/widgets/loading_widget.dart index 0174f0ea..7abeebc1 100644 --- a/lib/common/widgets/loading_widget.dart +++ b/lib/common/widgets/loading_widget.dart @@ -3,17 +3,17 @@ import 'package:flutter/material.dart'; Widget get loadingWidget => Center(child: CircularProgressIndicator()); -Widget errorWidget({errMsg, callback}) => HttpError( +Widget errorWidget({errMsg, onReload}) => HttpError( isSliver: false, errMsg: errMsg, - callback: callback, + onReload: onReload, ); -Widget scrollErrorWidget({errMsg, callback}) => CustomScrollView( +Widget scrollErrorWidget({errMsg, onReload}) => CustomScrollView( slivers: [ HttpError( errMsg: errMsg, - callback: callback, + onReload: onReload, ) ], ); diff --git a/lib/pages/bangumi/introduction/view.dart b/lib/pages/bangumi/introduction/view.dart index 05e14aaa..f6dfde8e 100644 --- a/lib/pages/bangumi/introduction/view.dart +++ b/lib/pages/bangumi/introduction/view.dart @@ -102,7 +102,7 @@ class _BangumiIntroPanelState extends State ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: bangumiIntroController.onReload, + onReload: bangumiIntroController.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/bangumi/pgc_index/pgc_index_page.dart b/lib/pages/bangumi/pgc_index/pgc_index_page.dart index 34c45f59..0062ac02 100644 --- a/lib/pages/bangumi/pgc_index/pgc_index_page.dart +++ b/lib/pages/bangumi/pgc_index/pgc_index_page.dart @@ -82,7 +82,7 @@ class _PgcIndexPageState extends State }), Error() => scrollErrorWidget( errMsg: loadingState.errMsg, - callback: () { + onReload: () { _ctr.conditionState.value = LoadingState.loading(); _ctr.getPgcIndexCondition(); }, @@ -233,10 +233,10 @@ class _PgcIndexPageState extends State childCount: loadingState.response!.length, ), ) - : HttpError(callback: _ctr.onReload), + : HttpError(onReload: _ctr.onReload), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _ctr.onReload, + onReload: _ctr.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/bangumi/view.dart b/lib/pages/bangumi/view.dart index 099512df..4a9fe98f 100644 --- a/lib/pages/bangumi/view.dart +++ b/lib/pages/bangumi/view.dart @@ -324,11 +324,11 @@ class _BangumiPageState extends CommonPageState ), ) : HttpError( - callback: controller.onReload, + onReload: controller.onReload, ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: controller.onReload, + onReload: controller.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/blacklist/view.dart b/lib/pages/blacklist/view.dart index ea5e164b..ad57f6b7 100644 --- a/lib/pages/blacklist/view.dart +++ b/lib/pages/blacklist/view.dart @@ -105,11 +105,11 @@ class _BlackListPageState extends State { }, ) : HttpError( - callback: _blackListController.onReload, + onReload: _blackListController.onReload, ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _blackListController.onReload, + onReload: _blackListController.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/common/common_search_page.dart b/lib/pages/common/common_search_page.dart index 6786af06..7ac83f41 100644 --- a/lib/pages/common/common_search_page.dart +++ b/lib/pages/common/common_search_page.dart @@ -68,11 +68,11 @@ abstract class CommonSearchPageState Success() => loadingState.response?.isNotEmpty == true ? buildList(loadingState.response!) : HttpError( - callback: controller.onReload, + onReload: controller.onReload, ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: controller.onReload, + onReload: controller.onReload, ), _ => throw UnimplementedError(), }; diff --git a/lib/pages/dynamics/detail/view.dart b/lib/pages/dynamics/detail/view.dart index 65e3a46a..25f4a855 100644 --- a/lib/pages/dynamics/detail/view.dart +++ b/lib/pages/dynamics/detail/view.dart @@ -841,11 +841,11 @@ class _DynamicDetailPageState extends State ), ) : HttpError( - callback: _dynamicDetailController.onReload, + onReload: _dynamicDetailController.onReload, ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _dynamicDetailController.onReload, + onReload: _dynamicDetailController.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/dynamics/tab/view.dart b/lib/pages/dynamics/tab/view.dart index 402a6648..563f85b3 100644 --- a/lib/pages/dynamics/tab/view.dart +++ b/lib/pages/dynamics/tab/view.dart @@ -206,11 +206,11 @@ class _DynamicsTabPageState ), ) : HttpError( - callback: controller.onReload, + onReload: controller.onReload, ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: controller.onReload, + onReload: controller.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/fan/view.dart b/lib/pages/fan/view.dart index 7e2263cd..4b429887 100644 --- a/lib/pages/fan/view.dart +++ b/lib/pages/fan/view.dart @@ -129,11 +129,11 @@ class _FansPageState extends State { ), ) : HttpError( - callback: _fansController.onReload, + onReload: _fansController.onReload, ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _fansController.onReload, + onReload: _fansController.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/fav/article/view.dart b/lib/pages/fav/article/view.dart index 24babc13..6f2122fe 100644 --- a/lib/pages/fav/article/view.dart +++ b/lib/pages/fav/article/view.dart @@ -84,10 +84,10 @@ class _FavArticlePageState extends State childCount: loadingState.response!.length, ), ) - : HttpError(callback: _favArticleController.onReload), + : HttpError(onReload: _favArticleController.onReload), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _favArticleController.onReload, + onReload: _favArticleController.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/fav/note/child_view.dart b/lib/pages/fav/note/child_view.dart index a6835466..3d2a7459 100644 --- a/lib/pages/fav/note/child_view.dart +++ b/lib/pages/fav/note/child_view.dart @@ -166,10 +166,10 @@ class _FavNoteChildPageState extends State ), ), ) - : HttpError(callback: _favNoteController.onReload), + : HttpError(onReload: _favNoteController.onReload), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _favNoteController.onReload, + onReload: _favNoteController.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/fav/pgc/child_view.dart b/lib/pages/fav/pgc/child_view.dart index 191433f0..5cb8459d 100644 --- a/lib/pages/fav/pgc/child_view.dart +++ b/lib/pages/fav/pgc/child_view.dart @@ -212,10 +212,10 @@ class _FavPgcChildPageState extends State ), ), ) - : HttpError(callback: _favPgcController.onReload), + : HttpError(onReload: _favPgcController.onReload), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _favPgcController.onReload, + onReload: _favPgcController.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/fav/video/view.dart b/lib/pages/fav/video/view.dart index 14695d08..91806bef 100644 --- a/lib/pages/fav/video/view.dart +++ b/lib/pages/fav/video/view.dart @@ -98,11 +98,11 @@ class _FavVideoPageState extends State ), ) : HttpError( - callback: _favController.onReload, + onReload: _favController.onReload, ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _favController.onReload, + onReload: _favController.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/fav_detail/view.dart b/lib/pages/fav_detail/view.dart index 2c5013c5..c3125164 100644 --- a/lib/pages/fav_detail/view.dart +++ b/lib/pages/fav_detail/view.dart @@ -582,11 +582,11 @@ class _FavDetailPageState extends State { ), ) : HttpError( - callback: _favDetailController.onReload, + onReload: _favDetailController.onReload, ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _favDetailController.onReload, + onReload: _favDetailController.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/follow/child_view.dart b/lib/pages/follow/child_view.dart index 1e3c3d1f..bfe7f02c 100644 --- a/lib/pages/follow/child_view.dart +++ b/lib/pages/follow/child_view.dart @@ -102,11 +102,11 @@ class _FollowChildPageState extends State }, ) : HttpError( - callback: _followController.onReload, + onReload: _followController.onReload, ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _followController.onReload, + onReload: _followController.onReload, ), _ => throw UnimplementedError(), }; diff --git a/lib/pages/history/view.dart b/lib/pages/history/view.dart index b80097d4..a1b0c566 100644 --- a/lib/pages/history/view.dart +++ b/lib/pages/history/view.dart @@ -289,11 +289,11 @@ class _HistoryPageState extends State ), ) : HttpError( - callback: _historyController.onReload, + onReload: _historyController.onReload, ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _historyController.onReload, + onReload: _historyController.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/hot/view.dart b/lib/pages/hot/view.dart index ca946661..07028f94 100644 --- a/lib/pages/hot/view.dart +++ b/lib/pages/hot/view.dart @@ -181,11 +181,11 @@ class _HotPageState extends CommonPageState ), ) : HttpError( - callback: controller.onReload, + onReload: controller.onReload, ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: controller.onReload, + onReload: controller.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/html/view.dart b/lib/pages/html/view.dart index 89bcbad3..876cbaba 100644 --- a/lib/pages/html/view.dart +++ b/lib/pages/html/view.dart @@ -867,11 +867,11 @@ class _HtmlRenderPageState extends State }, ) : HttpError( - callback: _htmlRenderCtr.onReload, + onReload: _htmlRenderCtr.onReload, ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _htmlRenderCtr.onReload, + onReload: _htmlRenderCtr.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/later/child_view.dart b/lib/pages/later/child_view.dart index 9c1f3197..dcbf3d38 100644 --- a/lib/pages/later/child_view.dart +++ b/lib/pages/later/child_view.dart @@ -197,11 +197,11 @@ class _LaterViewChildPageState extends State ), ) : HttpError( - callback: _laterController.onReload, + onReload: _laterController.onReload, ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _laterController.onReload, + onReload: _laterController.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/live/view.dart b/lib/pages/live/view.dart index 23b1cb13..ceb0ecd6 100644 --- a/lib/pages/live/view.dart +++ b/lib/pages/live/view.dart @@ -111,10 +111,10 @@ class _LivePageState extends CommonPageState childCount: loadingState.response!.length, ), ) - : scrollErrorWidget(callback: controller.onReload), + : scrollErrorWidget(onReload: controller.onReload), Error() => HttpError( errMsg: loadingState.errMsg, - callback: controller.onReload, + onReload: controller.onReload, ), _ => throw UnimplementedError(), }; @@ -321,7 +321,7 @@ class _LivePageState extends CommonPageState ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: () { + onReload: () { controller ..followListState.value = LoadingState.loading() ..fetchLiveFollowing(); diff --git a/lib/pages/member/content/member_contribute/content/article/member_article.dart b/lib/pages/member/content/member_contribute/content/article/member_article.dart index 140118df..24e431c0 100644 --- a/lib/pages/member/content/member_contribute/content/article/member_article.dart +++ b/lib/pages/member/content/member_contribute/content/article/member_article.dart @@ -66,11 +66,11 @@ class _MemberArticleState extends State ), ) : scrollErrorWidget( - callback: _controller.onReload, + onReload: _controller.onReload, ), Error() => scrollErrorWidget( errMsg: loadingState.errMsg, - callback: _controller.onReload, + onReload: _controller.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/member/content/member_contribute/content/bangumi/member_bangumi.dart b/lib/pages/member/content/member_contribute/content/bangumi/member_bangumi.dart index 971a62be..db57f782 100644 --- a/lib/pages/member/content/member_contribute/content/bangumi/member_bangumi.dart +++ b/lib/pages/member/content/member_contribute/content/bangumi/member_bangumi.dart @@ -87,11 +87,11 @@ class _MemberBangumiState extends State ), ) : scrollErrorWidget( - callback: _controller.onReload, + onReload: _controller.onReload, ), Error() => scrollErrorWidget( errMsg: loadingState.errMsg, - callback: _controller.onReload, + onReload: _controller.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/member/content/member_contribute/content/favorite/member_favorite.dart b/lib/pages/member/content/member_contribute/content/favorite/member_favorite.dart index 11cff622..68f671bb 100644 --- a/lib/pages/member/content/member_contribute/content/favorite/member_favorite.dart +++ b/lib/pages/member/content/member_contribute/content/favorite/member_favorite.dart @@ -67,11 +67,11 @@ class _MemberFavoriteState extends State ), ) : scrollErrorWidget( - callback: _controller.onReload, + onReload: _controller.onReload, ), Error() => scrollErrorWidget( errMsg: loadingState.errMsg, - callback: _controller.onReload, + onReload: _controller.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/member/content/member_contribute/content/season_series/season_series_page.dart b/lib/pages/member/content/member_contribute/content/season_series/season_series_page.dart index 733bb823..14171bed 100644 --- a/lib/pages/member/content/member_contribute/content/season_series/season_series_page.dart +++ b/lib/pages/member/content/member_contribute/content/season_series/season_series_page.dart @@ -92,13 +92,13 @@ class _SeasonSeriesPageState extends State ], ) : scrollErrorWidget( - callback: () { + onReload: () { _controller.onReload(); }, ), Error() => scrollErrorWidget( errMsg: loadingState.errMsg, - callback: () { + onReload: () { _controller.onReload(); }, ), diff --git a/lib/pages/member/content/member_contribute/content/video/member_video.dart b/lib/pages/member/content/member_contribute/content/video/member_video.dart index 1ec420e1..4d2bce55 100644 --- a/lib/pages/member/content/member_contribute/content/video/member_video.dart +++ b/lib/pages/member/content/member_contribute/content/video/member_video.dart @@ -224,11 +224,11 @@ class _MemberVideoState extends State ], ) : scrollErrorWidget( - callback: _controller.onReload, + onReload: _controller.onReload, ), Error() => scrollErrorWidget( errMsg: loadingState.errMsg, - callback: _controller.onReload, + onReload: _controller.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/member/member_page.dart b/lib/pages/member/member_page.dart index 382073fa..6d161d44 100644 --- a/lib/pages/member/member_page.dart +++ b/lib/pages/member/member_page.dart @@ -264,7 +264,7 @@ class _MemberPageNewState extends State { Widget _errorWidget(msg) { return errorWidget( errMsg: msg, - callback: _userController.onReload, + onReload: _userController.onReload, ); } diff --git a/lib/pages/member/widget/edit_profile_page.dart b/lib/pages/member/widget/edit_profile_page.dart index fcf3fd0f..80a7daf2 100644 --- a/lib/pages/member/widget/edit_profile_page.dart +++ b/lib/pages/member/widget/edit_profile_page.dart @@ -202,7 +202,7 @@ class _EditProfilePageState extends State { ), Error() => errorWidget( errMsg: loadingState.errMsg, - callback: _getInfo, + onReload: _getInfo, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/member_coin/view.dart b/lib/pages/member_coin/view.dart index f8d7715c..e4ba82c6 100644 --- a/lib/pages/member_coin/view.dart +++ b/lib/pages/member_coin/view.dart @@ -88,10 +88,10 @@ class _MemberCoinPageState extends State { return MemberCoinsItem(coinItem: loadingState.response![index]); }, ) - : HttpError(callback: _ctr.onReload), + : HttpError(onReload: _ctr.onReload), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _ctr.onReload, + onReload: _ctr.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/member_dynamics/view.dart b/lib/pages/member_dynamics/view.dart index a4f2f535..5b9099f9 100644 --- a/lib/pages/member_dynamics/view.dart +++ b/lib/pages/member_dynamics/view.dart @@ -159,11 +159,11 @@ class _MemberDynamicsPageState extends State ), ) : HttpError( - callback: _memberDynamicController.onReload, + onReload: _memberDynamicController.onReload, ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _memberDynamicController.onReload, + onReload: _memberDynamicController.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/member_like/view.dart b/lib/pages/member_like/view.dart index f3bba696..86cc8570 100644 --- a/lib/pages/member_like/view.dart +++ b/lib/pages/member_like/view.dart @@ -88,10 +88,10 @@ class _MemberLikePageState extends State { return MemberCoinsItem(coinItem: loadingState.response![index]); }, ) - : HttpError(callback: _ctr.onReload), + : HttpError(onReload: _ctr.onReload), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _ctr.onReload, + onReload: _ctr.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/member_search/search_archive.dart b/lib/pages/member_search/search_archive.dart index 39067b1a..c5e58c92 100644 --- a/lib/pages/member_search/search_archive.dart +++ b/lib/pages/member_search/search_archive.dart @@ -80,14 +80,14 @@ class _SearchArchiveState extends State ), ) : HttpError( - callback: () { + onReload: () { widget.ctr.archiveState.value = LoadingState.loading(); widget.ctr.refreshArchive(); }, ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: () { + onReload: () { widget.ctr.archiveState.value = LoadingState.loading(); widget.ctr.refreshArchive(); }, diff --git a/lib/pages/member_search/search_dynamic.dart b/lib/pages/member_search/search_dynamic.dart index d3d15ce7..71ea3759 100644 --- a/lib/pages/member_search/search_dynamic.dart +++ b/lib/pages/member_search/search_dynamic.dart @@ -141,14 +141,14 @@ class _SearchDynamicState extends State ], ) : HttpError( - callback: () { + onReload: () { widget.ctr.dynamicState.value = LoadingState.loading(); widget.ctr.refreshDynamic(); }, ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: () { + onReload: () { widget.ctr.dynamicState.value = LoadingState.loading(); widget.ctr.refreshDynamic(); }, diff --git a/lib/pages/msg_feed_top/at_me/view.dart b/lib/pages/msg_feed_top/at_me/view.dart index a6540c72..f7e68b23 100644 --- a/lib/pages/msg_feed_top/at_me/view.dart +++ b/lib/pages/msg_feed_top/at_me/view.dart @@ -157,10 +157,10 @@ class _AtMePageState extends State { ); }, ) - : HttpError(callback: _atMeController.onReload), + : HttpError(onReload: _atMeController.onReload), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _atMeController.onReload, + onReload: _atMeController.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/msg_feed_top/like_me/view.dart b/lib/pages/msg_feed_top/like_me/view.dart index 340bacf6..c44a2323 100644 --- a/lib/pages/msg_feed_top/like_me/view.dart +++ b/lib/pages/msg_feed_top/like_me/view.dart @@ -117,11 +117,11 @@ class _LikeMePageState extends State { ], ); } - return HttpError(callback: _likeMeController.onReload); + return HttpError(onReload: _likeMeController.onReload); }(), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _likeMeController.onReload, + onReload: _likeMeController.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/msg_feed_top/reply_me/view.dart b/lib/pages/msg_feed_top/reply_me/view.dart index 666b46e5..103fc274 100644 --- a/lib/pages/msg_feed_top/reply_me/view.dart +++ b/lib/pages/msg_feed_top/reply_me/view.dart @@ -178,10 +178,10 @@ class _ReplyMePageState extends State { ); }, ) - : HttpError(callback: _replyMeController.onReload), + : HttpError(onReload: _replyMeController.onReload), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _replyMeController.onReload, + onReload: _replyMeController.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/msg_feed_top/sys_msg/view.dart b/lib/pages/msg_feed_top/sys_msg/view.dart index 02e95fd6..a8279b8c 100644 --- a/lib/pages/msg_feed_top/sys_msg/view.dart +++ b/lib/pages/msg_feed_top/sys_msg/view.dart @@ -136,10 +136,10 @@ class _SysMsgPageState extends State { ); }, ) - : HttpError(callback: _sysMsgController.onReload), + : HttpError(onReload: _sysMsgController.onReload), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _sysMsgController.onReload, + onReload: _sysMsgController.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/rank/zone/view.dart b/lib/pages/rank/zone/view.dart index 736a0aed..44f7d0ed 100644 --- a/lib/pages/rank/zone/view.dart +++ b/lib/pages/rank/zone/view.dart @@ -82,10 +82,10 @@ class _ZonePageState extends CommonPageState childCount: loadingState.response!.length, ), ) - : HttpError(callback: controller.onReload), + : HttpError(onReload: controller.onReload), Error() => HttpError( errMsg: loadingState.errMsg, - callback: controller.onReload, + onReload: controller.onReload, ), _ => throw UnimplementedError(), }; diff --git a/lib/pages/rcmd/view.dart b/lib/pages/rcmd/view.dart index b90a3ccc..1deeb376 100644 --- a/lib/pages/rcmd/view.dart +++ b/lib/pages/rcmd/view.dart @@ -135,10 +135,10 @@ class _RcmdPageState extends CommonPageState : loadingState.response!.length, ), ) - : HttpError(callback: controller.onReload), + : HttpError(onReload: controller.onReload), Error() => HttpError( errMsg: loadingState.errMsg, - callback: controller.onReload, + onReload: controller.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/search/view.dart b/lib/pages/search/view.dart index bfed6180..83d8b33d 100644 --- a/lib/pages/search/view.dart +++ b/lib/pages/search/view.dart @@ -360,7 +360,7 @@ class _SearchPageState extends State { : const SizedBox.shrink(), Error() => errorWidget( errMsg: loadingState.errMsg, - callback: isHot + onReload: isHot ? _searchController.queryHotSearchList : _searchController.queryRecommendList, ), diff --git a/lib/pages/search_panel/view.dart b/lib/pages/search_panel/view.dart index e7163010..ef4630f3 100644 --- a/lib/pages/search_panel/view.dart +++ b/lib/pages/search_panel/view.dart @@ -117,11 +117,11 @@ abstract class CommonSearchPanelState< Success() => loadingState.response?.isNotEmpty == true ? buildList(loadingState.response!) : HttpError( - callback: controller.onReload, + onReload: controller.onReload, ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: controller.onReload, + onReload: controller.onReload, ), _ => throw UnimplementedError(), }; diff --git a/lib/pages/search_trending/view.dart b/lib/pages/search_trending/view.dart index 45df368b..52cd65de 100644 --- a/lib/pages/search_trending/view.dart +++ b/lib/pages/search_trending/view.dart @@ -223,11 +223,11 @@ class _SearchTrendingPageState extends State { ), ) : HttpError( - callback: _controller.onReload, + onReload: _controller.onReload, ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _controller.onReload, + onReload: _controller.onReload, ), _ => throw UnimplementedError(), }; diff --git a/lib/pages/subscription/view.dart b/lib/pages/subscription/view.dart index d5949018..53215886 100644 --- a/lib/pages/subscription/view.dart +++ b/lib/pages/subscription/view.dart @@ -71,11 +71,11 @@ class _SubPageState extends State { ), ) : HttpError( - callback: _subController.onReload, + onReload: _subController.onReload, ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _subController.onReload, + onReload: _subController.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/subscription_detail/view.dart b/lib/pages/subscription_detail/view.dart index cbdb3659..28aa627d 100644 --- a/lib/pages/subscription_detail/view.dart +++ b/lib/pages/subscription_detail/view.dart @@ -91,11 +91,11 @@ class _SubDetailPageState extends State { ), ) : HttpError( - callback: _subDetailController.onReload, + onReload: _subDetailController.onReload, ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _subDetailController.onReload, + onReload: _subDetailController.onReload, ), _ => throw UnimplementedError(), }; diff --git a/lib/pages/video/detail/introduction/widgets/create_fav_page.dart b/lib/pages/video/detail/introduction/widgets/create_fav_page.dart index f3caaafc..c17b08cf 100644 --- a/lib/pages/video/detail/introduction/widgets/create_fav_page.dart +++ b/lib/pages/video/detail/introduction/widgets/create_fav_page.dart @@ -102,7 +102,7 @@ class _CreateFavPageState extends State { slivers: [ HttpError( errMsg: _errMsg, - callback: _getFolderInfo, + onReload: _getFolderInfo, ), ], ), diff --git a/lib/pages/video/detail/introduction/widgets/fav_panel.dart b/lib/pages/video/detail/introduction/widgets/fav_panel.dart index 4a362760..564a80d5 100644 --- a/lib/pages/video/detail/introduction/widgets/fav_panel.dart +++ b/lib/pages/video/detail/introduction/widgets/fav_panel.dart @@ -86,7 +86,7 @@ class _FavPanelState extends State { if (snapshot.data is! Map) { return HttpError( isSliver: false, - callback: () => setState(() { + onReload: () => setState(() { _futureBuilderFuture = widget.ctr.queryVideoInFolder(); }), ); @@ -138,7 +138,7 @@ class _FavPanelState extends State { slivers: [ HttpError( errMsg: data['msg'], - callback: () => setState(() { + onReload: () => setState(() { _futureBuilderFuture = widget.ctr.queryVideoInFolder(); }), diff --git a/lib/pages/video/detail/introduction/widgets/group_panel.dart b/lib/pages/video/detail/introduction/widgets/group_panel.dart index e86b326a..1ee62cb2 100644 --- a/lib/pages/video/detail/introduction/widgets/group_panel.dart +++ b/lib/pages/video/detail/introduction/widgets/group_panel.dart @@ -96,7 +96,7 @@ class _GroupPanelState extends State { if (snapshot.data is! Map) { return HttpError( isSliver: false, - callback: () => setState(() { + onReload: () => setState(() { _futureBuilderFuture = MemberHttp.followUpTags(); }), ); @@ -146,7 +146,7 @@ class _GroupPanelState extends State { slivers: [ HttpError( errMsg: data['msg'], - callback: () => setState(() {}), + onReload: () => setState(() {}), ), ], ); diff --git a/lib/pages/video/detail/member/horizontal_member_page.dart b/lib/pages/video/detail/member/horizontal_member_page.dart index f3fd7448..e6c9293c 100644 --- a/lib/pages/video/detail/member/horizontal_member_page.dart +++ b/lib/pages/video/detail/member/horizontal_member_page.dart @@ -111,7 +111,7 @@ class _HorizontalMemberPageState extends State { ), Error() => scrollErrorWidget( errMsg: userState.errMsg, - callback: () { + onReload: () { _controller.userState.value = LoadingState.loading(); _controller.getUserInfo(); }, @@ -228,7 +228,7 @@ class _HorizontalMemberPageState extends State { ), Error() => scrollErrorWidget( errMsg: loadingState.errMsg, - callback: _controller.onReload, + onReload: _controller.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/video/detail/note/note_list_page.dart b/lib/pages/video/detail/note/note_list_page.dart index e1bc2168..dfd8b893 100644 --- a/lib/pages/video/detail/note/note_list_page.dart +++ b/lib/pages/video/detail/note/note_list_page.dart @@ -190,7 +190,7 @@ class _NoteListPageState extends CommonSlidePageState { slivers: [ HttpError( errMsg: errMsg, - callback: _controller.onReload, + onReload: _controller.onReload, ) ], ); diff --git a/lib/pages/video/detail/related/view.dart b/lib/pages/video/detail/related/view.dart index d88017ab..95972fdd 100644 --- a/lib/pages/video/detail/related/view.dart +++ b/lib/pages/video/detail/related/view.dart @@ -58,7 +58,7 @@ class _RelatedVideoPanelState extends State : const SliverToBoxAdapter(), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _relatedController.onReload, + onReload: _relatedController.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/video/detail/reply/view.dart b/lib/pages/video/detail/reply/view.dart index ce68bd9c..efe684da 100644 --- a/lib/pages/video/detail/reply/view.dart +++ b/lib/pages/video/detail/reply/view.dart @@ -264,11 +264,11 @@ class _VideoReplyPanelState extends State ) : HttpError( errMsg: '还没有评论', - callback: _videoReplyController.onReload, + onReload: _videoReplyController.onReload, ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _videoReplyController.onReload, + onReload: _videoReplyController.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/video/detail/reply_reply/view.dart b/lib/pages/video/detail/reply_reply/view.dart index 9d03ae63..6dcb727e 100644 --- a/lib/pages/video/detail/reply_reply/view.dart +++ b/lib/pages/video/detail/reply_reply/view.dart @@ -445,7 +445,7 @@ class _VideoReplyReplyPanelState }(), Error() => errorWidget( errMsg: loadingState.errMsg, - callback: _videoReplyReplyController.onReload, + onReload: _videoReplyReplyController.onReload, ), LoadingState() => throw UnimplementedError(), }; diff --git a/lib/pages/whisper/view.dart b/lib/pages/whisper/view.dart index 27dc6d76..3a1fabc5 100644 --- a/lib/pages/whisper/view.dart +++ b/lib/pages/whisper/view.dart @@ -76,11 +76,11 @@ class _WhisperPageState extends State { ), ) : HttpError( - callback: _whisperController.onReload, + onReload: _whisperController.onReload, ), Error() => HttpError( errMsg: loadingState.errMsg, - callback: _whisperController.onReload, + onReload: _whisperController.onReload, ), _ => throw UnimplementedError(), }; diff --git a/lib/pages/whisper_detail/view.dart b/lib/pages/whisper_detail/view.dart index e439cf36..4adc87fd 100644 --- a/lib/pages/whisper_detail/view.dart +++ b/lib/pages/whisper_detail/view.dart @@ -181,11 +181,11 @@ class _WhisperDetailPageState ), ) : scrollErrorWidget( - callback: _whisperDetailController.onReload, + onReload: _whisperDetailController.onReload, ), Error() => scrollErrorWidget( errMsg: loadingState.errMsg, - callback: _whisperDetailController.onReload, + onReload: _whisperDetailController.onReload, ), _ => throw UnimplementedError(), };