mirror of
https://github.com/HChaZZY/PiliPlus.git
synced 2025-12-06 09:13:48 +08:00
opt dyn panel
Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
@@ -67,8 +67,7 @@ class DynamicPanel extends StatelessWidget {
|
|||||||
padding: const EdgeInsets.fromLTRB(12, 12, 12, 6),
|
padding: const EdgeInsets.fromLTRB(12, 12, 12, 6),
|
||||||
child: authorWidget,
|
child: authorWidget,
|
||||||
),
|
),
|
||||||
if (item.modules.moduleDynamic!.desc != null ||
|
if (item.type != 'DYNAMIC_TYPE_NONE')
|
||||||
item.modules.moduleDynamic!.major != null)
|
|
||||||
content(theme, isSave, context, item, source, callback),
|
content(theme, isSave, context, item, source, callback),
|
||||||
module(theme, isSave, item, context, source, callback),
|
module(theme, isSave, item, context, source, callback),
|
||||||
if (item.modules.moduleDynamic?.additional != null)
|
if (item.modules.moduleDynamic?.additional != null)
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ import 'package:PiliPlus/common/widgets/badge.dart';
|
|||||||
import 'package:PiliPlus/common/widgets/image/image_save.dart';
|
import 'package:PiliPlus/common/widgets/image/image_save.dart';
|
||||||
import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
|
import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
|
||||||
import 'package:PiliPlus/models/dynamics/result.dart';
|
import 'package:PiliPlus/models/dynamics/result.dart';
|
||||||
import 'package:PiliPlus/pages/article/widgets/opus_content.dart';
|
|
||||||
import 'package:PiliPlus/pages/dynamics/widgets/additional_panel.dart';
|
import 'package:PiliPlus/pages/dynamics/widgets/additional_panel.dart';
|
||||||
|
import 'package:PiliPlus/pages/dynamics/widgets/blocked_item.dart';
|
||||||
import 'package:PiliPlus/pages/dynamics/widgets/content_panel.dart';
|
import 'package:PiliPlus/pages/dynamics/widgets/content_panel.dart';
|
||||||
import 'package:PiliPlus/pages/dynamics/widgets/live_panel.dart';
|
import 'package:PiliPlus/pages/dynamics/widgets/live_panel.dart';
|
||||||
import 'package:PiliPlus/pages/dynamics/widgets/live_panel_sub.dart';
|
import 'package:PiliPlus/pages/dynamics/widgets/live_panel_sub.dart';
|
||||||
@@ -17,17 +17,6 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
|
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
|
|
||||||
Widget blockedItem(ThemeData theme, ModuleBlocked moduleBlocked) {
|
|
||||||
return Padding(
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 13, vertical: 1),
|
|
||||||
child: LayoutBuilder(
|
|
||||||
builder: (context, constraints) {
|
|
||||||
return moduleBlockedItem(theme, moduleBlocked, constraints.maxWidth);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
Widget module(
|
Widget module(
|
||||||
ThemeData theme,
|
ThemeData theme,
|
||||||
bool isSave,
|
bool isSave,
|
||||||
@@ -99,6 +88,7 @@ Widget module(
|
|||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
|
if (orig.type != 'DYNAMIC_TYPE_NONE') ...[
|
||||||
Row(
|
Row(
|
||||||
children: [
|
children: [
|
||||||
GestureDetector(
|
GestureDetector(
|
||||||
@@ -122,10 +112,11 @@ Widget module(
|
|||||||
const SizedBox(height: 5),
|
const SizedBox(height: 5),
|
||||||
content(theme, isSave, context, orig, source, callback,
|
content(theme, isSave, context, orig, source, callback,
|
||||||
floor: floor + 1),
|
floor: floor + 1),
|
||||||
|
],
|
||||||
module(theme, isSave, orig, context, source, callback,
|
module(theme, isSave, orig, context, source, callback,
|
||||||
floor: floor + 1),
|
floor: floor + 1),
|
||||||
if (orig.modules.moduleDynamic?.additional != null)
|
if (orig.modules.moduleDynamic?.additional != null)
|
||||||
addWidget(theme, orig, context, floor: floor),
|
addWidget(theme, orig, context, floor: floor + 1),
|
||||||
if (orig.modules.moduleDynamic?.major?.blocked != null)
|
if (orig.modules.moduleDynamic?.major?.blocked != null)
|
||||||
blockedItem(theme, orig.modules.moduleDynamic!.major!.blocked!),
|
blockedItem(theme, orig.modules.moduleDynamic!.major!.blocked!),
|
||||||
],
|
],
|
||||||
@@ -150,15 +141,11 @@ Widget module(
|
|||||||
return videoSeasonWidget(
|
return videoSeasonWidget(
|
||||||
theme, isSave, source, item, context, 'pgc', callback,
|
theme, isSave, source, item, context, 'pgc', callback,
|
||||||
floor: floor);
|
floor: floor);
|
||||||
// 直播结束
|
|
||||||
case 'DYNAMIC_TYPE_NONE':
|
case 'DYNAMIC_TYPE_NONE':
|
||||||
return Row(
|
return Row(
|
||||||
|
spacing: 4,
|
||||||
children: [
|
children: [
|
||||||
const Icon(
|
const Icon(FontAwesomeIcons.ghost, size: 14),
|
||||||
FontAwesomeIcons.ghost,
|
|
||||||
size: 14,
|
|
||||||
),
|
|
||||||
const SizedBox(width: 4),
|
|
||||||
Text(item.modules.moduleDynamic!.major!.none!.tips!)
|
Text(item.modules.moduleDynamic!.major!.none!.tips!)
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user