feat: dyn reaction

Signed-off-by: dom <githubaccount56556@proton.me>
This commit is contained in:
dom
2026-06-19 21:23:54 +08:00
parent f91a8aa913
commit 7126d05063
16 changed files with 706 additions and 199 deletions

View File

@@ -0,0 +1,85 @@
import 'package:flutter/rendering.dart' show RenderSliverToBoxAdapter;
import 'package:flutter/widgets.dart';
class SliverToBoxWithOffsetAdapter extends SliverToBoxAdapter {
const SliverToBoxWithOffsetAdapter({
super.key,
required this.offset,
required this.onVisibilityChanged,
super.child,
});
final double offset;
final ValueChanged<bool> onVisibilityChanged;
@override
RenderSliverToBoxWithOffsetAdapter createRenderObject(BuildContext context) =>
RenderSliverToBoxWithOffsetAdapter(
offset: offset,
onVisibilityChanged: onVisibilityChanged,
);
}
class RenderSliverToBoxWithOffsetAdapter extends RenderSliverToBoxAdapter {
RenderSliverToBoxWithOffsetAdapter({
required this.offset,
required this.onVisibilityChanged,
super.child,
});
bool? _visible;
final double offset;
final ValueChanged<bool> onVisibilityChanged;
@override
void performLayout() {
final visible = constraints.scrollOffset > offset;
if (_visible != visible) {
_visible = visible;
WidgetsBinding.instance.addPostFrameCallback(
(_) => onVisibilityChanged(visible),
);
}
super.performLayout();
}
}
class SliverToBoxWithVisibilityAdapter extends SliverToBoxAdapter {
const SliverToBoxWithVisibilityAdapter({
super.key,
required this.onVisibilityChanged,
super.child,
});
final ValueChanged<bool> onVisibilityChanged;
@override
RenderSliverToBoxWithVisibilityAdapter createRenderObject(
BuildContext context,
) => RenderSliverToBoxWithVisibilityAdapter(
onVisibilityChanged: onVisibilityChanged,
);
}
class RenderSliverToBoxWithVisibilityAdapter extends RenderSliverToBoxAdapter {
RenderSliverToBoxWithVisibilityAdapter({
required this.onVisibilityChanged,
super.child,
});
final ValueChanged<bool> onVisibilityChanged;
bool? _visible;
@override
void performLayout() {
super.performLayout();
final visible = geometry!.visible;
if (_visible != visible) {
_visible = visible;
WidgetsBinding.instance.addPostFrameCallback(
(_) => onVisibilityChanged(visible),
);
}
}
}

View File

@@ -1008,4 +1008,8 @@ abstract final class Api {
static const String bubble = '/x/tribee/v1/dyn/all'; static const String bubble = '/x/tribee/v1/dyn/all';
static const String sortFollowTag = '/x/relation/tags/update_sort'; static const String sortFollowTag = '/x/relation/tags/update_sort';
static const String replyReport = '/x/v2/reply/report';
static const String dynReaction = '/x/polymer/web-dynamic/v1/detail/reaction';
} }

View File

@@ -18,6 +18,7 @@ import 'package:PiliPlus/models_new/article/article_view/data.dart';
import 'package:PiliPlus/models_new/bubble/data.dart'; import 'package:PiliPlus/models_new/bubble/data.dart';
import 'package:PiliPlus/models_new/dynamic/dyn_mention/data.dart'; import 'package:PiliPlus/models_new/dynamic/dyn_mention/data.dart';
import 'package:PiliPlus/models_new/dynamic/dyn_mention/group.dart'; import 'package:PiliPlus/models_new/dynamic/dyn_mention/group.dart';
import 'package:PiliPlus/models_new/dynamic/dyn_reaction/data.dart';
import 'package:PiliPlus/models_new/dynamic/dyn_reserve/data.dart'; import 'package:PiliPlus/models_new/dynamic/dyn_reserve/data.dart';
import 'package:PiliPlus/models_new/dynamic/dyn_reserve_info/data.dart'; import 'package:PiliPlus/models_new/dynamic/dyn_reserve_info/data.dart';
import 'package:PiliPlus/models_new/dynamic/dyn_topic_feed/topic_card_list.dart'; import 'package:PiliPlus/models_new/dynamic/dyn_topic_feed/topic_card_list.dart';
@@ -804,4 +805,23 @@ abstract final class DynamicsHttp {
return Error(res.data['message']); return Error(res.data['message']);
} }
} }
static Future<LoadingState<DynReactionData>> dynReaction({
required Object id,
String? offset,
}) async {
final res = await Request.get(
Api.dynReaction,
queryParameters: {
'id': id,
'offset': offset,
'web_location': 333.1369,
},
);
if (res.data['code'] == 0) {
return Success(DynReactionData.fromJson(res.data['data']));
} else {
return Error(res.data['message']);
}
}
} }

View File

@@ -186,7 +186,7 @@ abstract final class ReplyHttp {
String? reasonDesc, String? reasonDesc,
}) async { }) async {
final res = await Request.post( final res = await Request.post(
'/x/v2/reply/report', Api.replyReport,
data: { data: {
'add_blacklist': banUid, 'add_blacklist': banUid,
'csrf': Accounts.main.csrf, 'csrf': Accounts.main.csrf,

View File

@@ -0,0 +1,20 @@
import 'package:PiliPlus/models_new/dynamic/dyn_reaction/item.dart';
class DynReactionData {
bool? hasMore;
List<DynReactionItem>? items;
String? offset;
int total;
DynReactionData({this.hasMore, this.items, this.offset, required this.total});
factory DynReactionData.fromJson(Map<String, dynamic> json) =>
DynReactionData(
hasMore: json['has_more'] as bool?,
items: (json['items'] as List<dynamic>?)
?.map((e) => DynReactionItem.fromJson(e as Map<String, dynamic>))
.toList(),
offset: json['offset'] as String?,
total: json['total'] as int? ?? 0,
);
}

View File

@@ -0,0 +1,21 @@
class DynReactionItem {
String? action;
String? face;
String? mid;
String? name;
DynReactionItem({
this.action,
this.face,
this.mid,
this.name,
});
factory DynReactionItem.fromJson(Map<String, dynamic> json) =>
DynReactionItem(
action: json['action'] as String?,
face: json['face'] as String?,
mid: json['mid'] as String?,
name: json['name'] as String?,
);
}

View File

@@ -7,6 +7,7 @@ import 'package:PiliPlus/common/widgets/icon/custom_icons.dart';
import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
import 'package:PiliPlus/common/widgets/scaffold.dart'; import 'package:PiliPlus/common/widgets/scaffold.dart';
import 'package:PiliPlus/common/widgets/scroll_physics.dart'; import 'package:PiliPlus/common/widgets/scroll_physics.dart';
import 'package:PiliPlus/common/widgets/sliver/sliver_to_box_adapter.dart';
import 'package:PiliPlus/models/common/image_preview_type.dart'; import 'package:PiliPlus/models/common/image_preview_type.dart';
import 'package:PiliPlus/models/dynamics/result.dart' show DynamicStat; import 'package:PiliPlus/models/dynamics/result.dart' show DynamicStat;
import 'package:PiliPlus/pages/article/controller.dart'; import 'package:PiliPlus/pages/article/controller.dart';
@@ -49,28 +50,16 @@ class _ArticlePageState extends CommonDynPageState<ArticlePage> {
'id': controller.id, 'id': controller.id,
}; };
@override
void didChangeDependencies() {
super.didChangeDependencies();
WidgetsBinding.instance.addPostFrameCallback((_) {
if (scrollController.hasClients) {
controller.showTitle.value =
scrollController.positions.last.pixels >= 45;
}
});
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final theme = Theme.of(context); final child = scaffold(
return scaffold(
appBar: _buildAppBar(), appBar: _buildAppBar(),
body: Stack( body: Stack(
clipBehavior: .none, clipBehavior: .none,
children: [ children: [
Padding( Padding(
padding: .only(left: padding.left, right: padding.right), padding: .only(left: padding.left, right: padding.right),
child: _buildPage(theme), child: _buildPage(),
), ),
Positioned( Positioned(
left: 0, left: 0,
@@ -78,25 +67,24 @@ class _ArticlePageState extends CommonDynPageState<ArticlePage> {
bottom: 0, bottom: 0,
child: SlideTransition( child: SlideTransition(
position: fabAnimation, position: fabAnimation,
child: _buildBottom(theme), child: _buildBottom(),
), ),
), ),
], ],
), ),
); );
return fabAnimWrapper(child);
} }
Widget _buildPage(ThemeData theme) { Widget _buildPage() {
double padding = max(maxWidth / 2 - Grid.smallCardWidth, 0); double padding = max(maxWidth / 2 - Grid.smallCardWidth, 0);
if (isPortrait) { if (isPortrait) {
return Padding( return Padding(
padding: EdgeInsets.symmetric(horizontal: padding), padding: EdgeInsets.symmetric(horizontal: padding),
child: CustomScrollView( child: CustomScrollView(
controller: scrollController,
physics: const AlwaysScrollableScrollPhysics(), physics: const AlwaysScrollableScrollPhysics(),
slivers: [ slivers: [
_buildContent( _buildContent(
theme,
maxWidth - this.padding.horizontal - 2 * padding - 24, maxWidth - this.padding.horizontal - 2 * padding - 24,
), ),
SliverToBoxAdapter( SliverToBoxAdapter(
@@ -105,8 +93,8 @@ class _ArticlePageState extends CommonDynPageState<ArticlePage> {
color: theme.dividerColor.withValues(alpha: 0.05), color: theme.dividerColor.withValues(alpha: 0.05),
), ),
), ),
buildReplyHeader(theme), buildReplyHeader(),
Obx(() => replyList(theme, controller.loadingState.value)), Obx(() => replyList(controller.loadingState.value)),
], ],
), ),
); );
@@ -121,7 +109,6 @@ class _ArticlePageState extends CommonDynPageState<ArticlePage> {
Expanded( Expanded(
flex: flex, flex: flex,
child: CustomScrollView( child: CustomScrollView(
controller: scrollController,
physics: const AlwaysScrollableScrollPhysics(), physics: const AlwaysScrollableScrollPhysics(),
slivers: [ slivers: [
SliverPadding( SliverPadding(
@@ -130,7 +117,6 @@ class _ArticlePageState extends CommonDynPageState<ArticlePage> {
bottom: this.padding.bottom + 100, bottom: this.padding.bottom + 100,
), ),
sliver: _buildContent( sliver: _buildContent(
theme,
(maxWidth - this.padding.horizontal) * flex / (flex + flex1) - (maxWidth - this.padding.horizontal) * flex / (flex + flex1) -
padding - padding -
32, 32,
@@ -153,11 +139,10 @@ class _ArticlePageState extends CommonDynPageState<ArticlePage> {
body: refreshIndicator( body: refreshIndicator(
onRefresh: controller.onRefresh, onRefresh: controller.onRefresh,
child: CustomScrollView( child: CustomScrollView(
controller: scrollController,
physics: const AlwaysScrollableScrollPhysics(), physics: const AlwaysScrollableScrollPhysics(),
slivers: [ slivers: [
buildReplyHeader(theme), buildReplyHeader(),
Obx(() => replyList(theme, controller.loadingState.value)), Obx(() => replyList(controller.loadingState.value)),
], ],
), ),
), ),
@@ -168,7 +153,7 @@ class _ArticlePageState extends CommonDynPageState<ArticlePage> {
); );
} }
Widget _buildContent(ThemeData theme, double maxWidth) => SliverPadding( Widget _buildContent(double maxWidth) => SliverPadding(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8), padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
sliver: Obx( sliver: Obx(
() { () {
@@ -351,7 +336,9 @@ class _ArticlePageState extends CommonDynPageState<ArticlePage> {
), ),
), ),
if (controller.summary.title != null) if (controller.summary.title != null)
SliverToBoxAdapter( SliverToBoxWithVisibilityAdapter(
onVisibilityChanged: (bool visible) =>
controller.showTitle.value = !visible,
child: Text( child: Text(
controller.summary.title!, controller.summary.title!,
style: const TextStyle( style: const TextStyle(
@@ -507,7 +494,7 @@ class _ArticlePageState extends CommonDynPageState<ArticlePage> {
], ],
); );
Widget _buildBottom(ThemeData theme) { Widget _buildBottom() {
late final primary = theme.colorScheme.primary; late final primary = theme.colorScheme.primary;
late final outline = theme.colorScheme.outline; late final outline = theme.colorScheme.outline;
late final btnStyle = TextButton.styleFrom( late final btnStyle = TextButton.styleFrom(

View File

@@ -8,6 +8,7 @@ import 'package:PiliPlus/common/widgets/view_safe_area.dart';
import 'package:PiliPlus/grpc/bilibili/main/community/reply/v1.pb.dart' import 'package:PiliPlus/grpc/bilibili/main/community/reply/v1.pb.dart'
show ReplyInfo; show ReplyInfo;
import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/models/common/enum_with_label.dart';
import 'package:PiliPlus/pages/common/dyn/common_dyn_controller.dart'; import 'package:PiliPlus/pages/common/dyn/common_dyn_controller.dart';
import 'package:PiliPlus/pages/common/fab_mixin.dart'; import 'package:PiliPlus/pages/common/fab_mixin.dart';
import 'package:PiliPlus/pages/video/reply/widgets/reply_item_grpc.dart'; import 'package:PiliPlus/pages/video/reply/widgets/reply_item_grpc.dart';
@@ -21,56 +22,70 @@ import 'package:easy_debounce/easy_throttle.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
abstract class CommonDynPageState<T extends StatefulWidget> extends State<T> enum DynType implements EnumWithLabel {
with SingleTickerProviderStateMixin, BaseFabMixin, FabMixin { reply('评论'),
CommonDynController get controller; reaction('赞与转发');
late final ScrollController scrollController; @override
final String label;
const DynType(this.label);
}
abstract class CommonDynPageState<T extends StatefulWidget> extends State<T>
with
SingleTickerProviderStateMixin<T>,
BaseFabMixin,
FabMixin,
CommonDynPageMixin<T> {}
abstract class CommonDynPageMultiState<T extends StatefulWidget>
extends State<T>
with
TickerProviderStateMixin<T>,
BaseFabMixin,
FabMixin,
CommonDynPageMixin<T> {
late final TabController tabController;
@override
void initState() {
super.initState();
tabController = TabController(length: DynType.values.length, vsync: this);
}
@override
void dispose() {
tabController.dispose();
super.dispose();
}
}
mixin CommonDynPageMixin<T extends StatefulWidget>
on State<T>, TickerProvider, BaseFabMixin<T>, FabMixin<T> {
CommonDynController get controller;
bool get horizontalPreview => !isPortrait && controller.horizontalPreview; bool get horizontalPreview => !isPortrait && controller.horizontalPreview;
dynamic get arguments; dynamic get arguments;
late ThemeData theme;
late EdgeInsets padding; late EdgeInsets padding;
late bool isPortrait; late bool isPortrait;
late double maxWidth; late double maxWidth;
late double maxHeight; late double maxHeight;
@override
void initState() {
super.initState();
scrollController = ScrollController()..addListener(listener);
}
void listener() {
final pos = scrollController.positions;
controller.showTitle.value = pos.first.pixels > 55;
if (pos.any((e) => e.userScrollDirection == .forward)) {
showFab();
} else if (pos.any((e) => e.userScrollDirection == .reverse)) {
hideFab();
}
}
@override @override
void didChangeDependencies() { void didChangeDependencies() {
super.didChangeDependencies(); super.didChangeDependencies();
final size = MediaQuery.sizeOf(context); final size = MediaQuery.sizeOf(context);
theme = Theme.of(context);
maxWidth = size.width; maxWidth = size.width;
maxHeight = size.height; maxHeight = size.height;
isPortrait = size.isPortrait; isPortrait = size.isPortrait;
padding = MediaQuery.viewPaddingOf(context); padding = MediaQuery.viewPaddingOf(context);
} }
@override Widget buildReplyHeader() {
void dispose() {
scrollController
..removeListener(listener)
..dispose();
super.dispose();
}
Widget buildReplyHeader(ThemeData theme) {
final secondary = theme.colorScheme.secondary; final secondary = theme.colorScheme.secondary;
return SliverPinnedHeader( return SliverPinnedHeader(
backgroundColor: theme.colorScheme.surface, backgroundColor: theme.colorScheme.surface,
@@ -104,10 +119,7 @@ abstract class CommonDynPageState<T extends StatefulWidget> extends State<T>
); );
} }
Widget replyList( Widget replyList(LoadingState<List<ReplyInfo>?> loadingState) {
ThemeData theme,
LoadingState<List<ReplyInfo>?> loadingState,
) {
return switch (loadingState) { return switch (loadingState) {
Loading() => SliverList.builder( Loading() => SliverList.builder(
itemCount: 12, itemCount: 12,
@@ -137,7 +149,7 @@ abstract class CommonDynPageState<T extends StatefulWidget> extends State<T>
replyItem: response[index], replyItem: response[index],
replyLevel: 1, replyLevel: 1,
replyReply: (replyItem, id) => replyReply: (replyItem, id) =>
replyReply(context, replyItem, id, theme), replyReply(context, replyItem, id),
onReply: controller.onReply, onReply: controller.onReply,
onDelete: (item, subIndex) => onDelete: (item, subIndex) =>
controller.onRemove(index, item, subIndex), controller.onRemove(index, item, subIndex),
@@ -166,12 +178,7 @@ abstract class CommonDynPageState<T extends StatefulWidget> extends State<T>
}; };
} }
void replyReply( void replyReply(BuildContext context, ReplyInfo replyItem, int? id) {
BuildContext context,
ReplyInfo replyItem,
int? id,
ThemeData theme,
) {
EasyThrottle.throttle('replyReply', const Duration(milliseconds: 500), () { EasyThrottle.throttle('replyReply', const Duration(milliseconds: 500), () {
int oid = replyItem.oid.toInt(); int oid = replyItem.oid.toInt();
int rpid = replyItem.id.toInt(); int rpid = replyItem.id.toInt();
@@ -283,4 +290,22 @@ abstract class CommonDynPageState<T extends StatefulWidget> extends State<T>
tooltip: '评论', tooltip: '评论',
child: const Icon(Icons.reply), child: const Icon(Icons.reply),
); );
Widget fabAnimWrapper(Widget child) {
return NotificationListener<UserScrollNotification>(
onNotification: (notification) {
if (notification.metrics.axisDirection == .down) {
switch (notification.direction) {
case .forward:
showFab();
case .reverse:
hideFab();
default:
}
}
return false;
},
child: child,
);
}
} }

View File

@@ -0,0 +1,42 @@
import 'package:PiliPlus/http/dynamics.dart';
import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/models_new/dynamic/dyn_reaction/data.dart';
import 'package:PiliPlus/models_new/dynamic/dyn_reaction/item.dart';
import 'package:PiliPlus/pages/common/common_list_controller.dart';
import 'package:get/get.dart';
class DynReactController
extends CommonListController<DynReactionData, DynReactionItem> {
DynReactController(this.id, {int count = -1}) : count = RxInt(count);
final Object id;
String? _offset;
final RxInt count;
@override
List<DynReactionItem>? getDataList(DynReactionData response) {
_offset = response.offset;
if (response.hasMore != true) {
isEnd = true;
}
return response.items;
}
@override
bool customHandleResponse(bool isRefresh, Success<DynReactionData> response) {
if (isRefresh) {
count.value = response.response.total;
}
return false;
}
@override
Future<LoadingState<DynReactionData>> customGetData() =>
DynamicsHttp.dynReaction(id: id, offset: _offset);
@override
Future<void> onRefresh() {
_offset = null;
return super.onRefresh();
}
}

View File

@@ -0,0 +1,93 @@
import 'package:PiliPlus/common/widgets/flutter/list_tile.dart';
import 'package:PiliPlus/common/widgets/flutter/refresh_indicator.dart';
import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart';
import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart';
import 'package:PiliPlus/common/widgets/pendant_avatar.dart';
import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/models_new/dynamic/dyn_reaction/item.dart';
import 'package:PiliPlus/pages/common/dyn/common_dyn_page.dart';
import 'package:PiliPlus/pages/common/dyn/reaction/controller.dart';
import 'package:flutter/material.dart' hide ListTile;
import 'package:get/get.dart';
class DynReactPage extends StatelessWidget {
const DynReactPage({
super.key,
required this.id,
this.isPortrait = true,
required this.controller,
});
final Object id;
final bool isPortrait;
final DynReactController controller;
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
if (controller.loadingState.value == .loading()) {
controller.queryData();
}
Widget buildBody(
ThemeData theme,
LoadingState<List<DynReactionItem>?> state,
) {
return switch (state) {
Loading() => const SliverFillRemaining(child: m3eLoading),
Success(:final response) =>
response != null && response.isNotEmpty
? SliverList.builder(
itemCount: response.length,
itemBuilder: (context, index) {
if (index == response.length - 1) {
controller.onLoadMore();
}
final item = response[index];
return ListTile(
dense: true,
safeArea: false,
visualDensity: .standard,
onTap: () => Get.toNamed('/member?mid=${item.mid}'),
leading: PendantAvatar(item.face!, size: 36),
title: Text.rich(
TextSpan(
text: item.name,
style: const TextStyle(fontSize: 14),
children: [
TextSpan(
text: ' ${item.action}',
style: TextStyle(
fontSize: 12,
color: theme.colorScheme.outline,
),
),
],
),
),
);
},
)
: HttpError(onReload: controller.onReload),
Error(:final errMsg) => HttpError(
errMsg: errMsg,
onReload: controller.onReload,
),
};
}
final child = CustomScrollView(
key: const PageStorageKey(DynType.reaction),
slivers: [
SliverPadding(
padding: .only(
bottom: MediaQuery.viewPaddingOf(context).bottom + 100,
),
sliver: Obx(() => buildBody(theme, controller.loadingState.value)),
),
],
);
if (isPortrait) return child;
return refreshIndicator(onRefresh: controller.onRefresh, child: child);
}
}

View File

@@ -75,7 +75,11 @@ class ActionPanel extends StatelessWidget {
onPressed: () => EasyThrottle.throttle( onPressed: () => EasyThrottle.throttle(
'interactAction', 'interactAction',
const Duration(milliseconds: 200), const Duration(milliseconds: 200),
() => PageUtils.pushDynDetail(item, isPush: true), () => PageUtils.pushDynDetail(
item,
isPush: true,
viewComment: true,
),
), ),
icon: Icon( icon: Icon(
BiliIcons.ic_comment, BiliIcons.ic_comment,

View File

@@ -1,3 +1,4 @@
import 'package:PiliPlus/common/widgets/scroll_physics.dart' show ReloadMixin;
import 'package:PiliPlus/http/dynamics.dart'; import 'package:PiliPlus/http/dynamics.dart';
import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/http/reply.dart'; import 'package:PiliPlus/http/reply.dart';
@@ -6,7 +7,7 @@ import 'package:PiliPlus/pages/common/dyn/common_dyn_controller.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
class DynamicDetailController extends CommonDynController { class DynamicDetailController extends CommonDynController with ReloadMixin {
@override @override
late int oid; late int oid;
@override @override
@@ -69,4 +70,10 @@ class DynamicDetailController extends CommonDynController {
}); });
} }
} }
@override
Future<void> onReload() {
reload = true;
return super.onReload();
}
} }

View File

@@ -1,17 +1,23 @@
import 'dart:math'; import 'dart:math';
import 'package:PiliPlus/common/style.dart';
import 'package:PiliPlus/common/widgets/flutter/refresh_indicator.dart'; import 'package:PiliPlus/common/widgets/flutter/refresh_indicator.dart';
import 'package:PiliPlus/common/widgets/flutter/text_field/controller.dart'; import 'package:PiliPlus/common/widgets/flutter/text_field/controller.dart';
import 'package:PiliPlus/common/widgets/icon/bili_icons.dart'; import 'package:PiliPlus/common/widgets/icon/bili_icons.dart';
import 'package:PiliPlus/common/widgets/icon/custom_icons.dart'; import 'package:PiliPlus/common/widgets/icon/custom_icons.dart';
import 'package:PiliPlus/common/widgets/pair.dart'; import 'package:PiliPlus/common/widgets/pair.dart';
import 'package:PiliPlus/common/widgets/scaffold.dart'; import 'package:PiliPlus/common/widgets/scaffold.dart';
import 'package:PiliPlus/common/widgets/scroll_physics.dart';
import 'package:PiliPlus/common/widgets/sliver/sliver_floating_header.dart';
import 'package:PiliPlus/common/widgets/sliver/sliver_to_box_adapter.dart';
import 'package:PiliPlus/http/constants.dart'; import 'package:PiliPlus/http/constants.dart';
import 'package:PiliPlus/http/dynamics.dart'; import 'package:PiliPlus/http/dynamics.dart';
import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/models/common/reply/reply_option_type.dart'; import 'package:PiliPlus/models/common/reply/reply_option_type.dart';
import 'package:PiliPlus/models/dynamics/result.dart'; import 'package:PiliPlus/models/dynamics/result.dart';
import 'package:PiliPlus/pages/common/dyn/common_dyn_page.dart'; import 'package:PiliPlus/pages/common/dyn/common_dyn_page.dart';
import 'package:PiliPlus/pages/common/dyn/reaction/controller.dart';
import 'package:PiliPlus/pages/common/dyn/reaction/view.dart';
import 'package:PiliPlus/pages/dynamics/widgets/author_panel.dart'; import 'package:PiliPlus/pages/dynamics/widgets/author_panel.dart';
import 'package:PiliPlus/pages/dynamics/widgets/dynamic_panel.dart'; import 'package:PiliPlus/pages/dynamics/widgets/dynamic_panel.dart';
import 'package:PiliPlus/pages/dynamics_create/view.dart'; import 'package:PiliPlus/pages/dynamics_create/view.dart';
@@ -33,32 +39,71 @@ class DynamicDetailPage extends StatefulWidget {
State<DynamicDetailPage> createState() => _DynamicDetailPageState(); State<DynamicDetailPage> createState() => _DynamicDetailPageState();
} }
class _DynamicDetailPageState extends CommonDynPageState<DynamicDetailPage> { class _DynamicDetailPageState
extends CommonDynPageMultiState<DynamicDetailPage> {
@override @override
final DynamicDetailController controller = Get.putOrFind( late final DynamicDetailController controller;
DynamicDetailController.new, late final DynReactController _reactController;
tag: (Get.arguments['item'] as DynamicItemModel).idStr.toString(),
); late final RxBool _isRefreshing = false.obs;
void _startRefresh() {
_isRefreshing.value = true;
_refreshController.repeat();
}
void _stopRefresh() {
if (!mounted) return;
_isRefreshing.value = false;
_refreshController.stop();
}
void _onRefresh(Future<void> future) {
_startRefresh();
future.whenComplete(_stopRefresh);
// Future.delayed(
// const Duration(milliseconds: 800),
// ).whenComplete(_stopRefresh);
}
late final AnimationController _refreshController;
@override @override
dynamic get arguments => { dynamic get arguments => {'item': controller.dynItem};
'item': controller.dynItem,
};
@override @override
void didChangeDependencies() { void initState() {
super.didChangeDependencies(); super.initState();
WidgetsBinding.instance.addPostFrameCallback((_) { final args = Get.arguments;
if (scrollController.hasClients) { final item = args['item'] as DynamicItemModel;
controller.showTitle.value = final id = item.idStr.toString();
scrollController.positions.first.pixels > 55; if (args['viewComment'] ?? false) {
} WidgetsBinding.instance.addPostFrameCallback(_jumpToComment);
}); }
controller = Get.putOrFind(DynamicDetailController.new, tag: id);
final stat = item.modules.moduleStat;
controller.count.value = stat?.comment?.count ?? -1;
_reactController = Get.put(
DynReactController(
id,
count: (stat?.like?.count ?? -1) + (stat?.forward?.count ?? -1),
),
tag: id,
);
_refreshController = AnimationController(
vsync: this,
duration: CircularProgressIndicator.defaultAnimationDuration,
);
}
@override
void dispose() {
_refreshController.dispose();
super.dispose();
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final theme = Theme.of(context);
return scaffold( return scaffold(
appBar: _buildAppBar(), appBar: _buildAppBar(),
body: Stack( body: Stack(
@@ -66,12 +111,7 @@ class _DynamicDetailPageState extends CommonDynPageState<DynamicDetailPage> {
children: [ children: [
Padding( Padding(
padding: .only(left: padding.left, right: padding.right), padding: .only(left: padding.left, right: padding.right),
child: isPortrait child: _buildBody(),
? refreshIndicator(
onRefresh: controller.onRefresh,
child: _buildBody(theme),
)
: _buildBody(theme),
), ),
Positioned( Positioned(
left: 0, left: 0,
@@ -79,7 +119,7 @@ class _DynamicDetailPageState extends CommonDynPageState<DynamicDetailPage> {
bottom: 0, bottom: 0,
child: SlideTransition( child: SlideTransition(
position: fabAnimation, position: fabAnimation,
child: _buildBottom(theme), child: _buildBottom(),
), ),
), ),
], ],
@@ -251,17 +291,126 @@ class _DynamicDetailPageState extends CommonDynPageState<DynamicDetailPage> {
: [ratioWidget(maxWidth), const SizedBox(width: 16)], : [ratioWidget(maxWidth), const SizedBox(width: 16)],
); );
Widget _buildBody(ThemeData theme) { Widget _buildTabBar() {
double padding = max(maxWidth / 2 - Grid.smallCardWidth, 0); return SizedBox(
Widget child; height: 40,
if (isPortrait) { child: TabBar(
child = Padding( padding: .zero,
padding: EdgeInsets.symmetric(horizontal: padding), isScrollable: true,
child: CustomScrollView( indicatorSize: .tab,
controller: scrollController, tabAlignment: .start,
physics: const AlwaysScrollableScrollPhysics(), controller: tabController,
slivers: [ labelPadding: const .symmetric(horizontal: 12),
SliverToBoxAdapter( dividerColor: theme.colorScheme.outline.withValues(alpha: 0.1),
onTap: (value) {
if (!tabController.indexIsChanging) {
final positions = PrimaryScrollController.of(context).positions;
if (positions.length == 1) {
final postion = positions.single;
if (postion.pixels >= postion.maxScrollExtent) {
postion.jumpTo(postion.pixels);
}
}
switch (value) {
case 0:
_onRefresh(controller.onRefresh());
case 1:
_onRefresh(_reactController.onRefresh());
}
}
},
tabs: [
Tab(
child: Obx(() {
final count = controller.count.value;
return Text(
'${DynType.reply.label}${count < 0 ? '' : ' ${NumUtils.numFormat(count)}'}',
);
}),
),
Tab(
child: Obx(() {
final count = _reactController.count.value;
return Text(
'${DynType.reaction.label}${count < 0 ? '' : ' ${NumUtils.numFormat(count)}'}',
);
}),
),
],
),
);
}
Widget _buildTabBody([bool isPortrait = true]) {
final reply = CustomScrollView(
key: const PageStorageKey(DynType.reply),
physics: ReloadScrollPhysics(controller: controller),
slivers: [
buildReplyHeader(isPortrait),
Obx(() => replyList(controller.loadingState.value)),
],
);
return Stack(
clipBehavior: .none,
children: [
tabBarView(
controller: tabController,
children: [
isPortrait
? reply
: refreshIndicator(
onRefresh: controller.onRefresh,
child: reply,
),
DynReactPage(
isPortrait: isPortrait,
id: controller.dynItem.idStr,
controller: _reactController,
),
],
),
Positioned(
left: 0,
right: 0,
top: displacement,
child: Obx(() {
final isRefreshing = _isRefreshing.value;
return AnimatedScale(
scale: isRefreshing ? 1 : 0,
duration: const Duration(milliseconds: 200),
child: Center(
child: SizedBox.fromSize(
size: const .square(40),
child: Material(
type: .circle,
color: theme.colorScheme.onSecondary,
elevation: 2.0,
child: Padding(
padding: const .all(6),
child: CircularProgressIndicator(
strokeWidth: 2.5,
controller: _refreshController,
),
),
),
),
),
);
}),
),
],
);
}
Widget _buildPortrait(double padding) {
return Padding(
padding: EdgeInsets.symmetric(horizontal: padding),
child: NestedScrollView(
headerSliverBuilder: (context, innerBoxIsScrolled) {
return [
SliverToBoxWithOffsetAdapter(
offset: 55,
onVisibilityChanged: controller.showTitle.call,
child: DynamicPanel( child: DynamicPanel(
item: controller.dynItem, item: controller.dynItem,
isDetail: true, isDetail: true,
@@ -271,72 +420,81 @@ class _DynamicDetailPageState extends CommonDynPageState<DynamicDetailPage> {
onSetReplySubject: controller.onSetReplySubject, onSetReplySubject: controller.onSetReplySubject,
), ),
), ),
buildReplyHeader(theme), ];
Obx(() => replyList(theme, controller.loadingState.value)), },
body: Column(
children: [
_buildTabBar(),
Expanded(child: _buildTabBody()),
], ],
), ),
); ),
} else { );
padding = padding / 4; }
final flex = controller.ratio[0].toInt();
final flex1 = controller.ratio[1].toInt(); Widget _buildHorizontal(double padding) {
child = Row( padding = padding / 4;
children: [ final flex = controller.ratio[0].toInt();
Expanded( final flex1 = controller.ratio[1].toInt();
flex: flex, return Row(
child: CustomScrollView( children: [
controller: scrollController, Expanded(
physics: const AlwaysScrollableScrollPhysics(), flex: flex,
slivers: [ child: CustomScrollView(
SliverPadding( slivers: [
padding: EdgeInsets.only( SliverPadding(
left: padding, padding: .only(
bottom: this.padding.bottom + 100, left: padding,
), bottom: this.padding.bottom + 100,
sliver: SliverToBoxAdapter(
child: DynamicPanel(
item: controller.dynItem,
isDetail: true,
isDetailPortraitW: isPortrait,
onSetPubSetting: controller.onSetPubSetting,
onEdit: _onEdit,
onSetReplySubject: controller.onSetReplySubject,
),
),
), ),
], sliver: SliverToBoxWithOffsetAdapter(
), offset: 55,
), onVisibilityChanged: controller.showTitle.call,
Expanded( child: DynamicPanel(
flex: flex1, item: controller.dynItem,
child: Padding( isDetail: true,
padding: EdgeInsets.only(right: padding), isDetailPortraitW: isPortrait,
child: Scaffold( onSetPubSetting: controller.onSetPubSetting,
backgroundColor: Colors.transparent, onEdit: _onEdit,
resizeToAvoidBottomInset: false, onSetReplySubject: controller.onSetReplySubject,
body: refreshIndicator(
onRefresh: controller.onRefresh,
child: CustomScrollView(
controller: scrollController,
physics: const AlwaysScrollableScrollPhysics(),
slivers: [
buildReplyHeader(theme),
Obx(
() => replyList(theme, controller.loadingState.value),
),
],
), ),
), ),
), ),
],
),
),
Expanded(
flex: flex1,
child: Padding(
padding: EdgeInsets.only(right: padding),
child: Scaffold(
backgroundColor: Colors.transparent,
resizeToAvoidBottomInset: false,
body: Column(
children: [
_buildTabBar(),
Expanded(child: _buildTabBody(false)),
],
),
), ),
), ),
], ),
); ],
} );
return child;
} }
Widget _buildBottom(ThemeData theme) { Widget _buildBody() {
double padding = max(maxWidth / 2 - Grid.smallCardWidth, 0);
Widget child;
if (isPortrait) {
child = _buildPortrait(padding);
} else {
child = _buildHorizontal(padding);
}
return fabAnimWrapper(child);
}
Widget _buildBottom() {
final primary = theme.colorScheme.primary; final primary = theme.colorScheme.primary;
final outline = theme.colorScheme.outline; final outline = theme.colorScheme.outline;
final btnStyle = TextButton.styleFrom( final btnStyle = TextButton.styleFrom(
@@ -437,6 +595,14 @@ class _DynamicDetailPageState extends CommonDynPageState<DynamicDetailPage> {
), ),
), ),
), ),
Expanded(
child: textIconButton(
icon: BiliIcons.ic_comment,
text: '评论',
stat: moduleStat?.comment,
onPressed: _jumpToComment,
),
),
Expanded( Expanded(
child: Builder( child: Builder(
builder: (context) { builder: (context) {
@@ -465,4 +631,44 @@ class _DynamicDetailPageState extends CommonDynPageState<DynamicDetailPage> {
), ),
); );
} }
@override
Widget buildReplyHeader([bool isPortrait = true]) {
final secondary = theme.colorScheme.secondary;
final child = Padding(
padding: const .fromLTRB(12, 2.5, 6, 2.5),
child: Obx(
() {
final sortType = controller.sortType.value;
return Row(
mainAxisAlignment: .spaceBetween,
children: [
Text(sortType.title),
TextButton.icon(
style: Style.buttonStyle,
onPressed: controller.queryBySort,
icon: Icon(Icons.sort, size: 16, color: secondary),
label: Text(
sortType.label,
style: TextStyle(fontSize: 13, color: secondary),
),
),
],
);
},
),
);
return SliverFloatingHeaderWidget(
backgroundColor: theme.colorScheme.surface,
child: child,
);
}
void _jumpToComment([_]) {
if (!isPortrait) return;
try {
final position = PrimaryScrollController.of(context).position;
position.jumpTo(position.maxScrollExtent);
} catch (_) {}
}
} }

View File

@@ -38,8 +38,7 @@ class _MatchInfoPageState extends CommonDynPageState<MatchInfoPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final theme = Theme.of(context); final child = scaffold(
return scaffold(
appBar: AppBar(title: const Text('比赛详情')), appBar: AppBar(title: const Text('比赛详情')),
body: Stack( body: Stack(
clipBehavior: .none, clipBehavior: .none,
@@ -48,12 +47,11 @@ class _MatchInfoPageState extends CommonDynPageState<MatchInfoPage> {
child: refreshIndicator( child: refreshIndicator(
onRefresh: controller.onRefresh, onRefresh: controller.onRefresh,
child: CustomScrollView( child: CustomScrollView(
controller: scrollController,
physics: const AlwaysScrollableScrollPhysics(), physics: const AlwaysScrollableScrollPhysics(),
slivers: [ slivers: [
Obx(() => _buildInfo(theme, controller.infoState.value)), Obx(() => _buildInfo(controller.infoState.value)),
buildReplyHeader(theme), buildReplyHeader(),
Obx(() => replyList(theme, controller.loadingState.value)), Obx(() => replyList(controller.loadingState.value)),
], ],
), ),
), ),
@@ -75,9 +73,10 @@ class _MatchInfoPageState extends CommonDynPageState<MatchInfoPage> {
], ],
), ),
); );
return fabAnimWrapper(child);
} }
Widget _buildInfo(ThemeData theme, LoadingState<MatchContest?> infoState) { Widget _buildInfo(LoadingState<MatchContest?> infoState) {
if (infoState case Success(:final response?)) { if (infoState case Success(:final response?)) {
try { try {
Widget teamInfo(MatchTeam team) { Widget teamInfo(MatchTeam team) {
@@ -199,12 +198,7 @@ class _MatchInfoPageState extends CommonDynPageState<MatchInfoPage> {
} }
@override @override
void replyReply( void replyReply(BuildContext context, ReplyInfo replyItem, int? id) {
BuildContext context,
ReplyInfo replyItem,
int? id,
ThemeData theme,
) {
EasyThrottle.throttle('replyReply', const Duration(milliseconds: 500), () { EasyThrottle.throttle('replyReply', const Duration(milliseconds: 500), () {
int oid = replyItem.oid.toInt(); int oid = replyItem.oid.toInt();
int rpid = replyItem.id.toInt(); int rpid = replyItem.id.toInt();

View File

@@ -8,6 +8,7 @@ import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
import 'package:PiliPlus/common/widgets/image_viewer/hero.dart'; import 'package:PiliPlus/common/widgets/image_viewer/hero.dart';
import 'package:PiliPlus/common/widgets/marquee.dart'; import 'package:PiliPlus/common/widgets/marquee.dart';
import 'package:PiliPlus/common/widgets/scaffold.dart'; import 'package:PiliPlus/common/widgets/scaffold.dart';
import 'package:PiliPlus/common/widgets/sliver/sliver_to_box_adapter.dart';
import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/http/music.dart'; import 'package:PiliPlus/http/music.dart';
import 'package:PiliPlus/models/common/image_preview_type.dart'; import 'package:PiliPlus/models/common/image_preview_type.dart';
@@ -48,19 +49,19 @@ class _MusicDetailPageState extends CommonDynPageState<MusicDetailPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final theme = Theme.of(context); final child = scaffold(
return scaffold(
appBar: _buildAppBar(), appBar: _buildAppBar(),
body: Padding( body: Padding(
padding: EdgeInsets.only(left: padding.left, right: padding.right), padding: EdgeInsets.only(left: padding.left, right: padding.right),
child: isPortrait child: isPortrait
? refreshIndicator( ? refreshIndicator(
onRefresh: controller.onRefresh, onRefresh: controller.onRefresh,
child: _buildBody(theme), child: _buildBody(),
) )
: _buildBody(theme), : _buildBody(),
), ),
); );
return fabAnimWrapper(child);
} }
PreferredSizeWidget _buildAppBar() => AppBar( PreferredSizeWidget _buildAppBar() => AppBar(
@@ -99,7 +100,7 @@ class _MusicDetailPageState extends CommonDynPageState<MusicDetailPage> {
: [ratioWidget(maxWidth), const SizedBox(width: 16)], : [ratioWidget(maxWidth), const SizedBox(width: 16)],
); );
Widget _buildBody(ThemeData theme) => Obx(() { Widget _buildBody() => Obx(() {
switch (controller.infoState.value) { switch (controller.infoState.value) {
case Success(:final response): case Success(:final response):
double padding = math.max(maxWidth / 2 - Grid.smallCardWidth, 0); double padding = math.max(maxWidth / 2 - Grid.smallCardWidth, 0);
@@ -108,14 +109,15 @@ class _MusicDetailPageState extends CommonDynPageState<MusicDetailPage> {
child = Padding( child = Padding(
padding: EdgeInsets.symmetric(horizontal: padding), padding: EdgeInsets.symmetric(horizontal: padding),
child: CustomScrollView( child: CustomScrollView(
controller: scrollController,
physics: const AlwaysScrollableScrollPhysics(), physics: const AlwaysScrollableScrollPhysics(),
slivers: [ slivers: [
SliverToBoxAdapter( SliverToBoxWithOffsetAdapter(
child: _buildCard(theme, response, maxWidth), offset: 45,
onVisibilityChanged: controller.showTitle.call,
child: _buildCard(response, maxWidth),
), ),
buildReplyHeader(theme), buildReplyHeader(),
Obx(() => replyList(theme, controller.loadingState.value)), Obx(() => replyList(controller.loadingState.value)),
], ],
), ),
); );
@@ -131,7 +133,6 @@ class _MusicDetailPageState extends CommonDynPageState<MusicDetailPage> {
Expanded( Expanded(
flex: flex, flex: flex,
child: CustomScrollView( child: CustomScrollView(
controller: scrollController,
physics: const AlwaysScrollableScrollPhysics(), physics: const AlwaysScrollableScrollPhysics(),
slivers: [ slivers: [
SliverPadding( SliverPadding(
@@ -139,7 +140,7 @@ class _MusicDetailPageState extends CommonDynPageState<MusicDetailPage> {
left: padding, left: padding,
), ),
sliver: SliverToBoxAdapter( sliver: SliverToBoxAdapter(
child: _buildCard(theme, response, leftWidth), child: _buildCard(response, leftWidth),
), ),
), ),
], ],
@@ -155,13 +156,11 @@ class _MusicDetailPageState extends CommonDynPageState<MusicDetailPage> {
body: refreshIndicator( body: refreshIndicator(
onRefresh: controller.onRefresh, onRefresh: controller.onRefresh,
child: CustomScrollView( child: CustomScrollView(
controller: scrollController,
physics: const AlwaysScrollableScrollPhysics(), physics: const AlwaysScrollableScrollPhysics(),
slivers: [ slivers: [
buildReplyHeader(theme), buildReplyHeader(),
Obx( Obx(
() => () => replyList(controller.loadingState.value),
replyList(theme, controller.loadingState.value),
), ),
], ],
), ),
@@ -176,7 +175,7 @@ class _MusicDetailPageState extends CommonDynPageState<MusicDetailPage> {
clipBehavior: Clip.none, clipBehavior: Clip.none,
children: [ children: [
child, child,
_buildBottom(theme, response), _buildBottom(response),
], ],
); );
default: default:
@@ -184,7 +183,7 @@ class _MusicDetailPageState extends CommonDynPageState<MusicDetailPage> {
} }
}); });
Widget _buildBottom(ThemeData theme, MusicDetail item) { Widget _buildBottom(MusicDetail item) {
final primary = theme.colorScheme.primary; final primary = theme.colorScheme.primary;
final outline = theme.colorScheme.outline; final outline = theme.colorScheme.outline;
final style = TextButton.styleFrom( final style = TextButton.styleFrom(
@@ -356,8 +355,7 @@ class _MusicDetailPageState extends CommonDynPageState<MusicDetailPage> {
Widget _buildRank( Widget _buildRank(
int? rank, int? rank,
String name, String name, [
ThemeData theme, [
VoidCallback? onTap, VoidCallback? onTap,
]) { ]) {
final outline = theme.colorScheme.outline; final outline = theme.colorScheme.outline;
@@ -393,7 +391,7 @@ class _MusicDetailPageState extends CommonDynPageState<MusicDetailPage> {
); );
} }
Widget _buildCard(ThemeData theme, MusicDetail item, double maxWidth) { Widget _buildCard(MusicDetail item, double maxWidth) {
final textTheme = theme.textTheme; final textTheme = theme.textTheme;
return SizedBox( return SizedBox(
width: maxWidth, width: maxWidth,
@@ -533,12 +531,11 @@ class _MusicDetailPageState extends CommonDynPageState<MusicDetailPage> {
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
const Text('热歌榜排名'), const Text('热歌榜排名'),
_buildRank(item.hotSongHeat?.lastHeat, '热度', theme), _buildRank(item.hotSongHeat?.lastHeat, '热度'),
_buildRank(item.listenPv, '总播放量', theme), _buildRank(item.listenPv, '总播放量'),
_buildRank( _buildRank(
item.musicRelation, item.musicRelation,
'使用稿件量', '使用稿件量',
theme,
() => Get.to( () => Get.to(
const MusicRecommendPage(), const MusicRecommendPage(),
arguments: (id: controller.musicId, item: item), arguments: (id: controller.musicId, item: item),

View File

@@ -219,6 +219,7 @@ abstract final class PageUtils {
static Future<void> pushDynDetail( static Future<void> pushDynDetail(
DynamicItemModel item, { DynamicItemModel item, {
bool isPush = false, bool isPush = false,
bool viewComment = false,
}) async { }) async {
void push() { void push() {
if (item.basic?.commentType == 12) { if (item.basic?.commentType == 12) {
@@ -238,6 +239,7 @@ abstract final class PageUtils {
'/dynamicDetail', '/dynamicDetail',
arguments: { arguments: {
'item': item, 'item': item,
if (viewComment) 'viewComment': true,
}, },
); );
} }