Merge 56bfce06f1 into 0ec9f3535b

.vscode/settings.json

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

android/app/src/debug/AndroidManifest.xml

@@ -3,17 +3,4 @@
          to allow setting breakpoints, to provide hot reload, etc.
     -->
   <uses-permission android:name="android.permission.INTERNET" />
-  <application
-    android:name="${applicationName}"
-    android:allowBackup="false"
-    android:fullBackupContent="false"
-    android:icon="@mipmap/ic_launcher"
-    android:label="@string/app_name_en"
-    android:requestLegacyExternalStorage="true"
-    android:usesCleartextTraffic="true">
-    <!-- Disable Impeller -->
-    <meta-data
-      android:name="io.flutter.embedding.android.EnableImpeller"
-      android:value="false" />
-  </application>
 </manifest>

lib/collections/fake.dart

@@ -94,7 +94,6 @@ abstract class FakeData {
     ..trackNumber = 1
     ..type = "type"
     ..uri = "uri"
-    ..externalIds = externalIds
     ..isPlayable = true
     ..explicit = false
     ..linkedFrom = trackLink;

lib/components/adaptive/adaptive_pop_sheet_list.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/material.dart' show showModalBottomSheet;
 import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:shadcn_flutter/shadcn_flutter_extension.dart';
 import 'package:spotube/collections/spotube_icons.dart';
@@ -25,7 +26,7 @@ class AdaptiveMenuButton<T> extends MenuButton {
 
 /// An adaptive widget that shows a [PopupMenuButton] when screen size is above
 /// or equal to 640px
-/// In smaller screen, a [IconButton] with a [openDrawer] is shown
+/// In smaller screen, a [IconButton] with a [showModalBottomSheet] is shown
 class AdaptivePopSheetList<T> extends StatelessWidget {
   final List<AdaptiveMenuButton<T>> Function(BuildContext context) items;
   final Widget? icon;
@@ -38,7 +39,7 @@ class AdaptivePopSheetList<T> extends StatelessWidget {
 
   final Offset offset;
 
-  final AbstractButtonStyle variance;
+  final ButtonVariance variance;
 
   const AdaptivePopSheetList({
     super.key,
@@ -91,23 +92,23 @@ class AdaptivePopSheetList<T> extends StatelessWidget {
         // ),
         position: position,
         builder: (context) {
-          return WidgetStatesProvider.boundary(
+          return DropdownMenu(
-            child: DropdownMenu(
+            children: childrenModified(context),
-              children: childrenModified(context),
-            ),
           );
         },
       ).future;
       return;
     }
 
-    await openDrawer(
+    showModalBottomSheet(
       context: context,
-      draggable: true,
+      enableDrag: true,
       showDragHandle: true,
-      position: OverlayPosition.bottom,
+      useRootNavigator: true,
-      borderRadius: context.theme.borderRadiusMd,
+      shape: RoundedRectangleBorder(
-      transformBackdrop: false,
+        borderRadius: context.theme.borderRadiusMd,
+      ),
+      backgroundColor: context.theme.colorScheme.card,
       builder: (context) {
         final children = childrenModified(context);
         return ListView.builder(
@@ -124,7 +125,7 @@ class AdaptivePopSheetList<T> extends StatelessWidget {
               onPressed: () {
                 data.onPressed?.call(context);
                 if (data.autoClose) {
-                  closeDrawer(context);
+                  Navigator.of(context).pop();
                 }
               },
               leading: data.leading,

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_presentation/presentation_actions.dart

@@ -74,26 +74,6 @@ class TrackPresentationActionsSection extends HookConsumerWidget {
         ref.watch(presentationStateProvider(options.collection).notifier);
     final selectedTracks = state.selectedTracks;
 
-    Future<void> actionDownloadTracks({
-      required BuildContext context,
-      required List<Track> tracks,
-      required String action,
-    }) async {
-      final confirmed = audioSource == AudioSource.piped ||
-          (await showDialog<bool>(
-                context: context,
-                builder: (context) {
-                  return const ConfirmDownloadDialog();
-                },
-              ) ??
-              false);
-      if (confirmed != true) return;
-      downloader.batchAddToQueue(tracks);
-      notifier.deselectAllTracks();
-      if (!context.mounted) return;
-      showToastForAction(context, action, tracks.length);
-    }
-
     return AdaptivePopSheetList(
       tooltip: context.l10n.more_actions,
       headings: [
@@ -115,12 +95,22 @@ class TrackPresentationActionsSection extends HookConsumerWidget {
 
         switch (action) {
           case "download":
-            await actionDownloadTracks(
+            {
-              context: context,
+              final confirmed = audioSource == AudioSource.piped ||
-              tracks: tracks,
+                  (await showDialog<bool?>(
-              action: action,
+                        context: context,
-            );
+                        builder: (context) {
-            break;
+                          return const ConfirmDownloadDialog();
+                        },
+                      ) ??
+                      false);
+              if (confirmed != true) return;
+              downloader.batchAddToQueue(tracks);
+              notifier.deselectAllTracks();
+              if (!context.mounted) return;
+              showToastForAction(context, action, tracks.length);
+              break;
+            }
           case "add-to-playlist":
             {
               if (context.mounted) {

lib/components/track_presentation/presentation_top.dart

@@ -57,7 +57,7 @@ class TrackPresentationTopSection extends HookConsumerWidget {
         Tooltip(
           tooltip: TooltipContainer(
             child: Text(context.l10n.shuffle_playlist),
-          ).call,
+          ),
           child: IconButton.secondary(
             icon: isLoading
                 ? const Center(
@@ -73,7 +73,7 @@ class TrackPresentationTopSection extends HookConsumerWidget {
           Tooltip(
             tooltip: TooltipContainer(
               child: Text(context.l10n.add_to_queue),
-            ).call,
+            ),
             child: IconButton.secondary(
               icon: const Icon(SpotubeIcons.queueAdd),
               enabled: !isLoading && !isActive,
@@ -126,7 +126,7 @@ class TrackPresentationTopSection extends HookConsumerWidget {
           Tooltip(
             tooltip: TooltipContainer(
               child: Text(context.l10n.share),
-            ).call,
+            ),
             child: IconButton.outline(
               icon: const Icon(SpotubeIcons.share),
               size: ButtonSize.small,

lib/components/track_tile/track_options.dart

@@ -91,14 +91,24 @@ class TrackOptions extends HookConsumerWidget {
   ) {
     /// showDialog doesn't work for some reason. So we have to
     /// manually push a Dialog Route in the Navigator to get it working
-    showDialog(
+    Navigator.push(
-      context: context,
+      context,
-      builder: (context) {
+      DialogRoute(
-        return PlaylistAddTrackDialog(
+        alignment: Alignment.bottomCenter,
-          tracks: [track],
+        transitionBuilder: (context, animation, secondaryAnimation, child) {
-          openFromPlaylist: playlistId,
+          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,
+            ),
+          );
+        },
+      ),
     );
   }
 
@@ -328,7 +338,6 @@ class TrackOptions extends HookConsumerWidget {
         }
       },
       icon: icon ?? const Icon(SpotubeIcons.moreHorizontal),
-      variance: ButtonVariance.outline,
       headings: [
         Basic(
           leading: AspectRatio(

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/extensions/track.dart

@@ -4,9 +4,7 @@ import 'dart:typed_data';
 import 'package:metadata_god/metadata_god.dart';
 import 'package:path/path.dart';
 import 'package:spotify/spotify.dart';
-import 'package:spotube/provider/spotify/spotify.dart';
 import 'package:spotube/services/audio_player/audio_player.dart';
-import 'package:spotube/services/logger/logger.dart';
 
 extension TrackExtensions on Track {
   Track fromFile(
@@ -69,40 +67,27 @@ extension TrackExtensions on Track {
   }
 }
 
-extension IterableTrackSimpleExtensions on Iterable<TrackSimple> {
+extension TrackSimpleExtensions on TrackSimple {
-  Future<List<Track>> asTracks(AlbumSimple album, ref) async {
+  Track asTrack(AlbumSimple album) {
-    try {
+    Track track = Track();
-      final spotify = ref.read(spotifyProvider);
+    track.name = name;
-      final tracks = await spotify.invoke(
+    track.album = album;
-        (api) => api.tracks.list(map((trackSimple) => trackSimple.id!).toList()));
+    track.artists = artists;
-      return tracks.toList();
+    track.availableMarkets = availableMarkets;
-    } catch (e, stack) {
+    track.discNumber = discNumber;
-      // Ignore errors and create the track locally
+    track.durationMs = durationMs;
-      AppLogger.reportError(e, stack);
+    track.explicit = explicit;
-
+    track.externalUrls = externalUrls;
-      List<Track> tracks = [];
+    track.href = href;
-      for (final trackSimple in this) {
+    track.id = id;
-        Track track = Track();
+    track.isPlayable = isPlayable;
-        track.album = album;
+    track.linkedFrom = linkedFrom;
-        track.name = trackSimple.name;
+    track.name = name;
-        track.artists = trackSimple.artists;
+    track.previewUrl = previewUrl;
-        track.availableMarkets = trackSimple.availableMarkets;
+    track.trackNumber = trackNumber;
-        track.discNumber = trackSimple.discNumber;
+    track.type = type;
-        track.durationMs = trackSimple.durationMs;
+    track.uri = uri;
-        track.explicit = trackSimple.explicit;
+    return track;
-        track.externalUrls = trackSimple.externalUrls;
-        track.href = trackSimple.href;
-        track.id = trackSimple.id;
-        track.isPlayable = trackSimple.isPlayable;
-        track.linkedFrom = trackSimple.linkedFrom;
-        track.previewUrl = trackSimple.previewUrl;
-        track.trackNumber = trackSimple.trackNumber;
-        track.type = trackSimple.type;
-        track.uri = trackSimple.uri;
-        tracks.add(track);
-      }
-      return tracks;
-    }
   }
 }
 

lib/models/database/database.dart

@@ -62,7 +62,7 @@ class AppDatabase extends _$AppDatabase {
   AppDatabase() : super(_openConnection());
 
   @override
-  int get schemaVersion => 5;
+  int get schemaVersion => 4;
 
   @override
   MigrationStrategy get migration {
@@ -87,33 +87,6 @@ class AppDatabase extends _$AppDatabase {
             schema.preferencesTable.youtubeClientEngine,
           );
         },
-        from4To5: (m, schema) async {
-          final columnName = schema.preferencesTable.accentColorScheme
-              .escapedNameFor(SqlDialect.sqlite);
-          final columnNameOld =
-              '"${schema.preferencesTable.accentColorScheme.name}_old"';
-          final tableName = schema.preferencesTable.actualTableName;
-          await customStatement(
-            "ALTER TABLE $tableName "
-            "RENAME COLUMN $columnName to $columnNameOld",
-          );
-          await customStatement(
-            "ALTER TABLE $tableName "
-            "ADD COLUMN $columnName TEXT NOT NULL DEFAULT 'Orange:0xFFf97315'",
-          );
-          await customStatement(
-            "UPDATE $tableName "
-            "SET $columnName = $columnNameOld",
-          );
-          await customStatement(
-            "ALTER TABLE $tableName "
-            "DROP COLUMN $columnNameOld",
-          );
-          await customStatement(
-            "UPDATE $tableName "
-            "SET $columnName = 'Orange:0xFFf97315' WHERE $columnName = 'Blue:0xFF2196F3'",
-          );
-        },
       ),
     );
   }

lib/models/database/database.g.dart

@@ -666,7 +666,7 @@ class $PreferencesTableTable extends PreferencesTable
               'accent_color_scheme', aliasedName, false,
               type: DriftSqlType.string,
               requiredDuringInsert: false,
-              defaultValue: const Constant("Orange:0xFFf97315"))
+              defaultValue: const Constant("Blue:0xFF2196F3"))
           .withConverter<SpotubeColor>(
               $PreferencesTableTable.$converteraccentColorScheme);
   static const VerificationMeta _layoutModeMeta =

lib/models/database/database.steps.dart

@@ -2,7 +2,7 @@
 import 'package:drift/internal/versioned_schema.dart' as i0;
 import 'package:drift/drift.dart' as i1;
 import 'package:drift/drift.dart';
-import 'package:flutter/material.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:spotify/spotify.dart';
 import 'package:spotube/models/database/database.dart';
 import 'package:spotube/services/sourced_track/enums.dart'; // ignore_for_file: type=lint,unused_import
@@ -1188,232 +1188,10 @@ i1.GeneratedColumn<String> _column_54(String aliasedName) =>
     i1.GeneratedColumn<String>('youtube_client_engine', aliasedName, false,
         type: i1.DriftSqlType.string,
         defaultValue: Constant(YoutubeClientEngine.youtubeExplode.name));
-
-final class Schema5 extends i0.VersionedSchema {
-  Schema5({required super.database}) : super(version: 5);
-  @override
-  late final List<i1.DatabaseSchemaEntity> entities = [
-    authenticationTable,
-    blacklistTable,
-    preferencesTable,
-    scrobblerTable,
-    skipSegmentTable,
-    sourceMatchTable,
-    audioPlayerStateTable,
-    playlistTable,
-    playlistMediaTable,
-    historyTable,
-    lyricsTable,
-    uniqueBlacklist,
-    uniqTrackMatch,
-  ];
-  late final Shape0 authenticationTable = Shape0(
-      source: i0.VersionedTable(
-        entityName: 'authentication_table',
-        withoutRowId: false,
-        isStrict: false,
-        tableConstraints: [],
-        columns: [
-          _column_0,
-          _column_1,
-          _column_2,
-          _column_3,
-        ],
-        attachedDatabase: database,
-      ),
-      alias: null);
-  late final Shape1 blacklistTable = Shape1(
-      source: i0.VersionedTable(
-        entityName: 'blacklist_table',
-        withoutRowId: false,
-        isStrict: false,
-        tableConstraints: [],
-        columns: [
-          _column_0,
-          _column_4,
-          _column_5,
-          _column_6,
-        ],
-        attachedDatabase: database,
-      ),
-      alias: null);
-  late final Shape12 preferencesTable = Shape12(
-      source: i0.VersionedTable(
-        entityName: 'preferences_table',
-        withoutRowId: false,
-        isStrict: false,
-        tableConstraints: [],
-        columns: [
-          _column_0,
-          _column_7,
-          _column_8,
-          _column_9,
-          _column_10,
-          _column_11,
-          _column_12,
-          _column_13,
-          _column_14,
-          _column_15,
-          _column_55,
-          _column_17,
-          _column_18,
-          _column_19,
-          _column_20,
-          _column_21,
-          _column_22,
-          _column_23,
-          _column_24,
-          _column_25,
-          _column_26,
-          _column_54,
-          _column_27,
-          _column_28,
-          _column_29,
-          _column_30,
-          _column_31,
-          _column_53,
-        ],
-        attachedDatabase: database,
-      ),
-      alias: null);
-  late final Shape3 scrobblerTable = Shape3(
-      source: i0.VersionedTable(
-        entityName: 'scrobbler_table',
-        withoutRowId: false,
-        isStrict: false,
-        tableConstraints: [],
-        columns: [
-          _column_0,
-          _column_32,
-          _column_33,
-          _column_34,
-        ],
-        attachedDatabase: database,
-      ),
-      alias: null);
-  late final Shape4 skipSegmentTable = Shape4(
-      source: i0.VersionedTable(
-        entityName: 'skip_segment_table',
-        withoutRowId: false,
-        isStrict: false,
-        tableConstraints: [],
-        columns: [
-          _column_0,
-          _column_35,
-          _column_36,
-          _column_37,
-          _column_32,
-        ],
-        attachedDatabase: database,
-      ),
-      alias: null);
-  late final Shape5 sourceMatchTable = Shape5(
-      source: i0.VersionedTable(
-        entityName: 'source_match_table',
-        withoutRowId: false,
-        isStrict: false,
-        tableConstraints: [],
-        columns: [
-          _column_0,
-          _column_37,
-          _column_38,
-          _column_39,
-          _column_32,
-        ],
-        attachedDatabase: database,
-      ),
-      alias: null);
-  late final Shape6 audioPlayerStateTable = Shape6(
-      source: i0.VersionedTable(
-        entityName: 'audio_player_state_table',
-        withoutRowId: false,
-        isStrict: false,
-        tableConstraints: [],
-        columns: [
-          _column_0,
-          _column_40,
-          _column_41,
-          _column_42,
-          _column_43,
-        ],
-        attachedDatabase: database,
-      ),
-      alias: null);
-  late final Shape7 playlistTable = Shape7(
-      source: i0.VersionedTable(
-        entityName: 'playlist_table',
-        withoutRowId: false,
-        isStrict: false,
-        tableConstraints: [],
-        columns: [
-          _column_0,
-          _column_44,
-          _column_45,
-        ],
-        attachedDatabase: database,
-      ),
-      alias: null);
-  late final Shape8 playlistMediaTable = Shape8(
-      source: i0.VersionedTable(
-        entityName: 'playlist_media_table',
-        withoutRowId: false,
-        isStrict: false,
-        tableConstraints: [],
-        columns: [
-          _column_0,
-          _column_46,
-          _column_47,
-          _column_48,
-          _column_49,
-        ],
-        attachedDatabase: database,
-      ),
-      alias: null);
-  late final Shape9 historyTable = Shape9(
-      source: i0.VersionedTable(
-        entityName: 'history_table',
-        withoutRowId: false,
-        isStrict: false,
-        tableConstraints: [],
-        columns: [
-          _column_0,
-          _column_32,
-          _column_50,
-          _column_51,
-          _column_52,
-        ],
-        attachedDatabase: database,
-      ),
-      alias: null);
-  late final Shape10 lyricsTable = Shape10(
-      source: i0.VersionedTable(
-        entityName: 'lyrics_table',
-        withoutRowId: false,
-        isStrict: false,
-        tableConstraints: [],
-        columns: [
-          _column_0,
-          _column_37,
-          _column_52,
-        ],
-        attachedDatabase: database,
-      ),
-      alias: null);
-  final i1.Index uniqueBlacklist = i1.Index('unique_blacklist',
-      'CREATE UNIQUE INDEX unique_blacklist ON blacklist_table (element_type, element_id)');
-  final i1.Index uniqTrackMatch = i1.Index('uniq_track_match',
-      'CREATE UNIQUE INDEX uniq_track_match ON source_match_table (track_id, source_id, source_type)');
-}
-
-i1.GeneratedColumn<String> _column_55(String aliasedName) =>
-    i1.GeneratedColumn<String>('accent_color_scheme', aliasedName, false,
-        type: i1.DriftSqlType.string,
-        defaultValue: const Constant("Orange:0xFFf97315"));
 i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
   required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
   required Future<void> Function(i1.Migrator m, Schema4 schema) from3To4,
-  required Future<void> Function(i1.Migrator m, Schema5 schema) from4To5,
 }) {
   return (currentVersion, database) async {
     switch (currentVersion) {
@@ -1432,11 +1210,6 @@ i0.MigrationStepWithVersion migrationSteps({
         final migrator = i1.Migrator(database, schema);
         await from3To4(migrator, schema);
         return 4;
-      case 4:
-        final schema = Schema5(database: database);
-        final migrator = i1.Migrator(database, schema);
-        await from4To5(migrator, schema);
-        return 5;
       default:
         throw ArgumentError.value('Unknown migration from $currentVersion');
     }
@@ -1447,12 +1220,10 @@ i1.OnUpgrade stepByStep({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
   required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
   required Future<void> Function(i1.Migrator m, Schema4 schema) from3To4,
-  required Future<void> Function(i1.Migrator m, Schema5 schema) from4To5,
 }) =>
     i0.VersionedSchema.stepByStepHelper(
         step: migrationSteps(
       from1To2: from1To2,
       from2To3: from2To3,
       from3To4: from3To4,
-      from4To5: from4To5,
     ));

lib/models/database/tables/preferences.dart

@@ -79,7 +79,7 @@ class PreferencesTable extends Table {
   TextColumn get closeBehavior => textEnum<CloseBehavior>()
       .withDefault(Constant(CloseBehavior.close.name))();
   TextColumn get accentColorScheme => text()
-      .withDefault(const Constant("Orange:0xFFf97315"))
+      .withDefault(const Constant("Blue:0xFF2196F3"))
       .map(const SpotubeColorConverter())();
   TextColumn get layoutMode =>
       textEnum<LayoutMode>().withDefault(Constant(LayoutMode.adaptive.name))();
@@ -130,7 +130,7 @@ class PreferencesTable extends Table {
       systemTitleBar: false,
       skipNonMusic: false,
       closeBehavior: CloseBehavior.close,
-      accentColorScheme: SpotubeColor(Colors.orange.value, name: "Orange"),
+      accentColorScheme: SpotubeColor(Colors.blue.value, name: "Blue"),
       layoutMode: LayoutMode.adaptive,
       locale: const Locale("system", "system"),
       market: Market.US,

lib/modules/album/album_card.dart

@@ -54,7 +54,7 @@ class AlbumCard extends HookConsumerWidget {
 
     Future<List<Track>> fetchAllTrack() async {
       if (album.tracks != null && album.tracks!.isNotEmpty) {
-        return album.tracks!.asTracks(album, ref);
+        return album.tracks!.map((track) => track.asTrack(album)).toList();
       }
       await ref.read(albumTracksProvider(album).future);
       return ref.read(albumTracksProvider(album).notifier).fetchAll();

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';
@@ -132,7 +132,7 @@ class PlayerView extends HookConsumerWidget {
                   Tooltip(
                     tooltip: TooltipContainer(
                       child: Text(context.l10n.details),
-                    ).call,
+                    ),
                     child: IconButton.ghost(
                       icon: const Icon(SpotubeIcons.info, size: 18),
                       onPressed: currentTrack == null

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';
 
@@ -82,7 +82,7 @@ class PlayerActions extends HookConsumerWidget {
       children: [
         if (showQueue)
           Tooltip(
-            tooltip: TooltipContainer(child: Text(context.l10n.queue)).call,
+            tooltip: TooltipContainer(child: Text(context.l10n.queue)),
             child: IconButton.ghost(
               icon: const Icon(SpotubeIcons.queue),
               enabled: playlist.activeTrack != null,
@@ -119,8 +119,7 @@ class PlayerActions extends HookConsumerWidget {
         if (!isLocalTrack)
           Tooltip(
             tooltip: TooltipContainer(
-              child: Text(context.l10n.alternative_track_sources),
+                child: Text(context.l10n.alternative_track_sources)),
-            ).call,
             child: IconButton.ghost(
               enabled: playlist.activeTrack != null,
               icon: const Icon(SpotubeIcons.alternativeRoute),
@@ -161,8 +160,7 @@ class PlayerActions extends HookConsumerWidget {
           else
             Tooltip(
               tooltip:
-                  TooltipContainer(child: Text(context.l10n.download_track))
+                  TooltipContainer(child: Text(context.l10n.download_track)),
-                      .call,
               child: IconButton.ghost(
                 icon: Icon(
                   isDownloaded ? SpotubeIcons.done : SpotubeIcons.download,

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/provider/spotify/album/tracks.dart

@@ -33,7 +33,7 @@ class AlbumTracksNotifier extends AutoDisposeFamilyPaginatedAsyncNotifier<Track,
     final tracks = await spotify.invoke(
       (api) => api.albums.tracks(arg.id!).getPage(limit, offset),
     );
-    final items = await tracks.items!.asTracks(arg, ref);
+    final items = tracks.items?.map((e) => e.asTrack(arg)).toList() ?? [];
 
     return (
       items: items,

lib/provider/user_preferences/user_preferences_provider.dart

@@ -90,9 +90,9 @@ class UserPreferencesNotifier extends Notifier<PreferencesTableData> {
   Future<void> reset() async {
     final db = ref.read(databaseProvider);
 
-    final query = db.update(db.preferencesTable);
+    final query = db.update(db.preferencesTable)..where((t) => t.id.equals(0));
 
-    await query.replace(PreferencesTableCompanion.insert(id: const Value(0)));
+    await query.replace(PreferencesTableCompanion.insert());
   }
 
   static Future<String> getMusicCacheDir() async {

lib/services/sourced_track/sources/youtube.dart

@@ -236,75 +236,32 @@ class YoutubeSourcedTrack extends SourcedTrack {
         .toList();
   }
 
-  static Future<List<YoutubeVideoInfo>> fetchFromIsrc({
-    required Track track,
-    required Ref ref,
-  }) async {
-    final isrcResults = <YoutubeVideoInfo>[];
-    final isrc = track.externalIds?.isrc;
-    if (isrc != null && isrc.isNotEmpty) {
-      final searchedVideos =
-          await ref.read(youtubeEngineProvider).searchVideos(isrc.toString());
-      if (searchedVideos.isNotEmpty) {
-        isrcResults.addAll(searchedVideos
-            .map<YoutubeVideoInfo>(YoutubeVideoInfo.fromVideo)
-            .map((YoutubeVideoInfo videoInfo) {
-              final ytWords = videoInfo.title
-                  .toLowerCase()
-                  .replaceAll(RegExp(r'[^\p{L}\p{N}\p{Z}]+', unicode: true), '')
-                  .split(RegExp(r'\p{Z}+', unicode: true))
-                  .where((item) => item.isNotEmpty);
-              final spWords = track.name!
-                  .toLowerCase()
-                  .replaceAll(RegExp(r'[^\p{L}\p{N}\p{Z}]+', unicode: true), '')
-                  .split(RegExp(r'\p{Z}+', unicode: true))
-                  .where((item) => item.isNotEmpty);
-              // Single word and duration match with 3 second tolerance
-              if (ytWords.any((word) => spWords.contains(word)) &&
-                  (videoInfo.duration - track.duration!)
-                      .abs().inMilliseconds <= 3000) {
-                return videoInfo;
-              }
-              return null;
-            })
-            .whereType<YoutubeVideoInfo>()
-            .toList());
-      }
-    }
-    return isrcResults;
-  }
-
   static Future<List<SiblingType>> fetchSiblings({
     required Track track,
     required Ref ref,
   }) async {
-    final videoResults = <YoutubeVideoInfo>[];
+    final links = await SongLinkService.links(track.id!);
+    final ytLink = links.firstWhereOrNull((link) => link.platform == "youtube");
 
-    if (track is! SourcedTrack) {
+    if (ytLink?.url != null
-      final isrcResults = await fetchFromIsrc(
+        // allows to fetch siblings more results for already sourced track
-        track: track,
+        &&
-        ref: ref,
+        track is! SourcedTrack) {
-      );
+      try {
-
+        return [
-      videoResults.addAll(isrcResults);
+          await toSiblingType(
-
+            0,
-      if (isrcResults.isEmpty) {
+            YoutubeVideoInfo.fromVideo(
-        final links = await SongLinkService.links(track.id!);
+              await ref.read(youtubeEngineProvider).getVideo(
-        final ytLink = links.firstWhereOrNull(
+                    Uri.parse(ytLink!.url!).queryParameters["v"]!,
-          (link) => link.platform == "youtube",
+                  ),
-        );
+            ),
-        if (ytLink?.url != null) {
+            ref,
-          try {
+          )
-            videoResults.add(
+        ];
-              YoutubeVideoInfo.fromVideo(await ref
+      } on VideoUnplayableException catch (e, stack) {
-                  .read(youtubeEngineProvider)
+        // Ignore this error and continue with the search
-                  .getVideo(Uri.parse(ytLink!.url!).queryParameters["v"]!)),
+        AppLogger.reportError(e, stack);
-            );
-          } on VideoUnplayableException catch (e, stack) {
-            // Ignore this error and continue with the search
-            AppLogger.reportError(e, stack);
-          }
-        }
       }
     }
 
@@ -314,27 +271,20 @@ class YoutubeSourcedTrack extends SourcedTrack {
         await ref.read(youtubeEngineProvider).searchVideos(query);
 
     if (ServiceUtils.onlyContainsEnglish(query)) {
-      videoResults
+      return await Future.wait(searchResults
-          .addAll(searchResults.map(YoutubeVideoInfo.fromVideo).toList());
+          .map(YoutubeVideoInfo.fromVideo)
-    } else {
+          .mapIndexed((index, info) => toSiblingType(index, info, ref)));
-      videoResults.addAll(rankResults(
-        searchResults.map(YoutubeVideoInfo.fromVideo).toList(),
-        track,
-      ));
     }
 
-    final seenIds = <String>{};
+    final rankedSiblings = rankResults(
-    int index = 0;
+      searchResults.map(YoutubeVideoInfo.fromVideo).toList(),
+      track,
+    );
+
     return await Future.wait(
-      videoResults.map((videoResult) async {
+      rankedSiblings
-        // Deduplicate results
+          .mapIndexed((index, info) => toSiblingType(index, info, ref)),
-        if (!seenIds.contains(videoResult.id)) {
+    );
-          seenIds.add(videoResult.id);
-          return await toSiblingType(index++, videoResult, ref);
-        }
-        return null;
-      }),
-    ).then((s) => s.whereType<SiblingType>().toList());
   }
 
   @override

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

test/drift/app_db/generated/schema.dart

@@ -3,30 +3,27 @@
 // ignore_for_file: type=lint
 import 'package:drift/drift.dart';
 import 'package:drift/internal/migrations.dart';
-import 'schema_v3.dart' as v3;
-import 'schema_v5.dart' as v5;
-import 'schema_v1.dart' as v1;
-import 'schema_v2.dart' as v2;
 import 'schema_v4.dart' as v4;
+import 'schema_v3.dart' as v3;
+import 'schema_v2.dart' as v2;
+import 'schema_v1.dart' as v1;
 
 class GeneratedHelper implements SchemaInstantiationHelper {
   @override
   GeneratedDatabase databaseForVersion(QueryExecutor db, int version) {
     switch (version) {
-      case 3:
-        return v3.DatabaseAtV3(db);
-      case 5:
-        return v5.DatabaseAtV5(db);
-      case 1:
-        return v1.DatabaseAtV1(db);
-      case 2:
-        return v2.DatabaseAtV2(db);
       case 4:
         return v4.DatabaseAtV4(db);
+      case 3:
+        return v3.DatabaseAtV3(db);
+      case 2:
+        return v2.DatabaseAtV2(db);
+      case 1:
+        return v1.DatabaseAtV1(db);
       default:
         throw MissingSchemaException(version, versions);
     }
   }
 
-  static const versions = const [1, 2, 3, 4, 5];
+  static const versions = const [1, 2, 3, 4];
 }