EchoZenith/PiliPlus
1
0
Fork 0
mirror of https://github.com/bggRGjQaUbCoE/PiliPlus.git synced 2026-04-20 11:08:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

tweaks (#1252)

Browse Source 
* opt: cache

* opt: MediaListPanel

* feat: nested replyreply panel

* tweaks

* opt: abstract class

* opt: PageStorageKey

* opt: contextExt

* opt: EpisodePanel

* opt

* opt: context instead GlobalKey

* feat: jump to reply

* refa: reply_reply

* fix: jump

* fix: index

* update

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>

* opt: keepalive

* reapply: nested replyreply

* mod: spacing

* opt: CommonSlidePageState

* fix drag bottomsheet

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>

* opt reply jump

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>

* opt reply2reply

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>

* tweaks

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>

* tweaks

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>

* reapply: jumpToReply

* fix: padding

* fix: anim

* fix some panels

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>

* opt: implements Scaffold

* opt: remove keepalive

* revert: GlobalKey

* tweaks

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>

---------

Co-authored-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
My-Responsitories
2025-09-15 18:45:28 +08:00
committed by GitHub
parent b9a55ccbce
commit 37fb63c3b1
75 changed files with 6300 additions and 1140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
lib/pages/video/reply_reply/controller.dart
View File

@@ -7,8 +7,11 @@ import 'package:PiliPlus/pages/video/reply_new/view.dart';
import 'package:PiliPlus/utils/id_utils.dart';
import 'package:PiliPlus/utils/request_utils.dart';
import 'package:PiliPlus/utils/storage_pref.dart';
import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart';
import 'package:fixnum/fixnum.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/scheduler.dart';
import 'package:get/get.dart';
import 'package:get/get_navigation/src/dialog/dialog_route.dart';
import 'package:super_sliver_list/super_sliver_list.dart';
@@ -22,10 +25,8 @@ class VideoReplyReplyController extends ReplyController
required this.rpid,
required this.dialog,
required this.replyType,
required this.isDialogue,
});
final int? dialog;
final bool isDialogue;
int? id;
// 视频aid 请求时使用的oid
int oid;
@@ -34,12 +35,18 @@ class VideoReplyReplyController extends ReplyController
int replyType;
bool hasRoot = false;
late final Rx<ReplyInfo?> firstFloor = Rx<ReplyInfo?>(null);
final Rx<ReplyInfo?> firstFloor = Rx(null);
final index = RxnInt();
int? index;
AnimationController? animController;
final listController = ListController();
AnimationController? _controller;
AnimationController get animController => _controller ??= AnimationController(
duration: const Duration(milliseconds: 1000),
vsync: this,
);
late final horizontalPreview = Pref.horizontalPreview;
@override
@@ -54,7 +61,7 @@ class VideoReplyReplyController extends ReplyController
@override
List<ReplyInfo>? getDataList(response) {
return isDialogue ? response.replies : response.root.replies;
return dialog != null ? response.replies : response.root.replies;
}
@override
@@ -73,29 +80,7 @@ class VideoReplyReplyController extends ReplyController
firstFloor.value ??= data.root;
}
if (id != null) {
final id64 = Int64(id!);
final index = data.root.replies.indexWhere((item) => item.id == id64);
if (index != -1) {
this.index = index;
animController = AnimationController(
duration: const Duration(milliseconds: 300),
vsync: this,
);
WidgetsBinding.instance.addPostFrameCallback((_) async {
try {
listController.jumpToItem(
index: index,
scrollController: scrollController,
alignment: 0.25,
);
await Future.delayed(
const Duration(milliseconds: 800),
animController?.forward,
);
this.index = null;
} catch (_) {}
});
}
setIndexById(Int64(id!), data.root.replies);
id = null;
}
}
@@ -103,8 +88,41 @@ class VideoReplyReplyController extends ReplyController
return false;
}
bool setIndexById(Int64 id64, [List<ReplyInfo>? replies]) {
final index = (replies ?? loadingState.value.data!).indexWhere(
(item) => item.id == id64,
);
if (index != -1) {
this.index.value = index;
jumpToItem(index);
return true;
}
return false;
}
ExtendedNestedScrollController? nestedController;
void jumpToItem(int index) {
SchedulerBinding.instance.addPostFrameCallback((_) {
animController.forward(from: 0);
try {
// ignore: invalid_use_of_visible_for_testing_member
final offset = listController.getOffsetToReveal(index, 0.25);
if (offset.isFinite) {
if (nestedController case final nestedController?) {
nestedController.nestedPositions.last.localJumpTo(offset);
} else {
scrollController.jumpTo(offset);
}
}
} catch (_) {
if (kDebugMode) rethrow;
}
});
}
@override
Future<LoadingState> customGetData() => isDialogue
Future<LoadingState> customGetData() => dialog != null
? ReplyGrpc.dialogList(
type: replyType,
oid: oid,
@@ -129,6 +147,14 @@ class VideoReplyReplyController extends ReplyController
onReload();
}
@override
Future<void> onReload() {
if (loadingState.value.isSuccess) {
index.value = null;
}
return super.onReload();
}
@override
void onReply(
BuildContext context, {
@@ -201,8 +227,8 @@ class VideoReplyReplyController extends ReplyController
@override
void onClose() {
animController?.dispose();
listController.dispose();
_controller?.dispose();
_controller = null;
super.dispose();
}
}

129
lib/pages/video/reply_reply/view.dart
View File

@@ -2,17 +2,18 @@ import 'package:PiliPlus/common/skeleton/video_reply.dart';
import 'package:PiliPlus/common/widgets/custom_sliver_persistent_header_delegate.dart';
import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart';
import 'package:PiliPlus/common/widgets/refresh_indicator.dart';
import 'package:PiliPlus/common/widgets/scaffold/scaffold.dart';
import 'package:PiliPlus/grpc/bilibili/main/community/reply/v1.pb.dart'
show ReplyInfo, Mode;
import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/pages/common/slide/common_slide_page.dart';
import 'package:PiliPlus/pages/video/reply/widgets/reply_item_grpc.dart';
import 'package:PiliPlus/pages/video/reply_reply/controller.dart';
import 'package:PiliPlus/utils/context_ext.dart';
import 'package:PiliPlus/utils/num_utils.dart';
import 'package:PiliPlus/utils/page_utils.dart';
import 'package:PiliPlus/utils/utils.dart';
import 'package:flutter/material.dart';
import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart';
import 'package:flutter/material.dart' hide Scaffold, ScaffoldState;
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart' hide ContextExtensionss;
import 'package:super_sliver_list/super_sliver_list.dart';
@@ -27,9 +28,9 @@ class VideoReplyReplyPanel extends CommonSlidePage {
this.firstFloor,
required this.isVideoDetail,
required this.replyType,
this.isDialogue = false,
this.onViewImage,
this.onDismissed,
this.isNested = false,
});
final int? id;
final int oid;
@@ -38,28 +39,33 @@ class VideoReplyReplyPanel extends CommonSlidePage {
final ReplyInfo? firstFloor;
final bool isVideoDetail;
final int replyType;
final bool isDialogue;
final VoidCallback? onViewImage;
final ValueChanged<int>? onDismissed;
final bool isNested;
@override
State<VideoReplyReplyPanel> createState() => _VideoReplyReplyPanelState();
}
class _VideoReplyReplyPanelState
extends CommonSlidePageState<VideoReplyReplyPanel> {
class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel>
with SingleTickerProviderStateMixin, CommonSlideMixin {
late VideoReplyReplyController _controller;
late final _key = GlobalKey<ScaffoldState>();
late final _tag = Utils.makeHeroTag(
'${widget.rpid}${widget.dialog}${widget.isDialogue}',
);
bool get _horizontalPreview =>
_controller.horizontalPreview && context.isLandscape;
Function(List<String> imgList, int index)? _imageCallback;
late final _tag = Utils.makeHeroTag('${widget.rpid}${widget.dialog}');
Animation<Color?>? colorAnimation;
late final bool isDialogue = widget.dialog != null;
@override
void didChangeDependencies() {
super.didChangeDependencies();
final controller = PrimaryScrollController.of(context);
_controller
..didChangeDependencies(context)
..nestedController = controller is ExtendedNestedScrollController
? controller
: null;
}
@override
void initState() {
super.initState();
@@ -71,7 +77,6 @@ class _VideoReplyReplyPanelState
rpid: widget.rpid,
dialog: widget.dialog,
replyType: widget.replyType,
isDialogue: widget.isDialogue,
),
tag: _tag,
);
@@ -83,24 +88,10 @@ class _VideoReplyReplyPanelState
super.dispose();
}
@override
void didChangeDependencies() {
super.didChangeDependencies();
_imageCallback = _horizontalPreview
? (imgList, index) => PageUtils.onHorizontalPreview(
_key,
this,
imgList,
index,
)
: null;
}
@override
Widget buildPage(ThemeData theme) {
Widget child() => enableSlide ? slideList(theme) : buildList(theme);
return Scaffold(
key: _key,
resizeToAvoidBottomInset: false,
body: widget.isVideoDetail
? Column(
@@ -119,7 +110,7 @@ class _VideoReplyReplyPanelState
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Text(widget.isDialogue ? '对话列表' : '评论详情'),
Text(isDialogue ? '对话列表' : '评论详情'),
IconButton(
tooltip: '关闭',
icon: const Icon(Icons.close, size: 20),
@@ -138,14 +129,23 @@ class _VideoReplyReplyPanelState
ReplyInfo? get firstFloor =>
widget.firstFloor ?? _controller.firstFloor.value;
ScrollController get scrollController =>
_controller.nestedController ?? _controller.scrollController;
@override
Widget buildList(ThemeData theme) {
return refreshIndicator(
onRefresh: _controller.onRefresh,
child: CustomScrollView(
controller: _controller.scrollController,
key: ValueKey(scrollController.hashCode),
controller: scrollController,
physics: widget.isNested
? const AlwaysScrollableScrollPhysics(
parent: ClampingScrollPhysics(),
)
: const AlwaysScrollableScrollPhysics(),
slivers: [
if (!widget.isDialogue) ...[
if (!isDialogue) ...[
if (widget.firstFloor case final firstFloor?)
_header(theme, firstFloor)
else
@@ -180,7 +180,6 @@ class _VideoReplyReplyPanelState
upMid: _controller.upMid,
onViewImage: widget.onViewImage,
onDismissed: widget.onDismissed,
callback: _imageCallback,
onCheckReply: (item) =>
_controller.onCheckReply(item, isManual: true),
),
@@ -252,18 +251,14 @@ class _VideoReplyReplyPanelState
ThemeData theme,
LoadingState<List<ReplyInfo>?> loadingState,
) {
final jumpIndex = _controller.index.value;
return switch (loadingState) {
Loading() => SliverToBoxAdapter(
child: IgnorePointer(
child: ListView.builder(
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
itemBuilder: (context, index) => const VideoReplySkeleton(),
itemCount: 8,
),
),
Loading() => SliverPrototypeExtentList.builder(
prototypeItem: const VideoReplySkeleton(),
itemBuilder: (_, _) => const VideoReplySkeleton(),
itemCount: 8,
),
Success(:var response) => SuperSliverList.builder(
Success(:var response!) => SuperSliverList.builder(
listController: _controller.listController,
itemBuilder: (context, index) {
if (index == response.length) {
@@ -284,19 +279,23 @@ class _VideoReplyReplyPanelState
),
);
}
final child = _replyItem(response[index], index);
if (_controller.index == index) {
colorAnimation ??= ColorTween(
begin: theme.colorScheme.onInverseSurface,
end: theme.colorScheme.surface,
).animate(_controller.animController!);
final child = _replyItem(context, response[index], index);
if (jumpIndex == index) {
return AnimatedBuilder(
animation: colorAnimation!,
builder: (context, _) {
animation: colorAnimation ??=
ColorTween(
begin: theme.colorScheme.onInverseSurface,
end: theme.colorScheme.surface,
).animate(
CurvedAnimation(
parent: _controller.animController,
curve: const Interval(0.8, 1.0), // 前0.8s不变, 后0.2s开始动画
),
),
child: child,
builder: (context, child) {
return ColoredBox(
color:
colorAnimation!.value ??
theme.colorScheme.onInverseSurface,
color: colorAnimation!.value!,
child: child,
);
},
@@ -304,7 +303,7 @@ class _VideoReplyReplyPanelState
}
return child;
},
itemCount: response!.length + 1,
itemCount: response.length + 1,
),
Error(:var errMsg) => HttpError(
errMsg: errMsg,
@@ -313,15 +312,15 @@ class _VideoReplyReplyPanelState
};
}
Widget _replyItem(ReplyInfo replyItem, int index) {
Widget _replyItem(BuildContext context, ReplyInfo replyItem, int index) {
return ReplyItemGrpc(
replyItem: replyItem,
replyLevel: widget.isDialogue ? 3 : 2,
replyLevel: isDialogue ? 3 : 2,
onReply: (replyItem) =>
_controller.onReply(context, replyItem: replyItem, index: index),
_controller.onReply(this.context, replyItem: replyItem, index: index),
onDelete: (item, subIndex) => _controller.onRemove(index, item, null),
upMid: _controller.upMid,
showDialogue: () => _key.currentState?.showBottomSheet(
showDialogue: () => Scaffold.of(context).showBottomSheet(
backgroundColor: Colors.transparent,
constraints: const BoxConstraints(),
(context) => VideoReplyReplyPanel(
@@ -330,12 +329,16 @@ class _VideoReplyReplyPanelState
dialog: replyItem.dialog.toInt(),
replyType: widget.replyType,
isVideoDetail: true,
isDialogue: true,
isNested: widget.isNested,
),
),
jumpToDialogue: () {
if (!_controller.setIndexById(replyItem.parent)) {
SmartDialog.showToast('评论可能已被删除');
}
},
onViewImage: widget.onViewImage,
onDismissed: widget.onDismissed,
callback: _imageCallback,
onCheckReply: (item) => _controller.onCheckReply(item, isManual: true),
);
}