diff --git a/lib/common/widgets/video_card_h.dart b/lib/common/widgets/video_card_h.dart index 868280bb..a59b93a1 100644 --- a/lib/common/widgets/video_card_h.dart +++ b/lib/common/widgets/video_card_h.dart @@ -178,43 +178,49 @@ class VideoContent extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ if (videoItem.title is String) ...[ - Text( - videoItem.title as String, - textAlign: TextAlign.start, - style: TextStyle( - fontWeight: FontWeight.w500, - fontSize: Theme.of(context).textTheme.bodyMedium!.fontSize, - height: 1.4, - letterSpacing: 0.3, + Expanded( + child: Text( + videoItem.title as String, + textAlign: TextAlign.start, + style: TextStyle( + fontWeight: FontWeight.w500, + fontSize: Theme.of(context).textTheme.bodyMedium!.fontSize, + height: 1.36, + letterSpacing: 0.3, + ), + maxLines: 3, + overflow: TextOverflow.ellipsis, ), - maxLines: 2, - overflow: TextOverflow.ellipsis, ), ] else ...[ - RichText( - overflow: TextOverflow.ellipsis, - maxLines: 2, - text: TextSpan( - children: [ - for (final i in videoItem.title) ...[ - TextSpan( - text: i['text'] as String, - style: TextStyle( - fontWeight: FontWeight.w500, - fontSize: - Theme.of(context).textTheme.bodyMedium!.fontSize, - letterSpacing: 0.3, - color: i['type'] == 'em' - ? Theme.of(context).colorScheme.primary - : Theme.of(context).colorScheme.onSurface, + Expanded( + child: RichText( + overflow: TextOverflow.ellipsis, + maxLines: 3, + text: TextSpan( + children: [ + for (final i in videoItem.title) ...[ + TextSpan( + text: i['text'] as String, + style: TextStyle( + fontWeight: FontWeight.w500, + fontSize: Theme.of(context) + .textTheme + .bodyMedium! + .fontSize, + letterSpacing: 0.3, + color: i['type'] == 'em' + ? Theme.of(context).colorScheme.primary + : Theme.of(context).colorScheme.onSurface, + ), ), - ), - ] - ], + ] + ], + ), ), ), ], - const Spacer(), + // const Spacer(), // if (videoItem.rcmdReason != null && // videoItem.rcmdReason.content != '') // Container( @@ -239,14 +245,14 @@ class VideoContent extends StatelessWidget { "${pubdate}${showOwner ? videoItem.owner.name : ''}", maxLines: 1, style: TextStyle( - fontSize: 11, + fontSize: Theme.of(context).textTheme.labelSmall!.fontSize, height: 1, color: Theme.of(context).colorScheme.outline, overflow: TextOverflow.clip, ), ), ), - const SizedBox(height: 4), + const SizedBox(height: 3), Row( children: [ if (showView) ...[ @@ -265,7 +271,6 @@ class VideoContent extends StatelessWidget { if (source == 'normal') const SizedBox(width: 24), ], ), - const SizedBox(height: 5), ], ), ), diff --git a/lib/pages/fav/view.dart b/lib/pages/fav/view.dart index 920be10b..69a4a577 100644 --- a/lib/pages/fav/view.dart +++ b/lib/pages/fav/view.dart @@ -73,7 +73,7 @@ class _FavPageState extends State { mainAxisSpacing: StyleString.cardSpace, crossAxisSpacing: StyleString.safeSpace, maxCrossAxisExtent: Grid.maxRowWidth * 2, - childAspectRatio: StyleString.aspectRatio * 2.3, + childAspectRatio: StyleString.aspectRatio * 2.4, mainAxisExtent: 0), delegate: SliverChildBuilderDelegate( childCount: @@ -107,7 +107,7 @@ class _FavPageState extends State { mainAxisSpacing: StyleString.cardSpace, crossAxisSpacing: StyleString.safeSpace, maxCrossAxisExtent: Grid.maxRowWidth * 2, - childAspectRatio: StyleString.aspectRatio * 2.3, + childAspectRatio: StyleString.aspectRatio * 2.4, mainAxisExtent: 0), delegate: SliverChildBuilderDelegate( (BuildContext context, int index) { diff --git a/lib/pages/fav_detail/view.dart b/lib/pages/fav_detail/view.dart index 360884f3..8e488c95 100644 --- a/lib/pages/fav_detail/view.dart +++ b/lib/pages/fav_detail/view.dart @@ -220,7 +220,7 @@ class _FavDetailPageState extends State { crossAxisSpacing: StyleString.safeSpace, maxCrossAxisExtent: Grid.maxRowWidth * 2, childAspectRatio: - StyleString.aspectRatio * 2.3, + StyleString.aspectRatio * 2.4, mainAxisExtent: 0), delegate: SliverChildBuilderDelegate((context, index) { @@ -246,7 +246,7 @@ class _FavDetailPageState extends State { mainAxisSpacing: StyleString.cardSpace, crossAxisSpacing: StyleString.safeSpace, maxCrossAxisExtent: Grid.maxRowWidth * 2, - childAspectRatio: StyleString.aspectRatio * 2.3, + childAspectRatio: StyleString.aspectRatio * 2.4, mainAxisExtent: 0), delegate: SliverChildBuilderDelegate((context, index) { return const VideoCardHSkeleton(); diff --git a/lib/pages/history/view.dart b/lib/pages/history/view.dart index a921f23e..d743b8f3 100644 --- a/lib/pages/history/view.dart +++ b/lib/pages/history/view.dart @@ -199,7 +199,7 @@ class _HistoryPageState extends State { crossAxisSpacing: StyleString.safeSpace, maxCrossAxisExtent: Grid.maxRowWidth * 2, childAspectRatio: - StyleString.aspectRatio * 2.3, + StyleString.aspectRatio * 2.4, mainAxisExtent: 0), delegate: SliverChildBuilderDelegate( (context, index) { @@ -233,7 +233,7 @@ class _HistoryPageState extends State { mainAxisSpacing: StyleString.cardSpace, crossAxisSpacing: StyleString.safeSpace, maxCrossAxisExtent: Grid.maxRowWidth * 2, - childAspectRatio: StyleString.aspectRatio * 2.3, + childAspectRatio: StyleString.aspectRatio * 2.4, mainAxisExtent: 0), delegate: SliverChildBuilderDelegate((context, index) { return const VideoCardHSkeleton(); diff --git a/lib/pages/history_search/view.dart b/lib/pages/history_search/view.dart index b63b0ee4..f3ddc304 100644 --- a/lib/pages/history_search/view.dart +++ b/lib/pages/history_search/view.dart @@ -90,7 +90,7 @@ class _HistorySearchPageState extends State { mainAxisSpacing: StyleString.cardSpace, crossAxisSpacing: StyleString.safeSpace, maxCrossAxisExtent: Grid.maxRowWidth * 2, - childAspectRatio: StyleString.aspectRatio * 2.3, + childAspectRatio: StyleString.aspectRatio * 2.4, mainAxisExtent: 0), delegate: SliverChildBuilderDelegate( (context, index) { diff --git a/lib/pages/hot/view.dart b/lib/pages/hot/view.dart index c28c2341..b02f6961 100644 --- a/lib/pages/hot/view.dart +++ b/lib/pages/hot/view.dart @@ -96,7 +96,7 @@ class _HotPageState extends State with AutomaticKeepAliveClientMixin { mainAxisSpacing: StyleString.safeSpace, crossAxisSpacing: StyleString.safeSpace, maxCrossAxisExtent: Grid.maxRowWidth * 2, - childAspectRatio: StyleString.aspectRatio * 2.3, + childAspectRatio: StyleString.aspectRatio * 2.4, mainAxisExtent: 0), delegate: SliverChildBuilderDelegate((context, index) { return VideoCardH( @@ -133,7 +133,7 @@ class _HotPageState extends State with AutomaticKeepAliveClientMixin { mainAxisSpacing: StyleString.cardSpace, crossAxisSpacing: StyleString.cardSpace, maxCrossAxisExtent: Grid.maxRowWidth * 2, - childAspectRatio: StyleString.aspectRatio * 2.3), + childAspectRatio: StyleString.aspectRatio * 2.4), delegate: SliverChildBuilderDelegate((context, index) { return const VideoCardHSkeleton(); }, childCount: 10), diff --git a/lib/pages/later/view.dart b/lib/pages/later/view.dart index 9a804926..cc0bc739 100644 --- a/lib/pages/later/view.dart +++ b/lib/pages/later/view.dart @@ -92,7 +92,7 @@ class _LaterPageState extends State { maxCrossAxisExtent: Grid.maxRowWidth * 2, childAspectRatio: - StyleString.aspectRatio * 2.3, + StyleString.aspectRatio * 2.4, mainAxisExtent: 0), delegate: SliverChildBuilderDelegate( (context, index) { @@ -130,7 +130,7 @@ class _LaterPageState extends State { mainAxisSpacing: StyleString.safeSpace, crossAxisSpacing: StyleString.safeSpace, maxCrossAxisExtent: Grid.maxRowWidth * 2, - childAspectRatio: StyleString.aspectRatio * 2.3, + childAspectRatio: StyleString.aspectRatio * 2.4, mainAxisExtent: 0), delegate: SliverChildBuilderDelegate((context, index) { return const VideoCardHSkeleton(); diff --git a/lib/pages/member_archive/view.dart b/lib/pages/member_archive/view.dart index 4b84f96d..fcce7a6e 100644 --- a/lib/pages/member_archive/view.dart +++ b/lib/pages/member_archive/view.dart @@ -86,7 +86,7 @@ class _MemberArchivePageState extends State { maxCrossAxisExtent: Grid.maxRowWidth * 2, childAspectRatio: - StyleString.aspectRatio * 2.3, + StyleString.aspectRatio * 2.4, mainAxisExtent: 0), delegate: SliverChildBuilderDelegate( (BuildContext context, index) { diff --git a/lib/pages/member_search/view.dart b/lib/pages/member_search/view.dart index c132c2f9..636105de 100644 --- a/lib/pages/member_search/view.dart +++ b/lib/pages/member_search/view.dart @@ -116,7 +116,7 @@ class _MemberSearchPageState extends State maxCrossAxisExtent: Grid.maxRowWidth * 2, childAspectRatio: - StyleString.aspectRatio * 2.3, + StyleString.aspectRatio * 2.4, mainAxisExtent: 0), delegate: SliverChildBuilderDelegate( (context, index) { @@ -164,7 +164,7 @@ class _MemberSearchPageState extends State crossAxisSpacing: StyleString.safeSpace, maxCrossAxisExtent: Grid.maxRowWidth * 2, childAspectRatio: - StyleString.aspectRatio * 2.3, + StyleString.aspectRatio * 2.4, mainAxisExtent: 0), delegate: SliverChildBuilderDelegate((context, index) { diff --git a/lib/pages/rank/zone/view.dart b/lib/pages/rank/zone/view.dart index b9eb7ee6..261cdb5a 100644 --- a/lib/pages/rank/zone/view.dart +++ b/lib/pages/rank/zone/view.dart @@ -98,8 +98,8 @@ class _ZonePageState extends State mainAxisSpacing: StyleString.safeSpace, crossAxisSpacing: StyleString.safeSpace, maxCrossAxisExtent: Grid.maxRowWidth * 2, - childAspectRatio: StyleString.aspectRatio * 2.3, - mainAxisExtent: 0), + childAspectRatio: StyleString.aspectRatio * 2.4, + mainAxisExtent: 13), delegate: SliverChildBuilderDelegate((context, index) { return VideoCardH( videoItem: _zoneController.videoList[index], @@ -135,7 +135,7 @@ class _ZonePageState extends State mainAxisSpacing: StyleString.safeSpace, crossAxisSpacing: StyleString.safeSpace, maxCrossAxisExtent: Grid.maxRowWidth * 2, - childAspectRatio: StyleString.aspectRatio * 2.3, + childAspectRatio: StyleString.aspectRatio * 2.4, mainAxisExtent: 0), delegate: SliverChildBuilderDelegate((context, index) { return const VideoCardHSkeleton(); diff --git a/lib/pages/search_panel/view.dart b/lib/pages/search_panel/view.dart index a9fea647..1807dd6c 100644 --- a/lib/pages/search_panel/view.dart +++ b/lib/pages/search_panel/view.dart @@ -142,7 +142,7 @@ class _SearchPanelState extends State mainAxisSpacing: StyleString.safeSpace, crossAxisSpacing: StyleString.safeSpace, maxCrossAxisExtent: Grid.maxRowWidth * 2, - childAspectRatio: StyleString.aspectRatio * 2.3, + childAspectRatio: StyleString.aspectRatio * 2.4, mainAxisExtent: 0), delegate: SliverChildBuilderDelegate( (context, index) { diff --git a/lib/pages/search_panel/widgets/article_panel.dart b/lib/pages/search_panel/widgets/article_panel.dart index 2473fa77..64c9d4c0 100644 --- a/lib/pages/search_panel/widgets/article_panel.dart +++ b/lib/pages/search_panel/widgets/article_panel.dart @@ -16,7 +16,7 @@ Widget searchArticlePanel(BuildContext context, ctr, list) { mainAxisSpacing: StyleString.safeSpace, crossAxisSpacing: StyleString.safeSpace, maxCrossAxisExtent: Grid.maxRowWidth * 2, - childAspectRatio: StyleString.aspectRatio * 2.3, + childAspectRatio: StyleString.aspectRatio * 2.4, mainAxisExtent: 0), delegate: SliverChildBuilderDelegate( (BuildContext context, int index) { diff --git a/lib/pages/search_panel/widgets/video_panel.dart b/lib/pages/search_panel/widgets/video_panel.dart index ca0e980b..67a1d9fc 100644 --- a/lib/pages/search_panel/widgets/video_panel.dart +++ b/lib/pages/search_panel/widgets/video_panel.dart @@ -92,7 +92,7 @@ class SearchVideoPanel extends StatelessWidget { mainAxisSpacing: StyleString.safeSpace, crossAxisSpacing: StyleString.safeSpace, maxCrossAxisExtent: Grid.maxRowWidth * 2, - childAspectRatio: StyleString.aspectRatio * 2.3, + childAspectRatio: StyleString.aspectRatio * 2.4, mainAxisExtent: 0), delegate: SliverChildBuilderDelegate( (BuildContext context, int index) { diff --git a/lib/pages/subscription/view.dart b/lib/pages/subscription/view.dart index e0cd7ce4..001f2382 100644 --- a/lib/pages/subscription/view.dart +++ b/lib/pages/subscription/view.dart @@ -62,7 +62,7 @@ class _SubPageState extends State { mainAxisSpacing: StyleString.cardSpace, crossAxisSpacing: StyleString.safeSpace, maxCrossAxisExtent: Grid.maxRowWidth * 2, - childAspectRatio: StyleString.aspectRatio * 2.3, + childAspectRatio: StyleString.aspectRatio * 2.4, mainAxisExtent: 0), delegate: SliverChildBuilderDelegate( childCount: diff --git a/lib/pages/video/detail/related/view.dart b/lib/pages/video/detail/related/view.dart index 770370c4..fe56733b 100644 --- a/lib/pages/video/detail/related/view.dart +++ b/lib/pages/video/detail/related/view.dart @@ -52,7 +52,7 @@ class _RelatedVideoPanelState extends State mainAxisSpacing: StyleString.safeSpace, crossAxisSpacing: StyleString.safeSpace, maxCrossAxisExtent: Grid.maxRowWidth * 2, - childAspectRatio: StyleString.aspectRatio * 2.3, + childAspectRatio: StyleString.aspectRatio * 2.4, mainAxisExtent: 0), delegate: SliverChildBuilderDelegate((context, index) { if (index == relatedVideoList.length) { @@ -94,7 +94,7 @@ class _RelatedVideoPanelState extends State mainAxisSpacing: StyleString.safeSpace, crossAxisSpacing: StyleString.safeSpace, maxCrossAxisExtent: Grid.maxRowWidth * 2, - childAspectRatio: StyleString.aspectRatio * 2.3, + childAspectRatio: StyleString.aspectRatio * 2.4, mainAxisExtent: 0), delegate: SliverChildBuilderDelegate((context, index) { return const VideoCardHSkeleton();