mirrors/pilipala
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mod: 会员标识，回复按钮/高度，搜索页面

Browse Source
This commit is contained in:
guozhigq
2023-08-02 11:31:32 +08:00
parent e97abb545f
commit f3f0f64e4d
12 changed files with 146 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/images/big-vip.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

9
lib/common/skeleton/video_reply.dart
View File

@ -60,7 +60,14 @@ class VideoReplySkeleton extends StatelessWidget {
), ),
const Spacer(), const Spacer(),
Container( Container(
width: 40, width: 30,
height: 14,
margin: const EdgeInsets.only(bottom: 4),
color: bgColor,
),
const SizedBox(width: 8),
Container(
width: 30,
height: 14, height: 14,
margin: const EdgeInsets.only(bottom: 4), margin: const EdgeInsets.only(bottom: 4),
color: bgColor, color: bgColor,

4
lib/models/dynamics/result.dart
View File

@ -117,7 +117,7 @@ class ModuleAuthorModel {
this.pubTime, this.pubTime,
this.pubTs, this.pubTs,
this.type, this.type,
// this.vip, this.vip,
}); });
String? face; String? face;
@ -130,6 +130,7 @@ class ModuleAuthorModel {
String? pubTime; String? pubTime;
int? pubTs; int? pubTs;
String? type; String? type;
Map? vip;
ModuleAuthorModel.fromJson(Map<String, dynamic> json) { ModuleAuthorModel.fromJson(Map<String, dynamic> json) {
face = json['face']; face = json['face'];
@ -142,6 +143,7 @@ class ModuleAuthorModel {
pubTime = json['pub_time']; pubTime = json['pub_time'];
pubTs = json['pub_ts'] == 0 ? null : json['pub_ts']; pubTs = json['pub_ts'] == 0 ? null : json['pub_ts'];
type = json['type']; type = json['type'];
vip = json['vip'];
} }
} }

2
lib/pages/dynamics/deatil/view.dart
View File

@ -100,7 +100,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage> {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
elevation: 0, elevation: 0,
scrolledUnderElevation: 0, scrolledUnderElevation: 1,
centerTitle: false, centerTitle: false,
titleSpacing: 0, titleSpacing: 0,
title: StreamBuilder( title: StreamBuilder(

102
lib/pages/dynamics/widgets/author_panel.dart
View File

@ -6,59 +6,59 @@ import 'package:pilipala/utils/utils.dart';
Widget author(item, context) { Widget author(item, context) {
String heroTag = Utils.makeHeroTag(item.modules.moduleAuthor.mid); String heroTag = Utils.makeHeroTag(item.modules.moduleAuthor.mid);
return Container( return Row(
padding: const EdgeInsets.fromLTRB(12, 12, 12, 8), children: [
child: Row( GestureDetector(
children: [ onTap: () {
GestureDetector( feedBack();
onTap: () { Get.toNamed(
feedBack(); '/member?mid=${item.modules.moduleAuthor.mid}',
Get.toNamed( arguments: {
'/member?mid=${item.modules.moduleAuthor.mid}', 'face': item.modules.moduleAuthor.face,
arguments: { 'heroTag': heroTag
'face': item.modules.moduleAuthor.face, },
'heroTag': heroTag );
}, },
); child: Hero(
}, tag: heroTag,
child: Hero( child: NetworkImgLayer(
tag: heroTag, width: 40,
child: NetworkImgLayer( height: 40,
width: 40, type: 'avatar',
height: 40, src: item.modules.moduleAuthor.face,
type: 'avatar',
src: item.modules.moduleAuthor.face,
),
), ),
), ),
const SizedBox(width: 10), ),
Column( const SizedBox(width: 10),
crossAxisAlignment: CrossAxisAlignment.start, Column(
children: [ crossAxisAlignment: CrossAxisAlignment.start,
Text( children: [
item.modules.moduleAuthor.name, Text(
style: TextStyle( item.modules.moduleAuthor.name,
fontSize: Theme.of(context).textTheme.titleSmall!.fontSize, style: TextStyle(
), color: item.modules.moduleAuthor!.vip!['status'] > 0
? const Color.fromARGB(255, 251, 100, 163)
: Theme.of(context).colorScheme.onBackground,
fontSize: Theme.of(context).textTheme.titleSmall!.fontSize,
), ),
DefaultTextStyle.merge( ),
style: TextStyle( DefaultTextStyle.merge(
color: Theme.of(context).colorScheme.outline, style: TextStyle(
fontSize: Theme.of(context).textTheme.labelSmall!.fontSize, color: Theme.of(context).colorScheme.outline,
), fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
child: Row( ),
children: [ child: Row(
Text(item.modules.moduleAuthor.pubTime), children: [
if (item.modules.moduleAuthor.pubTime != '' && Text(item.modules.moduleAuthor.pubTime),
item.modules.moduleAuthor.pubAction != '') if (item.modules.moduleAuthor.pubTime != '' &&
const Text(' '), item.modules.moduleAuthor.pubAction != '')
Text(item.modules.moduleAuthor.pubAction), const Text(' '),
], Text(item.modules.moduleAuthor.pubAction),
), ],
) ),
], )
), ],
], ),
), ],
); );
} }

5
lib/pages/dynamics/widgets/dynamic_panel.dart
View File

@ -37,7 +37,10 @@ class DynamicPanel extends StatelessWidget {
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
author(item, context), Padding(
padding: const EdgeInsets.fromLTRB(12, 12, 12, 8),
child: author(item, context),
),
if (item!.modules!.moduleDynamic!.desc != null) if (item!.modules!.moduleDynamic!.desc != null)
content(item, context, source), content(item, context, source),
forWard(item, context, _dynamicsController, source), forWard(item, context, _dynamicsController, source),

45
lib/pages/search/widgets/hot_keyword.dart
View File

@ -21,34 +21,37 @@ class HotKeyword extends StatelessWidget {
children: [ children: [
for (var i in hotSearchList!) for (var i in hotSearchList!)
SizedBox( SizedBox(
width: width! / 2 - 8, width: width! / 2 - 4,
child: Material( child: Material(
borderRadius: BorderRadius.circular(3), borderRadius: BorderRadius.circular(3),
clipBehavior: Clip.hardEdge, clipBehavior: Clip.hardEdge,
child: InkWell( child: InkWell(
onTap: () => onClick!(i.keyword), onTap: () => onClick!(i.keyword),
child: Row( child: Padding(
children: [ padding: EdgeInsets.only(
SizedBox( left: 2,
width: width! / 2 - right: hotSearchList!.indexOf(i) % 2 == 1 ? 10 : 0),
(i.icon != null && i.icon != '' ? 50 : 12), child: Row(
child: Padding( children: [
padding: const EdgeInsets.fromLTRB(6, 5, 0, 5), Flexible(
child: Text( child: Padding(
i.keyword!, padding: const EdgeInsets.fromLTRB(6, 5, 4, 5),
overflow: TextOverflow.ellipsis, child: Text(
maxLines: 1, i.keyword!,
style: const TextStyle(fontSize: 14), overflow: TextOverflow.ellipsis,
maxLines: 1,
style: const TextStyle(fontSize: 14),
),
), ),
), ),
), if (i.icon != null && i.icon != '')
if (i.icon != null && i.icon != '') SizedBox(
SizedBox( height: 15,
width: 40, child: CachedNetworkImage(
child: imageUrl: i.icon!, height: 15.0),
CachedNetworkImage(imageUrl: i.icon!, height: 15.0), ),
), ],
], ),
), ),
), ),
), ),

2
lib/pages/video/detail/introduction/view.dart
View File

@ -142,7 +142,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
ThemeData t = Theme.of(context); ThemeData t = Theme.of(context);
return SliverPadding( return SliverPadding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
left: StyleString.safeSpace, right: StyleString.safeSpace, top: 13), left: StyleString.safeSpace, right: StyleString.safeSpace, top: 10),
sliver: SliverToBoxAdapter( sliver: SliverToBoxAdapter(
child: !widget.loadingStatus || videoItem.isNotEmpty child: !widget.loadingStatus || videoItem.isNotEmpty
? Column( ? Column(

12
lib/pages/video/detail/introduction/widgets/intro_detail.dart
View File

@ -55,7 +55,7 @@ class IntroDetail extends StatelessWidget {
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
), ),
const SizedBox(height: 4), const SizedBox(height: 6),
Row( Row(
children: [ children: [
StatView( StatView(
@ -91,10 +91,16 @@ class IntroDetail extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text(videoDetail!.bvid!), Text(
videoDetail!.bvid!,
style: const TextStyle(fontSize: 13),
),
const SizedBox(height: 4), const SizedBox(height: 4),
Text.rich( Text.rich(
style: const TextStyle(height: 1.4), style: const TextStyle(
height: 1.4,
fontSize: 13,
),
TextSpan( TextSpan(
children: [ children: [
buildContent(context, videoDetail!), buildContent(context, videoDetail!),

40
lib/pages/video/detail/reply/widgets/reply_item.dart
View File

@ -79,6 +79,22 @@ class ReplyItem extends StatelessWidget {
), ),
), ),
), ),
if (replyItem!.member!.vip!['vipStatus'] > 0 &&
replyItem!.member!.vip!['vipType'] == 2)
Positioned(
right: 0,
bottom: 0,
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(7),
color: Theme.of(context).colorScheme.background,
),
child: Image.asset(
'assets/images/big-vip.png',
height: 14,
),
),
),
], ],
), ),
); );
@ -111,9 +127,8 @@ class ReplyItem extends StatelessWidget {
Text( Text(
replyItem!.member!.uname!, replyItem!.member!.uname!,
style: TextStyle( style: TextStyle(
color: replyItem!.isUp! || color: replyItem!.member!.vip!['vipStatus'] > 0
replyItem!.member!.vip!['vipStatus'] > 0 ? const Color.fromARGB(255, 251, 100, 163)
? Theme.of(context).colorScheme.primary
: Theme.of(context).colorScheme.outline, : Theme.of(context).colorScheme.outline,
fontSize: 13, fontSize: 13,
), ),
@ -257,16 +272,21 @@ class ReplyItem extends StatelessWidget {
Icon(Icons.favorite, color: Colors.red[400], size: 18), Icon(Icons.favorite, color: Colors.red[400], size: 18),
SizedBox( SizedBox(
height: 28, height: 28,
width: 42, width: 28,
child: TextButton( child: IconButton(
style: ButtonStyle( style: ButtonStyle(
padding: MaterialStateProperty.all(EdgeInsets.zero), padding: MaterialStateProperty.all(EdgeInsets.zero),
), ),
child: Text('回复', icon: Icon(
style: Theme.of(context) Icons.reply_outlined,
.textTheme size: 18,
.labelMedium! color: Theme.of(context).colorScheme.outline,
.copyWith(color: Theme.of(context).colorScheme.outline)), ),
// child: Text('回复',
// style: Theme.of(context)
// .textTheme
// .labelMedium!
// .copyWith(color: Theme.of(context).colorScheme.outline)),
onPressed: () { onPressed: () {
feedBack(); feedBack();
showModalBottomSheet( showModalBottomSheet(

12
lib/pages/video/detail/replyNew/view.dart
View File

@ -117,12 +117,12 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
height: sheetHeight, height: 400,
clipBehavior: Clip.hardEdge, clipBehavior: Clip.hardEdge,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: const BorderRadius.only( borderRadius: const BorderRadius.only(
topLeft: Radius.circular(16), topLeft: Radius.circular(12),
topRight: Radius.circular(16), topRight: Radius.circular(12),
), ),
color: Theme.of(context).colorScheme.background, color: Theme.of(context).colorScheme.background,
), ),
@ -143,7 +143,11 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
autofocus: false, autofocus: false,
focusNode: replyContentFocusNode, focusNode: replyContentFocusNode,
decoration: const InputDecoration( decoration: const InputDecoration(
hintText: "输入回复内容", border: InputBorder.none), hintText: "输入回复内容",
border: InputBorder.none,
hintStyle: TextStyle(
fontSize: 14,
)),
style: Theme.of(context).textTheme.bodyLarge, style: Theme.of(context).textTheme.bodyLarge,
), ),
), ),

36
lib/pages/video/detail/widgets/header_control.dart
View File

@ -27,7 +27,7 @@ class HeaderControl extends StatefulWidget implements PreferredSizeWidget {
class _HeaderControlState extends State<HeaderControl> { class _HeaderControlState extends State<HeaderControl> {
late PlayUrlModel videoInfo; late PlayUrlModel videoInfo;
List<PlaySpeed> playSpeed = PlaySpeed.values; List<PlaySpeed> playSpeed = PlaySpeed.values;
TextStyle subTitleStyle = const TextStyle(fontSize: 12);
Size get preferredSize => const Size(double.infinity, kToolbarHeight); Size get preferredSize => const Size(double.infinity, kToolbarHeight);
@override @override
@ -38,25 +38,20 @@ class _HeaderControlState extends State<HeaderControl> {
/// 设置面板 /// 设置面板
void showSettingSheet() { void showSettingSheet() {
TextStyle subTitleStyle =
TextStyle(fontSize: 12, color: Theme.of(context).colorScheme.outline);
showModalBottomSheet( showModalBottomSheet(
elevation: 0,
context: context, context: context,
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
builder: (_) { builder: (_) {
return Container( return Container(
width: double.infinity, width: double.infinity,
height: 420, height: 400,
clipBehavior: Clip.hardEdge, clipBehavior: Clip.hardEdge,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).colorScheme.background, color: Theme.of(context).colorScheme.background,
borderRadius: const BorderRadius.all(Radius.circular(12)), borderRadius: const BorderRadius.all(Radius.circular(12)),
), ),
margin: EdgeInsets.only( margin: const EdgeInsets.all(12),
left: 12,
right: 12,
bottom: MediaQuery.of(context).padding.bottom + 23,
),
child: Column( child: Column(
children: [ children: [
SizedBox( SizedBox(
@ -174,11 +169,7 @@ class _HeaderControlState extends State<HeaderControl> {
color: Theme.of(context).colorScheme.background, color: Theme.of(context).colorScheme.background,
borderRadius: const BorderRadius.all(Radius.circular(12)), borderRadius: const BorderRadius.all(Radius.circular(12)),
), ),
margin: EdgeInsets.only( margin: const EdgeInsets.all(12),
left: 12,
right: 12,
bottom: MediaQuery.of(context).padding.bottom,
),
child: Material( child: Material(
child: ListView( child: ListView(
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
@ -234,8 +225,6 @@ class _HeaderControlState extends State<HeaderControl> {
} }
} }
TextStyle subTitleStyle =
TextStyle(fontSize: 12, color: Theme.of(context).colorScheme.outline);
showModalBottomSheet( showModalBottomSheet(
context: context, context: context,
elevation: 0, elevation: 0,
@ -249,11 +238,7 @@ class _HeaderControlState extends State<HeaderControl> {
color: Theme.of(context).colorScheme.background, color: Theme.of(context).colorScheme.background,
borderRadius: const BorderRadius.all(Radius.circular(12)), borderRadius: const BorderRadius.all(Radius.circular(12)),
), ),
margin: EdgeInsets.only( margin: const EdgeInsets.all(12),
left: 12,
right: 12,
bottom: MediaQuery.of(context).padding.bottom,
),
child: Column( child: Column(
children: [ children: [
SizedBox( SizedBox(
@ -279,7 +264,6 @@ class _HeaderControlState extends State<HeaderControl> {
Expanded( Expanded(
child: Material( child: Material(
child: Scrollbar( child: Scrollbar(
thumbVisibility: true,
child: ListView( child: ListView(
children: [ children: [
for (var i = 0; i < totalQaSam; i++) ...[ for (var i = 0; i < totalQaSam; i++) ...[
@ -329,8 +313,6 @@ class _HeaderControlState extends State<HeaderControl> {
AudioQuality currentAudioQa = widget.videoDetailCtr!.currentAudioQa; AudioQuality currentAudioQa = widget.videoDetailCtr!.currentAudioQa;
List<AudioItem> audio = videoInfo.dash!.audio!; List<AudioItem> audio = videoInfo.dash!.audio!;
TextStyle subTitleStyle =
TextStyle(fontSize: 12, color: Theme.of(context).colorScheme.outline);
showModalBottomSheet( showModalBottomSheet(
context: context, context: context,
elevation: 0, elevation: 0,
@ -344,11 +326,7 @@ class _HeaderControlState extends State<HeaderControl> {
color: Theme.of(context).colorScheme.background, color: Theme.of(context).colorScheme.background,
borderRadius: const BorderRadius.all(Radius.circular(12)), borderRadius: const BorderRadius.all(Radius.circular(12)),
), ),
margin: EdgeInsets.only( margin: const EdgeInsets.all(12),
left: 12,
right: 12,
bottom: MediaQuery.of(context).padding.bottom,
),
child: Column( child: Column(
children: [ children: [
const SizedBox(height: 45, child: Center(child: Text('选择音质'))), const SizedBox(height: 45, child: Center(child: Text('选择音质'))),