[Update] update dependencies

[Test] try fix ios safe area
canxin121 · Nov 2, 2024 · 174a458 · 174a458
1 parent b13db22
commit 174a458
Show file tree

Hide file tree

Showing 39 changed files with 306 additions and 316 deletions.
diff --git a/lib/common_pages/db_playlist_collection_page.dart b/lib/common_pages/db_playlist_collection_page.dart
@@ -78,8 +78,7 @@ class DbPlaylistCollectionPageState extends State<DbPlaylistCollectionPage>
             playlistCollections: playlistsCollections.map((e) => e.$1).toList(),
           ),
         ),
-        child: SafeArea(
-            child: Column(
+        child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Expanded(
@@ -99,7 +98,7 @@ class DbPlaylistCollectionPageState extends State<DbPlaylistCollectionPage>
               ),
             ),
           ],
-        )));
+        ));
   }
 
   @override

diff --git a/lib/common_pages/db_playlist_gridview_page.dart b/lib/common_pages/db_playlist_gridview_page.dart
@@ -234,54 +234,51 @@ class DbPlaylistGridPageState extends State<DbPlaylistGridPage>
   }
 
   Widget buildDesktopGrid() {
-    return SafeArea(
-      child: CustomScrollView(
-        slivers: [
-          SliverPadding(
-            padding: EdgeInsets.symmetric(
-                horizontal: Platform.isIOS ? 0.0 : 10.0, vertical: 20),
-            sliver: SliverGrid(
-              gridDelegate: const SliverGridDelegateWithResponsiveColumnCount(
-                minColumnWidth: 200.0,
-                mainAxisSpacing: 10.0,
-                crossAxisSpacing: 10.0,
-                minColumnCount: 4,
-                maxColumnCount: 8,
-              ),
-              delegate: SliverChildBuilderDelegate(
-                (BuildContext context, int index) {
-                  var musicList = playlists[index];
-                  return PlaylistCard(
-                    key: ValueKey(musicList.identity),
-                    playlist: musicList,
-                    onTap: () {
-                      navigate(
-                          context,
-                          DbMusicContainerListPage(
-                            playlist: musicList,
-                            isDesktop: true,
-                          ),
-                          widget.isDesktop,
-                          "###Playlist_${musicList.identity}###");
-                    },
-                    cacheCover: globalConfig.storageConfig.saveCover,
-                  );
-                },
-                childCount: playlists.length,
-              ),
+    return CustomScrollView(
+      slivers: [
+        SliverPadding(
+          padding: EdgeInsets.symmetric(
+              horizontal: Platform.isIOS ? 0.0 : 10.0, vertical: 20),
+          sliver: SliverGrid(
+            gridDelegate: const SliverGridDelegateWithResponsiveColumnCount(
+              minColumnWidth: 200.0,
+              mainAxisSpacing: 10.0,
+              crossAxisSpacing: 10.0,
+              minColumnCount: 4,
+              maxColumnCount: 8,
+            ),
+            delegate: SliverChildBuilderDelegate(
+              (BuildContext context, int index) {
+                var musicList = playlists[index];
+                return PlaylistCard(
+                  key: ValueKey(musicList.identity),
+                  playlist: musicList,
+                  onTap: () {
+                    navigate(
+                        context,
+                        DbMusicContainerListPage(
+                          playlist: musicList,
+                          isDesktop: true,
+                        ),
+                        widget.isDesktop,
+                        "###Playlist_${musicList.identity}###");
+                  },
+                  cacheCover: globalConfig.storageConfig.saveCover,
+                );
+              },
+              childCount: playlists.length,
             ),
           ),
-        ],
-      ),
+        ),
+      ],
     );
   }
 
   Widget buildMobileGrid(Color textColor) {
     return CustomScrollView(
       slivers: [
         SliverPadding(
-          padding: EdgeInsets.symmetric(
-              horizontal: Platform.isIOS ? 0.0 : 10.0, vertical: 20),
+          padding: EdgeInsets.only(top: 20),
           sliver: SliverGrid(
             gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
               crossAxisCount: 2,
@@ -290,21 +287,23 @@ class DbPlaylistGridPageState extends State<DbPlaylistGridPage>
             delegate: SliverChildBuilderDelegate(
               (BuildContext context, int index) {
                 var playlisy = playlists[index];
-                return PlaylistCard(
-                  playlist: playlists[index],
-                  onTap: () {
-                    Navigator.push(
-                      context,
-                      CupertinoPageRoute(
-                        builder: (context) => DbMusicContainerListPage(
-                          playlist: playlisy,
-                          isDesktop: false,
-                        ),
-                      ),
-                    );
-                  },
-                  key: ValueKey(playlisy.identity),
-                );
+                return Padding(
+                    padding: EdgeInsets.symmetric(horizontal: 10),
+                    child: PlaylistCard(
+                      playlist: playlists[index],
+                      onTap: () {
+                        Navigator.push(
+                          context,
+                          CupertinoPageRoute(
+                            builder: (context) => DbMusicContainerListPage(
+                              playlist: playlisy,
+                              isDesktop: false,
+                            ),
+                          ),
+                        );
+                      },
+                      key: ValueKey(playlisy.identity),
+                    ));
               },
               childCount: playlists.length,
             ),

diff --git a/lib/common_pages/online_music_agg_listview_page.dart b/lib/common_pages/online_music_agg_listview_page.dart
@@ -129,9 +129,6 @@ class OnlineMusicAggregatorListViewPageState
       backgroundColor: getPrimaryBackgroundColor(isDarkMode),
       child: CustomScrollView(
         slivers: <Widget>[
-          const SliverToBoxAdapter(
-            child: SafeArea(child: SizedBox()),
-          ),
           if (widget.playlist != null)
             MusicListHeader(
               playlist: widget.playlist!,

diff --git a/lib/desktop/comps/control_bar.dart b/lib/desktop/comps/control_bar.dart
@@ -26,7 +26,7 @@ class ControlBar extends StatelessWidget {
         ? const Color.fromARGB(255, 42, 42, 42)
         : const Color.fromARGB(255, 247, 247, 247);
     Color dividerColor = getDividerColor(isDarkMode);
-    bool isDesktop_ = isDesktop();
+    bool isDesktop_ = isDesktopDevice();
     final childWidget = GestureDetector(
       onPanStart: (details) {
         if (isDesktop_) {

diff --git a/lib/desktop/comps/popup_comp/volume_slider.dart b/lib/desktop/comps/popup_comp/volume_slider.dart
@@ -155,8 +155,7 @@ class _VolumeSliderOverlayState extends State<_VolumeSliderOverlay>
 
   @override
   Widget build(BuildContext context) {
-    return SafeArea(
-        child: CupertinoPageScaffold(
+    return CupertinoPageScaffold(
       backgroundColor: CupertinoColors.systemFill.withOpacity(0.0),
       child: GestureDetector(
         onTap: widget.onRemove,
@@ -182,6 +181,6 @@ class _VolumeSliderOverlayState extends State<_VolumeSliderOverlay>
           ],
         ),
       ),
-    ));
+    );
   }
 }
diff --git a/lib/desktop/home.dart b/lib/desktop/home.dart
@@ -48,8 +48,7 @@ class DesktopHomeState extends State<DesktopHome> {
   @override
   Widget build(BuildContext context) {
     return CupertinoPageScaffold(
-      child: SafeArea(
-          child: Row(
+      child: Row(
         children: [
           const MyNavListContainer(),
           Expanded(
@@ -78,7 +77,7 @@ class DesktopHomeState extends State<DesktopHome> {
             ),
           ),
         ],
-      )),
+      ),
     );
   }
 }
diff --git a/lib/desktop/pages/explore_page/music_chart_page.dart b/lib/desktop/pages/explore_page/music_chart_page.dart
@@ -67,24 +67,22 @@ class MusicChartPageState extends State<MusicChartPage>
           ).useSystemChineseFont(),
         ),
       ),
-      child: SafeArea(
-        child: isLoading
-            ? Center(child: CupertinoActivityIndicator())
-            : serverMusicChartCollections.isEmpty
-                ? Center(
-                    child: Text(
-                      '暂无排行榜数据',
-                      style: TextStyle(
-                        fontSize: 18,
-                        color: getTextColor(isDarkMode),
-                      ).useSystemChineseFont(),
-                    ),
-                  )
-                : MusicChartCollectionList(
-                    collections: serverMusicChartCollections,
-                    isDesktop: widget.isDesktop,
+      child: isLoading
+          ? Center(child: CupertinoActivityIndicator())
+          : serverMusicChartCollections.isEmpty
+              ? Center(
+                  child: Text(
+                    '暂无排行榜数据',
+                    style: TextStyle(
+                      fontSize: 18,
+                      color: getTextColor(isDarkMode),
+                    ).useSystemChineseFont(),
                   ),
-      ),
+                )
+              : MusicChartCollectionList(
+                  collections: serverMusicChartCollections,
+                  isDesktop: widget.isDesktop,
+                ),
     );
   }
 }
diff --git a/lib/desktop/pages/explore_page/playlist_tag_page.dart b/lib/desktop/pages/explore_page/playlist_tag_page.dart
@@ -67,24 +67,22 @@ class PlaylistTagPageState extends State<PlaylistTagPage>
           ).useSystemChineseFont(),
         ),
       ),
-      child: SafeArea(
-        child: isLoading
-            ? Center(child: CupertinoActivityIndicator())
-            : serverPlaylistTagCollections.isEmpty
-                ? Center(
-                    child: Text(
-                      '暂无歌单标签',
-                      style: TextStyle(
-                        fontSize: 18,
-                        color: getTextColor(isDarkMode),
-                      ).useSystemChineseFont(),
-                    ),
-                  )
-                : PlaylistTagCollectionList(
-                    collections: serverPlaylistTagCollections,
-                    isDesktop: widget.isDesktop,
+      child: isLoading
+          ? Center(child: CupertinoActivityIndicator())
+          : serverPlaylistTagCollections.isEmpty
+              ? Center(
+                  child: Text(
+                    '暂无歌单标签',
+                    style: TextStyle(
+                      fontSize: 18,
+                      color: getTextColor(isDarkMode),
+                    ).useSystemChineseFont(),
                   ),
-      ),
+                )
+              : PlaylistTagCollectionList(
+                  collections: serverPlaylistTagCollections,
+                  isDesktop: widget.isDesktop,
+                ),
     );
   }
 }
diff --git a/lib/main.dart b/lib/main.dart
@@ -60,7 +60,7 @@ class MyAppState extends State<MyApp> {
                   .useSystemChineseFont(),
             ),
           ),
-          home: _isWidthGreaterThanHeight || isDesktop()
+          home: _isWidthGreaterThanHeight || isDesktopDevice()
               ? const DesktopHome()
               : const MobileHome(),
         ));

diff --git a/lib/mobile/comps/play_display_comp/music_artpic.dart b/lib/mobile/comps/play_display_comp/music_artpic.dart
@@ -19,21 +19,20 @@ class MusicArtPic extends StatefulWidget {
 class MusicArtPicState extends State<MusicArtPic> {
   @override
   Widget build(BuildContext context) {
-    return SafeArea(
-        child: Obx(() => Container(
-            padding: widget.padding,
-            child: GlassContainer(
-              shadowColor: Platform.isIOS
-                  ? CupertinoColors.black.withOpacity(0.2)
-                  : CupertinoColors.black.withOpacity(0.4),
-              shadowStrength: Platform.isIOS ? 3 : 8,
-              shape: BoxShape.rectangle,
-              borderRadius: BorderRadius.circular(18.0),
-              child: imageWithCache(
-                  globalAudioHandler.playingMusic.value?.currentMusic
-                      .getCover(size: 250),
-                  cacheHeight: 250,
-                  cacheWidth: 250),
-            ))));
+    return Obx(() => Container(
+        padding: widget.padding,
+        child: GlassContainer(
+          shadowColor: Platform.isIOS
+              ? CupertinoColors.black.withOpacity(0.2)
+              : CupertinoColors.black.withOpacity(0.4),
+          shadowStrength: Platform.isIOS ? 3 : 8,
+          shape: BoxShape.rectangle,
+          borderRadius: BorderRadius.circular(18.0),
+          child: imageWithCache(
+              globalAudioHandler.playingMusic.value?.currentMusic
+                  .getCover(size: 250),
+              cacheHeight: 250,
+              cacheWidth: 250),
+        )));
   }
 }