mod: refresh

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
bggRGjQaUbCoE
2025-03-04 12:06:50 +08:00
parent 5986add7dd
commit 8ef163dd38
8 changed files with 568 additions and 559 deletions

View File

@@ -1,4 +1,5 @@
import 'package:PiliPlus/common/widgets/dialog.dart';
import 'package:PiliPlus/common/widgets/refresh_indicator.dart';
import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/http/user.dart';
import 'package:PiliPlus/models/user/fav_folder.dart';
@@ -71,7 +72,11 @@ class _FavDetailPageState extends State<FavDetailPage> {
)
: const SizedBox.shrink(),
),
body: CustomScrollView(
body: refreshIndicator(
onRefresh: () async {
await _favDetailController.onRefresh();
},
child: CustomScrollView(
physics: const AlwaysScrollableScrollPhysics(),
controller: _favDetailController.scrollController,
slivers: [
@@ -91,7 +96,8 @@ class _FavDetailPageState extends State<FavDetailPage> {
)
: Obx(
() => AnimatedOpacity(
opacity: _favDetailController.titleCtr.value ? 1 : 0,
opacity:
_favDetailController.titleCtr.value ? 1 : 0,
curve: Curves.easeOut,
duration: const Duration(milliseconds: 500),
child: Column(
@@ -99,11 +105,13 @@ class _FavDetailPageState extends State<FavDetailPage> {
children: [
Text(
_favDetailController.item.value.title ?? '',
style: Theme.of(context).textTheme.titleMedium,
style:
Theme.of(context).textTheme.titleMedium,
),
Text(
'${_favDetailController.item.value.mediaCount}条视频',
style: Theme.of(context).textTheme.labelMedium,
style:
Theme.of(context).textTheme.labelMedium,
)
],
),
@@ -221,14 +229,15 @@ class _FavDetailPageState extends State<FavDetailPage> {
_favDetailController.onReload();
});
} else {
SmartDialog.showToast(data['msg']);
SmartDialog.showToast(
data['msg']);
}
});
},
child: Text('清除失效内容'),
),
if (!Utils.isDefault(
_favDetailController.item.value.attr ??
if (!Utils.isDefault(_favDetailController
.item.value.attr ??
0))
PopupMenuItem(
onTap: () {
@@ -241,7 +250,8 @@ class _FavDetailPageState extends State<FavDetailPage> {
mediaIds: [mediaId])
.then((data) {
if (data['status']) {
SmartDialog.showToast('删除成功');
SmartDialog.showToast(
'删除成功');
Get.back(result: true);
} else {
SmartDialog.showToast(
@@ -296,7 +306,8 @@ class _FavDetailPageState extends State<FavDetailPage> {
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
const SizedBox(height: 4),
Text(
@@ -313,7 +324,8 @@ class _FavDetailPageState extends State<FavDetailPage> {
.item.value.intro?.isNotEmpty ==
true)
Text(
_favDetailController.item.value.intro ??
_favDetailController
.item.value.intro ??
'',
style: TextStyle(
fontSize: Theme.of(context)
@@ -339,7 +351,8 @@ class _FavDetailPageState extends State<FavDetailPage> {
.outline),
),
const Spacer(),
if (_favDetailController.item.value.attr !=
if (_favDetailController
.item.value.attr !=
null)
Text(
'${_favDetailController.item.value.mediaCount}条视频 · ${Utils.isPublicText(_favDetailController.item.value.attr ?? 0)}',
@@ -368,6 +381,7 @@ class _FavDetailPageState extends State<FavDetailPage> {
),
),
),
),
);
}

View File

@@ -1,4 +1,5 @@
import 'package:PiliPlus/common/widgets/icon_button.dart';
import 'package:PiliPlus/common/widgets/refresh_indicator.dart';
import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/pages/history/view.dart' show AppBarWidget;
import 'package:PiliPlus/utils/extension.dart';
@@ -146,7 +147,11 @@ class _LaterPageState extends State<LaterPage> {
)
: const SizedBox(),
),
body: CustomScrollView(
body: refreshIndicator(
onRefresh: () async {
await _laterController.onRefresh();
},
child: CustomScrollView(
physics: const AlwaysScrollableScrollPhysics(),
controller: _laterController.scrollController,
slivers: [
@@ -162,6 +167,7 @@ class _LaterPageState extends State<LaterPage> {
),
),
),
),
);
}

View File

@@ -1,3 +1,4 @@
import 'package:PiliPlus/common/widgets/loading_widget.dart';
import 'package:PiliPlus/common/widgets/refresh_indicator.dart';
import 'package:easy_debounce/easy_throttle.dart';
import 'package:flutter/material.dart';
@@ -52,21 +53,24 @@ class _AtMePageState extends State<AtMePage> {
onRefresh: () async {
await _atMeController.onRefresh();
},
child: SingleChildScrollView(
controller: _scrollController,
child: LayoutBuilder(
builder: (BuildContext context, BoxConstraints constraints) {
return Obx(
child: Obx(
() {
// TODO: refactor
if (_atMeController.msgFeedAtMeList.isEmpty) {
if (_atMeController.cursor == -1 &&
_atMeController.cursorTime == -1) {
return const Center(
child: CircularProgressIndicator(),
);
} else {
return scrollErrorWidget(
callback: _atMeController.queryMsgFeedAtMe);
}
}
return ListView.separated(
controller: _scrollController,
itemCount: _atMeController.msgFeedAtMeList.length,
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
physics: const AlwaysScrollableScrollPhysics(),
itemBuilder: (context, int i) {
return ListTile(
onTap: () {
@@ -86,10 +90,7 @@ class _AtMePageState extends State<AtMePage> {
title: Text(
"${_atMeController.msgFeedAtMeList[i].user?.nickname} "
"${_atMeController.msgFeedAtMeList[i].item?.business}中@了我",
style: Theme.of(context)
.textTheme
.titleMedium!
.copyWith(
style: Theme.of(context).textTheme.titleMedium!.copyWith(
color: Theme.of(context).colorScheme.primary,
)),
subtitle: Column(
@@ -106,22 +107,17 @@ class _AtMePageState extends State<AtMePage> {
.textTheme
.bodyMedium!
.copyWith(
color: Theme.of(context)
.colorScheme
.outline))
color: Theme.of(context).colorScheme.outline))
],
),
trailing: _atMeController
.msgFeedAtMeList[i].item?.image !=
trailing: _atMeController.msgFeedAtMeList[i].item?.image !=
null &&
_atMeController.msgFeedAtMeList[i].item?.image !=
""
_atMeController.msgFeedAtMeList[i].item?.image != ""
? NetworkImgLayer(
width: 45,
height: 45,
type: 'cover',
src: _atMeController
.msgFeedAtMeList[i].item?.image,
src: _atMeController.msgFeedAtMeList[i].item?.image,
)
: null,
);
@@ -136,8 +132,6 @@ class _AtMePageState extends State<AtMePage> {
},
);
},
);
}),
),
),
);

View File

@@ -53,6 +53,7 @@ class _LikeMePageState extends State<LikeMePage> {
onRefresh: () async {
await _likeMeController.onRefresh();
},
// TODO: refactor
child: SingleChildScrollView(
controller: _scrollController,
child: LayoutBuilder(

View File

@@ -51,11 +51,8 @@ class _ReplyMePageState extends State<ReplyMePage> {
onRefresh: () async {
await _replyMeController.onRefresh();
},
child: SingleChildScrollView(
controller: _scrollController,
child: LayoutBuilder(
builder: (BuildContext context, BoxConstraints constraints) {
return Obx(
// TODO: refactor
child: Obx(
() {
if (_replyMeController.msgFeedReplyMeList.isEmpty) {
return const Center(
@@ -63,9 +60,9 @@ class _ReplyMePageState extends State<ReplyMePage> {
);
}
return ListView.separated(
controller: _scrollController,
itemCount: _replyMeController.msgFeedReplyMeList.length,
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
physics: const AlwaysScrollableScrollPhysics(),
itemBuilder: (context, int i) {
return ListTile(
onTap: () {
@@ -80,14 +77,15 @@ class _ReplyMePageState extends State<ReplyMePage> {
width: 45,
height: 45,
type: 'avatar',
src: _replyMeController
.msgFeedReplyMeList[i].user?.avatar,
src: _replyMeController.msgFeedReplyMeList[i].user?.avatar,
),
title: Text(
"${_replyMeController.msgFeedReplyMeList[i].user?.nickname} "
"回复了我的${_replyMeController.msgFeedReplyMeList[i].item?.business}",
style: Theme.of(context).textTheme.bodyMedium!.copyWith(
color: Theme.of(context).colorScheme.primary),
style: Theme.of(context)
.textTheme
.bodyMedium!
.copyWith(color: Theme.of(context).colorScheme.primary),
),
subtitle: Column(
mainAxisAlignment: MainAxisAlignment.start,
@@ -114,9 +112,8 @@ class _ReplyMePageState extends State<ReplyMePage> {
.textTheme
.labelMedium!
.copyWith(
color: Theme.of(context)
.colorScheme
.outline,
color:
Theme.of(context).colorScheme.outline,
height: 1.5)),
if (_replyMeController.msgFeedReplyMeList[i].item
?.rootReplyContent !=
@@ -132,9 +129,8 @@ class _ReplyMePageState extends State<ReplyMePage> {
.textTheme
.labelMedium!
.copyWith(
color: Theme.of(context)
.colorScheme
.outline,
color:
Theme.of(context).colorScheme.outline,
height: 1.5)),
]),
);
@@ -149,8 +145,6 @@ class _ReplyMePageState extends State<ReplyMePage> {
},
);
},
);
}),
),
),
);

View File

@@ -57,11 +57,8 @@ class _SysMsgPageState extends State<SysMsgPage> {
onRefresh: () async {
await _sysMsgController.onRefresh();
},
child: SingleChildScrollView(
controller: _scrollController,
child: LayoutBuilder(
builder: (BuildContext context, BoxConstraints constraints) {
return Obx(
// TODO: refactor
child: Obx(
() {
if (_sysMsgController.msgFeedSysMsgList.isEmpty) {
return const Center(
@@ -69,9 +66,9 @@ class _SysMsgPageState extends State<SysMsgPage> {
);
}
return ListView.separated(
controller: _scrollController,
itemCount: _sysMsgController.msgFeedSysMsgList.length,
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
physics: const AlwaysScrollableScrollPhysics(),
itemBuilder: (context, int i) {
String? content =
_sysMsgController.msgFeedSysMsgList[i].content;
@@ -96,9 +93,8 @@ class _SysMsgPageState extends State<SysMsgPage> {
child: Text(
'取消',
style: TextStyle(
color: Theme.of(context)
.colorScheme
.outline,
color:
Theme.of(context).colorScheme.outline,
),
),
),
@@ -141,8 +137,7 @@ class _SysMsgPageState extends State<SysMsgPage> {
.textTheme
.bodySmall!
.copyWith(
color:
Theme.of(context).colorScheme.outline,
color: Theme.of(context).colorScheme.outline,
),
textAlign: TextAlign.end,
),
@@ -161,8 +156,6 @@ class _SysMsgPageState extends State<SysMsgPage> {
},
);
},
);
}),
),
),
);

View File

@@ -1,5 +1,6 @@
import 'package:PiliPlus/common/constants.dart';
import 'package:PiliPlus/common/skeleton/video_card_h.dart';
import 'package:PiliPlus/common/widgets/refresh_indicator.dart';
import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/pages/subscription/widgets/item.dart';
import 'package:PiliPlus/utils/grid.dart';
@@ -22,7 +23,11 @@ class _SubPageState extends State<SubPage> {
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(title: const Text('我的订阅')),
body: CustomScrollView(
body: refreshIndicator(
onRefresh: () async {
await _subController.onRefresh();
},
child: CustomScrollView(
slivers: [
Obx(() => _buildBody(_subController.loadingState.value)),
SliverToBoxAdapter(
@@ -32,6 +37,7 @@ class _SubPageState extends State<SubPage> {
),
],
),
),
);
}

View File

@@ -2,6 +2,7 @@ import 'package:PiliPlus/common/skeleton/video_reply.dart';
import 'package:PiliPlus/common/widgets/icon_button.dart';
import 'package:PiliPlus/common/widgets/loading_widget.dart';
import 'package:PiliPlus/common/widgets/network_img_layer.dart';
import 'package:PiliPlus/common/widgets/refresh_indicator.dart';
import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/pages/video/detail/note/note_list_page_ctr.dart';
import 'package:PiliPlus/utils/app_scheme.dart';
@@ -79,7 +80,7 @@ class _NoteListPageState extends State<NoteListPage> {
],
),
Success() => (loadingState.response as List?)?.isNotEmpty == true
? RefreshIndicator(
? refreshIndicator(
onRefresh: () async {
await _controller.onRefresh();
},