From e13f3752467c9066abe481c8c9fe0e52ee9a5201 Mon Sep 17 00:00:00 2001 From: orz12 Date: Fri, 22 Mar 2024 02:12:48 +0800 Subject: [PATCH] =?UTF-8?q?mod:=20=E9=A6=96=E9=A1=B5=E9=97=B4=E8=B7=9D?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=81=E5=BC=B1=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common/widgets/badge.dart | 2 +- lib/common/widgets/stat/danmu.dart | 4 ++-- lib/common/widgets/stat/view.dart | 4 ++-- lib/common/widgets/video_card_v.dart | 10 +++++----- lib/pages/live/view.dart | 6 +++--- lib/pages/rcmd/view.dart | 7 +++---- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/lib/common/widgets/badge.dart b/lib/common/widgets/badge.dart index 2ac6486b..439b5083 100644 --- a/lib/common/widgets/badge.dart +++ b/lib/common/widgets/badge.dart @@ -40,7 +40,7 @@ class PBadge extends StatelessWidget { color = Colors.white; } if (type == 'color') { - bgColor = t.primaryContainer.withOpacity(0.6); + bgColor = t.primaryContainer.withOpacity(0.5); color = t.primary; } if (type == 'line') { diff --git a/lib/common/widgets/stat/danmu.dart b/lib/common/widgets/stat/danmu.dart index e5803d6b..155c2f31 100644 --- a/lib/common/widgets/stat/danmu.dart +++ b/lib/common/widgets/stat/danmu.dart @@ -13,8 +13,8 @@ class StatDanMu extends StatelessWidget { Widget build(BuildContext context) { Map colorObject = { 'white': Colors.white, - 'gray': Theme.of(context).colorScheme.outline, - 'black': Theme.of(context).colorScheme.onBackground.withOpacity(0.8), + 'gray': Theme.of(context).colorScheme.outline.withOpacity(0.8), + 'black': Theme.of(context).colorScheme.onBackground.withOpacity(0.7), }; Color color = colorObject[theme]!; return Row( diff --git a/lib/common/widgets/stat/view.dart b/lib/common/widgets/stat/view.dart index 9c6f92a5..280844f1 100644 --- a/lib/common/widgets/stat/view.dart +++ b/lib/common/widgets/stat/view.dart @@ -14,8 +14,8 @@ class StatView extends StatelessWidget { Widget build(BuildContext context) { Map colorObject = { 'white': Colors.white, - 'gray': Theme.of(context).colorScheme.outline, - 'black': Theme.of(context).colorScheme.onBackground.withOpacity(0.8), + 'gray': Theme.of(context).colorScheme.outline.withOpacity(0.8), + 'black': Theme.of(context).colorScheme.onBackground.withOpacity(0.7), }; Color color = colorObject[theme]!; return Row( diff --git a/lib/common/widgets/video_card_v.dart b/lib/common/widgets/video_card_v.dart index 61a9e7ba..e72a51e5 100644 --- a/lib/common/widgets/video_card_v.dart +++ b/lib/common/widgets/video_card_v.dart @@ -189,7 +189,7 @@ class VideoCardV extends StatelessWidget { if (videoItem.goto == 'av') Positioned( right: 0, - bottom: 1, + bottom: 0, child: VideoPopupMenu( size: 30, iconSize: 16, @@ -206,7 +206,7 @@ class VideoContent extends StatelessWidget { Widget build(BuildContext context) { return Expanded( child: Padding( - padding: const EdgeInsets.fromLTRB(5, 8, 5, 4), + padding: const EdgeInsets.fromLTRB(6, 5, 6, 5), child: Column( crossAxisAlignment: CrossAxisAlignment.start, // mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -219,7 +219,7 @@ class VideoContent extends StatelessWidget { maxLines: 2, overflow: TextOverflow.ellipsis, style: const TextStyle( - height: 1.42, + height: 1.38, )), ), ], @@ -268,7 +268,7 @@ class VideoContent extends StatelessWidget { Expanded( flex: 1, child: Text( - videoItem.owner.name, + videoItem.owner.name.toString(), // semanticsLabel: "Up主：${videoItem.owner.name}", maxLines: 1, overflow: TextOverflow.clip, @@ -321,7 +321,7 @@ class VideoStat extends StatelessWidget { text: TextSpan( style: TextStyle( fontSize: Theme.of(context).textTheme.labelSmall!.fontSize, - color: Theme.of(context).colorScheme.outline, + color: Theme.of(context).colorScheme.outline.withOpacity(0.8), ), text: Utils.formatTimestampToRelativeTime(videoItem.pubdate)), ), diff --git a/lib/pages/live/view.dart b/lib/pages/live/view.dart index 033b39a5..f1104d4d 100644 --- a/lib/pages/live/view.dart +++ b/lib/pages/live/view.dart @@ -76,7 +76,7 @@ class _LivePageState extends State return Container( clipBehavior: Clip.hardEdge, margin: const EdgeInsets.only( - left: StyleString.safeSpace, right: StyleString.safeSpace), + left: StyleString.cardSpace, right: StyleString.cardSpace), decoration: const BoxDecoration( borderRadius: BorderRadius.all(StyleString.imgRadius), ), @@ -143,9 +143,9 @@ class _LivePageState extends State return SliverGrid( gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent( // 行间距 - mainAxisSpacing: StyleString.safeSpace, + mainAxisSpacing: StyleString.cardSpace, // 列间距 - crossAxisSpacing: StyleString.safeSpace, + crossAxisSpacing: StyleString.cardSpace, // 最大宽度 maxCrossAxisExtent: Grid.maxRowWidth, mainAxisExtent: Grid.calculateActualWidth(context, Grid.maxRowWidth, StyleString.safeSpace) / StyleString.aspectRatio+ diff --git a/lib/pages/rcmd/view.dart b/lib/pages/rcmd/view.dart index cc07e7e7..a0ea6e12 100644 --- a/lib/pages/rcmd/view.dart +++ b/lib/pages/rcmd/view.dart @@ -90,7 +90,7 @@ class _RcmdPageState extends State slivers: [ SliverPadding( padding: - const EdgeInsets.fromLTRB(0, StyleString.safeSpace, 0, 0), + const EdgeInsets.fromLTRB(0, StyleString.cardSpace, 0, 0), sliver: FutureBuilder( future: _futureBuilderFuture, builder: (context, snapshot) { @@ -145,19 +145,18 @@ class _RcmdPageState extends State } Widget contentGrid(ctr, videoList) { - return SliverGrid( gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent( // 行间距 mainAxisSpacing: StyleString.cardSpace, // 列间距 - crossAxisSpacing: StyleString.safeSpace, + crossAxisSpacing: StyleString.cardSpace, // 最大宽度 maxCrossAxisExtent: Grid.maxRowWidth, mainAxisExtent: Grid.calculateActualWidth( context, Grid.maxRowWidth, StyleString.safeSpace) / StyleString.aspectRatio + - MediaQuery.textScalerOf(context).scale(92), + MediaQuery.textScalerOf(context).scale(90), ), delegate: SliverChildBuilderDelegate( (BuildContext context, int index) {