diff --git a/lib/pages/article/view.dart b/lib/pages/article/view.dart index 0fae2f6c..e39537db 100644 --- a/lib/pages/article/view.dart +++ b/lib/pages/article/view.dart @@ -556,7 +556,7 @@ class _ArticlePageState extends State bottom: MediaQuery.of(context).padding.bottom), height: 125, child: Text( - _articleCtr.isEnd.not ? '加载中...' : '没有更多了', + _articleCtr.isEnd ? '没有更多了' : '加载中...', style: TextStyle( fontSize: 12, color: theme.colorScheme.outline, diff --git a/lib/pages/dynamics_detail/view.dart b/lib/pages/dynamics_detail/view.dart index b4b46210..26ec5d1a 100644 --- a/lib/pages/dynamics_detail/view.dart +++ b/lib/pages/dynamics_detail/view.dart @@ -791,11 +791,7 @@ class _DynamicDetailPageState extends State bottom: MediaQuery.of(context).padding.bottom), height: 125, child: Text( - _dynamicDetailController.isEnd.not - ? '加载中...' - : response.isEmpty - ? '还没有评论' - : '没有更多了', + _dynamicDetailController.isEnd ? '没有更多了' : '加载中...', style: TextStyle( fontSize: 12, color: theme.colorScheme.outline, diff --git a/lib/pages/fav_detail/view.dart b/lib/pages/fav_detail/view.dart index a6c1bd28..38836b55 100644 --- a/lib/pages/fav_detail/view.dart +++ b/lib/pages/fav_detail/view.dart @@ -379,7 +379,7 @@ class _FavDetailPageState extends State { height: 60, alignment: Alignment.center, child: Text( - _favDetailController.isEnd.not ? '加载中...' : '没有更多了', + _favDetailController.isEnd ? '没有更多了' : '加载中...', style: TextStyle( color: theme.colorScheme.outline, fontSize: 13, diff --git a/lib/pages/video/reply/view.dart b/lib/pages/video/reply/view.dart index 97e31617..ef53464d 100644 --- a/lib/pages/video/reply/view.dart +++ b/lib/pages/video/reply/view.dart @@ -9,7 +9,6 @@ import 'package:PiliPlus/models/common/reply/reply_sort_type.dart'; import 'package:PiliPlus/models/common/reply/reply_type.dart'; import 'package:PiliPlus/pages/video/reply/controller.dart'; import 'package:PiliPlus/pages/video/reply/widgets/reply_item_grpc.dart'; -import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/feed_back.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; @@ -214,11 +213,7 @@ class _VideoReplyPanelState extends State padding: EdgeInsets.only(bottom: bottom), height: bottom + 100, child: Text( - _videoReplyController.isEnd.not - ? '加载中...' - : response.isEmpty - ? '还没有评论' - : '没有更多了', + _videoReplyController.isEnd ? '没有更多了' : '加载中...', style: TextStyle( fontSize: 12, color: theme.colorScheme.outline, diff --git a/lib/pages/video/reply_reply/view.dart b/lib/pages/video/reply_reply/view.dart index 7b09b4fa..c1efc82c 100644 --- a/lib/pages/video/reply_reply/view.dart +++ b/lib/pages/video/reply_reply/view.dart @@ -9,7 +9,6 @@ import 'package:PiliPlus/pages/common/common_slide_page.dart'; import 'package:PiliPlus/pages/video/reply/widgets/reply_item_grpc.dart'; import 'package:PiliPlus/pages/video/reply_new/view.dart'; import 'package:PiliPlus/pages/video/reply_reply/controller.dart'; -import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/request_utils.dart'; import 'package:PiliPlus/utils/utils.dart'; @@ -411,11 +410,7 @@ class _VideoReplyReplyPanelState bottom: MediaQuery.of(context).padding.bottom), height: 125, child: Text( - _videoReplyReplyController.isEnd.not - ? '加载中...' - : response.isEmpty - ? '还没有评论' - : '没有更多了', + _videoReplyReplyController.isEnd ? '没有更多了' : '加载中...', style: TextStyle( fontSize: 12, color: theme.colorScheme.outline,