Merge 3ff0f6dd27 into 4072531c62

.github/workflows/pr-lint.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
 
 env:
-  FLUTTER_VERSION: 3.29.1
+  FLUTTER_VERSION: 3.29.0
 
 jobs:
   lint:

.github/workflows/spotube-release-binary.yml

@@ -20,7 +20,7 @@ on:
         description: Dry run without uploading to release
 
 env:
-  FLUTTER_VERSION: 3.29.1
+  FLUTTER_VERSION: 3.29.0
   FLUTTER_CHANNEL: master
 
 permissions:

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/animated_gradient.dart

@@ -0,0 +1,126 @@
+import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+
+class AnimateGradient extends HookWidget {
+  const AnimateGradient({
+    super.key,
+    required this.primaryColors,
+    required this.secondaryColors,
+    this.child,
+    this.primaryBegin,
+    this.primaryEnd,
+    this.secondaryBegin,
+    this.secondaryEnd,
+    AnimationController? controller,
+    this.duration = const Duration(seconds: 4),
+    this.animateAlignments = true,
+    this.reverse = true,
+  })  : assert(primaryColors.length >= 2),
+        assert(primaryColors.length == secondaryColors.length),
+        _controller = controller;
+
+  /// [controller]: pass this to have a fine control over the [Animation]
+  final AnimationController? _controller;
+
+  /// [duration]: Time to switch between [Gradient].
+  /// By default its value is [Duration(seconds:4)]
+  final Duration duration;
+
+  /// [primaryColors]: These will be the starting colors of the [Animation].
+  final List<Color> primaryColors;
+
+  /// [secondaryColors]: These Colors are those in which the [primaryColors] will transition into.
+  final List<Color> secondaryColors;
+
+  /// [primaryBegin]: This is begin [Alignment] for [primaryColors].
+  /// By default its value is [Alignment.topLeft]
+  final Alignment? primaryBegin;
+
+  /// [primaryBegin]: This is end [Alignment] for [primaryColors].
+  /// By default its value is [Alignment.topRight]
+  final Alignment? primaryEnd;
+
+  /// [secondaryBegin]: This is begin [Alignment] for [secondaryColors].
+  /// By default its value is [Alignment.bottomLeft]
+  final Alignment? secondaryBegin;
+
+  /// [secondaryEnd]: This is end [Alignment] for [secondaryColors].
+  /// By default its value is [Alignment.bottomRight]
+  final Alignment? secondaryEnd;
+
+  /// [animateAlignments]: set to false if you don't want to animate the alignments.
+  /// This can provide you way cooler animations
+  final bool animateAlignments;
+
+  /// [reverse]: set it to false if you don't want to reverse the animation.
+  /// using that it will go into one direction only
+  final bool reverse;
+
+  final Widget? child;
+
+  @override
+  Widget build(BuildContext context) {
+    // ignore: no_leading_underscores_for_local_identifiers
+    final __controller = useAnimationController(
+      duration: duration,
+    )..repeat(reverse: reverse);
+
+    final controller = _controller ?? __controller;
+
+    final animation = useMemoized(
+        () => CurvedAnimation(
+              parent: controller,
+              curve: Curves.easeInOut,
+            ),
+        [controller]);
+
+    final colorTween = useMemoized(
+        () => primaryColors.map((color) {
+              return ColorTween(
+                begin: color,
+                end: color,
+              );
+            }).toList(),
+        [primaryColors]);
+    final colors = useMemoized(
+        () => colorTween.map((color) {
+              return color.evaluate(animation)!;
+            }).toList(),
+        [colorTween, animation]);
+
+    final begin = useMemoized(
+        () => AlignmentTween(
+              begin: primaryBegin ?? Alignment.topLeft,
+              end: primaryEnd ?? Alignment.topRight,
+            ),
+        [primaryBegin, primaryEnd]);
+
+    final end = useMemoized(
+        () => AlignmentTween(
+              begin: secondaryBegin ?? Alignment.bottomLeft,
+              end: secondaryEnd ?? Alignment.bottomRight,
+            ),
+        [secondaryBegin, secondaryEnd]);
+
+    return AnimatedBuilder(
+      animation: animation,
+      child: useMemoized(() => child, [child]),
+      builder: (BuildContext context, Widget? child) {
+        return Container(
+          decoration: BoxDecoration(
+            gradient: LinearGradient(
+              begin: animateAlignments
+                  ? begin.evaluate(animation)
+                  : (primaryBegin as Alignment),
+              end: animateAlignments
+                  ? end.evaluate(animation)
+                  : primaryEnd as Alignment,
+              colors: colors,
+            ),
+          ),
+          child: child,
+        );
+      },
+    );
+  }
+}

lib/components/spotube_page_route.dart

@@ -0,0 +1,24 @@
+import 'package:shadcn_flutter/shadcn_flutter.dart';
+
+class SpotubePage<T> extends MaterialPage<T> {
+  const SpotubePage({required super.child});
+}
+
+// class SpotubeSlidePage extends CustomTransitionPage {
+//   SpotubeSlidePage({
+//     required super.child,
+//     super.key,
+//   }) : super(
+//           reverseTransitionDuration: const Duration(milliseconds: 150),
+//           transitionDuration: const Duration(milliseconds: 150),
+//           transitionsBuilder: (context, animation, secondaryAnimation, child) {
+//             return SlideTransition(
+//               position: Tween<Offset>(
+//                 begin: const Offset(1, 0),
+//                 end: Offset.zero,
+//               ).animate(animation),
+//               child: child,
+//             );
+//           },
+//         );
+// }

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

@@ -90,25 +90,11 @@ class TrackOptions extends HookConsumerWidget {
     BuildContext context,
     Track track,
   ) {
-    /// showDialog doesn't work for some reason. So we have to
+    showDialog(
-    /// manually push a Dialog Route in the Navigator to get it working
+      context: context,
-    Navigator.push(
+      builder: (context) => PlaylistAddTrackDialog(
-      context,
+        tracks: [track],
-      DialogRoute(
+        openFromPlaylist: playlistId,
-        alignment: Alignment.bottomCenter,
-        transitionBuilder: (context, animation, secondaryAnimation, child) {
-          return FadeTransition(opacity: animation, child: child);
-        },
-        context: context,
-        barrierColor: Colors.black.withValues(alpha: 0.5),
-        builder: (context) {
-          return Center(
-            child: PlaylistAddTrackDialog(
-              tracks: [track],
-              openFromPlaylist: playlistId,
-            ),
-          );
-        },
       ),
     );
   }
@@ -366,7 +352,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/modules/playlist/playlist_create_dialog.dart

@@ -101,17 +101,11 @@ class PlaylistCreateDialog extends HookConsumerWidget {
         } else {
           await playlistNotifier.create(payload, onError);
         }
-
-        if (trackIds.isNotEmpty) {
-          await playlistNotifier.addTracks(trackIds, onError);
-        }
       } finally {
         isSubmitting.value = false;
         if (context.mounted &&
             !ref.read(playlistProvider(playlistId ?? "")).hasError) {
-          context.router.maybePop<Playlist>(
+          context.router.maybePop();
-            await ref.read(playlistProvider(playlistId ?? "").future),
-          );
         }
       }
     }

lib/pages/getting_started/sections/region.dart

@@ -133,38 +133,37 @@ class GettingStartedPageLanguageRegionSection extends HookConsumerWidget {
                       popup: SelectPopup.builder(
                         searchPlaceholder: Text(context.l10n.search),
                         builder: (context, searchQuery) {
-                          final hasNotQueried =
+                          final filteredLocale = searchQuery?.isNotEmpty != true
-                              searchQuery == null || searchQuery.trim().isEmpty;
+                              ? L10n.all
-                          final filteredLocale = hasNotQueried
-                              ? [
-                                  const Locale("system", "system"),
-                                  ...L10n.all,
-                                ]
                               : L10n.all
                                   .where(
-                                    (element) => filterLocale(
+                                    (element) =>
-                                      element,
+                                        filterLocale(element, searchQuery!),
-                                      searchQuery.trim(),
-                                    ),
                                   )
                                   .toList();
 
                           return SelectItemBuilder(
-                            childCount: filteredLocale.length,
+                            childCount: filteredLocale.length + 1,
                             builder: (context, index) {
-                              final locale = filteredLocale[index];
+                              if (index == 0 &&
-                              if (locale == const Locale("system", "system")) {
+                                  searchQuery?.isNotEmpty != true) {
                                 return SelectItemButton(
-                                  value: locale,
+                                  value: const Locale("system", "system"),
                                   child: Text(context.l10n.system_default),
                                 );
                               }
+
+                              final indexThen = searchQuery?.isNotEmpty != true
+                                  ? index
+                                  : index - 1;
+
+                              final locale = filteredLocale[indexThen];
                               return SelectItemButton(
                                 value: locale,
                                 child: Text(
                                   LanguageLocals.getDisplayLanguage(
-                                    locale.languageCode,
+                                          locale.languageCode)
-                                  ).toString(),
+                                      .toString(),
                                 ),
                               );
                             },

lib/pages/lastfm_login/lastfm_login.dart

@@ -96,9 +96,7 @@ class LastFMLoginPage extends HookConsumerWidget {
                             FormField(
                               label: Text(context.l10n.username),
                               key: usernameKey,
-                              validator: const NotEmptyValidator(
+                              validator: const NotEmptyValidator(),
-                                message: "Username is required",
-                              ),
                               child: TextField(
                                 autofillHints: const [
                                   AutofillHints.username,
@@ -109,9 +107,7 @@ class LastFMLoginPage extends HookConsumerWidget {
                             ),
                             FormField(
                               key: passwordKey,
-                              validator: const NotEmptyValidator(
+                              validator: const NotEmptyValidator(),
-                                message: "Password is required",
-                              ),
                               label: Text(context.l10n.password),
                               child: TextField(
                                 autofillHints: const [

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
         ],

lib/provider/local_tracks/local_tracks_provider.dart

@@ -24,9 +24,6 @@ const supportedAudioTypes = [
   "audio/opus",
   "audio/wav",
   "audio/aac",
-  "audio/flac",
-  "audio/x-flac",
-  "audio/x-wav",
 ];
 
 const imgMimeToExt = {
@@ -71,16 +68,13 @@ final localTracksProvider =
               await Directory(location).list(recursive: true).toList();
 
           entities.addAll(
-            dirEntities.where(
+            dirEntities
-              (e) {
+                .where(
-                final mime = lookupMimeType(e.path) ??
+                  (e) =>
-                    (extension(e.path) == ".opus" ? "audio/opus" : null);
+                      e is File &&
-
+                      supportedAudioTypes.contains(lookupMimeType(e.path)),
-                print("${basename(e.path)}: $mime");
+                )
-
+                .cast<File>(),
-                return e is File && supportedAudioTypes.contains(mime);
-              },
-            ).cast<File>(),
           );
         } catch (e, stack) {
           AppLogger.reportError(e, stack);

lib/provider/spotify/playlist/playlist.dart

@@ -98,23 +98,6 @@ class PlaylistNotifier extends FamilyAsyncNotifier<Playlist, String> {
       }
     });
   }
-
-  Future<void> addTracks(List<String> trackIds, [ValueChanged? onError]) async {
-    try {
-      if (state.value == null) return;
-
-      final spotify = ref.read(spotifyProvider);
-
-      await spotify.playlists.addTracks(
-        trackIds.map((id) => "spotify:track:$id").toList(),
-        state.value!.id!,
-      );
-    } catch (e, stack) {
-      onError?.call(e);
-      AppLogger.reportError(e, stack);
-      rethrow;
-    }
-  }
 }
 
 final playlistProvider =

pubspec.lock

@@ -1539,10 +1539,10 @@ packages:
     dependency: "direct main"
     description:
       name: mime
-      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
+      sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "1.0.6"
   nm:
     dependency: transitive
     description:

pubspec.yaml

@@ -88,7 +88,7 @@ dependencies:
   media_kit: ^1.1.10+1
   media_kit_libs_audio: ^1.0.4
   metadata_god: ^1.0.0
-  mime: ^2.0.0
+  mime: ^1.0.2
   open_file: ^3.5.10
   package_info_plus: ^6.0.0
   palette_generator: ^0.3.3
@@ -193,6 +193,46 @@ flutter:
     - packages/flutter_undraw/assets/undraw/empty.svg
     - packages/flutter_undraw/assets/undraw/no_data.svg
   fonts:
+    - family: GeistSans
+      fonts:
+        - asset: packages/shadcn_flutter/fonts/Geist-Black.otf
+          weight: 800
+        - asset: packages/shadcn_flutter/fonts/Geist-Bold.otf
+          weight: 700
+        - asset: packages/shadcn_flutter/fonts/Geist-Light.otf
+          weight: 300
+        - asset: packages/shadcn_flutter/fonts/Geist-Medium.otf
+          weight: 500
+        - asset: packages/shadcn_flutter/fonts/Geist-SemiBold.otf
+          weight: 600
+        - asset: packages/shadcn_flutter/fonts/Geist-Thin.otf
+          weight: 100
+        - asset: packages/shadcn_flutter/fonts/Geist-UltraBlack.otf
+          weight: 900
+        - asset: packages/shadcn_flutter/fonts/Geist-UltraLight.otf
+          weight: 200
+        - asset: packages/shadcn_flutter/fonts/Geist-Regular.otf
+          weight: 400
+    - family: GeistMono
+      fonts:
+        - asset: packages/shadcn_flutter/fonts/GeistMono-Black.otf
+          weight: 800
+        - asset: packages/shadcn_flutter/fonts/GeistMono-Bold.otf
+          weight: 700
+        - asset: packages/shadcn_flutter/fonts/GeistMono-Light.otf
+          weight: 300
+        - asset: packages/shadcn_flutter/fonts/GeistMono-Medium.otf
+          weight: 500
+        - asset: packages/shadcn_flutter/fonts/GeistMono-Regular.otf
+          weight: 400
+        - asset: packages/shadcn_flutter/fonts/GeistMono-SemiBold.otf
+          weight: 600
+        - asset: packages/shadcn_flutter/fonts/GeistMono-Thin.otf
+          weight: 100
+        - asset: packages/shadcn_flutter/fonts/GeistMono-UltraBlack.otf
+          weight: 900
+        - asset: packages/shadcn_flutter/fonts/GeistMono-UltraLight.otf
+          weight: 200
     - family: RadixIcons
       fonts:
         - asset: packages/shadcn_flutter/icons/RadixIcons.otf