Merge 42e954428b into bd4cd22e4e

lib/collections/routes.dart

@@ -75,17 +75,17 @@ class AppRouter extends RootStackRouter {
                   path: "local",
                   page: UserLocalLibraryRoute.page,
                 ),
+                AutoRoute(
+                  path: "local/folder",
+                  page: LocalLibraryRoute.page,
+                  // parentNavigatorKey: shellRouteNavigatorKey,
+                ),
                 AutoRoute(
                   path: "downloads",
                   page: UserDownloadsRoute.page,
                 ),
               ],
             ),
-            AutoRoute(
-              path: "local/folder",
-              page: LocalLibraryRoute.page,
-              // parentNavigatorKey: shellRouteNavigatorKey,
-            ),
             AutoRoute(
               path: "library/generate",
               page: PlaylistGeneratorRoute.page,

lib/components/adaptive/adaptive_pop_sheet_list.dart

@@ -28,7 +28,7 @@ class AdaptiveMenuButton<T> extends MenuButton {
 /// or equal to 640px
 /// In smaller screen, a [IconButton] with a [showModalBottomSheet] is shown
 class AdaptivePopSheetList<T> extends StatelessWidget {
-  final List<AdaptiveMenuButton<T>> Function(BuildContext context) items;
+  final List<AdaptiveMenuButton<T>> children;
   final Widget? icon;
   final Widget? child;
   final bool useRootNavigator;
@@ -43,7 +43,7 @@ class AdaptivePopSheetList<T> extends StatelessWidget {
 
   const AdaptivePopSheetList({
     super.key,
-    required this.items,
+    required this.children,
     this.icon,
     this.child,
     this.useRootNavigator = true,
@@ -59,28 +59,27 @@ class AdaptivePopSheetList<T> extends StatelessWidget {
 
   Future<void> showDropdownMenu(BuildContext context, Offset position) async {
     final mediaQuery = MediaQuery.of(context);
-    List<MenuButton> childrenModified(BuildContext context) =>
+    final childrenModified = children.map((s) {
-        items(context).map((s) {
+      if (s.onPressed == null) {
-          if (s.onPressed == null) {
+        return MenuButton(
-            return MenuButton(
+          key: s.key,
-              key: s.key,
+          autoClose: s.autoClose,
-              autoClose: s.autoClose,
+          enabled: s.enabled,
-              enabled: s.enabled,
+          leading: s.leading,
-              leading: s.leading,
+          focusNode: s.focusNode,
-              focusNode: s.focusNode,
+          onPressed: (context) {
-              onPressed: (context) {
+            if (s.value != null) {
-                if (s.value != null) {
+              onSelected?.call(s.value as T);
-                  onSelected?.call(s.value as T);
+            }
-                }
+          },
-              },
+          popoverController: s.popoverController,
-              popoverController: s.popoverController,
+          subMenu: s.subMenu,
-              subMenu: s.subMenu,
+          trailing: s.trailing,
-              trailing: s.trailing,
+          child: s.child,
-              child: s.child,
+        );
-            );
+      }
-          }
+      return s;
-          return s;
+    }).toList();
-        }).toList();
 
     if (mediaQuery.mdAndUp) {
       await showDropdown<T?>(
@@ -93,7 +92,7 @@ class AdaptivePopSheetList<T> extends StatelessWidget {
         position: position,
         builder: (context) {
           return DropdownMenu(
-            children: childrenModified(context),
+            children: childrenModified,
           );
         },
       ).future;
@@ -110,12 +109,11 @@ class AdaptivePopSheetList<T> extends StatelessWidget {
       ),
       backgroundColor: context.theme.colorScheme.card,
       builder: (context) {
-        final children = childrenModified(context);
         return ListView.builder(
-          itemCount: children.length,
+          itemCount: childrenModified.length,
           shrinkWrap: true,
           itemBuilder: (context, index) {
-            final data = children[index];
+            final data = childrenModified[index];
 
             return Button(
               enabled: data.enabled,

lib/components/track_presentation/presentation_actions.dart

@@ -166,7 +166,7 @@ class TrackPresentationActionsSection extends HookConsumerWidget {
       },
       icon: const Icon(SpotubeIcons.moreVertical),
       variance: ButtonVariance.outline,
-      items: (context) => [
+      children: [
         AdaptiveMenuButton(
           value: "download",
           leading: const Icon(SpotubeIcons.download),

lib/components/track_presentation/sort_tracks_dropdown.dart

@@ -23,7 +23,7 @@ class SortTracksDropdown extends StatelessWidget {
       onSelected: onChanged,
       tooltip: context.l10n.sort_tracks,
       icon: const Icon(SpotubeIcons.sort),
-      items: (context) => [
+      children: [
         AdaptiveMenuButton(
           value: SortBy.none,
           enabled: value != SortBy.none,

lib/components/track_tile/track_options.dart

@@ -366,7 +366,7 @@ class TrackOptions extends HookConsumerWidget {
           ),
         ),
       ],
-      items: (context) => [
+      children: [
         if (isLocalTrack)
           AdaptiveMenuButton(
             value: TrackOptionValue.delete,

lib/modules/player/player.dart

@@ -27,7 +27,6 @@ import 'package:spotube/provider/audio_player/audio_player.dart';
 import 'package:spotube/provider/server/active_sourced_track.dart';
 import 'package:spotube/provider/volume_provider.dart';
 import 'package:spotube/services/sourced_track/sources/youtube.dart';
-import 'package:spotube/utils/platform.dart';
 
 import 'package:url_launcher/url_launcher_string.dart';
 
@@ -102,8 +101,7 @@ class PlayerView extends HookConsumerWidget {
           backgroundColor: Colors.transparent,
           headers: [
             SafeArea(
-              minimum:
+              minimum: const EdgeInsets.only(top: 80),
-                  kIsMobile ? const EdgeInsets.only(top: 80) : EdgeInsets.zero,
               bottom: false,
               child: TitleBar(
                 surfaceOpacity: 0,

lib/modules/player/player_actions.dart

@@ -191,7 +191,7 @@ class PlayerActions extends HookConsumerWidget {
               sleepTimerNotifier.setSleepTimer(value);
             }
           },
-          items: (context) => [
+          children: [
             for (final entry in sleepTimerEntries.entries)
               AdaptiveMenuButton(
                 value: entry.value,

lib/pages/lyrics/lyrics.dart

@@ -81,7 +81,6 @@ class LyricsPage extends HookConsumerWidget {
                   title: tabbar,
                   height: 58 * context.theme.scaling,
                   surfaceBlur: 0,
-                  automaticallyImplyLeading: false,
                 )
               : tabbar
         ],