refactor dyn uplist

Signed-off-by: dom <githubaccount56556@proton.me>
This commit is contained in:
dom
2026-06-27 09:45:18 +08:00
parent 840f8d5a25
commit 5d15bf5e59
9 changed files with 228 additions and 275 deletions

View File

@@ -1,7 +1,6 @@
import 'package:PiliPlus/common/assets.dart';
import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
import 'package:PiliPlus/models/common/dynamic/up_panel_position.dart';
import 'package:PiliPlus/models/common/image_type.dart';
import 'package:PiliPlus/models/dynamics/up.dart';
import 'package:PiliPlus/pages/dynamics/controller.dart';
import 'package:PiliPlus/pages/live_follow/view.dart';
@@ -15,10 +14,12 @@ import 'package:get/get.dart';
class UpPanel extends StatefulWidget {
const UpPanel({
required this.dynamicsController,
super.key,
required this.upData,
required this.dynamicsController,
});
final FollowUpModel upData;
final DynamicsController dynamicsController;
@override
@@ -33,16 +34,12 @@ class _UpPanelState extends State<UpPanel> {
@override
Widget build(BuildContext context) {
final accountService = controller.accountService;
if (!accountService.isLogin.value) {
return const SizedBox.shrink();
}
final theme = Theme.of(context);
final upData = controller.upState.value.data;
final List<UpItem> upList = upData.upList;
final List<LiveUserItem>? liveList = upData.liveUsers?.items;
final upData = widget.upData;
final upList = upData.upList;
final liveList = upData.liveUsers?.items;
return CustomScrollView(
scrollDirection: isTop ? Axis.horizontal : Axis.vertical,
scrollDirection: isTop ? .horizontal : .vertical,
physics: const AlwaysScrollableScrollPhysics(),
controller: controller.scrollController,
slivers: [
@@ -54,11 +51,11 @@ class _UpPanelState extends State<UpPanel> {
onLongPress: toFollowPage,
onSecondaryTap: PlatformUtils.isMobile ? null : toFollowPage,
child: Container(
alignment: Alignment.center,
alignment: .center,
height: isTop ? 76 : 60,
padding: isTop ? const EdgeInsets.only(left: 12, right: 6) : null,
padding: isTop ? const .only(left: 12, right: 6) : null,
child: Text.rich(
textAlign: TextAlign.center,
textAlign: .center,
style: TextStyle(
fontSize: 13,
color: theme.colorScheme.primary,
@@ -71,7 +68,7 @@ class _UpPanelState extends State<UpPanel> {
if (!isTop) ...[
const TextSpan(text: '\n'),
WidgetSpan(
alignment: PlaceholderAlignment.middle,
alignment: .middle,
child: Icon(
controller.showLiveUp
? Icons.expand_less
@@ -82,7 +79,7 @@ class _UpPanelState extends State<UpPanel> {
),
] else
WidgetSpan(
alignment: PlaceholderAlignment.middle,
alignment: .middle,
child: Icon(
controller.showLiveUp
? Icons.keyboard_arrow_right
@@ -113,13 +110,13 @@ class _UpPanelState extends State<UpPanel> {
theme,
UpItem(
uname: '',
face: accountService.face.value,
face: controller.accountService.face.value,
mid: Accounts.main.mid,
),
),
),
),
if (upList.isNotEmpty)
if (upList != null && upList.isNotEmpty)
SliverList.builder(
itemCount: upList.length,
itemBuilder: (context, index) {
@@ -131,23 +128,19 @@ class _UpPanelState extends State<UpPanel> {
);
}
void _onSelect(UpItem data) {
controller
..currentMid = data.mid
..onSelectUp(data.mid);
data.hasUpdate = false;
void _onSelect(UpItem item) {
item.hasUpdate = false;
controller.onSelectUp(item.mid);
setState(() {});
}
Widget upItemBuild(ThemeData theme, UpItem data) {
Widget upItemBuild(ThemeData theme, UpItem item) {
final currentMid = controller.currentMid;
final isLive = data is LiveUserItem;
final isCurrent = isLive || currentMid == data.mid || currentMid == -1;
final isLive = item is LiveUserItem;
final isCurrent = isLive || currentMid == item.mid || currentMid == -1;
final isAll = data.mid == -1;
void toMemberPage() => Get.toNamed('/member?mid=${data.mid}');
final isAll = item.mid == -1;
void toMemberPage() => Get.toNamed('/member?mid=${item.mid}');
Widget avatar;
if (isAll) {
@@ -166,12 +159,12 @@ class _UpPanelState extends State<UpPanel> {
);
} else {
avatar = Padding(
padding: const EdgeInsets.symmetric(horizontal: 4),
padding: const .symmetric(horizontal: 4),
child: NetworkImgLayer(
width: 38,
height: 38,
src: data.face,
type: ImageType.avatar,
src: item.face,
type: .avatar,
),
);
if (isLive) {
@@ -191,7 +184,7 @@ class _UpPanelState extends State<UpPanel> {
),
],
);
} else if (data.hasUpdate ?? false) {
} else if (item.hasUpdate ?? false) {
avatar = Stack(
clipBehavior: .none,
children: [
@@ -216,9 +209,9 @@ class _UpPanelState extends State<UpPanel> {
onTap: () {
feedBack();
if (isLive) {
PageUtils.toLiveRoom(data.roomId);
PageUtils.toLiveRoom(item.roomId);
} else {
_onSelect(data);
_onSelect(item);
}
},
// onDoubleTap: isLive ? () => _onSelect(data) : null,
@@ -228,18 +221,18 @@ class _UpPanelState extends State<UpPanel> {
opacity: isCurrent ? 1 : 0.6,
child: Column(
spacing: 4,
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
mainAxisSize: .min,
mainAxisAlignment: .center,
children: [
avatar,
Padding(
padding: const EdgeInsets.symmetric(horizontal: 4),
padding: const .symmetric(horizontal: 4),
child: Text(
isTop ? '${data.uname}\n' : data.uname!,
isTop ? '${item.uname}\n' : item.uname!,
maxLines: 2,
textAlign: TextAlign.center,
textAlign: .center,
style: TextStyle(
color: currentMid == data.mid
color: currentMid == item.mid
? theme.colorScheme.primary
: theme.colorScheme.outline,
height: 1.1,