From 8498ea0618451af9e0ba246d0480328efad302f8 Mon Sep 17 00:00:00 2001 From: bggRGjQaUbCoE Date: Mon, 25 Aug 2025 18:11:40 +0800 Subject: [PATCH] tweak Signed-off-by: bggRGjQaUbCoE --- lib/pages/live/view.dart | 1 + lib/pages/member_home/view.dart | 2 +- lib/pages/member_pgc/view.dart | 2 +- lib/pages/mine/view.dart | 90 +++++++++++---------- lib/pages/pgc/view.dart | 2 +- lib/pages/pgc_index/view.dart | 2 +- lib/pages/video/introduction/pgc/view.dart | 1 + lib/pages/video/introduction/ugc/view.dart | 1 + lib/pages/video/widgets/header_control.dart | 1 + 9 files changed, 55 insertions(+), 47 deletions(-) diff --git a/lib/pages/live/view.dart b/lib/pages/live/view.dart index 0d95c481f..c101c05d6 100644 --- a/lib/pages/live/view.dart +++ b/lib/pages/live/view.dart @@ -279,6 +279,7 @@ class _LivePageState extends CommonPageState Widget _buildFollowBody(ThemeData theme, List followList) { return SelfSizedHorizontalList( gapSize: 5, + padding: EdgeInsets.zero, childBuilder: (index) { final item = followList[index]; return SizedBox( diff --git a/lib/pages/member_home/view.dart b/lib/pages/member_home/view.dart index 2b786ee6a..ac430320a 100644 --- a/lib/pages/member_home/view.dart +++ b/lib/pages/member_home/view.dart @@ -61,7 +61,7 @@ class _MemberHomeState extends State late final gridDelegatePgc = SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: StyleString.cardSpace, crossAxisSpacing: StyleString.cardSpace, - maxCrossAxisExtent: Grid.smallCardWidth / 3 * 2, + maxCrossAxisExtent: Grid.smallCardWidth * 0.6, childAspectRatio: 0.75, mainAxisExtent: MediaQuery.textScalerOf(context).scale(52), ); diff --git a/lib/pages/member_pgc/view.dart b/lib/pages/member_pgc/view.dart index ddcd550cd..90eeb58b1 100644 --- a/lib/pages/member_pgc/view.dart +++ b/lib/pages/member_pgc/view.dart @@ -63,7 +63,7 @@ class _MemberBangumiState extends State late final gridDelegate = SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: StyleString.cardSpace, crossAxisSpacing: StyleString.cardSpace, - maxCrossAxisExtent: Grid.smallCardWidth / 3 * 2, + maxCrossAxisExtent: Grid.smallCardWidth * 0.6, childAspectRatio: 0.75, mainAxisExtent: MediaQuery.textScalerOf(context).scale(52), ); diff --git a/lib/pages/mine/view.dart b/lib/pages/mine/view.dart index c017a6969..489cf32b9 100644 --- a/lib/pages/mine/view.dart +++ b/lib/pages/mine/view.dart @@ -85,28 +85,30 @@ class _MediaPageState extends CommonPageState mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: controller.list .map( - (e) => InkWell( - onTap: e.onTap, - borderRadius: StyleString.mdRadius, - child: ConstrainedBox( - constraints: const BoxConstraints(maxWidth: 80), - child: AspectRatio( - aspectRatio: 1, - child: Column( - spacing: 6, - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - size: 22, - e.icon, - color: primary, - ), - Text( - e.title, - style: const TextStyle(fontSize: 13), - ), - ], + (e) => Flexible( + child: InkWell( + onTap: e.onTap, + borderRadius: StyleString.mdRadius, + child: ConstrainedBox( + constraints: const BoxConstraints(maxWidth: 80), + child: AspectRatio( + aspectRatio: 1, + child: Column( + spacing: 6, + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon( + size: 22, + e.icon, + color: primary, + ), + Text( + e.title, + style: const TextStyle(fontSize: 13), + ), + ], + ), ), ), ), @@ -378,27 +380,29 @@ class _MediaPageState extends CommonPageState required TextStyle? lebelStyle, required VoidCallback onTap, }) { - return InkWell( - onTap: onTap, - borderRadius: StyleString.mdRadius, - child: ConstrainedBox( - constraints: const BoxConstraints(maxWidth: 80), - child: AspectRatio( - aspectRatio: 1, - child: Column( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - count?.toString() ?? '-', - style: countStyle, - ), - const SizedBox(height: 4), - Text( - name, - style: lebelStyle, - ), - ], + return Flexible( + child: InkWell( + onTap: onTap, + borderRadius: StyleString.mdRadius, + child: ConstrainedBox( + constraints: const BoxConstraints(maxWidth: 80), + child: AspectRatio( + aspectRatio: 1, + child: Column( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + count?.toString() ?? '-', + style: countStyle, + ), + const SizedBox(height: 4), + Text( + name, + style: lebelStyle, + ), + ], + ), ), ), ), diff --git a/lib/pages/pgc/view.dart b/lib/pages/pgc/view.dart index efe46c0b1..1f9d6a2ee 100644 --- a/lib/pages/pgc/view.dart +++ b/lib/pages/pgc/view.dart @@ -318,7 +318,7 @@ class _PgcPageState extends CommonPageState late final gridDelegate = SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: StyleString.cardSpace, crossAxisSpacing: StyleString.cardSpace, - maxCrossAxisExtent: Grid.smallCardWidth / 3 * 2, + maxCrossAxisExtent: Grid.smallCardWidth * 0.6, childAspectRatio: 0.75, mainAxisExtent: MediaQuery.textScalerOf(context).scale(50), ); diff --git a/lib/pages/pgc_index/view.dart b/lib/pages/pgc_index/view.dart index 800d4d104..1a27c106f 100644 --- a/lib/pages/pgc_index/view.dart +++ b/lib/pages/pgc_index/view.dart @@ -216,7 +216,7 @@ class _PgcIndexPageState extends State late final gridDelegate = SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: StyleString.cardSpace, crossAxisSpacing: StyleString.cardSpace, - maxCrossAxisExtent: Grid.smallCardWidth / 3 * 2, + maxCrossAxisExtent: Grid.smallCardWidth * 0.6, childAspectRatio: 0.75, mainAxisExtent: MediaQuery.textScalerOf(context).scale(50), ); diff --git a/lib/pages/video/introduction/pgc/view.dart b/lib/pages/video/introduction/pgc/view.dart index 97e35256d..bb4aa1fcf 100644 --- a/lib/pages/video/introduction/pgc/view.dart +++ b/lib/pages/video/introduction/pgc/view.dart @@ -409,6 +409,7 @@ class _PgcIntroPageState extends TripleState return SizedBox( height: 48, child: Row( + crossAxisAlignment: CrossAxisAlignment.start, children: [ Obx( () => ActionItem( diff --git a/lib/pages/video/introduction/ugc/view.dart b/lib/pages/video/introduction/ugc/view.dart index 2ed74967a..204e3bbe0 100644 --- a/lib/pages/video/introduction/ugc/view.dart +++ b/lib/pages/video/introduction/ugc/view.dart @@ -507,6 +507,7 @@ class _UgcIntroPanelState extends TripleState return SizedBox( height: 48, child: Row( + crossAxisAlignment: CrossAxisAlignment.start, children: [ Obx( () => ActionItem( diff --git a/lib/pages/video/widgets/header_control.dart b/lib/pages/video/widgets/header_control.dart index a713f463e..a66e8a51c 100644 --- a/lib/pages/video/widgets/header_control.dart +++ b/lib/pages/video/widgets/header_control.dart @@ -2272,6 +2272,7 @@ class HeaderControlState extends TripleState { if (showFSActionItem && isFullScreen) Row( mainAxisAlignment: MainAxisAlignment.end, + crossAxisAlignment: CrossAxisAlignment.start, children: [ SizedBox( width: 42,