mirror of
https://github.com/bggRGjQaUbCoE/PiliPlus.git
synced 2026-04-21 11:22:16 +08:00
opt: dyn panel
Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
@@ -1,5 +1,3 @@
|
||||
// 操作栏
|
||||
|
||||
import 'package:PiliPlus/common/widgets/network_img_layer.dart';
|
||||
import 'package:PiliPlus/http/msg.dart';
|
||||
import 'package:PiliPlus/utils/extension.dart';
|
||||
@@ -11,7 +9,6 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:PiliPlus/http/dynamics.dart';
|
||||
import 'package:PiliPlus/models/dynamics/result.dart';
|
||||
import 'package:PiliPlus/pages/dynamics/index.dart';
|
||||
import 'package:PiliPlus/utils/feed_back.dart';
|
||||
|
||||
class ActionPanel extends StatefulWidget {
|
||||
@@ -26,8 +23,6 @@ class ActionPanel extends StatefulWidget {
|
||||
}
|
||||
|
||||
class _ActionPanelState extends State<ActionPanel> {
|
||||
final DynamicsController _dynamicsController = Get.put(DynamicsController());
|
||||
// late ModuleStatModel stat;
|
||||
bool isProcessing = false;
|
||||
void handleState(Future Function() action) async {
|
||||
if (isProcessing.not) {
|
||||
@@ -37,12 +32,6 @@ class _ActionPanelState extends State<ActionPanel> {
|
||||
}
|
||||
}
|
||||
|
||||
// @override
|
||||
// void initState() {
|
||||
// super.initState();
|
||||
// stat = widget.item!.modules.moduleStat;
|
||||
// }
|
||||
|
||||
// 动态点赞
|
||||
Future onLikeDynamic() async {
|
||||
feedBack();
|
||||
@@ -123,8 +112,8 @@ class _ActionPanelState extends State<ActionPanel> {
|
||||
Expanded(
|
||||
flex: 1,
|
||||
child: TextButton.icon(
|
||||
onPressed: () => _dynamicsController.pushDetail(widget.item, 1,
|
||||
action: 'comment'),
|
||||
onPressed: () =>
|
||||
Utils.pushDynDetail(widget.item, 1, action: 'comment'),
|
||||
icon: Icon(
|
||||
FontAwesomeIcons.comment,
|
||||
size: 16,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import 'package:PiliPlus/common/widgets/image_save.dart';
|
||||
import 'package:PiliPlus/utils/utils.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:PiliPlus/pages/dynamics/index.dart';
|
||||
import 'action_panel.dart';
|
||||
import 'author_panel.dart';
|
||||
import 'content_panel.dart';
|
||||
@@ -12,7 +12,7 @@ class DynamicPanel extends StatelessWidget {
|
||||
final Function? onRemove;
|
||||
final Function(List<String>, int)? callback;
|
||||
|
||||
DynamicPanel({
|
||||
const DynamicPanel({
|
||||
required this.item,
|
||||
this.source,
|
||||
this.onRemove,
|
||||
@@ -20,11 +20,9 @@ class DynamicPanel extends StatelessWidget {
|
||||
super.key,
|
||||
});
|
||||
|
||||
final DynamicsController _dynamicsController = Get.put(DynamicsController());
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
return Padding(
|
||||
padding: source == 'detail'
|
||||
? const EdgeInsets.only(bottom: 12)
|
||||
: EdgeInsets.zero,
|
||||
@@ -46,7 +44,29 @@ class DynamicPanel extends StatelessWidget {
|
||||
child: InkWell(
|
||||
onTap: source == 'detail' && item.type != 'DYNAMIC_TYPE_AV'
|
||||
? null
|
||||
: () => _dynamicsController.pushDetail(item, 1),
|
||||
: () => Utils.pushDynDetail(item, 1),
|
||||
onLongPress: () {
|
||||
if (item.type == 'DYNAMIC_TYPE_AV') {
|
||||
imageSaveDialog(
|
||||
context: context,
|
||||
title: item.modules.moduleDynamic.major.archive.title,
|
||||
cover: item.modules.moduleDynamic.major.archive.cover,
|
||||
);
|
||||
} else if (item.type == 'DYNAMIC_TYPE_UGC_SEASON') {
|
||||
imageSaveDialog(
|
||||
context: context,
|
||||
title: item.modules.moduleDynamic.major.ugcSeason.title,
|
||||
cover: item.modules.moduleDynamic.major.ugcSeason.cover,
|
||||
);
|
||||
} else if (item.type == 'DYNAMIC_TYPE_PGC' ||
|
||||
item.type == 'DYNAMIC_TYPE_PGC_UNION') {
|
||||
imageSaveDialog(
|
||||
context: context,
|
||||
title: item.modules.moduleDynamic.major.pgc.title,
|
||||
cover: item.modules.moduleDynamic.major.pgc.cover,
|
||||
);
|
||||
}
|
||||
},
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
children: [
|
||||
@@ -61,7 +81,7 @@ class DynamicPanel extends StatelessWidget {
|
||||
if (item!.modules!.moduleDynamic!.desc != null ||
|
||||
item!.modules!.moduleDynamic!.major != null)
|
||||
content(context, item, source, callback),
|
||||
forWard(item, context, _dynamicsController, source, callback),
|
||||
forWard(item, context, source, callback),
|
||||
const SizedBox(height: 2),
|
||||
if (source == null) ActionPanel(item: item),
|
||||
],
|
||||
|
||||
@@ -1,24 +1,21 @@
|
||||
import 'package:PiliPlus/grpc/app/dynamic/v2/dynamic.pb.dart';
|
||||
import 'package:PiliPlus/pages/dynamics/widgets/author_panel_grpc.dart';
|
||||
import 'package:PiliPlus/pages/dynamics/widgets/content_panel_grpc.dart';
|
||||
import 'package:PiliPlus/utils/utils.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:PiliPlus/pages/dynamics/index.dart';
|
||||
|
||||
class DynamicPanelGrpc extends StatelessWidget {
|
||||
final DynamicItem item;
|
||||
final String? source;
|
||||
final Function? onRemove;
|
||||
|
||||
DynamicPanelGrpc({
|
||||
const DynamicPanelGrpc({
|
||||
required this.item,
|
||||
this.source,
|
||||
this.onRemove,
|
||||
super.key,
|
||||
});
|
||||
|
||||
final DynamicsController _dynamicsController = Get.put(DynamicsController());
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
@@ -43,7 +40,7 @@ class DynamicPanelGrpc extends StatelessWidget {
|
||||
child: InkWell(
|
||||
onTap: source == 'detail' && item.itemType == DynamicType.draw
|
||||
? null
|
||||
: () => _dynamicsController.pushDetail(item, 1),
|
||||
: () => Utils.pushDynDetail(item, 1),
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
children: [
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
// 转发
|
||||
import 'package:PiliPlus/common/widgets/image_save.dart';
|
||||
import 'package:PiliPlus/common/widgets/imageview.dart';
|
||||
import 'package:PiliPlus/common/widgets/network_img_layer.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
@@ -35,7 +36,7 @@ InlineSpan picsNodes(List<OpusPicsModel> pics, callback) {
|
||||
);
|
||||
}
|
||||
|
||||
Widget forWard(item, context, ctr, source, callback, {floor = 1}) {
|
||||
Widget forWard(item, context, source, callback, {floor = 1}) {
|
||||
TextStyle authorStyle =
|
||||
TextStyle(color: Theme.of(context).colorScheme.primary);
|
||||
|
||||
@@ -140,13 +141,35 @@ Widget forWard(item, context, ctr, source, callback, {floor = 1}) {
|
||||
// 转发
|
||||
case 'DYNAMIC_TYPE_FORWARD':
|
||||
return InkWell(
|
||||
onTap: () => ctr.pushDetail(item.orig, floor + 1),
|
||||
onTap: () => Utils.pushDynDetail(item.orig, floor + 1),
|
||||
onLongPress: () {
|
||||
if (item.orig.type == 'DYNAMIC_TYPE_AV') {
|
||||
imageSaveDialog(
|
||||
context: context,
|
||||
title: item.orig.modules.moduleDynamic.major.archive.title,
|
||||
cover: item.orig.modules.moduleDynamic.major.archive.cover,
|
||||
);
|
||||
} else if (item.orig.type == 'DYNAMIC_TYPE_UGC_SEASON') {
|
||||
imageSaveDialog(
|
||||
context: context,
|
||||
title: item.orig.modules.moduleDynamic.major.ugcSeason.title,
|
||||
cover: item.orig.modules.moduleDynamic.major.ugcSeason.cover,
|
||||
);
|
||||
} else if (item.orig.type == 'DYNAMIC_TYPE_PGC' ||
|
||||
item.orig.type == 'DYNAMIC_TYPE_PGC_UNION') {
|
||||
imageSaveDialog(
|
||||
context: context,
|
||||
title: item.orig.modules.moduleDynamic.major.pgc.title,
|
||||
cover: item.orig.modules.moduleDynamic.major.pgc.cover,
|
||||
);
|
||||
}
|
||||
},
|
||||
child: Container(
|
||||
padding:
|
||||
const EdgeInsets.only(left: 15, top: 10, right: 15, bottom: 8),
|
||||
color: Theme.of(context).dividerColor.withOpacity(0.08),
|
||||
child: forWard(item.orig, context, ctr, source, callback,
|
||||
floor: floor + 1),
|
||||
child:
|
||||
forWard(item.orig, context, source, callback, floor: floor + 1),
|
||||
),
|
||||
);
|
||||
// 直播
|
||||
|
||||
@@ -4,12 +4,10 @@ import 'package:PiliPlus/common/constants.dart';
|
||||
import 'package:PiliPlus/common/widgets/badge.dart';
|
||||
import 'package:PiliPlus/common/widgets/network_img_layer.dart';
|
||||
import 'package:PiliPlus/models/dynamics/result.dart';
|
||||
import 'package:PiliPlus/pages/dynamics/index.dart';
|
||||
import 'package:PiliPlus/utils/utils.dart';
|
||||
|
||||
import 'rich_node_panel.dart';
|
||||
|
||||
final DynamicsController _dynamicsController = Get.put(DynamicsController());
|
||||
Widget liveRcmdPanel(item, context, {floor = 1}) {
|
||||
TextStyle authorStyle =
|
||||
TextStyle(color: Theme.of(context).colorScheme.primary);
|
||||
@@ -65,7 +63,7 @@ Widget liveRcmdPanel(item, context, {floor = 1}) {
|
||||
const EdgeInsets.symmetric(horizontal: StyleString.safeSpace),
|
||||
child: GestureDetector(
|
||||
onTap: () {
|
||||
_dynamicsController.pushDetail(item, floor);
|
||||
Utils.pushDynDetail(item, floor);
|
||||
},
|
||||
child: LayoutBuilder(builder: (context, box) {
|
||||
double width = box.maxWidth;
|
||||
|
||||
Reference in New Issue
Block a user