diff --git a/lib/pages/bangumi/view.dart b/lib/pages/bangumi/view.dart index ff4c046f7..25cdd3882 100644 --- a/lib/pages/bangumi/view.dart +++ b/lib/pages/bangumi/view.dart @@ -114,7 +114,7 @@ class _BangumiPageState extends State ), ), SizedBox( - height: Grid.maxRowWidth / 2 / 0.75 + + height: Grid.mediumCardWidth / 2 / 0.75 + MediaQuery.textScalerOf(context).scale(50), child: Obx( () => _buildFollowBody( @@ -163,7 +163,7 @@ class _BangumiPageState extends State // 列间距 crossAxisSpacing: StyleString.cardSpace, // 最大宽度 - maxCrossAxisExtent: Grid.maxRowWidth / 3 * 2, + maxCrossAxisExtent: Grid.smallCardWidth / 3 * 2, childAspectRatio: 0.75, mainAxisExtent: MediaQuery.textScalerOf(context).scale(50), ), @@ -199,7 +199,7 @@ class _BangumiPageState extends State _bangumiController.queryBangumiFollow(false); } return Container( - width: Grid.maxRowWidth / 2, + width: Grid.mediumCardWidth / 2, margin: EdgeInsets.only( left: StyleString.safeSpace, right: index == loadingState.response.length - 1 diff --git a/lib/pages/dynamics/detail/view.dart b/lib/pages/dynamics/detail/view.dart index 5af6c49d9..0208fbdf7 100644 --- a/lib/pages/dynamics/detail/view.dart +++ b/lib/pages/dynamics/detail/view.dart @@ -314,7 +314,7 @@ class _DynamicDetailPageState extends State children: [ Builder( builder: (context) { - double padding = max(context.width / 2 - Grid.maxRowWidth, 0); + double padding = max(context.width / 2 - Grid.mediumCardWidth, 0); if (orientation == Orientation.portrait) { return CustomScrollView( controller: _dynamicDetailController.scrollController, diff --git a/lib/pages/dynamics/tab/view.dart b/lib/pages/dynamics/tab/view.dart index 01c4b783f..ab797c6c5 100644 --- a/lib/pages/dynamics/tab/view.dart +++ b/lib/pages/dynamics/tab/view.dart @@ -111,7 +111,7 @@ class _DynamicsTabPageState extends State slivers: [ const SliverFillRemaining(), SliverConstrainedCrossAxis( - maxExtent: Grid.maxRowWidth * 2, + maxExtent: Grid.mediumCardWidth * 2, sliver: SliverList( delegate: SliverChildBuilderDelegate( (context, index) { @@ -129,7 +129,7 @@ class _DynamicsTabPageState extends State gridDelegate: SliverGridDelegateWithExtentAndRatio( crossAxisSpacing: StyleString.cardSpace / 2, mainAxisSpacing: StyleString.cardSpace / 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.smallCardWidth * 2, childAspectRatio: StyleString.aspectRatio, mainAxisExtent: 50, ), @@ -148,7 +148,7 @@ class _DynamicsTabPageState extends State Success() => (loadingState.response as List?)?.isNotEmpty == true ? dynamicsWaterfallFlow ? SliverWaterfallFlow.extent( - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.smallCardWidth * 2, //cacheExtent: 0.0, crossAxisSpacing: StyleString.cardSpace / 2, mainAxisSpacing: StyleString.cardSpace / 2, @@ -184,7 +184,7 @@ class _DynamicsTabPageState extends State slivers: [ const SliverFillRemaining(), SliverConstrainedCrossAxis( - maxExtent: Grid.maxRowWidth * 2, + maxExtent: Grid.mediumCardWidth * 2, sliver: SliverList( delegate: SliverChildBuilderDelegate( (context, index) { diff --git a/lib/pages/fan/view.dart b/lib/pages/fan/view.dart index ec8bb0e2c..4b3a67bfe 100644 --- a/lib/pages/fan/view.dart +++ b/lib/pages/fan/view.dart @@ -54,7 +54,7 @@ class _FansPageState extends State { Success() => (loadingState.response as List?)?.isNotEmpty == true ? SliverGrid( gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent( - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.smallCardWidth * 2, mainAxisExtent: 56, ), delegate: SliverChildBuilderDelegate( diff --git a/lib/pages/fav/view.dart b/lib/pages/fav/view.dart index fcd54a785..799d812e0 100644 --- a/lib/pages/fav/view.dart +++ b/lib/pages/fav/view.dart @@ -85,7 +85,7 @@ class _FavPageState extends State { Loading() => SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate( @@ -102,7 +102,7 @@ class _FavPageState extends State { sliver: SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate( diff --git a/lib/pages/fav_detail/view.dart b/lib/pages/fav_detail/view.dart index 3eae69cb2..60396c0bb 100644 --- a/lib/pages/fav_detail/view.dart +++ b/lib/pages/fav_detail/view.dart @@ -293,7 +293,7 @@ class _FavDetailPageState extends State { Loading() => SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate( @@ -311,7 +311,7 @@ class _FavDetailPageState extends State { sliver: SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate( diff --git a/lib/pages/fav_search/view.dart b/lib/pages/fav_search/view.dart index 283816754..fc4bf65cc 100644 --- a/lib/pages/fav_search/view.dart +++ b/lib/pages/fav_search/view.dart @@ -73,7 +73,7 @@ class _FavSearchPageState extends State { sliver: SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate( @@ -117,7 +117,7 @@ class _FavSearchPageState extends State { SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate( diff --git a/lib/pages/history/view.dart b/lib/pages/history/view.dart index 8f08dae76..c03f9df83 100644 --- a/lib/pages/history/view.dart +++ b/lib/pages/history/view.dart @@ -151,7 +151,7 @@ class _HistoryPageState extends State { Loading() => SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate( @@ -165,7 +165,7 @@ class _HistoryPageState extends State { ? SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate( diff --git a/lib/pages/hot/view.dart b/lib/pages/hot/view.dart index 8221d189d..5a09c130c 100644 --- a/lib/pages/hot/view.dart +++ b/lib/pages/hot/view.dart @@ -85,7 +85,7 @@ class _HotPageState extends State with AutomaticKeepAliveClientMixin { return SliverGrid( gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate( @@ -104,7 +104,7 @@ class _HotPageState extends State with AutomaticKeepAliveClientMixin { ? SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate( diff --git a/lib/pages/html/view.dart b/lib/pages/html/view.dart index db80de7a2..5cc1a8d34 100644 --- a/lib/pages/html/view.dart +++ b/lib/pages/html/view.dart @@ -290,7 +290,7 @@ class _HtmlRenderPageState extends State children: [ OrientationBuilder( builder: (context, orientation) { - double padding = max(context.width / 2 - Grid.maxRowWidth, 0); + double padding = max(context.width / 2 - Grid.mediumCardWidth, 0); return Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/lib/pages/later/view.dart b/lib/pages/later/view.dart index f306724c5..0071277e2 100644 --- a/lib/pages/later/view.dart +++ b/lib/pages/later/view.dart @@ -128,7 +128,7 @@ class _LaterPageState extends State { Loading() => SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate( @@ -142,7 +142,7 @@ class _LaterPageState extends State { ? SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate( diff --git a/lib/pages/live/view.dart b/lib/pages/live/view.dart index 7bb583be7..b5e57b762 100644 --- a/lib/pages/live/view.dart +++ b/lib/pages/live/view.dart @@ -124,7 +124,7 @@ class _LivePageState extends State // 列间距 crossAxisSpacing: StyleString.cardSpace, // 最大宽度 - maxCrossAxisExtent: Grid.maxRowWidth, + maxCrossAxisExtent: Grid.smallCardWidth, childAspectRatio: StyleString.aspectRatio, mainAxisExtent: MediaQuery.textScalerOf(context).scale(90), ), @@ -319,7 +319,7 @@ class _LivePageState extends State gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: StyleString.cardSpace, crossAxisSpacing: StyleString.cardSpace, - maxCrossAxisExtent: Grid.maxRowWidth, + maxCrossAxisExtent: Grid.smallCardWidth, childAspectRatio: StyleString.aspectRatio, mainAxisExtent: MediaQuery.textScalerOf(context).scale(90), ), diff --git a/lib/pages/member/new/content/member_contribute/content/bangumi/member_bangumi.dart b/lib/pages/member/new/content/member_contribute/content/bangumi/member_bangumi.dart index 317793b7c..cbe038528 100644 --- a/lib/pages/member/new/content/member_contribute/content/bangumi/member_bangumi.dart +++ b/lib/pages/member/new/content/member_contribute/content/bangumi/member_bangumi.dart @@ -63,7 +63,7 @@ class _MemberBangumiState extends State gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: StyleString.cardSpace, crossAxisSpacing: StyleString.cardSpace, - maxCrossAxisExtent: Grid.maxRowWidth / 3 * 2, + maxCrossAxisExtent: Grid.smallCardWidth / 3 * 2, childAspectRatio: 0.75, mainAxisExtent: MediaQuery.textScalerOf(context).scale(30), diff --git a/lib/pages/member/new/content/member_contribute/content/video/member_video.dart b/lib/pages/member/new/content/member_contribute/content/video/member_video.dart index aac23dc51..b0fd6ee80 100644 --- a/lib/pages/member/new/content/member_contribute/content/video/member_video.dart +++ b/lib/pages/member/new/content/member_contribute/content/video/member_video.dart @@ -159,7 +159,7 @@ class _MemberVideoState extends State sliver: SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate( diff --git a/lib/pages/member/new/content/member_home/member_home.dart b/lib/pages/member/new/content/member_home/member_home.dart index aa312f184..8ef9242ae 100644 --- a/lib/pages/member/new/content/member_home/member_home.dart +++ b/lib/pages/member/new/content/member_home/member_home.dart @@ -61,7 +61,7 @@ class _MemberHomeState extends State gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: StyleString.cardSpace, crossAxisSpacing: StyleString.cardSpace, - maxCrossAxisExtent: Grid.maxRowWidth, + maxCrossAxisExtent: Grid.smallCardWidth, childAspectRatio: StyleString.aspectRatio, mainAxisExtent: MediaQuery.textScalerOf(context).scale(55), @@ -188,7 +188,7 @@ class _MemberHomeState extends State gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: StyleString.cardSpace, crossAxisSpacing: StyleString.cardSpace, - maxCrossAxisExtent: Grid.maxRowWidth / 3 * 2, + maxCrossAxisExtent: Grid.smallCardWidth / 3 * 2, childAspectRatio: 0.75, mainAxisExtent: MediaQuery.textScalerOf(context).scale(30), diff --git a/lib/pages/member/widgets/seasons.dart b/lib/pages/member/widgets/seasons.dart index 1749cd295..03d1d560f 100644 --- a/lib/pages/member/widgets/seasons.dart +++ b/lib/pages/member/widgets/seasons.dart @@ -65,7 +65,7 @@ class MemberSeasonsPanel extends StatelessWidget { gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: StyleString.cardSpace, crossAxisSpacing: StyleString.cardSpace, - maxCrossAxisExtent: Grid.maxRowWidth, + maxCrossAxisExtent: Grid.smallCardWidth, childAspectRatio: 0.94, ), physics: const NeverScrollableScrollPhysics(), diff --git a/lib/pages/member_archive/view.dart b/lib/pages/member_archive/view.dart index 1e8a90051..c5a1cd562 100644 --- a/lib/pages/member_archive/view.dart +++ b/lib/pages/member_archive/view.dart @@ -96,7 +96,7 @@ class _MemberArchivePageState extends State { SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: StyleString.safeSpace, crossAxisSpacing: StyleString.safeSpace, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.4, ), diff --git a/lib/pages/member_dynamics/view.dart b/lib/pages/member_dynamics/view.dart index 02a60150c..f8b0ff8da 100644 --- a/lib/pages/member_dynamics/view.dart +++ b/lib/pages/member_dynamics/view.dart @@ -82,7 +82,7 @@ class _MemberDynamicsPageState extends State ), sliver: dynamicsWaterfallFlow ? SliverWaterfallFlow.extent( - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.smallCardWidth * 2, //cacheExtent: 0.0, crossAxisSpacing: StyleString.safeSpace, mainAxisSpacing: StyleString.safeSpace, @@ -117,7 +117,7 @@ class _MemberDynamicsPageState extends State slivers: [ const SliverFillRemaining(), SliverConstrainedCrossAxis( - maxExtent: Grid.maxRowWidth * 2, + maxExtent: Grid.mediumCardWidth * 2, sliver: SliverList( delegate: SliverChildBuilderDelegate( (context, index) { diff --git a/lib/pages/member_search/search_archive.dart b/lib/pages/member_search/search_archive.dart index b96a961c5..c2cf5b00b 100644 --- a/lib/pages/member_search/search_archive.dart +++ b/lib/pages/member_search/search_archive.dart @@ -41,7 +41,7 @@ class SearchArchive extends StatelessWidget { sliver: SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate( diff --git a/lib/pages/member_search/search_dynamic.dart b/lib/pages/member_search/search_dynamic.dart index 495159faf..dfb3de0a7 100644 --- a/lib/pages/member_search/search_dynamic.dart +++ b/lib/pages/member_search/search_dynamic.dart @@ -50,7 +50,7 @@ class SearchDynamic extends StatelessWidget { ), sliver: dynamicsWaterfallFlow ? SliverWaterfallFlow.extent( - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.smallCardWidth * 2, crossAxisSpacing: StyleString.safeSpace, mainAxisSpacing: StyleString.safeSpace, lastChildLayoutTypeBuilder: (index) { @@ -72,7 +72,7 @@ class SearchDynamic extends StatelessWidget { slivers: [ const SliverFillRemaining(), SliverConstrainedCrossAxis( - maxExtent: Grid.maxRowWidth * 2, + maxExtent: Grid.mediumCardWidth * 2, sliver: SliverList( delegate: SliverChildBuilderDelegate( (context, index) { diff --git a/lib/pages/member_seasons/view.dart b/lib/pages/member_seasons/view.dart index f040bbf80..f5625b5a4 100644 --- a/lib/pages/member_seasons/view.dart +++ b/lib/pages/member_seasons/view.dart @@ -82,7 +82,7 @@ class _MemberSeasonsPageState extends State { SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: StyleString.cardSpace, crossAxisSpacing: StyleString.cardSpace, - maxCrossAxisExtent: Grid.maxRowWidth, + maxCrossAxisExtent: Grid.smallCardWidth, childAspectRatio: 0.94, ), physics: const NeverScrollableScrollPhysics(), diff --git a/lib/pages/rank/zone/view.dart b/lib/pages/rank/zone/view.dart index ed7ee08e4..0984c3bfb 100644 --- a/lib/pages/rank/zone/view.dart +++ b/lib/pages/rank/zone/view.dart @@ -101,7 +101,7 @@ class _ZonePageState extends State return SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate( @@ -117,7 +117,7 @@ class _ZonePageState extends State return SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate( diff --git a/lib/pages/rcmd/view.dart b/lib/pages/rcmd/view.dart index 1f06deab2..a19e7dcb6 100644 --- a/lib/pages/rcmd/view.dart +++ b/lib/pages/rcmd/view.dart @@ -106,7 +106,7 @@ class _RcmdPageState extends State // 列间距 crossAxisSpacing: StyleString.cardSpace, // 最大宽度 - maxCrossAxisExtent: Grid.maxRowWidth, + maxCrossAxisExtent: Grid.smallCardWidth, childAspectRatio: StyleString.aspectRatio, mainAxisExtent: MediaQuery.textScalerOf(context).scale(90), ), diff --git a/lib/pages/search_panel/view.dart b/lib/pages/search_panel/view.dart index 624434f36..f94a862e5 100644 --- a/lib/pages/search_panel/view.dart +++ b/lib/pages/search_panel/view.dart @@ -69,7 +69,7 @@ class _SearchPanelState extends State SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.smallCardWidth * 2, childAspectRatio: StyleString.aspectRatio * (widget.searchType == SearchType.media_bangumi || widget.searchType == SearchType.media_ft diff --git a/lib/pages/search_panel/widgets/article_panel.dart b/lib/pages/search_panel/widgets/article_panel.dart index 6ecf2e74e..7311d1d21 100644 --- a/lib/pages/search_panel/widgets/article_panel.dart +++ b/lib/pages/search_panel/widgets/article_panel.dart @@ -86,7 +86,7 @@ Widget searchArticlePanel(context, searchPanelCtr, LoadingState loadingState) { sliver: SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate( diff --git a/lib/pages/search_panel/widgets/live_panel.dart b/lib/pages/search_panel/widgets/live_panel.dart index f0cf9f0b8..67295e6d6 100644 --- a/lib/pages/search_panel/widgets/live_panel.dart +++ b/lib/pages/search_panel/widgets/live_panel.dart @@ -21,7 +21,7 @@ Widget searchLivePanel(BuildContext context, ctr, LoadingState loadingState) { primary: false, controller: ctr!.scrollController, gridDelegate: SliverGridDelegateWithExtentAndRatio( - maxCrossAxisExtent: Grid.maxRowWidth, + maxCrossAxisExtent: Grid.smallCardWidth, crossAxisSpacing: StyleString.safeSpace, mainAxisSpacing: StyleString.safeSpace, childAspectRatio: StyleString.aspectRatio, diff --git a/lib/pages/search_panel/widgets/media_bangumi_panel.dart b/lib/pages/search_panel/widgets/media_bangumi_panel.dart index c20fd9248..ed378a285 100644 --- a/lib/pages/search_panel/widgets/media_bangumi_panel.dart +++ b/lib/pages/search_panel/widgets/media_bangumi_panel.dart @@ -24,7 +24,7 @@ Widget searchBangumiPanel(context, ctr, LoadingState loadingState) { ), sliver: SliverGrid( gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent( - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.smallCardWidth * 2, mainAxisExtent: 160, ), delegate: SliverChildBuilderDelegate( diff --git a/lib/pages/search_panel/widgets/user_panel.dart b/lib/pages/search_panel/widgets/user_panel.dart index 7f8b02c40..a0f608d32 100644 --- a/lib/pages/search_panel/widgets/user_panel.dart +++ b/lib/pages/search_panel/widgets/user_panel.dart @@ -82,7 +82,7 @@ Widget searchUserPanel(context, searchPanelCtr, LoadingState loadingState) { ), sliver: SliverGrid( gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent( - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.smallCardWidth * 2, mainAxisExtent: 56, ), delegate: SliverChildBuilderDelegate( diff --git a/lib/pages/search_panel/widgets/video_panel.dart b/lib/pages/search_panel/widgets/video_panel.dart index a01d1a20c..f1c878e9f 100644 --- a/lib/pages/search_panel/widgets/video_panel.dart +++ b/lib/pages/search_panel/widgets/video_panel.dart @@ -92,7 +92,7 @@ Widget searchVideoPanel(context, ctr, LoadingState loadingState) { sliver: SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate( diff --git a/lib/pages/setting/widgets/model.dart b/lib/pages/setting/widgets/model.dart index 26ba70425..8546caa12 100644 --- a/lib/pages/setting/widgets/model.dart +++ b/lib/pages/setting/widgets/model.dart @@ -154,8 +154,8 @@ List get styleSettings => [ context: Get.context!, builder: (context) { return SlideDialog( - title: '最大列宽度(默认280dp)', - value: GStorage.maxRowWidth, + title: '小卡最大列宽度(默认240dp)', + value: GStorage.smallCardWidth, min: 150.0, max: 500.0, divisions: 35, @@ -163,15 +163,41 @@ List get styleSettings => [ ); }); if (result != null) { - await GStorage.setting.put(SettingBoxKey.maxRowWidth, result); + await GStorage.setting.put(SettingBoxKey.smallCardWidth, result); SmartDialog.showToast('重启生效'); setState(); } }, leading: const Icon(Icons.calendar_view_week_outlined), - title: '列表宽度(dp)限制', + title: '小卡列表宽度(dp)限制', getSubtitle: () => - '当前:${GStorage.maxRowWidth.toInt()}dp,屏幕宽度:${MediaQuery.of(Get.context!).size.width.toPrecision(2)}dp。宽度越小列数越多,横条、大卡会2倍折算', + '当前:${GStorage.mediumCardWidth.toInt()}dp,屏幕宽度:${MediaQuery.of(Get.context!).size.width.toPrecision(2)}dp。宽度越小列数越多。', + ), + SettingsModel( + settingsType: SettingsType.normal, + onTap: (setState) async { + double? result = await showDialog( + context: Get.context!, + builder: (context) { + return SlideDialog( + title: '中卡最大列宽度(默认280dp)', + value: GStorage.mediumCardWidth, + min: 150.0, + max: 500.0, + divisions: 35, + suffix: 'dp', + ); + }); + if (result != null) { + await GStorage.setting.put(SettingBoxKey.mediumCardWidth, result); + SmartDialog.showToast('重启生效'); + setState(); + } + }, + leading: const Icon(Icons.calendar_view_week_outlined), + title: '中卡列表宽度(dp)限制', + getSubtitle: () => + '当前:${GStorage.mediumCardWidth.toInt()}dp,屏幕宽度:${MediaQuery.of(Get.context!).size.width.toPrecision(2)}dp。宽度越小列数越多。', ), SettingsModel( settingsType: SettingsType.sw1tch, diff --git a/lib/pages/subscription/view.dart b/lib/pages/subscription/view.dart index 37c4b914b..c182d7c93 100644 --- a/lib/pages/subscription/view.dart +++ b/lib/pages/subscription/view.dart @@ -40,7 +40,7 @@ class _SubPageState extends State { Loading() => SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate( @@ -52,7 +52,7 @@ class _SubPageState extends State { ? SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate( diff --git a/lib/pages/subscription_detail/view.dart b/lib/pages/subscription_detail/view.dart index 4281f1fb4..0fa07c43f 100644 --- a/lib/pages/subscription_detail/view.dart +++ b/lib/pages/subscription_detail/view.dart @@ -237,7 +237,7 @@ class _SubDetailPageState extends State { gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), @@ -267,7 +267,7 @@ class _SubDetailPageState extends State { return SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate( diff --git a/lib/pages/video/detail/member/horizontal_member_page.dart b/lib/pages/video/detail/member/horizontal_member_page.dart index b08126a26..49c947b20 100644 --- a/lib/pages/video/detail/member/horizontal_member_page.dart +++ b/lib/pages/video/detail/member/horizontal_member_page.dart @@ -167,7 +167,7 @@ class _HorizontalMemberPageState extends State { sliver: SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate( diff --git a/lib/pages/video/detail/related/view.dart b/lib/pages/video/detail/related/view.dart index 50c5c874b..e867544b6 100644 --- a/lib/pages/video/detail/related/view.dart +++ b/lib/pages/video/detail/related/view.dart @@ -37,7 +37,7 @@ class _RelatedVideoPanelState extends State Loading() => SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate( @@ -51,7 +51,7 @@ class _RelatedVideoPanelState extends State ? SliverGrid( gridDelegate: SliverGridDelegateWithExtentAndRatio( mainAxisSpacing: 2, - maxCrossAxisExtent: Grid.maxRowWidth * 2, + maxCrossAxisExtent: Grid.mediumCardWidth * 2, childAspectRatio: StyleString.aspectRatio * 2.2, ), delegate: SliverChildBuilderDelegate((context, index) { diff --git a/lib/utils/grid.dart b/lib/utils/grid.dart index 117d9ffd8..53987f6b0 100644 --- a/lib/utils/grid.dart +++ b/lib/utils/grid.dart @@ -4,7 +4,8 @@ import 'package:flutter/rendering.dart'; import 'storage.dart'; class Grid { - static double maxRowWidth = GStorage.maxRowWidth; + static double mediumCardWidth = GStorage.mediumCardWidth; + static double smallCardWidth = GStorage.smallCardWidth; // // static double calculateActualWidth(BuildContext context, double maxCrossAxisExtent, double crossAxisSpacing, {double? screenWidthOffset}) { // double screenWidth = MediaQuery.of(context).size.width; diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index c0ededace..291584aa3 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -117,8 +117,11 @@ class GStorage { static int get previewQ => setting.get(SettingBoxKey.previewQuality, defaultValue: 80); - static double get maxRowWidth => - setting.get(SettingBoxKey.maxRowWidth, defaultValue: 280.0); + static double get mediumCardWidth => + setting.get(SettingBoxKey.mediumCardWidth, defaultValue: 280.0); + + static double get smallCardWidth => + setting.get(SettingBoxKey.smallCardWidth, defaultValue: 240.0); static UpPanelPosition get upPanelPosition => UpPanelPosition.values[setting.get(SettingBoxKey.upPanelPosition, @@ -589,7 +592,8 @@ class SettingBoxKey { customColor = 'customColor', // 自定义主题色 enableSingleRow = 'enableSingleRow', // 首页单列 displayMode = 'displayMode', - maxRowWidth = 'maxRowWidth', // 首页列最大宽度(dp) + mediumCardWidth = 'mediumCardWidth', // 首页列最大宽度(dp) + smallCardWidth = 'smallCardWidth', videoPlayerRemoveSafeArea = 'videoPlayerRemoveSafeArea', // 视频播放器移除安全边距 // videoPlayerShowStatusBarBackgroundColor = // 'videoPlayerShowStatusBarBackgroundColor', // 播放页状态栏显示为背景色