[Test] add min asix

canxin121 · Nov 2, 2024 · db1edcd · db1edcd
1 parent 794c181
commit db1edcd
Show file tree

Hide file tree

Showing 21 changed files with 34 additions and 9 deletions.
diff --git a/lib/common_pages/db_music_agg_listview_page.dart b/lib/common_pages/db_music_agg_listview_page.dart
@@ -127,6 +127,7 @@ class DbMusicContainerListPageState extends State<DbMusicContainerListPage>
     return CupertinoPageScaffold(
         backgroundColor: getBackgroundColor(isDesktop, isDarkMode),
         child: Column(
+          mainAxisSize: MainAxisSize.min,
           children: [
             CupertinoNavigationBar(
                 padding: const EdgeInsetsDirectional.only(end: 16),
@@ -221,6 +222,7 @@ class DbMusicContainerListPageState extends State<DbMusicContainerListPage>
     return CupertinoPageScaffold(
         backgroundColor: getBackgroundColor(isDesktop, isDarkMode),
         child: Column(
+          mainAxisSize: MainAxisSize.min,
           children: [
             CupertinoNavigationBar(
                 padding: const EdgeInsetsDirectional.only(end: 16),

diff --git a/lib/common_pages/db_playlist_collection_page.dart b/lib/common_pages/db_playlist_collection_page.dart
@@ -55,6 +55,7 @@ class DbPlaylistCollectionPageState extends State<DbPlaylistCollectionPage>
     return CupertinoPageScaffold(
         backgroundColor: getBackgroundColor(widget.isDesktop, isDarkMode),
         child: Column(
+          mainAxisSize: MainAxisSize.min,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             CupertinoNavigationBar(

diff --git a/lib/common_pages/db_playlist_gridview_page.dart b/lib/common_pages/db_playlist_gridview_page.dart
@@ -132,6 +132,7 @@ class DbPlaylistGridPageState extends State<DbPlaylistGridPage>
     return CupertinoPageScaffold(
         backgroundColor: getBackgroundColor(widget.isDesktop, isDarkMode),
         child: Column(
+          mainAxisSize: MainAxisSize.min,
           children: [
             CupertinoNavigationBar(
               backgroundColor: getNavigatorBarColor(isDarkMode),
@@ -191,6 +192,7 @@ class DbPlaylistGridPageState extends State<DbPlaylistGridPage>
     return CupertinoPageScaffold(
       backgroundColor: getBackgroundColor(widget.isDesktop, isDarkMode),
       child: Column(
+        mainAxisSize: MainAxisSize.min,
         children: [
           CupertinoNavigationBar(
             backgroundColor: getNavigatorBarColor(isDarkMode),

diff --git a/lib/common_pages/multi_selection_page/music_aggregator.dart b/lib/common_pages/multi_selection_page/music_aggregator.dart
@@ -62,6 +62,7 @@ class MusicAggregatorMultiSelectionPageState
     return CupertinoPageScaffold(
         backgroundColor: getBackgroundColor(widget.isDesktop, isDarkMode),
         child: Column(
+          mainAxisSize: MainAxisSize.min,
           children: [
             CupertinoNavigationBar(
               padding: const EdgeInsetsDirectional.only(end: 16),

diff --git a/lib/common_pages/multi_selection_page/playlist.dart b/lib/common_pages/multi_selection_page/playlist.dart
@@ -54,7 +54,7 @@ class PlaylistMultiSelectionPageState extends State<PlaylistMultiSelectionPage>
     final bool isDarkMode = brightness == Brightness.dark;
     return CupertinoPageScaffold(
         backgroundColor: getBackgroundColor(widget.isDesktop, isDarkMode),
-        child: Column(children: [
+        child: Column(mainAxisSize: MainAxisSize.min, children: [
           CupertinoNavigationBar(
             backgroundColor: getNavigatorBarColor(isDarkMode),
             padding: const EdgeInsetsDirectional.all(0),

diff --git a/lib/common_pages/multi_selection_page/playlist_collection.dart b/lib/common_pages/multi_selection_page/playlist_collection.dart
@@ -61,7 +61,7 @@ class PlaylistCollectionMultiSelectionPageState
 
     return CupertinoPageScaffold(
       backgroundColor: getBackgroundColor(widget.isDesktop, isDarkMode),
-      child: Column(children: [
+      child: Column(mainAxisSize: MainAxisSize.min, children: [
         CupertinoNavigationBar(
           padding: const EdgeInsetsDirectional.only(end: 16),
           backgroundColor: getNavigatorBarColor(isDarkMode),

diff --git a/lib/common_pages/online_music_agg_listview_page.dart b/lib/common_pages/online_music_agg_listview_page.dart
@@ -99,6 +99,7 @@ class OnlineMusicAggregatorListViewPageState
     return CupertinoPageScaffold(
         backgroundColor: getBackgroundColor(widget.isDesktop, isDarkMode),
         child: Column(
+          mainAxisSize: MainAxisSize.min,
           children: [
             CupertinoNavigationBar(
                 backgroundColor: getNavigatorBarColor(isDarkMode),
@@ -224,6 +225,7 @@ class OnlineMusicAggregatorListViewPageState
     return CupertinoPageScaffold(
         backgroundColor: backgroundColor,
         child: Column(
+          mainAxisSize: MainAxisSize.min,
           children: [
             CupertinoNavigationBar(
                 backgroundColor: getNavigatorBarColor(isDarkMode),

diff --git a/lib/common_pages/online_playlist_gridview_page.dart b/lib/common_pages/online_playlist_gridview_page.dart
@@ -76,6 +76,7 @@ class SearchMusicListState extends State<OnlinePlaylistGridViewPage>
     return CupertinoPageScaffold(
       backgroundColor: getBackgroundColor(widget.isDesktop, isDarkMode),
       child: Column(
+        mainAxisSize: MainAxisSize.min,
         children: [
           CupertinoNavigationBar(
             backgroundColor: getNavigatorBarColor(isDarkMode),

diff --git a/lib/common_pages/reorder_page/music_aggregator.dart b/lib/common_pages/reorder_page/music_aggregator.dart
@@ -54,6 +54,7 @@ class MuiscAggregatorReorderPageState extends State<MuiscAggregatorReorderPage>
     return CupertinoPageScaffold(
       backgroundColor: getBackgroundColor(widget.isDesktop, isDarkMode),
       child: Column(
+        mainAxisSize: MainAxisSize.min,
         children: [
           CupertinoNavigationBar(
             backgroundColor: getBackgroundColor(widget.isDesktop, isDarkMode),

diff --git a/lib/common_pages/reorder_page/playlist.dart b/lib/common_pages/reorder_page/playlist.dart
@@ -62,6 +62,7 @@ class PlaylistReorderPageState extends State<PlaylistReorderPage>
     return CupertinoPageScaffold(
         backgroundColor: getBackgroundColor(widget.isDesktop, isDarkMode),
         child: Column(
+          mainAxisSize: MainAxisSize.min,
           children: [
             CupertinoNavigationBar(
               backgroundColor: getNavigatorBarColor(isDarkMode),

diff --git a/lib/common_pages/reorder_page/playlist_collection.dart b/lib/common_pages/reorder_page/playlist_collection.dart
@@ -63,6 +63,7 @@ class PlaylistCollectionReorderPageState
     return CupertinoPageScaffold(
         backgroundColor: getBackgroundColor(widget.isDesktop, isDarkMode),
         child: Column(
+          mainAxisSize: MainAxisSize.min,
           children: [
             CupertinoNavigationBar(
               backgroundColor: getNavigatorBarColor(isDarkMode),

diff --git a/lib/common_pages/setting_page.dart b/lib/common_pages/setting_page.dart
@@ -14,7 +14,6 @@ import 'package:app_rhyme/src/rust/api/types/config.dart';
 import 'package:app_rhyme/src/rust/api/types/external_api.dart';
 import 'package:app_rhyme/src/rust/api/utils/database.dart';
 import 'package:app_rhyme/types/stream_controller.dart';
-import 'package:app_rhyme/utils/cache_helper.dart';
 import 'package:app_rhyme/utils/check_update.dart';
 import 'package:app_rhyme/utils/chore.dart';
 import 'package:app_rhyme/utils/clipboard_helper.dart';
@@ -70,6 +69,7 @@ class SettingPageState extends State<SettingPage> with WidgetsBindingObserver {
     return CupertinoPageScaffold(
         backgroundColor: getSettingPageBackgroundColor(isDarkMode),
         child: Column(
+          mainAxisSize: MainAxisSize.min,
           children: [
             CupertinoNavigationBar(
               backgroundColor: getNavigatorBarColor(isDarkMode),
@@ -266,6 +266,7 @@ class QualityConfigPageState extends State<QualityConfigPage>
     return CupertinoPageScaffold(
         backgroundColor: getSettingPageBackgroundColor(isDarkMode),
         child: Column(
+          mainAxisSize: MainAxisSize.min,
           children: [
             CupertinoNavigationBar(
               backgroundColor: getNavigatorBarColor(isDarkMode),
@@ -377,6 +378,7 @@ class UpdateConfigPageState extends State<UpdateConfigPage>
     return CupertinoPageScaffold(
         backgroundColor: getSettingPageBackgroundColor(isDarkMode),
         child: Column(
+          mainAxisSize: MainAxisSize.min,
           children: [
             CupertinoNavigationBar(
               backgroundColor: getNavigatorBarColor(isDarkMode),
@@ -508,6 +510,7 @@ class StorageConfigPageState extends State<StorageConfigPage>
     return CupertinoPageScaffold(
         backgroundColor: getSettingPageBackgroundColor(isDarkMode),
         child: Column(
+          mainAxisSize: MainAxisSize.min,
           children: [
             CupertinoNavigationBar(
               middle: Text('储存设置', style: TextStyle(color: textColor)),
@@ -968,6 +971,7 @@ class ExternalApiConfigPageState extends State<ExternalApiConfigPage>
     return CupertinoPageScaffold(
         backgroundColor: getSettingPageBackgroundColor(isDarkMode),
         child: Column(
+          mainAxisSize: MainAxisSize.min,
           children: [
             CupertinoNavigationBar(
               middle: Text('第三方音源设置', style: TextStyle(color: textColor)),
@@ -1207,6 +1211,7 @@ class WindowConfigPageState extends State<WindowConfigPage>
     return CupertinoPageScaffold(
         backgroundColor: getSettingPageBackgroundColor(isDarkMode),
         child: Column(
+          mainAxisSize: MainAxisSize.min,
           children: [
             CupertinoNavigationBar(
               middle: Text('窗口设置(重启后生效)', style: TextStyle(color: textColor)),

diff --git a/lib/desktop/comps/popup_comp/playlist.dart b/lib/desktop/comps/popup_comp/playlist.dart
@@ -31,7 +31,8 @@ class MusicList extends StatelessWidget {
               itemBuilder: (context, index) => Padding(
                 padding: const EdgeInsets.only(left: 10, right: 10),
                 child: MobileMusicAggregatorListItem(
-                  key: ValueKey(musicContainerList[index].musicAggregator.identity()),
+                  key: ValueKey(
+                      musicContainerList[index].musicAggregator.identity()),
                   musicAgg: musicContainerList[index].musicAggregator,
                   isDark: isDarkMode,
                   onTap: () {

diff --git a/lib/desktop/pages/explore_page/music_chart_page.dart b/lib/desktop/pages/explore_page/music_chart_page.dart
@@ -57,6 +57,7 @@ class MusicChartPageState extends State<MusicChartPage>
     return CupertinoPageScaffold(
         backgroundColor: getBackgroundColor(widget.isDesktop, isDarkMode),
         child: Column(
+          mainAxisSize: MainAxisSize.min,
           children: [
             CupertinoNavigationBar(
               backgroundColor: getNavigatorBarColor(isDarkMode),

diff --git a/lib/desktop/pages/explore_page/playlist_tag_page.dart b/lib/desktop/pages/explore_page/playlist_tag_page.dart
@@ -57,6 +57,7 @@ class PlaylistTagPageState extends State<PlaylistTagPage>
     return CupertinoPageScaffold(
         backgroundColor: getBackgroundColor(widget.isDesktop, isDarkMode),
         child: Column(
+          mainAxisSize: MainAxisSize.min,
           children: [
             CupertinoNavigationBar(
               backgroundColor: getNavigatorBarColor(isDarkMode),

diff --git a/lib/desktop/pages/search_page/music_aggregator.dart b/lib/desktop/pages/search_page/music_aggregator.dart
@@ -75,6 +75,7 @@ class MusicAggregatorSearchPageState extends State<MusicAggregatorSearchPage>
     return CupertinoPageScaffold(
       backgroundColor: getBackgroundColor(widget.isDesktop, isDarkMode),
       child: Column(
+        mainAxisSize: MainAxisSize.min,
         children: [
           CupertinoNavigationBar(
             backgroundColor: getNavigatorBarColor(isDarkMode),

diff --git a/lib/desktop/pages/search_page/playlist.dart b/lib/desktop/pages/search_page/playlist.dart
@@ -74,6 +74,7 @@ class SearchMusicListState extends State<PlaylistSearchPage>
     return CupertinoPageScaffold(
       backgroundColor: getBackgroundColor(widget.isDesktop, isDarkMode),
       child: Column(
+        mainAxisSize: MainAxisSize.min,
         children: [
           CupertinoNavigationBar(
             backgroundColor: getNavigatorBarColor(isDarkMode),

diff --git a/lib/mobile/comps/music_agg_comp/music_agg_list_item.dart b/lib/mobile/comps/music_agg_comp/music_agg_list_item.dart
@@ -99,9 +99,7 @@ class MobileMusicAggregatorListItemState
           ClipRRect(
             borderRadius: BorderRadius.circular(8.0),
             child: imageWithCache(defaultMusic!.getCover(size: 250),
-                width: 40,
-                height: 40,
-                enableCache: widget.cacheCover),
+                width: 40, height: 40, enableCache: widget.cacheCover),
           ),
           // 歌曲的信息(歌名, 歌手)
           Expanded(

diff --git a/lib/mobile/pages/explore_page.dart b/lib/mobile/pages/explore_page.dart
@@ -68,6 +68,7 @@ class MobileExplorePageState extends State<MobileExplorePage> {
 
     return CupertinoPageScaffold(
       child: Column(
+        mainAxisSize: MainAxisSize.min,
         children: [
           CupertinoNavigationBar(
             backgroundColor: getNavigatorBarColor(isDarkMode),
@@ -95,10 +96,12 @@ class MobileExplorePageState extends State<MobileExplorePage> {
             children: {
               ExploreSegment.musicChart: Text(
                   ExploreSegment.musicChart.displayName,
-                  style: TextStyle(color: getTextColor(isDarkMode)).useSystemChineseFont()),
+                  style: TextStyle(color: getTextColor(isDarkMode))
+                      .useSystemChineseFont()),
               ExploreSegment.playlistTag: Text(
                   ExploreSegment.playlistTag.displayName,
-                  style: TextStyle(color: getTextColor(isDarkMode)).useSystemChineseFont()),
+                  style: TextStyle(color: getTextColor(isDarkMode))
+                      .useSystemChineseFont()),
             },
           ),
           Expanded(

diff --git a/lib/mobile/pages/search_page.dart b/lib/mobile/pages/search_page.dart
@@ -111,6 +111,7 @@ class _SearchPageMobileState extends State<SearchPageMobile> {
 
     return CupertinoPageScaffold(
       child: Column(
+        mainAxisSize: MainAxisSize.min,
         children: [
           CupertinoNavigationBar(
             backgroundColor: getNavigatorBarColor(isDarkMode),

diff --git a/lib/utils/refresh.dart b/lib/utils/refresh.dart
@@ -0,0 +1 @@
+