diff --git a/lib/common/widgets/stat/danmu.dart b/lib/common/widgets/stat/danmu.dart index d8deb3e2c..55a3b491b 100644 --- a/lib/common/widgets/stat/danmu.dart +++ b/lib/common/widgets/stat/danmu.dart @@ -17,7 +17,8 @@ class StatDanMu extends StatelessWidget { return Row( children: [ Icon( - CupertinoIcons.ellipses_bubble, + // CupertinoIcons.ellipses_bubble, + Icons.subtitles_outlined, size: 14, color: color, ), diff --git a/lib/common/widgets/stat/view.dart b/lib/common/widgets/stat/view.dart index 302ceee67..55d8a3392 100644 --- a/lib/common/widgets/stat/view.dart +++ b/lib/common/widgets/stat/view.dart @@ -17,7 +17,8 @@ class StatView extends StatelessWidget { return Row( children: [ Icon( - CupertinoIcons.play_rectangle, + // CupertinoIcons.play_rectangle, + Icons.play_circle_outlined, size: 13, color: color, ), diff --git a/lib/common/widgets/video_card_h.dart b/lib/common/widgets/video_card_h.dart index 8b885e42d..5d48f0225 100644 --- a/lib/common/widgets/video_card_h.dart +++ b/lib/common/widgets/video_card_h.dart @@ -3,6 +3,7 @@ import 'package:get/get.dart'; import 'package:flutter/material.dart'; import 'package:pilipala/common/constants.dart'; import 'package:pilipala/common/widgets/badge.dart'; +import 'package:pilipala/common/widgets/stat/danmu.dart'; import 'package:pilipala/common/widgets/stat/view.dart'; import 'package:pilipala/http/search.dart'; import 'package:pilipala/utils/utils.dart'; @@ -53,7 +54,7 @@ class VideoCardH extends StatelessWidget { children: [ Padding( padding: const EdgeInsets.fromLTRB( - StyleString.cardSpace, 7, StyleString.cardSpace, 7), + StyleString.safeSpace, 6, StyleString.safeSpace, 6), child: LayoutBuilder( builder: (context, boxConstraints) { double width = @@ -125,7 +126,7 @@ class VideoContent extends StatelessWidget { Widget build(BuildContext context) { return Expanded( child: Padding( - padding: const EdgeInsets.fromLTRB(10, 2, 6, 0), + padding: const EdgeInsets.fromLTRB(10, 4, 6, 2), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -191,6 +192,7 @@ class VideoContent extends StatelessWidget { ), ], ), + const SizedBox(height: 3), Row( children: [ StatView( @@ -198,12 +200,16 @@ class VideoContent extends StatelessWidget { view: videoItem.stat.view, ), const SizedBox(width: 8), - Text( - Utils.dateFormat(videoItem.pubdate!), - style: TextStyle( - fontSize: 11, - color: Theme.of(context).colorScheme.outline), - ) + StatDanMu( + theme: 'gray', + danmu: videoItem.stat.danmaku, + ), + // Text( + // Utils.dateFormat(videoItem.pubdate!), + // style: TextStyle( + // fontSize: 11, + // color: Theme.of(context).colorScheme.outline), + // ) ], ), ], diff --git a/lib/common/widgets/video_card_v.dart b/lib/common/widgets/video_card_v.dart index cd8793761..a461e09e1 100644 --- a/lib/common/widgets/video_card_v.dart +++ b/lib/common/widgets/video_card_v.dart @@ -27,9 +27,9 @@ class VideoCardV extends StatelessWidget { return Card( elevation: 0, clipBehavior: Clip.hardEdge, - // shape: RoundedRectangleBorder( - // borderRadius: StyleString.mdRadius, - // ), + shape: RoundedRectangleBorder( + borderRadius: StyleString.mdRadius, + ), margin: EdgeInsets.zero, child: GestureDetector( onLongPress: () { @@ -52,6 +52,7 @@ class VideoCardV extends StatelessWidget { child: Column( children: [ Container( + clipBehavior: Clip.hardEdge, decoration: const BoxDecoration( borderRadius: BorderRadius.only( topLeft: StyleString.imgRadius, @@ -78,20 +79,20 @@ class VideoCardV extends StatelessWidget { height: maxHeight, ), ), - // Positioned( - // left: 0, - // right: 0, - // bottom: 0, - // child: AnimatedOpacity( - // opacity: 1, - // duration: const Duration(milliseconds: 200), - // child: VideoStat( - // view: videoItem.stat.view, - // danmaku: videoItem.stat.danmaku, - // duration: videoItem.duration, - // ), - // ), - // ), + Positioned( + left: 0, + right: 0, + bottom: 0, + child: AnimatedOpacity( + opacity: 1, + duration: const Duration(milliseconds: 200), + child: VideoStat( + view: videoItem.stat.view, + danmaku: videoItem.stat.danmaku, + duration: videoItem.duration, + ), + ), + ), ], ); }), @@ -114,7 +115,7 @@ class VideoContent extends StatelessWidget { return Expanded( child: Padding( // 多列 - padding: const EdgeInsets.fromLTRB(4, 6, 6, 7), + padding: const EdgeInsets.fromLTRB(4, 5, 6, 8), // 单列 // padding: const EdgeInsets.fromLTRB(14, 10, 4, 8), child: Column( @@ -220,7 +221,7 @@ class VideoStat extends StatelessWidget { Widget build(BuildContext context) { return Container( height: 45, - padding: const EdgeInsets.only(top: 22, left: 8, right: 8), + padding: const EdgeInsets.only(top: 22, left: 8, right: 10), decoration: const BoxDecoration( gradient: LinearGradient( begin: Alignment.topCenter, diff --git a/lib/pages/live/view.dart b/lib/pages/live/view.dart index 8c7330004..47eb1baf9 100644 --- a/lib/pages/live/view.dart +++ b/lib/pages/live/view.dart @@ -99,7 +99,7 @@ class _LivePageState extends State { // 行间距 mainAxisSpacing: StyleString.cardSpace + 2, // 列间距 - crossAxisSpacing: StyleString.cardSpace, + crossAxisSpacing: StyleString.cardSpace + 2, // 列数 crossAxisCount: ctr.crossAxisCount, mainAxisExtent: diff --git a/lib/pages/live/widgets/live_item.dart b/lib/pages/live/widgets/live_item.dart index e589ea2d8..e34a82820 100644 --- a/lib/pages/live/widgets/live_item.dart +++ b/lib/pages/live/widgets/live_item.dart @@ -92,7 +92,7 @@ class LiveContent extends StatelessWidget { return Expanded( child: Padding( // 多列 - padding: const EdgeInsets.fromLTRB(4, 6, 6, 4), + padding: const EdgeInsets.fromLTRB(4, 5, 6, 4), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/lib/pages/rcmd/view.dart b/lib/pages/rcmd/view.dart index 102574615..117b06925 100644 --- a/lib/pages/rcmd/view.dart +++ b/lib/pages/rcmd/view.dart @@ -101,7 +101,7 @@ class _RcmdPageState extends State // 行间距 mainAxisSpacing: StyleString.cardSpace + 2, // 列间距 - crossAxisSpacing: StyleString.cardSpace, + crossAxisSpacing: StyleString.cardSpace + 2, // 列数 crossAxisCount: ctr.crossAxisCount, mainAxisExtent: