.vscode/settings.json

@@ -9,7 +9,6 @@
     "fuzzywuzzy",
     "gapless",
     "instrumentalness",
-    "isrc",
     "Mpris",
     "RGBO",
     "riverpod",

lib/components/adaptive/adaptive_pop_sheet_list.dart

@@ -39,7 +39,7 @@ class AdaptivePopSheetList<T> extends StatelessWidget {
 
   final Offset offset;
 
-  final AbstractButtonStyle variance;
+  final ButtonVariance variance;
 
   const AdaptivePopSheetList({
     super.key,
@@ -92,10 +92,8 @@ class AdaptivePopSheetList<T> extends StatelessWidget {
         // ),
         position: position,
         builder: (context) {
-          return WidgetStatesProvider.boundary(
+          return DropdownMenu(
-            child: DropdownMenu(
+            children: childrenModified(context),
-              children: childrenModified(context),
-            ),
           );
         },
       ).future;

lib/components/heart_button/heart_button.dart

@@ -13,7 +13,7 @@ class HeartButton extends HookConsumerWidget {
   final IconData? icon;
   final Color? color;
   final String? tooltip;
-  final AbstractButtonStyle variance;
+  final ButtonVariance variance;
   final ButtonSize size;
   const HeartButton({
     required this.isLiked,

lib/components/titlebar/titlebar_icon_buttons.dart

@@ -1,6 +1,7 @@
 import 'dart:math';
 
 import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:spotube/extensions/button_variance.dart';
 
 class ShadcnWindowButton extends StatelessWidget {
   final Widget icon;
@@ -21,7 +22,7 @@ class ShadcnWindowButton extends StatelessWidget {
       height: 32,
       child: IconButton(
         variance: ButtonVariance.ghost.copyWith(
-          decoration: (context, states, value) {
+          decoration: (context, states) {
             final decoration = ButtonVariance.ghost.decoration(context, states)
                 as BoxDecoration;
             if (hoverBackgroundColor != null &&

lib/components/track_tile/track_tile.dart

@@ -5,7 +5,7 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
+import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:skeletonizer/skeletonizer.dart';
 import 'package:spotify/spotify.dart';
 import 'package:spotube/collections/routes.gr.dart';
@@ -17,6 +17,7 @@ import 'package:spotube/components/links/link_text.dart';
 import 'package:spotube/components/track_tile/track_options.dart';
 import 'package:spotube/components/ui/button_tile.dart';
 import 'package:spotube/extensions/artist_simple.dart';
+import 'package:spotube/extensions/button_variance.dart';
 import 'package:spotube/extensions/constrains.dart';
 import 'package:spotube/extensions/duration.dart';
 import 'package:spotube/extensions/image.dart';
@@ -107,7 +108,7 @@ class TrackTile extends HookConsumerWidget {
                     ? ButtonVariance.destructive
                     : ButtonVariance.ghost)
                 .copyWith(
-              padding: (context, states, value) =>
+              padding: (context, states) =>
                   const EdgeInsets.symmetric(vertical: 8, horizontal: 0),
             ),
             leading: Row(
@@ -228,8 +229,7 @@ class TrackTile extends HookConsumerWidget {
                           Flexible(
                             child: Button(
                               style: ButtonVariance.link.copyWith(
-                                padding: (context, states, value) =>
+                                padding: (context, states) => EdgeInsets.zero,
-                                    EdgeInsets.zero,
                               ),
                               onPressed: () {
                                 context

lib/components/ui/button_tile.dart

@@ -9,7 +9,7 @@ class ButtonTile extends StatelessWidget {
   final VoidCallback? onPressed;
   final VoidCallback? onLongPress;
   final bool selected;
-  final AbstractButtonStyle style;
+  final ButtonVariance style;
   final EdgeInsets? padding;
 
   const ButtonTile({

lib/modules/home/sections/genres/genre_card_playlist_card.dart

@@ -1,6 +1,6 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
+import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:spotify/spotify.dart' hide Image;
 import 'package:spotube/collections/env.dart';
 import 'package:spotube/collections/routes.gr.dart';

lib/modules/player/player.dart

@@ -2,7 +2,7 @@ import 'package:auto_route/auto_route.dart';
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
+import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:sliding_up_panel/sliding_up_panel.dart';
 
 import 'package:spotube/collections/assets.gen.dart';

lib/modules/player/player_actions.dart

@@ -2,7 +2,7 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
+import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:shadcn_flutter/shadcn_flutter_extension.dart';
 import 'package:spotube/collections/routes.gr.dart';
 

lib/modules/player/player_controls.dart

@@ -3,7 +3,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:media_kit/media_kit.dart';
 import 'package:palette_generator/palette_generator.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
+import 'package:shadcn_flutter/shadcn_flutter.dart';
 
 import 'package:spotube/collections/spotube_icons.dart';
 import 'package:spotube/collections/intents.dart';

lib/modules/player/player_overlay_collapsed.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
+import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:sliding_up_panel/sliding_up_panel.dart';
 import 'package:spotube/collections/intents.dart';
 import 'package:spotube/collections/spotube_icons.dart';

lib/modules/playlist/playlist_card.dart

@@ -1,7 +1,7 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
+import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:spotify/spotify.dart' hide Offset, Image;
 import 'package:spotube/collections/env.dart';
 import 'package:spotube/collections/routes.gr.dart';

lib/modules/root/bottom_player.dart

@@ -1,7 +1,7 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
+import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:shadcn_flutter/shadcn_flutter_extension.dart';
 
 import 'package:spotube/collections/assets.gen.dart';

lib/pages/artist/section/header.dart

@@ -1,7 +1,7 @@
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
+import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:skeletonizer/skeletonizer.dart';
 import 'package:spotube/collections/fake.dart';
 import 'package:spotube/collections/spotube_icons.dart';

lib/pages/connect/control/control.dart

@@ -1,6 +1,6 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
+import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:shadcn_flutter/shadcn_flutter_extension.dart';
 import 'package:spotube/collections/routes.gr.dart';
 import 'package:spotube/collections/spotube_icons.dart';

lib/pages/lyrics/lyrics.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
+import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:shadcn_flutter/shadcn_flutter_extension.dart';
 
 import 'package:spotube/components/titlebar/titlebar.dart';

lib/pages/lyrics/mini_lyrics.dart

@@ -2,7 +2,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:palette_generator/palette_generator.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
+import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:shadcn_flutter/shadcn_flutter_extension.dart';
 import 'package:spotube/collections/routes.gr.dart';
 import 'package:spotube/collections/spotube_icons.dart';

lib/pages/search/search.dart

@@ -125,34 +125,28 @@ class SearchPage extends HookConsumerWidget {
                                       child: TextField(
                                         autofocus: true,
                                         controller: controller,
-                                        features: [
+                                        leading:
-                                          const InputFeature.leading(
+                                            const Icon(SpotubeIcons.search),
-                                            Icon(SpotubeIcons.search),
-                                          ),
-                                          InputFeature.trailing(
-                                            AnimatedCrossFade(
-                                              duration: const Duration(
-                                                  milliseconds: 300),
-                                              crossFadeState: controller
-                                                      .text.isNotEmpty
-                                                  ? CrossFadeState.showFirst
-                                                  : CrossFadeState.showSecond,
-                                              firstChild: IconButton.ghost(
-                                                size: ButtonSize.small,
-                                                icon: const Icon(
-                                                    SpotubeIcons.close),
-                                                onPressed: () {
-                                                  controller.clear();
-                                                },
-                                              ),
-                                              secondChild:
-                                                  const SizedBox.square(
-                                                      dimension: 28),
-                                            ),
-                                          )
-                                        ],
                                         textInputAction: TextInputAction.search,
                                         placeholder: Text(context.l10n.search),
+                                        trailing: AnimatedCrossFade(
+                                          duration:
+                                              const Duration(milliseconds: 300),
+                                          crossFadeState:
+                                              controller.text.isNotEmpty
+                                                  ? CrossFadeState.showFirst
+                                                  : CrossFadeState.showSecond,
+                                          firstChild: IconButton.ghost(
+                                            size: ButtonSize.small,
+                                            icon:
+                                                const Icon(SpotubeIcons.close),
+                                            onPressed: () {
+                                              controller.clear();
+                                            },
+                                          ),
+                                          secondChild: const SizedBox.square(
+                                              dimension: 28),
+                                        ),
                                         onSubmitted: onSubmitted,
                                       ),
                                     ),

lib/pages/settings/sections/playback.dart

@@ -11,7 +11,7 @@ import 'package:form_builder_validators/form_builder_validators.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:piped_client/piped_client.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
+import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:spotube/collections/routes.gr.dart';
 import 'package:spotube/collections/spotube_icons.dart';
 import 'package:spotube/components/form/text_form_field.dart';
@@ -106,7 +106,7 @@ class SettingsPlaybackSection extends HookConsumerWidget {
                       Tooltip(
                         tooltip: TooltipContainer(
                           child: Text(context.l10n.add_custom_url),
-                        ).call,
+                        ),
                         child: IconButton.outline(
                           icon: const Icon(SpotubeIcons.edit),
                           size: ButtonSize.small,
@@ -261,7 +261,7 @@ class SettingsPlaybackSection extends HookConsumerWidget {
                       Tooltip(
                         tooltip: TooltipContainer(
                           child: Text(context.l10n.add_custom_url),
-                        ).call,
+                        ),
                         child: IconButton.outline(
                           icon: const Icon(SpotubeIcons.edit),
                           size: ButtonSize.small,

lib/provider/server/routes/playback.dart

@@ -128,10 +128,7 @@ class ServerPlaybackRoutes {
           .read(sourcedTrackProvider(SpotubeMedia(track)).notifier)
           .refreshStreamingUrl();
 
-      if (playlist.activeTrack?.id == sourcedTrack?.id &&
+      ref.read(activeSourcedTrackProvider.notifier).update(sourcedTrack);
-          sourcedTrack != null) {
-        ref.read(activeSourcedTrackProvider.notifier).update(sourcedTrack);
-      }
 
       return await dio.get<Uint8List>(
         sourcedTrack!.url,
@@ -202,10 +199,7 @@ class ServerPlaybackRoutes {
           ? activeSourcedTrack
           : await ref.read(sourcedTrackProvider(SpotubeMedia(track)).future);
 
-      if (playlist.activeTrack?.id == sourcedTrack?.id &&
+      ref.read(activeSourcedTrackProvider.notifier).update(sourcedTrack);
-          sourcedTrack != null) {
-        ref.read(activeSourcedTrackProvider.notifier).update(sourcedTrack);
-      }
 
       final (bytes: audioBytes, response: res) =
           await streamTrack(sourcedTrack!, request.headers);

lib/services/sourced_track/sources/youtube.dart

@@ -238,28 +238,32 @@ class YoutubeSourcedTrack extends SourcedTrack {
 
   static Future<List<YoutubeVideoInfo>> fetchFromIsrc({
     required Track track,
+    required Provider provider,
     required Ref ref,
   }) async {
     final isrcResults = <YoutubeVideoInfo>[];
     final isrc = track.externalIds?.isrc;
     if (isrc != null && isrc.isNotEmpty) {
-      final searchedVideos =
+      final searchedVideos = await ref
-          await ref.read(youtubeEngineProvider).searchVideos(isrc.toString());
+          .read(provider)
+          .searchVideos(isrc.toString());
       if (searchedVideos.isNotEmpty) {
         isrcResults.addAll(searchedVideos
             .map<YoutubeVideoInfo>(YoutubeVideoInfo.fromVideo)
             .map((YoutubeVideoInfo videoInfo) {
-              final ytWords = videoInfo.title
+              final ytWords =
-                  .toLowerCase()
+                  videoInfo.title
-                  .replaceAll(RegExp(r'[^a-zA-Z0-9\s]+'), '')
+                      .toLowerCase()
-                  .split(RegExp(r'\s+'))
+                      .replaceAll(RegExp(r'[^a-zA-Z0-9\s]+'), '')
-                  .where((item) => item.isNotEmpty);
+                      .split(RegExp(r'\s+'))
-              final spWords = track.name!
+                      .where((item) => item.isNotEmpty);
-                  .toLowerCase()
+              final spWords =
-                  .replaceAll(RegExp(r'\((.*)\)'), '')
+                  track.name!
-                  .replaceAll(RegExp(r'[^a-zA-Z0-9\s]+'), '')
+                      .toLowerCase()
-                  .split(RegExp(r'\s+'))
+                      .replaceAll(RegExp(r'\((.*)\)'), '')
-                  .where((item) => item.isNotEmpty);
+                      .replaceAll(RegExp(r'[^a-zA-Z0-9\s]+'), '')
+                      .split(RegExp(r'\s+'))
+                      .where((item) => item.isNotEmpty);
               // Word match to filter out unrelated results
               final matchCount =
                   ytWords.where((word) => spWords.contains(word)).length;
@@ -267,9 +271,8 @@ class YoutubeSourcedTrack extends SourcedTrack {
                 return videoInfo;
               }
               return null;
-            })
+            }
-            .whereType<YoutubeVideoInfo>()
+        ).whereType<YoutubeVideoInfo>().toList());
-            .toList());
       }
     }
     return isrcResults;
@@ -281,31 +284,22 @@ class YoutubeSourcedTrack extends SourcedTrack {
   }) async {
     final videoResults = <YoutubeVideoInfo>[];
 
-    if (track is! SourcedTrack) {
+    final isrcResults = await fetchFromIsrc(track: track, provider: youtubeEngineProvider, ref: ref);
-      final isrcResults = await fetchFromIsrc(
+    videoResults.addAll(isrcResults);
-        track: track,
-        ref: ref,
-      );
 
-      videoResults.addAll(isrcResults);
+    final links = await SongLinkService.links(track.id!);
+    final ytLink = links.firstWhereOrNull((link) => link.platform == "youtube");
 
-      if (isrcResults.isEmpty) {
+    if (isrcResults.isEmpty && ytLink?.url != null) {
-        final links = await SongLinkService.links(track.id!);
+      try {
-        final ytLink = links.firstWhereOrNull(
+        videoResults.add(
-          (link) => link.platform == "youtube",
+            YoutubeVideoInfo.fromVideo(
-        );
+                await ref.read(youtubeEngineProvider)
-        if (ytLink?.url != null) {
+                    .getVideo(Uri.parse(ytLink!.url!).queryParameters["v"]!)
-          try {
+        ));
-            videoResults.add(
+      } on VideoUnplayableException catch (e, stack) {
-              YoutubeVideoInfo.fromVideo(await ref
+        // Ignore this error and continue with the search
-                  .read(youtubeEngineProvider)
+        AppLogger.reportError(e, stack);
-                  .getVideo(Uri.parse(ytLink!.url!).queryParameters["v"]!)),
-            );
-          } on VideoUnplayableException catch (e, stack) {
-            // Ignore this error and continue with the search
-            AppLogger.reportError(e, stack);
-          }
-        }
       }
     }
 
@@ -315,12 +309,13 @@ class YoutubeSourcedTrack extends SourcedTrack {
         await ref.read(youtubeEngineProvider).searchVideos(query);
 
     if (ServiceUtils.onlyContainsEnglish(query)) {
-      videoResults
+      videoResults.addAll(
-          .addAll(searchResults.map(YoutubeVideoInfo.fromVideo).toList());
+          searchResults.map(YoutubeVideoInfo.fromVideo).toList()
+      );
     } else {
       videoResults.addAll(rankResults(
-        searchResults.map(YoutubeVideoInfo.fromVideo).toList(),
+          searchResults.map(YoutubeVideoInfo.fromVideo).toList(),
-        track,
+          track,
       ));
     }
 

linux/CMakeLists.txt

@@ -32,7 +32,6 @@ function(APPLY_STANDARD_SETTINGS TARGET)
   target_compile_options(${TARGET} PRIVATE -Wall -Werror)
   target_compile_options(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:-O3>")
   target_compile_definitions(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:NDEBUG>")
-  target_compile_options(${TARGET} PRIVATE -Wno-error=deprecated-declarations)
 endfunction()
 
 set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")

pubspec.lock

@@ -2012,10 +2012,10 @@ packages:
     dependency: "direct main"
     description:
       name: shadcn_flutter
-      sha256: "2b6faf9a93628469c29a534e653295e26781f2799efe5dc971b91e91062ebf52"
+      sha256: "1e5f40484a42217a69af254952168783d1305025d56dabc45ab16396dba84d5e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.0.32"
+    version: "0.0.26"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -2449,10 +2449,10 @@ packages:
     dependency: "direct main"
     description:
       name: tray_manager
-      sha256: c2da0f0f1ddb455e721cf68d05d1281fec75cf5df0a1d3cb67b6ca0bdfd5709d
+      sha256: f231031c5c0eb4ad514e18ddaab27a912ddbe50335c594bc28fb0f9972ab6a84
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.0"
+    version: "0.3.1"
   type_plus:
     dependency: transitive
     description:

pubspec.yaml

@@ -102,7 +102,7 @@ dependencies:
       ref: dart-3-support
       url: https://github.com/KRTirtho/scrobblenaut.git
   scroll_to_index: ^3.0.1
-  shadcn_flutter: ^0.0.32
+  shadcn_flutter: ^0.0.26
   shared_preferences: ^2.2.3
   shelf: ^1.4.1
   shelf_router: ^1.1.4
@@ -120,7 +120,7 @@ dependencies:
   test: ^1.25.7
   timezone: ^0.10.0
   titlebar_buttons: ^1.0.0
-  tray_manager: ^0.4.0
+  tray_manager: ^0.3.0
   url_launcher: ^6.2.6
   uuid: ^4.4.0
   version: ^3.0.2