Merge 686e0a2dba55a4669c256dfa063a50818a44409d into b0bb26f84b66d9970d9d86e66b4696ae7d994eb0

At the time of writing the latest Flutter version.

android/app/src/debug/AndroidManifest.xml

@@ -5,9 +5,4 @@
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
-
-    <!-- audio_service -->
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
 </manifest>

android/app/src/main/AndroidManifest.xml

@@ -69,5 +69,4 @@
     <!-- audio_service -->
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
 </manifest>

android/app/src/profile/AndroidManifest.xml

@@ -5,9 +5,4 @@
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
-
-    <!-- audio_service -->
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
 </manifest>

lib/app/app.g.dart

@@ -20,5 +20,4 @@ final lastPathProvider = NotifierProvider<LastPath, String>.internal(
 );
 
 typedef _$LastPath = Notifier<String>;
-// ignore_for_file: type=lint
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

lib/app/images.g.dart

@@ -30,6 +30,8 @@ class _SystemHash {
   }
 }
 
+typedef _ArtistArtCacheInfoRef = AutoDisposeProviderRef<CacheInfo>;
+
 /// See also [_artistArtCacheInfo].
 @ProviderFor(_artistArtCacheInfo)
 const _artistArtCacheInfoProvider = _ArtistArtCacheInfoFamily();
@@ -79,11 +81,11 @@ class _ArtistArtCacheInfoFamily extends Family<CacheInfo> {
 class _ArtistArtCacheInfoProvider extends AutoDisposeProvider<CacheInfo> {
   /// See also [_artistArtCacheInfo].
   _ArtistArtCacheInfoProvider({
-    required String artistId,
+    required this.artistId,
-    bool thumbnail = true,
+    this.thumbnail = true,
-  }) : this._internal(
+  }) : super.internal(
           (ref) => _artistArtCacheInfo(
-            ref as _ArtistArtCacheInfoRef,
+            ref,
             artistId: artistId,
             thumbnail: thumbnail,
           ),
@@ -96,48 +98,11 @@ class _ArtistArtCacheInfoProvider extends AutoDisposeProvider<CacheInfo> {
           dependencies: _ArtistArtCacheInfoFamily._dependencies,
           allTransitiveDependencies:
               _ArtistArtCacheInfoFamily._allTransitiveDependencies,
-          artistId: artistId,
-          thumbnail: thumbnail,
         );
 
-  _ArtistArtCacheInfoProvider._internal(
-    super._createNotifier, {
-    required super.name,
-    required super.dependencies,
-    required super.allTransitiveDependencies,
-    required super.debugGetCreateSourceHash,
-    required super.from,
-    required this.artistId,
-    required this.thumbnail,
-  }) : super.internal();
-
   final String artistId;
   final bool thumbnail;
 
-  @override
-  Override overrideWith(
-    CacheInfo Function(_ArtistArtCacheInfoRef provider) create,
-  ) {
-    return ProviderOverride(
-      origin: this,
-      override: _ArtistArtCacheInfoProvider._internal(
-        (ref) => create(ref as _ArtistArtCacheInfoRef),
-        from: from,
-        name: null,
-        dependencies: null,
-        allTransitiveDependencies: null,
-        debugGetCreateSourceHash: null,
-        artistId: artistId,
-        thumbnail: thumbnail,
-      ),
-    );
-  }
-
-  @override
-  AutoDisposeProviderElement<CacheInfo> createElement() {
-    return _ArtistArtCacheInfoProviderElement(this);
-  }
-
   @override
   bool operator ==(Object other) {
     return other is _ArtistArtCacheInfoProvider &&
@@ -155,26 +120,9 @@ class _ArtistArtCacheInfoProvider extends AutoDisposeProvider<CacheInfo> {
   }
 }
 
-mixin _ArtistArtCacheInfoRef on AutoDisposeProviderRef<CacheInfo> {
-  /// The parameter `artistId` of this provider.
-  String get artistId;
-
-  /// The parameter `thumbnail` of this provider.
-  bool get thumbnail;
-}
-
-class _ArtistArtCacheInfoProviderElement
-    extends AutoDisposeProviderElement<CacheInfo> with _ArtistArtCacheInfoRef {
-  _ArtistArtCacheInfoProviderElement(super.provider);
-
-  @override
-  String get artistId => (origin as _ArtistArtCacheInfoProvider).artistId;
-  @override
-  bool get thumbnail => (origin as _ArtistArtCacheInfoProvider).thumbnail;
-}
-
 String _$artistArtCachedUrlHash() =>
     r'2a5e0fea614ff12a1d562faccec6cfe98394af42';
+typedef _ArtistArtCachedUrlRef = AutoDisposeFutureProviderRef<String?>;
 
 /// See also [_artistArtCachedUrl].
 @ProviderFor(_artistArtCachedUrl)
@@ -225,11 +173,11 @@ class _ArtistArtCachedUrlFamily extends Family<AsyncValue<String?>> {
 class _ArtistArtCachedUrlProvider extends AutoDisposeFutureProvider<String?> {
   /// See also [_artistArtCachedUrl].
   _ArtistArtCachedUrlProvider({
-    required String artistId,
+    required this.artistId,
-    bool thumbnail = true,
+    this.thumbnail = true,
-  }) : this._internal(
+  }) : super.internal(
           (ref) => _artistArtCachedUrl(
-            ref as _ArtistArtCachedUrlRef,
+            ref,
             artistId: artistId,
             thumbnail: thumbnail,
           ),
@@ -242,48 +190,11 @@ class _ArtistArtCachedUrlProvider extends AutoDisposeFutureProvider<String?> {
           dependencies: _ArtistArtCachedUrlFamily._dependencies,
           allTransitiveDependencies:
               _ArtistArtCachedUrlFamily._allTransitiveDependencies,
-          artistId: artistId,
-          thumbnail: thumbnail,
         );
 
-  _ArtistArtCachedUrlProvider._internal(
-    super._createNotifier, {
-    required super.name,
-    required super.dependencies,
-    required super.allTransitiveDependencies,
-    required super.debugGetCreateSourceHash,
-    required super.from,
-    required this.artistId,
-    required this.thumbnail,
-  }) : super.internal();
-
   final String artistId;
   final bool thumbnail;
 
-  @override
-  Override overrideWith(
-    FutureOr<String?> Function(_ArtistArtCachedUrlRef provider) create,
-  ) {
-    return ProviderOverride(
-      origin: this,
-      override: _ArtistArtCachedUrlProvider._internal(
-        (ref) => create(ref as _ArtistArtCachedUrlRef),
-        from: from,
-        name: null,
-        dependencies: null,
-        allTransitiveDependencies: null,
-        debugGetCreateSourceHash: null,
-        artistId: artistId,
-        thumbnail: thumbnail,
-      ),
-    );
-  }
-
-  @override
-  AutoDisposeFutureProviderElement<String?> createElement() {
-    return _ArtistArtCachedUrlProviderElement(this);
-  }
-
   @override
   bool operator ==(Object other) {
     return other is _ArtistArtCachedUrlProvider &&
@@ -301,27 +212,9 @@ class _ArtistArtCachedUrlProvider extends AutoDisposeFutureProvider<String?> {
   }
 }
 
-mixin _ArtistArtCachedUrlRef on AutoDisposeFutureProviderRef<String?> {
-  /// The parameter `artistId` of this provider.
-  String get artistId;
-
-  /// The parameter `thumbnail` of this provider.
-  bool get thumbnail;
-}
-
-class _ArtistArtCachedUrlProviderElement
-    extends AutoDisposeFutureProviderElement<String?>
-    with _ArtistArtCachedUrlRef {
-  _ArtistArtCachedUrlProviderElement(super.provider);
-
-  @override
-  String get artistId => (origin as _ArtistArtCachedUrlProvider).artistId;
-  @override
-  bool get thumbnail => (origin as _ArtistArtCachedUrlProvider).thumbnail;
-}
-
 String _$artistArtUriCacheInfoHash() =>
     r'9bdc0f5654882265236ef746ea697a6d107a4b6f';
+typedef _ArtistArtUriCacheInfoRef = AutoDisposeFutureProviderRef<UriCacheInfo>;
 
 /// See also [_artistArtUriCacheInfo].
 @ProviderFor(_artistArtUriCacheInfo)
@@ -373,11 +266,11 @@ class _ArtistArtUriCacheInfoProvider
     extends AutoDisposeFutureProvider<UriCacheInfo> {
   /// See also [_artistArtUriCacheInfo].
   _ArtistArtUriCacheInfoProvider({
-    required String artistId,
+    required this.artistId,
-    bool thumbnail = true,
+    this.thumbnail = true,
-  }) : this._internal(
+  }) : super.internal(
           (ref) => _artistArtUriCacheInfo(
-            ref as _ArtistArtUriCacheInfoRef,
+            ref,
             artistId: artistId,
             thumbnail: thumbnail,
           ),
@@ -390,48 +283,11 @@ class _ArtistArtUriCacheInfoProvider
           dependencies: _ArtistArtUriCacheInfoFamily._dependencies,
           allTransitiveDependencies:
               _ArtistArtUriCacheInfoFamily._allTransitiveDependencies,
-          artistId: artistId,
-          thumbnail: thumbnail,
         );
 
-  _ArtistArtUriCacheInfoProvider._internal(
-    super._createNotifier, {
-    required super.name,
-    required super.dependencies,
-    required super.allTransitiveDependencies,
-    required super.debugGetCreateSourceHash,
-    required super.from,
-    required this.artistId,
-    required this.thumbnail,
-  }) : super.internal();
-
   final String artistId;
   final bool thumbnail;
 
-  @override
-  Override overrideWith(
-    FutureOr<UriCacheInfo> Function(_ArtistArtUriCacheInfoRef provider) create,
-  ) {
-    return ProviderOverride(
-      origin: this,
-      override: _ArtistArtUriCacheInfoProvider._internal(
-        (ref) => create(ref as _ArtistArtUriCacheInfoRef),
-        from: from,
-        name: null,
-        dependencies: null,
-        allTransitiveDependencies: null,
-        debugGetCreateSourceHash: null,
-        artistId: artistId,
-        thumbnail: thumbnail,
-      ),
-    );
-  }
-
-  @override
-  AutoDisposeFutureProviderElement<UriCacheInfo> createElement() {
-    return _ArtistArtUriCacheInfoProviderElement(this);
-  }
-
   @override
   bool operator ==(Object other) {
     return other is _ArtistArtUriCacheInfoProvider &&
@@ -448,24 +304,4 @@ class _ArtistArtUriCacheInfoProvider
     return _SystemHash.finish(hash);
   }
 }
-
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
-mixin _ArtistArtUriCacheInfoRef on AutoDisposeFutureProviderRef<UriCacheInfo> {
-  /// The parameter `artistId` of this provider.
-  String get artistId;
-
-  /// The parameter `thumbnail` of this provider.
-  bool get thumbnail;
-}
-
-class _ArtistArtUriCacheInfoProviderElement
-    extends AutoDisposeFutureProviderElement<UriCacheInfo>
-    with _ArtistArtUriCacheInfoRef {
-  _ArtistArtUriCacheInfoProviderElement(super.provider);
-
-  @override
-  String get artistId => (origin as _ArtistArtUriCacheInfoProvider).artistId;
-  @override
-  bool get thumbnail => (origin as _ArtistArtUriCacheInfoProvider).thumbnail;
-}
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

lib/app/pages/bottom_nav_page.g.dart

@@ -53,5 +53,4 @@ final lastBottomNavStateServiceProvider =
 );
 
 typedef _$LastBottomNavStateService = AsyncNotifier<void>;
-// ignore_for_file: type=lint
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

lib/app/pages/browse_page.g.dart

@@ -30,6 +30,8 @@ class _SystemHash {
   }
 }
 
+typedef AlbumsCategoryListRef = AutoDisposeStreamProviderRef<List<Album>>;
+
 /// See also [albumsCategoryList].
 @ProviderFor(albumsCategoryList)
 const albumsCategoryListProvider = AlbumsCategoryListFamily();
@@ -77,10 +79,10 @@ class AlbumsCategoryListProvider
     extends AutoDisposeStreamProvider<List<Album>> {
   /// See also [albumsCategoryList].
   AlbumsCategoryListProvider(
-    ListQuery opt,
+    this.opt,
-  ) : this._internal(
+  ) : super.internal(
           (ref) => albumsCategoryList(
-            ref as AlbumsCategoryListRef,
+            ref,
             opt,
           ),
           from: albumsCategoryListProvider,
@@ -92,44 +94,10 @@ class AlbumsCategoryListProvider
           dependencies: AlbumsCategoryListFamily._dependencies,
           allTransitiveDependencies:
               AlbumsCategoryListFamily._allTransitiveDependencies,
-          opt: opt,
         );
 
-  AlbumsCategoryListProvider._internal(
-    super._createNotifier, {
-    required super.name,
-    required super.dependencies,
-    required super.allTransitiveDependencies,
-    required super.debugGetCreateSourceHash,
-    required super.from,
-    required this.opt,
-  }) : super.internal();
-
   final ListQuery opt;
 
-  @override
-  Override overrideWith(
-    Stream<List<Album>> Function(AlbumsCategoryListRef provider) create,
-  ) {
-    return ProviderOverride(
-      origin: this,
-      override: AlbumsCategoryListProvider._internal(
-        (ref) => create(ref as AlbumsCategoryListRef),
-        from: from,
-        name: null,
-        dependencies: null,
-        allTransitiveDependencies: null,
-        debugGetCreateSourceHash: null,
-        opt: opt,
-      ),
-    );
-  }
-
-  @override
-  AutoDisposeStreamProviderElement<List<Album>> createElement() {
-    return _AlbumsCategoryListProviderElement(this);
-  }
-
   @override
   bool operator ==(Object other) {
     return other is AlbumsCategoryListProvider && other.opt == opt;
@@ -143,19 +111,4 @@ class AlbumsCategoryListProvider
     return _SystemHash.finish(hash);
   }
 }
-
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
-mixin AlbumsCategoryListRef on AutoDisposeStreamProviderRef<List<Album>> {
-  /// The parameter `opt` of this provider.
-  ListQuery get opt;
-}
-
-class _AlbumsCategoryListProviderElement
-    extends AutoDisposeStreamProviderElement<List<Album>>
-    with AlbumsCategoryListRef {
-  _AlbumsCategoryListProviderElement(super.provider);
-
-  @override
-  ListQuery get opt => (origin as AlbumsCategoryListProvider).opt;
-}
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

lib/app/pages/library_page.g.dart

@@ -60,6 +60,8 @@ class _SystemHash {
   }
 }
 
+typedef LibraryListQueryRef = ProviderRef<LibraryListQuery>;
+
 /// See also [libraryListQuery].
 @ProviderFor(libraryListQuery)
 const libraryListQueryProvider = LibraryListQueryFamily();
@@ -106,10 +108,10 @@ class LibraryListQueryFamily extends Family<LibraryListQuery> {
 class LibraryListQueryProvider extends Provider<LibraryListQuery> {
   /// See also [libraryListQuery].
   LibraryListQueryProvider(
-    int index,
+    this.index,
-  ) : this._internal(
+  ) : super.internal(
           (ref) => libraryListQuery(
-            ref as LibraryListQueryRef,
+            ref,
             index,
           ),
           from: libraryListQueryProvider,
@@ -121,44 +123,10 @@ class LibraryListQueryProvider extends Provider<LibraryListQuery> {
           dependencies: LibraryListQueryFamily._dependencies,
           allTransitiveDependencies:
               LibraryListQueryFamily._allTransitiveDependencies,
-          index: index,
         );
 
-  LibraryListQueryProvider._internal(
-    super._createNotifier, {
-    required super.name,
-    required super.dependencies,
-    required super.allTransitiveDependencies,
-    required super.debugGetCreateSourceHash,
-    required super.from,
-    required this.index,
-  }) : super.internal();
-
   final int index;
 
-  @override
-  Override overrideWith(
-    LibraryListQuery Function(LibraryListQueryRef provider) create,
-  ) {
-    return ProviderOverride(
-      origin: this,
-      override: LibraryListQueryProvider._internal(
-        (ref) => create(ref as LibraryListQueryRef),
-        from: from,
-        name: null,
-        dependencies: null,
-        allTransitiveDependencies: null,
-        debugGetCreateSourceHash: null,
-        index: index,
-      ),
-    );
-  }
-
-  @override
-  ProviderElement<LibraryListQuery> createElement() {
-    return _LibraryListQueryProviderElement(this);
-  }
-
   @override
   bool operator ==(Object other) {
     return other is LibraryListQueryProvider && other.index == index;
@@ -173,19 +141,6 @@ class LibraryListQueryProvider extends Provider<LibraryListQuery> {
   }
 }
 
-mixin LibraryListQueryRef on ProviderRef<LibraryListQuery> {
-  /// The parameter `index` of this provider.
-  int get index;
-}
-
-class _LibraryListQueryProviderElement extends ProviderElement<LibraryListQuery>
-    with LibraryListQueryRef {
-  _LibraryListQueryProviderElement(super.provider);
-
-  @override
-  int get index => (origin as LibraryListQueryProvider).index;
-}
-
 String _$lastLibraryStateServiceHash() =>
     r'a49e26b5dc0fcb0f697ec2def08e7336f64c4cb3';
 
@@ -218,5 +173,4 @@ final libraryListsProvider =
 );
 
 typedef _$LibraryLists = Notifier<IList<LibraryListQuery>>;
-// ignore_for_file: type=lint
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

lib/app/pages/library_songs_page.g.dart

@@ -29,6 +29,8 @@ class _SystemHash {
   }
 }
 
+typedef SongsListRef = AutoDisposeFutureProviderRef<List<Song>>;
+
 /// See also [songsList].
 @ProviderFor(songsList)
 const songsListProvider = SongsListFamily();
@@ -75,10 +77,10 @@ class SongsListFamily extends Family<AsyncValue<List<Song>>> {
 class SongsListProvider extends AutoDisposeFutureProvider<List<Song>> {
   /// See also [songsList].
   SongsListProvider(
-    ListQuery opt,
+    this.opt,
-  ) : this._internal(
+  ) : super.internal(
           (ref) => songsList(
-            ref as SongsListRef,
+            ref,
             opt,
           ),
           from: songsListProvider,
@@ -89,44 +91,10 @@ class SongsListProvider extends AutoDisposeFutureProvider<List<Song>> {
                   : _$songsListHash,
           dependencies: SongsListFamily._dependencies,
           allTransitiveDependencies: SongsListFamily._allTransitiveDependencies,
-          opt: opt,
         );
 
-  SongsListProvider._internal(
-    super._createNotifier, {
-    required super.name,
-    required super.dependencies,
-    required super.allTransitiveDependencies,
-    required super.debugGetCreateSourceHash,
-    required super.from,
-    required this.opt,
-  }) : super.internal();
-
   final ListQuery opt;
 
-  @override
-  Override overrideWith(
-    FutureOr<List<Song>> Function(SongsListRef provider) create,
-  ) {
-    return ProviderOverride(
-      origin: this,
-      override: SongsListProvider._internal(
-        (ref) => create(ref as SongsListRef),
-        from: from,
-        name: null,
-        dependencies: null,
-        allTransitiveDependencies: null,
-        debugGetCreateSourceHash: null,
-        opt: opt,
-      ),
-    );
-  }
-
-  @override
-  AutoDisposeFutureProviderElement<List<Song>> createElement() {
-    return _SongsListProviderElement(this);
-  }
-
   @override
   bool operator ==(Object other) {
     return other is SongsListProvider && other.opt == opt;
@@ -140,18 +108,4 @@ class SongsListProvider extends AutoDisposeFutureProvider<List<Song>> {
     return _SystemHash.finish(hash);
   }
 }
-
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
-mixin SongsListRef on AutoDisposeFutureProviderRef<List<Song>> {
-  /// The parameter `opt` of this provider.
-  ListQuery get opt;
-}
-
-class _SongsListProviderElement
-    extends AutoDisposeFutureProviderElement<List<Song>> with SongsListRef {
-  _SongsListProviderElement(super.provider);
-
-  @override
-  ListQuery get opt => (origin as SongsListProvider).opt;
-}
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

lib/app/pages/search_page.g.dart

@@ -35,5 +35,4 @@ final searchQueryProvider =
 );
 
 typedef _$SearchQuery = AutoDisposeNotifier<String?>;
-// ignore_for_file: type=lint
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

lib/cache/image_cache.g.dart

@@ -20,5 +20,4 @@ final imageCacheProvider = Provider<CacheManager>.internal(
 );
 
 typedef ImageCacheRef = ProviderRef<CacheManager>;
-// ignore_for_file: type=lint
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

lib/database/database.g.dart

@@ -53,10 +53,9 @@ class Queue extends Table with TableInfo<Queue, QueueData> {
   List<GeneratedColumn> get $columns =>
       [index, sourceId, id, context, contextId, currentTrack];
   @override
-  String get aliasedName => _alias ?? actualTableName;
+  String get aliasedName => _alias ?? 'queue';
   @override
-  String get actualTableName => $name;
+  String get actualTableName => 'queue';
-  static const String $name = 'queue';
   @override
   VerificationContext validateIntegrity(Insertable<QueueData> instance,
       {bool isInserting = false}) {
@@ -145,7 +144,8 @@ class QueueData extends DataClass implements Insertable<QueueData> {
     map['source_id'] = Variable<int>(sourceId);
     map['id'] = Variable<String>(id);
     {
-      map['context'] = Variable<String>(Queue.$convertercontext.toSql(context));
+      final converter = Queue.$convertercontext;
+      map['context'] = Variable<String>(converter.toSql(context));
     }
     if (!nullToAbsent || contextId != null) {
       map['context_id'] = Variable<String>(contextId);
@@ -315,8 +315,8 @@ class QueueCompanion extends UpdateCompanion<QueueData> {
       map['id'] = Variable<String>(id.value);
     }
     if (context.present) {
-      map['context'] =
+      final converter = Queue.$convertercontext;
-          Variable<String>(Queue.$convertercontext.toSql(context.value));
+      map['context'] = Variable<String>(converter.toSql(context.value));
     }
     if (contextId.present) {
       map['context_id'] = Variable<String>(contextId.value);
@@ -382,10 +382,9 @@ class LastAudioState extends Table
   List<GeneratedColumn> get $columns =>
       [id, queueMode, shuffleIndicies, repeat];
   @override
-  String get aliasedName => _alias ?? actualTableName;
+  String get aliasedName => _alias ?? 'last_audio_state';
   @override
-  String get actualTableName => $name;
+  String get actualTableName => 'last_audio_state';
-  static const String $name = 'last_audio_state';
   @override
   VerificationContext validateIntegrity(Insertable<LastAudioStateData> instance,
       {bool isInserting = false}) {
@@ -453,16 +452,17 @@ class LastAudioStateData extends DataClass
     final map = <String, Expression>{};
     map['id'] = Variable<int>(id);
     {
-      map['queue_mode'] =
+      final converter = LastAudioState.$converterqueueMode;
-          Variable<int>(LastAudioState.$converterqueueMode.toSql(queueMode));
+      map['queue_mode'] = Variable<int>(converter.toSql(queueMode));
     }
     if (!nullToAbsent || shuffleIndicies != null) {
-      map['shuffle_indicies'] = Variable<String>(
+      final converter = LastAudioState.$convertershuffleIndiciesn;
-          LastAudioState.$convertershuffleIndiciesn.toSql(shuffleIndicies));
+      map['shuffle_indicies'] =
+          Variable<String>(converter.toSql(shuffleIndicies));
     }
     {
-      map['repeat'] =
+      final converter = LastAudioState.$converterrepeat;
-          Variable<int>(LastAudioState.$converterrepeat.toSql(repeat));
+      map['repeat'] = Variable<int>(converter.toSql(repeat));
     }
     return map;
   }
@@ -592,17 +592,17 @@ class LastAudioStateCompanion extends UpdateCompanion<LastAudioStateData> {
       map['id'] = Variable<int>(id.value);
     }
     if (queueMode.present) {
-      map['queue_mode'] = Variable<int>(
+      final converter = LastAudioState.$converterqueueMode;
-          LastAudioState.$converterqueueMode.toSql(queueMode.value));
+      map['queue_mode'] = Variable<int>(converter.toSql(queueMode.value));
     }
     if (shuffleIndicies.present) {
-      map['shuffle_indicies'] = Variable<String>(LastAudioState
+      final converter = LastAudioState.$convertershuffleIndiciesn;
-          .$convertershuffleIndiciesn
+      map['shuffle_indicies'] =
-          .toSql(shuffleIndicies.value));
+          Variable<String>(converter.toSql(shuffleIndicies.value));
     }
     if (repeat.present) {
-      map['repeat'] =
+      final converter = LastAudioState.$converterrepeat;
-          Variable<int>(LastAudioState.$converterrepeat.toSql(repeat.value));
+      map['repeat'] = Variable<int>(converter.toSql(repeat.value));
     }
     return map;
   }
@@ -640,10 +640,9 @@ class LastBottomNavState extends Table
   @override
   List<GeneratedColumn> get $columns => [id, tab];
   @override
-  String get aliasedName => _alias ?? actualTableName;
+  String get aliasedName => _alias ?? 'last_bottom_nav_state';
   @override
-  String get actualTableName => $name;
+  String get actualTableName => 'last_bottom_nav_state';
-  static const String $name = 'last_bottom_nav_state';
   @override
   VerificationContext validateIntegrity(
       Insertable<LastBottomNavStateData> instance,
@@ -850,10 +849,9 @@ class LastLibraryState extends Table
   List<GeneratedColumn> get $columns =>
       [id, tab, albumsList, artistsList, playlistsList, songsList];
   @override
-  String get aliasedName => _alias ?? actualTableName;
+  String get aliasedName => _alias ?? 'last_library_state';
   @override
-  String get actualTableName => $name;
+  String get actualTableName => 'last_library_state';
-  static const String $name = 'last_library_state';
   @override
   VerificationContext validateIntegrity(
       Insertable<LastLibraryStateData> instance,
@@ -939,20 +937,20 @@ class LastLibraryStateData extends DataClass
     map['id'] = Variable<int>(id);
     map['tab'] = Variable<String>(tab);
     {
-      map['albums_list'] = Variable<String>(
+      final converter = LastLibraryState.$converteralbumsList;
-          LastLibraryState.$converteralbumsList.toSql(albumsList));
+      map['albums_list'] = Variable<String>(converter.toSql(albumsList));
     }
     {
-      map['artists_list'] = Variable<String>(
+      final converter = LastLibraryState.$converterartistsList;
-          LastLibraryState.$converterartistsList.toSql(artistsList));
+      map['artists_list'] = Variable<String>(converter.toSql(artistsList));
     }
     {
-      map['playlists_list'] = Variable<String>(
+      final converter = LastLibraryState.$converterplaylistsList;
-          LastLibraryState.$converterplaylistsList.toSql(playlistsList));
+      map['playlists_list'] = Variable<String>(converter.toSql(playlistsList));
     }
     {
-      map['songs_list'] = Variable<String>(
+      final converter = LastLibraryState.$convertersongsList;
-          LastLibraryState.$convertersongsList.toSql(songsList));
+      map['songs_list'] = Variable<String>(converter.toSql(songsList));
     }
     return map;
   }
@@ -1108,20 +1106,22 @@ class LastLibraryStateCompanion extends UpdateCompanion<LastLibraryStateData> {
       map['tab'] = Variable<String>(tab.value);
     }
     if (albumsList.present) {
-      map['albums_list'] = Variable<String>(
+      final converter = LastLibraryState.$converteralbumsList;
-          LastLibraryState.$converteralbumsList.toSql(albumsList.value));
+      map['albums_list'] = Variable<String>(converter.toSql(albumsList.value));
     }
     if (artistsList.present) {
-      map['artists_list'] = Variable<String>(
+      final converter = LastLibraryState.$converterartistsList;
-          LastLibraryState.$converterartistsList.toSql(artistsList.value));
+      map['artists_list'] =
+          Variable<String>(converter.toSql(artistsList.value));
     }
     if (playlistsList.present) {
-      map['playlists_list'] = Variable<String>(
+      final converter = LastLibraryState.$converterplaylistsList;
-          LastLibraryState.$converterplaylistsList.toSql(playlistsList.value));
+      map['playlists_list'] =
+          Variable<String>(converter.toSql(playlistsList.value));
     }
     if (songsList.present) {
-      map['songs_list'] = Variable<String>(
+      final converter = LastLibraryState.$convertersongsList;
-          LastLibraryState.$convertersongsList.toSql(songsList.value));
+      map['songs_list'] = Variable<String>(converter.toSql(songsList.value));
     }
     return map;
   }
@@ -1177,10 +1177,9 @@ class AppSettingsTable extends Table
   List<GeneratedColumn> get $columns =>
       [id, maxBitrateWifi, maxBitrateMobile, streamFormat];
   @override
-  String get aliasedName => _alias ?? actualTableName;
+  String get aliasedName => _alias ?? 'app_settings';
   @override
-  String get actualTableName => $name;
+  String get actualTableName => 'app_settings';
-  static const String $name = 'app_settings';
   @override
   VerificationContext validateIntegrity(Insertable<AppSettings> instance,
       {bool isInserting = false}) {
@@ -1360,10 +1359,9 @@ class Sources extends Table with TableInfo<Sources, Source> {
   List<GeneratedColumn> get $columns =>
       [id, name, address, isActive, createdAt];
   @override
-  String get aliasedName => _alias ?? actualTableName;
+  String get aliasedName => _alias ?? 'sources';
   @override
-  String get actualTableName => $name;
+  String get actualTableName => 'sources';
-  static const String $name = 'sources';
   @override
   VerificationContext validateIntegrity(Insertable<Source> instance,
       {bool isInserting = false}) {
@@ -1437,8 +1435,8 @@ class Source extends DataClass implements Insertable<Source> {
     map['id'] = Variable<int>(id);
     map['name'] = Variable<String>(name);
     {
-      map['address'] =
+      final converter = Sources.$converteraddress;
-          Variable<String>(Sources.$converteraddress.toSql(address));
+      map['address'] = Variable<String>(converter.toSql(address));
     }
     if (!nullToAbsent || isActive != null) {
       map['is_active'] = Variable<bool>(isActive);
@@ -1582,8 +1580,8 @@ class SourcesCompanion extends UpdateCompanion<Source> {
       map['name'] = Variable<String>(name.value);
     }
     if (address.present) {
-      map['address'] =
+      final converter = Sources.$converteraddress;
-          Variable<String>(Sources.$converteraddress.toSql(address.value));
+      map['address'] = Variable<String>(converter.toSql(address.value));
     }
     if (isActive.present) {
       map['is_active'] = Variable<bool>(isActive.value);
@@ -1655,10 +1653,9 @@ class SubsonicSources extends Table
   List<GeneratedColumn> get $columns =>
       [sourceId, features, username, password, useTokenAuth];
   @override
-  String get aliasedName => _alias ?? actualTableName;
+  String get aliasedName => _alias ?? 'subsonic_sources';
   @override
-  String get actualTableName => $name;
+  String get actualTableName => 'subsonic_sources';
-  static const String $name = 'subsonic_sources';
   @override
   VerificationContext validateIntegrity(Insertable<SubsonicSource> instance,
       {bool isInserting = false}) {
@@ -1741,8 +1738,8 @@ class SubsonicSource extends DataClass implements Insertable<SubsonicSource> {
     final map = <String, Expression>{};
     map['source_id'] = Variable<int>(sourceId);
     {
-      map['features'] =
+      final converter = SubsonicSources.$converterfeatures;
-          Variable<String>(SubsonicSources.$converterfeatures.toSql(features));
+      map['features'] = Variable<String>(converter.toSql(features));
     }
     map['username'] = Variable<String>(username);
     map['password'] = Variable<String>(password);
@@ -1882,8 +1879,8 @@ class SubsonicSourcesCompanion extends UpdateCompanion<SubsonicSource> {
       map['source_id'] = Variable<int>(sourceId.value);
     }
     if (features.present) {
-      map['features'] = Variable<String>(
+      final converter = SubsonicSources.$converterfeatures;
-          SubsonicSources.$converterfeatures.toSql(features.value));
+      map['features'] = Variable<String>(converter.toSql(features.value));
     }
     if (username.present) {
       map['username'] = Variable<String>(username.value);
@@ -1962,10 +1959,9 @@ class Artists extends Table with TableInfo<Artists, Artist> {
   List<GeneratedColumn> get $columns =>
       [sourceId, id, name, albumCount, starred, updated];
   @override
-  String get aliasedName => _alias ?? actualTableName;
+  String get aliasedName => _alias ?? 'artists';
   @override
-  String get actualTableName => $name;
+  String get actualTableName => 'artists';
-  static const String $name = 'artists';
   @override
   VerificationContext validateIntegrity(Insertable<Artist> instance,
       {bool isInserting = false}) {
@@ -2174,10 +2170,9 @@ class ArtistsFts extends Table
   @override
   List<GeneratedColumn> get $columns => [sourceId, name];
   @override
-  String get aliasedName => _alias ?? actualTableName;
+  String get aliasedName => _alias ?? 'artists_fts';
   @override
-  String get actualTableName => $name;
+  String get actualTableName => 'artists_fts';
-  static const String $name = 'artists_fts';
   @override
   VerificationContext validateIntegrity(Insertable<ArtistsFt> instance,
       {bool isInserting = false}) {
@@ -2473,10 +2468,9 @@ class Albums extends Table with TableInfo<Albums, Album> {
         updated
       ];
   @override
-  String get aliasedName => _alias ?? actualTableName;
+  String get aliasedName => _alias ?? 'albums';
   @override
-  String get actualTableName => $name;
+  String get actualTableName => 'albums';
-  static const String $name = 'albums';
   @override
   VerificationContext validateIntegrity(Insertable<Album> instance,
       {bool isInserting = false}) {
@@ -2843,10 +2837,9 @@ class AlbumsFts extends Table
   @override
   List<GeneratedColumn> get $columns => [sourceId, name];
   @override
-  String get aliasedName => _alias ?? actualTableName;
+  String get aliasedName => _alias ?? 'albums_fts';
   @override
-  String get actualTableName => $name;
+  String get actualTableName => 'albums_fts';
-  static const String $name = 'albums_fts';
   @override
   VerificationContext validateIntegrity(Insertable<AlbumsFt> instance,
       {bool isInserting = false}) {
@@ -3079,10 +3072,9 @@ class Playlists extends Table with TableInfo<Playlists, Playlist> {
   List<GeneratedColumn> get $columns =>
       [sourceId, id, name, comment, coverArt, songCount, created, updated];
   @override
-  String get aliasedName => _alias ?? actualTableName;
+  String get aliasedName => _alias ?? 'playlists';
   @override
-  String get actualTableName => $name;
+  String get actualTableName => 'playlists';
-  static const String $name = 'playlists';
   @override
   VerificationContext validateIntegrity(Insertable<Playlist> instance,
       {bool isInserting = false}) {
@@ -3348,10 +3340,9 @@ class PlaylistSongs extends Table with TableInfo<PlaylistSongs, PlaylistSong> {
   List<GeneratedColumn> get $columns =>
       [sourceId, playlistId, songId, position, updated];
   @override
-  String get aliasedName => _alias ?? actualTableName;
+  String get aliasedName => _alias ?? 'playlist_songs';
   @override
-  String get actualTableName => $name;
+  String get actualTableName => 'playlist_songs';
-  static const String $name = 'playlist_songs';
   @override
   VerificationContext validateIntegrity(Insertable<PlaylistSong> instance,
       {bool isInserting = false}) {
@@ -3641,10 +3632,9 @@ class PlaylistsFts extends Table
   @override
   List<GeneratedColumn> get $columns => [sourceId, name];
   @override
-  String get aliasedName => _alias ?? actualTableName;
+  String get aliasedName => _alias ?? 'playlists_fts';
   @override
-  String get actualTableName => $name;
+  String get actualTableName => 'playlists_fts';
-  static const String $name = 'playlists_fts';
   @override
   VerificationContext validateIntegrity(Insertable<PlaylistsFt> instance,
       {bool isInserting = false}) {
@@ -3946,10 +3936,9 @@ class Songs extends Table with TableInfo<Songs, Song> {
         updated
       ];
   @override
-  String get aliasedName => _alias ?? actualTableName;
+  String get aliasedName => _alias ?? 'songs';
   @override
-  String get actualTableName => $name;
+  String get actualTableName => 'songs';
-  static const String $name = 'songs';
   @override
   VerificationContext validateIntegrity(Insertable<Song> instance,
       {bool isInserting = false}) {
@@ -4247,8 +4236,8 @@ class SongsCompanion extends UpdateCompanion<Song> {
       map['artist'] = Variable<String>(artist.value);
     }
     if (duration.present) {
-      map['duration'] =
+      final converter = Songs.$converterdurationn;
-          Variable<int>(Songs.$converterdurationn.toSql(duration.value));
+      map['duration'] = Variable<int>(converter.toSql(duration.value));
     }
     if (track.present) {
       map['track'] = Variable<int>(track.value);
@@ -4327,10 +4316,9 @@ class SongsFts extends Table
   @override
   List<GeneratedColumn> get $columns => [sourceId, title];
   @override
-  String get aliasedName => _alias ?? actualTableName;
+  String get aliasedName => _alias ?? 'songs_fts';
   @override
-  String get actualTableName => $name;
+  String get actualTableName => 'songs_fts';
-  static const String $name = 'songs_fts';
   @override
   VerificationContext validateIntegrity(Insertable<SongsFt> instance,
       {bool isInserting = false}) {
@@ -5582,5 +5570,4 @@ final databaseProvider = Provider<SubtracksDatabase>.internal(
 );
 
 typedef DatabaseRef = ProviderRef<SubtracksDatabase>;
-// ignore_for_file: type=lint
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

lib/http/client.g.dart

@@ -20,5 +20,4 @@ final httpClientProvider = Provider<BaseClient>.internal(
 );
 
 typedef HttpClientRef = ProviderRef<BaseClient>;
-// ignore_for_file: type=lint
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

lib/models/music.freezed.dart

@@ -12,7 +12,7 @@ part of 'music.dart';
 T _$identity<T>(T value) => value;
 
 final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
 
 /// @nodoc
 mixin _$SourceId {
@@ -62,22 +62,21 @@ class _$SourceIdCopyWithImpl<$Res, $Val extends SourceId>
 }
 
 /// @nodoc
-abstract class _$$SourceIdImplCopyWith<$Res>
+abstract class _$$_SourceIdCopyWith<$Res> implements $SourceIdCopyWith<$Res> {
-    implements $SourceIdCopyWith<$Res> {
+  factory _$$_SourceIdCopyWith(
-  factory _$$SourceIdImplCopyWith(
+          _$_SourceId value, $Res Function(_$_SourceId) then) =
-          _$SourceIdImpl value, $Res Function(_$SourceIdImpl) then) =
+      __$$_SourceIdCopyWithImpl<$Res>;
-      __$$SourceIdImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({int sourceId, String id});
 }
 
 /// @nodoc
-class __$$SourceIdImplCopyWithImpl<$Res>
+class __$$_SourceIdCopyWithImpl<$Res>
-    extends _$SourceIdCopyWithImpl<$Res, _$SourceIdImpl>
+    extends _$SourceIdCopyWithImpl<$Res, _$_SourceId>
-    implements _$$SourceIdImplCopyWith<$Res> {
+    implements _$$_SourceIdCopyWith<$Res> {
-  __$$SourceIdImplCopyWithImpl(
+  __$$_SourceIdCopyWithImpl(
-      _$SourceIdImpl _value, $Res Function(_$SourceIdImpl) _then)
+      _$_SourceId _value, $Res Function(_$_SourceId) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -86,7 +85,7 @@ class __$$SourceIdImplCopyWithImpl<$Res>
     Object? sourceId = null,
     Object? id = null,
   }) {
-    return _then(_$SourceIdImpl(
+    return _then(_$_SourceId(
       sourceId: null == sourceId
           ? _value.sourceId
           : sourceId // ignore: cast_nullable_to_non_nullable
@@ -101,8 +100,8 @@ class __$$SourceIdImplCopyWithImpl<$Res>
 
 /// @nodoc
 
-class _$SourceIdImpl with DiagnosticableTreeMixin implements _SourceId {
+class _$_SourceId with DiagnosticableTreeMixin implements _SourceId {
-  const _$SourceIdImpl({required this.sourceId, required this.id});
+  const _$_SourceId({required this.sourceId, required this.id});
 
   @override
   final int sourceId;
@@ -124,10 +123,10 @@ class _$SourceIdImpl with DiagnosticableTreeMixin implements _SourceId {
   }
 
   @override
-  bool operator ==(Object other) {
+  bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$SourceIdImpl &&
+            other is _$_SourceId &&
             (identical(other.sourceId, sourceId) ||
                 other.sourceId == sourceId) &&
             (identical(other.id, id) || other.id == id));
@@ -139,13 +138,13 @@ class _$SourceIdImpl with DiagnosticableTreeMixin implements _SourceId {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$SourceIdImplCopyWith<_$SourceIdImpl> get copyWith =>
+  _$$_SourceIdCopyWith<_$_SourceId> get copyWith =>
-      __$$SourceIdImplCopyWithImpl<_$SourceIdImpl>(this, _$identity);
+      __$$_SourceIdCopyWithImpl<_$_SourceId>(this, _$identity);
 }
 
 abstract class _SourceId implements SourceId {
   const factory _SourceId(
-      {required final int sourceId, required final String id}) = _$SourceIdImpl;
+      {required final int sourceId, required final String id}) = _$_SourceId;
 
   @override
   int get sourceId;
@@ -153,7 +152,7 @@ abstract class _SourceId implements SourceId {
   String get id;
   @override
   @JsonKey(ignore: true)
-  _$$SourceIdImplCopyWith<_$SourceIdImpl> get copyWith =>
+  _$$_SourceIdCopyWith<_$_SourceId> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -206,22 +205,22 @@ class _$SourceIdSetCopyWithImpl<$Res, $Val extends SourceIdSet>
 }
 
 /// @nodoc
-abstract class _$$SourceIdSetImplCopyWith<$Res>
+abstract class _$$_SourceIdSetCopyWith<$Res>
     implements $SourceIdSetCopyWith<$Res> {
-  factory _$$SourceIdSetImplCopyWith(
+  factory _$$_SourceIdSetCopyWith(
-          _$SourceIdSetImpl value, $Res Function(_$SourceIdSetImpl) then) =
+          _$_SourceIdSet value, $Res Function(_$_SourceIdSet) then) =
-      __$$SourceIdSetImplCopyWithImpl<$Res>;
+      __$$_SourceIdSetCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({int sourceId, ISet<String> ids});
 }
 
 /// @nodoc
-class __$$SourceIdSetImplCopyWithImpl<$Res>
+class __$$_SourceIdSetCopyWithImpl<$Res>
-    extends _$SourceIdSetCopyWithImpl<$Res, _$SourceIdSetImpl>
+    extends _$SourceIdSetCopyWithImpl<$Res, _$_SourceIdSet>
-    implements _$$SourceIdSetImplCopyWith<$Res> {
+    implements _$$_SourceIdSetCopyWith<$Res> {
-  __$$SourceIdSetImplCopyWithImpl(
+  __$$_SourceIdSetCopyWithImpl(
-      _$SourceIdSetImpl _value, $Res Function(_$SourceIdSetImpl) _then)
+      _$_SourceIdSet _value, $Res Function(_$_SourceIdSet) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -230,7 +229,7 @@ class __$$SourceIdSetImplCopyWithImpl<$Res>
     Object? sourceId = null,
     Object? ids = null,
   }) {
-    return _then(_$SourceIdSetImpl(
+    return _then(_$_SourceIdSet(
       sourceId: null == sourceId
           ? _value.sourceId
           : sourceId // ignore: cast_nullable_to_non_nullable
@@ -245,8 +244,8 @@ class __$$SourceIdSetImplCopyWithImpl<$Res>
 
 /// @nodoc
 
-class _$SourceIdSetImpl with DiagnosticableTreeMixin implements _SourceIdSet {
+class _$_SourceIdSet with DiagnosticableTreeMixin implements _SourceIdSet {
-  const _$SourceIdSetImpl({required this.sourceId, required this.ids});
+  const _$_SourceIdSet({required this.sourceId, required this.ids});
 
   @override
   final int sourceId;
@@ -268,10 +267,10 @@ class _$SourceIdSetImpl with DiagnosticableTreeMixin implements _SourceIdSet {
   }
 
   @override
-  bool operator ==(Object other) {
+  bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$SourceIdSetImpl &&
+            other is _$_SourceIdSet &&
             (identical(other.sourceId, sourceId) ||
                 other.sourceId == sourceId) &&
             const DeepCollectionEquality().equals(other.ids, ids));
@@ -284,14 +283,14 @@ class _$SourceIdSetImpl with DiagnosticableTreeMixin implements _SourceIdSet {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$SourceIdSetImplCopyWith<_$SourceIdSetImpl> get copyWith =>
+  _$$_SourceIdSetCopyWith<_$_SourceIdSet> get copyWith =>
-      __$$SourceIdSetImplCopyWithImpl<_$SourceIdSetImpl>(this, _$identity);
+      __$$_SourceIdSetCopyWithImpl<_$_SourceIdSet>(this, _$identity);
 }
 
 abstract class _SourceIdSet implements SourceIdSet {
   const factory _SourceIdSet(
       {required final int sourceId,
-      required final ISet<String> ids}) = _$SourceIdSetImpl;
+      required final ISet<String> ids}) = _$_SourceIdSet;
 
   @override
   int get sourceId;
@@ -299,7 +298,7 @@ abstract class _SourceIdSet implements SourceIdSet {
   ISet<String> get ids;
   @override
   @JsonKey(ignore: true)
-  _$$SourceIdSetImplCopyWith<_$SourceIdSetImpl> get copyWith =>
+  _$$_SourceIdSetCopyWith<_$_SourceIdSet> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -373,10 +372,9 @@ class _$ArtistCopyWithImpl<$Res, $Val extends Artist>
 }
 
 /// @nodoc
-abstract class _$$ArtistImplCopyWith<$Res> implements $ArtistCopyWith<$Res> {
+abstract class _$$_ArtistCopyWith<$Res> implements $ArtistCopyWith<$Res> {
-  factory _$$ArtistImplCopyWith(
+  factory _$$_ArtistCopyWith(_$_Artist value, $Res Function(_$_Artist) then) =
-          _$ArtistImpl value, $Res Function(_$ArtistImpl) then) =
+      __$$_ArtistCopyWithImpl<$Res>;
-      __$$ArtistImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -388,11 +386,10 @@ abstract class _$$ArtistImplCopyWith<$Res> implements $ArtistCopyWith<$Res> {
 }
 
 /// @nodoc
-class __$$ArtistImplCopyWithImpl<$Res>
+class __$$_ArtistCopyWithImpl<$Res>
-    extends _$ArtistCopyWithImpl<$Res, _$ArtistImpl>
+    extends _$ArtistCopyWithImpl<$Res, _$_Artist>
-    implements _$$ArtistImplCopyWith<$Res> {
+    implements _$$_ArtistCopyWith<$Res> {
-  __$$ArtistImplCopyWithImpl(
+  __$$_ArtistCopyWithImpl(_$_Artist _value, $Res Function(_$_Artist) _then)
-      _$ArtistImpl _value, $Res Function(_$ArtistImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -404,7 +401,7 @@ class __$$ArtistImplCopyWithImpl<$Res>
     Object? albumCount = null,
     Object? starred = freezed,
   }) {
-    return _then(_$ArtistImpl(
+    return _then(_$_Artist(
       sourceId: null == sourceId
           ? _value.sourceId
           : sourceId // ignore: cast_nullable_to_non_nullable
@@ -431,8 +428,8 @@ class __$$ArtistImplCopyWithImpl<$Res>
 
 /// @nodoc
 
-class _$ArtistImpl with DiagnosticableTreeMixin implements _Artist {
+class _$_Artist with DiagnosticableTreeMixin implements _Artist {
-  const _$ArtistImpl(
+  const _$_Artist(
       {required this.sourceId,
       required this.id,
       required this.name,
@@ -468,10 +465,10 @@ class _$ArtistImpl with DiagnosticableTreeMixin implements _Artist {
   }
 
   @override
-  bool operator ==(Object other) {
+  bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$ArtistImpl &&
+            other is _$_Artist &&
             (identical(other.sourceId, sourceId) ||
                 other.sourceId == sourceId) &&
             (identical(other.id, id) || other.id == id) &&
@@ -488,8 +485,8 @@ class _$ArtistImpl with DiagnosticableTreeMixin implements _Artist {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$ArtistImplCopyWith<_$ArtistImpl> get copyWith =>
+  _$$_ArtistCopyWith<_$_Artist> get copyWith =>
-      __$$ArtistImplCopyWithImpl<_$ArtistImpl>(this, _$identity);
+      __$$_ArtistCopyWithImpl<_$_Artist>(this, _$identity);
 }
 
 abstract class _Artist implements Artist {
@@ -498,7 +495,7 @@ abstract class _Artist implements Artist {
       required final String id,
       required final String name,
       required final int albumCount,
-      final DateTime? starred}) = _$ArtistImpl;
+      final DateTime? starred}) = _$_Artist;
 
   @override
   int get sourceId;
@@ -512,7 +509,7 @@ abstract class _Artist implements Artist {
   DateTime? get starred;
   @override
   @JsonKey(ignore: true)
-  _$$ArtistImplCopyWith<_$ArtistImpl> get copyWith =>
+  _$$_ArtistCopyWith<_$_Artist> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -651,10 +648,9 @@ class _$AlbumCopyWithImpl<$Res, $Val extends Album>
 }
 
 /// @nodoc
-abstract class _$$AlbumImplCopyWith<$Res> implements $AlbumCopyWith<$Res> {
+abstract class _$$_AlbumCopyWith<$Res> implements $AlbumCopyWith<$Res> {
-  factory _$$AlbumImplCopyWith(
+  factory _$$_AlbumCopyWith(_$_Album value, $Res Function(_$_Album) then) =
-          _$AlbumImpl value, $Res Function(_$AlbumImpl) then) =
+      __$$_AlbumCopyWithImpl<$Res>;
-      __$$AlbumImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -675,11 +671,9 @@ abstract class _$$AlbumImplCopyWith<$Res> implements $AlbumCopyWith<$Res> {
 }
 
 /// @nodoc
-class __$$AlbumImplCopyWithImpl<$Res>
+class __$$_AlbumCopyWithImpl<$Res> extends _$AlbumCopyWithImpl<$Res, _$_Album>
-    extends _$AlbumCopyWithImpl<$Res, _$AlbumImpl>
+    implements _$$_AlbumCopyWith<$Res> {
-    implements _$$AlbumImplCopyWith<$Res> {
+  __$$_AlbumCopyWithImpl(_$_Album _value, $Res Function(_$_Album) _then)
-  __$$AlbumImplCopyWithImpl(
-      _$AlbumImpl _value, $Res Function(_$AlbumImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -700,7 +694,7 @@ class __$$AlbumImplCopyWithImpl<$Res>
     Object? frequentRank = freezed,
     Object? recentRank = freezed,
   }) {
-    return _then(_$AlbumImpl(
+    return _then(_$_Album(
       sourceId: null == sourceId
           ? _value.sourceId
           : sourceId // ignore: cast_nullable_to_non_nullable
@@ -763,8 +757,8 @@ class __$$AlbumImplCopyWithImpl<$Res>
 
 /// @nodoc
 
-class _$AlbumImpl with DiagnosticableTreeMixin implements _Album {
+class _$_Album with DiagnosticableTreeMixin implements _Album {
-  const _$AlbumImpl(
+  const _$_Album(
       {required this.sourceId,
       required this.id,
       required this.name,
@@ -839,10 +833,10 @@ class _$AlbumImpl with DiagnosticableTreeMixin implements _Album {
   }
 
   @override
-  bool operator ==(Object other) {
+  bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$AlbumImpl &&
+            other is _$_Album &&
             (identical(other.sourceId, sourceId) ||
                 other.sourceId == sourceId) &&
             (identical(other.id, id) || other.id == id) &&
@@ -888,8 +882,8 @@ class _$AlbumImpl with DiagnosticableTreeMixin implements _Album {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$AlbumImplCopyWith<_$AlbumImpl> get copyWith =>
+  _$$_AlbumCopyWith<_$_Album> get copyWith =>
-      __$$AlbumImplCopyWithImpl<_$AlbumImpl>(this, _$identity);
+      __$$_AlbumCopyWithImpl<_$_Album>(this, _$identity);
 }
 
 abstract class _Album implements Album {
@@ -907,7 +901,7 @@ abstract class _Album implements Album {
       required final int songCount,
       final bool isDeleted,
       final int? frequentRank,
-      final int? recentRank}) = _$AlbumImpl;
+      final int? recentRank}) = _$_Album;
 
   @override
   int get sourceId;
@@ -939,7 +933,7 @@ abstract class _Album implements Album {
   int? get recentRank;
   @override
   @JsonKey(ignore: true)
-  _$$AlbumImplCopyWith<_$AlbumImpl> get copyWith =>
+  _$$_AlbumCopyWith<_$_Album> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -1028,11 +1022,10 @@ class _$PlaylistCopyWithImpl<$Res, $Val extends Playlist>
 }
 
 /// @nodoc
-abstract class _$$PlaylistImplCopyWith<$Res>
+abstract class _$$_PlaylistCopyWith<$Res> implements $PlaylistCopyWith<$Res> {
-    implements $PlaylistCopyWith<$Res> {
+  factory _$$_PlaylistCopyWith(
-  factory _$$PlaylistImplCopyWith(
+          _$_Playlist value, $Res Function(_$_Playlist) then) =
-          _$PlaylistImpl value, $Res Function(_$PlaylistImpl) then) =
+      __$$_PlaylistCopyWithImpl<$Res>;
-      __$$PlaylistImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -1046,11 +1039,11 @@ abstract class _$$PlaylistImplCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$PlaylistImplCopyWithImpl<$Res>
+class __$$_PlaylistCopyWithImpl<$Res>
-    extends _$PlaylistCopyWithImpl<$Res, _$PlaylistImpl>
+    extends _$PlaylistCopyWithImpl<$Res, _$_Playlist>
-    implements _$$PlaylistImplCopyWith<$Res> {
+    implements _$$_PlaylistCopyWith<$Res> {
-  __$$PlaylistImplCopyWithImpl(
+  __$$_PlaylistCopyWithImpl(
-      _$PlaylistImpl _value, $Res Function(_$PlaylistImpl) _then)
+      _$_Playlist _value, $Res Function(_$_Playlist) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -1064,7 +1057,7 @@ class __$$PlaylistImplCopyWithImpl<$Res>
     Object? songCount = null,
     Object? created = null,
   }) {
-    return _then(_$PlaylistImpl(
+    return _then(_$_Playlist(
       sourceId: null == sourceId
           ? _value.sourceId
           : sourceId // ignore: cast_nullable_to_non_nullable
@@ -1099,8 +1092,8 @@ class __$$PlaylistImplCopyWithImpl<$Res>
 
 /// @nodoc
 
-class _$PlaylistImpl with DiagnosticableTreeMixin implements _Playlist {
+class _$_Playlist with DiagnosticableTreeMixin implements _Playlist {
-  const _$PlaylistImpl(
+  const _$_Playlist(
       {required this.sourceId,
       required this.id,
       required this.name,
@@ -1144,10 +1137,10 @@ class _$PlaylistImpl with DiagnosticableTreeMixin implements _Playlist {
   }
 
   @override
-  bool operator ==(Object other) {
+  bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$PlaylistImpl &&
+            other is _$_Playlist &&
             (identical(other.sourceId, sourceId) ||
                 other.sourceId == sourceId) &&
             (identical(other.id, id) || other.id == id) &&
@@ -1167,8 +1160,8 @@ class _$PlaylistImpl with DiagnosticableTreeMixin implements _Playlist {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$PlaylistImplCopyWith<_$PlaylistImpl> get copyWith =>
+  _$$_PlaylistCopyWith<_$_Playlist> get copyWith =>
-      __$$PlaylistImplCopyWithImpl<_$PlaylistImpl>(this, _$identity);
+      __$$_PlaylistCopyWithImpl<_$_Playlist>(this, _$identity);
 }
 
 abstract class _Playlist implements Playlist {
@@ -1179,7 +1172,7 @@ abstract class _Playlist implements Playlist {
       final String? comment,
       final String? coverArt,
       required final int songCount,
-      required final DateTime created}) = _$PlaylistImpl;
+      required final DateTime created}) = _$_Playlist;
 
   @override
   int get sourceId;
@@ -1197,7 +1190,7 @@ abstract class _Playlist implements Playlist {
   DateTime get created;
   @override
   @JsonKey(ignore: true)
-  _$$PlaylistImplCopyWith<_$PlaylistImpl> get copyWith =>
+  _$$_PlaylistCopyWith<_$_Playlist> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -1341,10 +1334,9 @@ class _$SongCopyWithImpl<$Res, $Val extends Song>
 }
 
 /// @nodoc
-abstract class _$$SongImplCopyWith<$Res> implements $SongCopyWith<$Res> {
+abstract class _$$_SongCopyWith<$Res> implements $SongCopyWith<$Res> {
-  factory _$$SongImplCopyWith(
+  factory _$$_SongCopyWith(_$_Song value, $Res Function(_$_Song) then) =
-          _$SongImpl value, $Res Function(_$SongImpl) then) =
+      __$$_SongCopyWithImpl<$Res>;
-      __$$SongImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -1366,10 +1358,9 @@ abstract class _$$SongImplCopyWith<$Res> implements $SongCopyWith<$Res> {
 }
 
 /// @nodoc
-class __$$SongImplCopyWithImpl<$Res>
+class __$$_SongCopyWithImpl<$Res> extends _$SongCopyWithImpl<$Res, _$_Song>
-    extends _$SongCopyWithImpl<$Res, _$SongImpl>
+    implements _$$_SongCopyWith<$Res> {
-    implements _$$SongImplCopyWith<$Res> {
+  __$$_SongCopyWithImpl(_$_Song _value, $Res Function(_$_Song) _then)
-  __$$SongImplCopyWithImpl(_$SongImpl _value, $Res Function(_$SongImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -1391,7 +1382,7 @@ class __$$SongImplCopyWithImpl<$Res>
     Object? downloadFilePath = freezed,
     Object? isDeleted = null,
   }) {
-    return _then(_$SongImpl(
+    return _then(_$_Song(
       sourceId: null == sourceId
           ? _value.sourceId
           : sourceId // ignore: cast_nullable_to_non_nullable
@@ -1458,8 +1449,8 @@ class __$$SongImplCopyWithImpl<$Res>
 
 /// @nodoc
 
-class _$SongImpl with DiagnosticableTreeMixin implements _Song {
+class _$_Song with DiagnosticableTreeMixin implements _Song {
-  const _$SongImpl(
+  const _$_Song(
       {required this.sourceId,
       required this.id,
       this.albumId,
@@ -1536,10 +1527,10 @@ class _$SongImpl with DiagnosticableTreeMixin implements _Song {
   }
 
   @override
-  bool operator ==(Object other) {
+  bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$SongImpl &&
+            other is _$_Song &&
             (identical(other.sourceId, sourceId) ||
                 other.sourceId == sourceId) &&
             (identical(other.id, id) || other.id == id) &&
@@ -1585,8 +1576,8 @@ class _$SongImpl with DiagnosticableTreeMixin implements _Song {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$SongImplCopyWith<_$SongImpl> get copyWith =>
+  _$$_SongCopyWith<_$_Song> get copyWith =>
-      __$$SongImplCopyWithImpl<_$SongImpl>(this, _$identity);
+      __$$_SongCopyWithImpl<_$_Song>(this, _$identity);
 }
 
 abstract class _Song implements Song {
@@ -1605,7 +1596,7 @@ abstract class _Song implements Song {
       final String? genre,
       final String? downloadTaskId,
       final String? downloadFilePath,
-      final bool isDeleted}) = _$SongImpl;
+      final bool isDeleted}) = _$_Song;
 
   @override
   int get sourceId;
@@ -1639,8 +1630,7 @@ abstract class _Song implements Song {
   bool get isDeleted;
   @override
   @JsonKey(ignore: true)
-  _$$SongImplCopyWith<_$SongImpl> get copyWith =>
+  _$$_SongCopyWith<_$_Song> get copyWith => throw _privateConstructorUsedError;
-      throw _privateConstructorUsedError;
 }
 
 /// @nodoc
@@ -1708,11 +1698,11 @@ class _$SearchResultsCopyWithImpl<$Res, $Val extends SearchResults>
 }
 
 /// @nodoc
-abstract class _$$SearchResultsImplCopyWith<$Res>
+abstract class _$$_SearchResultsCopyWith<$Res>
     implements $SearchResultsCopyWith<$Res> {
-  factory _$$SearchResultsImplCopyWith(
+  factory _$$_SearchResultsCopyWith(
-          _$SearchResultsImpl value, $Res Function(_$SearchResultsImpl) then) =
+          _$_SearchResults value, $Res Function(_$_SearchResults) then) =
-      __$$SearchResultsImplCopyWithImpl<$Res>;
+      __$$_SearchResultsCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -1723,11 +1713,11 @@ abstract class _$$SearchResultsImplCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$SearchResultsImplCopyWithImpl<$Res>
+class __$$_SearchResultsCopyWithImpl<$Res>
-    extends _$SearchResultsCopyWithImpl<$Res, _$SearchResultsImpl>
+    extends _$SearchResultsCopyWithImpl<$Res, _$_SearchResults>
-    implements _$$SearchResultsImplCopyWith<$Res> {
+    implements _$$_SearchResultsCopyWith<$Res> {
-  __$$SearchResultsImplCopyWithImpl(
+  __$$_SearchResultsCopyWithImpl(
-      _$SearchResultsImpl _value, $Res Function(_$SearchResultsImpl) _then)
+      _$_SearchResults _value, $Res Function(_$_SearchResults) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -1738,7 +1728,7 @@ class __$$SearchResultsImplCopyWithImpl<$Res>
     Object? albums = null,
     Object? artists = null,
   }) {
-    return _then(_$SearchResultsImpl(
+    return _then(_$_SearchResults(
       query: freezed == query
           ? _value.query
           : query // ignore: cast_nullable_to_non_nullable
@@ -1761,10 +1751,8 @@ class __$$SearchResultsImplCopyWithImpl<$Res>
 
 /// @nodoc
 
-class _$SearchResultsImpl
+class _$_SearchResults with DiagnosticableTreeMixin implements _SearchResults {
-    with DiagnosticableTreeMixin
+  const _$_SearchResults(
-    implements _SearchResults {
-  const _$SearchResultsImpl(
       {this.query,
       this.songs = const IListConst([]),
       this.albums = const IListConst([]),
@@ -1799,10 +1787,10 @@ class _$SearchResultsImpl
   }
 
   @override
-  bool operator ==(Object other) {
+  bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$SearchResultsImpl &&
+            other is _$_SearchResults &&
             (identical(other.query, query) || other.query == query) &&
             const DeepCollectionEquality().equals(other.songs, songs) &&
             const DeepCollectionEquality().equals(other.albums, albums) &&
@@ -1820,8 +1808,8 @@ class _$SearchResultsImpl
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$SearchResultsImplCopyWith<_$SearchResultsImpl> get copyWith =>
+  _$$_SearchResultsCopyWith<_$_SearchResults> get copyWith =>
-      __$$SearchResultsImplCopyWithImpl<_$SearchResultsImpl>(this, _$identity);
+      __$$_SearchResultsCopyWithImpl<_$_SearchResults>(this, _$identity);
 }
 
 abstract class _SearchResults implements SearchResults {
@@ -1829,7 +1817,7 @@ abstract class _SearchResults implements SearchResults {
       {final String? query,
       final IList<Song> songs,
       final IList<Album> albums,
-      final IList<Artist> artists}) = _$SearchResultsImpl;
+      final IList<Artist> artists}) = _$_SearchResults;
 
   @override
   String? get query;
@@ -1841,6 +1829,6 @@ abstract class _SearchResults implements SearchResults {
   IList<Artist> get artists;
   @override
   @JsonKey(ignore: true)
-  _$$SearchResultsImplCopyWith<_$SearchResultsImpl> get copyWith =>
+  _$$_SearchResultsCopyWith<_$_SearchResults> get copyWith =>
       throw _privateConstructorUsedError;
 }

lib/models/query.g.dart

@@ -6,26 +6,25 @@ part of 'query.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$PaginationImpl _$$PaginationImplFromJson(Map<String, dynamic> json) =>
+_$_Pagination _$$_PaginationFromJson(Map<String, dynamic> json) =>
-    _$PaginationImpl(
+    _$_Pagination(
-      limit: (json['limit'] as num).toInt(),
+      limit: json['limit'] as int,
-      offset: (json['offset'] as num?)?.toInt() ?? 0,
+      offset: json['offset'] as int? ?? 0,
     );
 
-Map<String, dynamic> _$$PaginationImplToJson(_$PaginationImpl instance) =>
+Map<String, dynamic> _$$_PaginationToJson(_$_Pagination instance) =>
     <String, dynamic>{
       'limit': instance.limit,
       'offset': instance.offset,
     };
 
-_$SortByImpl _$$SortByImplFromJson(Map<String, dynamic> json) => _$SortByImpl(
+_$_SortBy _$$_SortByFromJson(Map<String, dynamic> json) => _$_SortBy(
       column: json['column'] as String,
       dir: $enumDecodeNullable(_$SortDirectionEnumMap, json['dir']) ??
           SortDirection.asc,
     );
 
-Map<String, dynamic> _$$SortByImplToJson(_$SortByImpl instance) =>
+Map<String, dynamic> _$$_SortByToJson(_$_SortBy instance) => <String, dynamic>{
-    <String, dynamic>{
       'column': instance.column,
       'dir': _$SortDirectionEnumMap[instance.dir]!,
     };
@@ -35,17 +34,15 @@ const _$SortDirectionEnumMap = {
   SortDirection.desc: 'desc',
 };
 
-_$FilterWithEqualsImpl _$$FilterWithEqualsImplFromJson(
+_$_FilterWithEquals _$$_FilterWithEqualsFromJson(Map<String, dynamic> json) =>
-        Map<String, dynamic> json) =>
+    _$_FilterWithEquals(
-    _$FilterWithEqualsImpl(
       column: json['column'] as String,
       value: json['value'] as String,
       invert: json['invert'] as bool? ?? false,
       $type: json['runtimeType'] as String?,
     );
 
-Map<String, dynamic> _$$FilterWithEqualsImplToJson(
+Map<String, dynamic> _$$_FilterWithEqualsToJson(_$_FilterWithEquals instance) =>
-        _$FilterWithEqualsImpl instance) =>
     <String, dynamic>{
       'column': instance.column,
       'value': instance.value,
@@ -53,17 +50,17 @@ Map<String, dynamic> _$$FilterWithEqualsImplToJson(
       'runtimeType': instance.$type,
     };
 
-_$FilterWithGreaterThanImpl _$$FilterWithGreaterThanImplFromJson(
+_$_FilterWithGreaterThan _$$_FilterWithGreaterThanFromJson(
         Map<String, dynamic> json) =>
-    _$FilterWithGreaterThanImpl(
+    _$_FilterWithGreaterThan(
       column: json['column'] as String,
       value: json['value'] as String,
       orEquals: json['orEquals'] as bool? ?? false,
       $type: json['runtimeType'] as String?,
     );
 
-Map<String, dynamic> _$$FilterWithGreaterThanImplToJson(
+Map<String, dynamic> _$$_FilterWithGreaterThanToJson(
-        _$FilterWithGreaterThanImpl instance) =>
+        _$_FilterWithGreaterThan instance) =>
     <String, dynamic>{
       'column': instance.column,
       'value': instance.value,
@@ -71,33 +68,31 @@ Map<String, dynamic> _$$FilterWithGreaterThanImplToJson(
       'runtimeType': instance.$type,
     };
 
-_$FilterWithIsNullImpl _$$FilterWithIsNullImplFromJson(
+_$_FilterWithIsNull _$$_FilterWithIsNullFromJson(Map<String, dynamic> json) =>
-        Map<String, dynamic> json) =>
+    _$_FilterWithIsNull(
-    _$FilterWithIsNullImpl(
       column: json['column'] as String,
       invert: json['invert'] as bool? ?? false,
       $type: json['runtimeType'] as String?,
     );
 
-Map<String, dynamic> _$$FilterWithIsNullImplToJson(
+Map<String, dynamic> _$$_FilterWithIsNullToJson(_$_FilterWithIsNull instance) =>
-        _$FilterWithIsNullImpl instance) =>
     <String, dynamic>{
       'column': instance.column,
       'invert': instance.invert,
       'runtimeType': instance.$type,
     };
 
-_$FilterWithBetweenIntImpl _$$FilterWithBetweenIntImplFromJson(
+_$_FilterWithBetweenInt _$$_FilterWithBetweenIntFromJson(
         Map<String, dynamic> json) =>
-    _$FilterWithBetweenIntImpl(
+    _$_FilterWithBetweenInt(
       column: json['column'] as String,
-      from: (json['from'] as num).toInt(),
+      from: json['from'] as int,
-      to: (json['to'] as num).toInt(),
+      to: json['to'] as int,
       $type: json['runtimeType'] as String?,
     );
 
-Map<String, dynamic> _$$FilterWithBetweenIntImplToJson(
+Map<String, dynamic> _$$_FilterWithBetweenIntToJson(
-        _$FilterWithBetweenIntImpl instance) =>
+        _$_FilterWithBetweenInt instance) =>
     <String, dynamic>{
       'column': instance.column,
       'from': instance.from,
@@ -105,8 +100,8 @@ Map<String, dynamic> _$$FilterWithBetweenIntImplToJson(
       'runtimeType': instance.$type,
     };
 
-_$FilterWithIsInImpl _$$FilterWithIsInImplFromJson(Map<String, dynamic> json) =>
+_$_FilterWithIsIn _$$_FilterWithIsInFromJson(Map<String, dynamic> json) =>
-    _$FilterWithIsInImpl(
+    _$_FilterWithIsIn(
       column: json['column'] as String,
       invert: json['invert'] as bool? ?? false,
       values: json['values'] == null
@@ -115,8 +110,7 @@ _$FilterWithIsInImpl _$$FilterWithIsInImplFromJson(Map<String, dynamic> json) =>
       $type: json['runtimeType'] as String?,
     );
 
-Map<String, dynamic> _$$FilterWithIsInImplToJson(
+Map<String, dynamic> _$$_FilterWithIsInToJson(_$_FilterWithIsIn instance) =>
-        _$FilterWithIsInImpl instance) =>
     <String, dynamic>{
       'column': instance.column,
       'invert': instance.invert,
@@ -126,8 +120,7 @@ Map<String, dynamic> _$$FilterWithIsInImplToJson(
       'runtimeType': instance.$type,
     };
 
-_$ListQueryImpl _$$ListQueryImplFromJson(Map<String, dynamic> json) =>
+_$_ListQuery _$$_ListQueryFromJson(Map<String, dynamic> json) => _$_ListQuery(
-    _$ListQueryImpl(
       page: json['page'] == null
           ? const Pagination(limit: -1, offset: 0)
           : Pagination.fromJson(json['page'] as Map<String, dynamic>),
@@ -140,7 +133,7 @@ _$ListQueryImpl _$$ListQueryImplFromJson(Map<String, dynamic> json) =>
               (value) => FilterWith.fromJson(value as Map<String, dynamic>)),
     );
 
-Map<String, dynamic> _$$ListQueryImplToJson(_$ListQueryImpl instance) =>
+Map<String, dynamic> _$$_ListQueryToJson(_$_ListQuery instance) =>
     <String, dynamic>{
       'page': instance.page,
       'sort': instance.sort,

lib/models/settings.freezed.dart

@@ -12,7 +12,7 @@ part of 'settings.dart';
 T _$identity<T>(T value) => value;
 
 final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
 
 /// @nodoc
 mixin _$Settings {
@@ -81,11 +81,10 @@ class _$SettingsCopyWithImpl<$Res, $Val extends Settings>
 }
 
 /// @nodoc
-abstract class _$$SettingsImplCopyWith<$Res>
+abstract class _$$_SettingsCopyWith<$Res> implements $SettingsCopyWith<$Res> {
-    implements $SettingsCopyWith<$Res> {
+  factory _$$_SettingsCopyWith(
-  factory _$$SettingsImplCopyWith(
+          _$_Settings value, $Res Function(_$_Settings) then) =
-          _$SettingsImpl value, $Res Function(_$SettingsImpl) then) =
+      __$$_SettingsCopyWithImpl<$Res>;
-      __$$SettingsImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -98,11 +97,11 @@ abstract class _$$SettingsImplCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$SettingsImplCopyWithImpl<$Res>
+class __$$_SettingsCopyWithImpl<$Res>
-    extends _$SettingsCopyWithImpl<$Res, _$SettingsImpl>
+    extends _$SettingsCopyWithImpl<$Res, _$_Settings>
-    implements _$$SettingsImplCopyWith<$Res> {
+    implements _$$_SettingsCopyWith<$Res> {
-  __$$SettingsImplCopyWithImpl(
+  __$$_SettingsCopyWithImpl(
-      _$SettingsImpl _value, $Res Function(_$SettingsImpl) _then)
+      _$_Settings _value, $Res Function(_$_Settings) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -112,7 +111,7 @@ class __$$SettingsImplCopyWithImpl<$Res>
     Object? activeSource = freezed,
     Object? app = null,
   }) {
-    return _then(_$SettingsImpl(
+    return _then(_$_Settings(
       sources: null == sources
           ? _value.sources
           : sources // ignore: cast_nullable_to_non_nullable
@@ -131,8 +130,8 @@ class __$$SettingsImplCopyWithImpl<$Res>
 
 /// @nodoc
 
-class _$SettingsImpl implements _Settings {
+class _$_Settings implements _Settings {
-  const _$SettingsImpl(
+  const _$_Settings(
       {this.sources = const IListConst([]),
       this.activeSource,
       this.app = const AppSettings()});
@@ -152,10 +151,10 @@ class _$SettingsImpl implements _Settings {
   }
 
   @override
-  bool operator ==(Object other) {
+  bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$SettingsImpl &&
+            other is _$_Settings &&
             const DeepCollectionEquality().equals(other.sources, sources) &&
             (identical(other.activeSource, activeSource) ||
                 other.activeSource == activeSource) &&
@@ -169,15 +168,15 @@ class _$SettingsImpl implements _Settings {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$SettingsImplCopyWith<_$SettingsImpl> get copyWith =>
+  _$$_SettingsCopyWith<_$_Settings> get copyWith =>
-      __$$SettingsImplCopyWithImpl<_$SettingsImpl>(this, _$identity);
+      __$$_SettingsCopyWithImpl<_$_Settings>(this, _$identity);
 }
 
 abstract class _Settings implements Settings {
   const factory _Settings(
       {final IList<SourceSettings> sources,
       final SourceSettings? activeSource,
-      final AppSettings app}) = _$SettingsImpl;
+      final AppSettings app}) = _$_Settings;
 
   @override
   IList<SourceSettings> get sources;
@@ -187,7 +186,7 @@ abstract class _Settings implements Settings {
   AppSettings get app;
   @override
   @JsonKey(ignore: true)
-  _$$SettingsImplCopyWith<_$SettingsImpl> get copyWith =>
+  _$$_SettingsCopyWith<_$_Settings> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -246,22 +245,22 @@ class _$AppSettingsCopyWithImpl<$Res, $Val extends AppSettings>
 }
 
 /// @nodoc
-abstract class _$$AppSettingsImplCopyWith<$Res>
+abstract class _$$_AppSettingsCopyWith<$Res>
     implements $AppSettingsCopyWith<$Res> {
-  factory _$$AppSettingsImplCopyWith(
+  factory _$$_AppSettingsCopyWith(
-          _$AppSettingsImpl value, $Res Function(_$AppSettingsImpl) then) =
+          _$_AppSettings value, $Res Function(_$_AppSettings) then) =
-      __$$AppSettingsImplCopyWithImpl<$Res>;
+      __$$_AppSettingsCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({int maxBitrateWifi, int maxBitrateMobile, String? streamFormat});
 }
 
 /// @nodoc
-class __$$AppSettingsImplCopyWithImpl<$Res>
+class __$$_AppSettingsCopyWithImpl<$Res>
-    extends _$AppSettingsCopyWithImpl<$Res, _$AppSettingsImpl>
+    extends _$AppSettingsCopyWithImpl<$Res, _$_AppSettings>
-    implements _$$AppSettingsImplCopyWith<$Res> {
+    implements _$$_AppSettingsCopyWith<$Res> {
-  __$$AppSettingsImplCopyWithImpl(
+  __$$_AppSettingsCopyWithImpl(
-      _$AppSettingsImpl _value, $Res Function(_$AppSettingsImpl) _then)
+      _$_AppSettings _value, $Res Function(_$_AppSettings) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -271,7 +270,7 @@ class __$$AppSettingsImplCopyWithImpl<$Res>
     Object? maxBitrateMobile = null,
     Object? streamFormat = freezed,
   }) {
-    return _then(_$AppSettingsImpl(
+    return _then(_$_AppSettings(
       maxBitrateWifi: null == maxBitrateWifi
           ? _value.maxBitrateWifi
           : maxBitrateWifi // ignore: cast_nullable_to_non_nullable
@@ -290,8 +289,8 @@ class __$$AppSettingsImplCopyWithImpl<$Res>
 
 /// @nodoc
 
-class _$AppSettingsImpl extends _AppSettings {
+class _$_AppSettings extends _AppSettings {
-  const _$AppSettingsImpl(
+  const _$_AppSettings(
       {this.maxBitrateWifi = 0,
       this.maxBitrateMobile = 192,
       this.streamFormat = 'mp3'})
@@ -313,10 +312,10 @@ class _$AppSettingsImpl extends _AppSettings {
   }
 
   @override
-  bool operator ==(Object other) {
+  bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$AppSettingsImpl &&
+            other is _$_AppSettings &&
             (identical(other.maxBitrateWifi, maxBitrateWifi) ||
                 other.maxBitrateWifi == maxBitrateWifi) &&
             (identical(other.maxBitrateMobile, maxBitrateMobile) ||
@@ -332,15 +331,15 @@ class _$AppSettingsImpl extends _AppSettings {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$AppSettingsImplCopyWith<_$AppSettingsImpl> get copyWith =>
+  _$$_AppSettingsCopyWith<_$_AppSettings> get copyWith =>
-      __$$AppSettingsImplCopyWithImpl<_$AppSettingsImpl>(this, _$identity);
+      __$$_AppSettingsCopyWithImpl<_$_AppSettings>(this, _$identity);
 }
 
 abstract class _AppSettings extends AppSettings {
   const factory _AppSettings(
       {final int maxBitrateWifi,
       final int maxBitrateMobile,
-      final String? streamFormat}) = _$AppSettingsImpl;
+      final String? streamFormat}) = _$_AppSettings;
   const _AppSettings._() : super._();
 
   @override
@@ -351,7 +350,7 @@ abstract class _AppSettings extends AppSettings {
   String? get streamFormat;
   @override
   @JsonKey(ignore: true)
-  _$$AppSettingsImplCopyWith<_$AppSettingsImpl> get copyWith =>
+  _$$_AppSettingsCopyWith<_$_AppSettings> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -455,11 +454,11 @@ class _$SubsonicSettingsCopyWithImpl<$Res, $Val extends SubsonicSettings>
 }
 
 /// @nodoc
-abstract class _$$SubsonicSettingsImplCopyWith<$Res>
+abstract class _$$_SubsonicSettingsCopyWith<$Res>
     implements $SubsonicSettingsCopyWith<$Res> {
-  factory _$$SubsonicSettingsImplCopyWith(_$SubsonicSettingsImpl value,
+  factory _$$_SubsonicSettingsCopyWith(
-          $Res Function(_$SubsonicSettingsImpl) then) =
+          _$_SubsonicSettings value, $Res Function(_$_SubsonicSettings) then) =
-      __$$SubsonicSettingsImplCopyWithImpl<$Res>;
+      __$$_SubsonicSettingsCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -475,11 +474,11 @@ abstract class _$$SubsonicSettingsImplCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$SubsonicSettingsImplCopyWithImpl<$Res>
+class __$$_SubsonicSettingsCopyWithImpl<$Res>
-    extends _$SubsonicSettingsCopyWithImpl<$Res, _$SubsonicSettingsImpl>
+    extends _$SubsonicSettingsCopyWithImpl<$Res, _$_SubsonicSettings>
-    implements _$$SubsonicSettingsImplCopyWith<$Res> {
+    implements _$$_SubsonicSettingsCopyWith<$Res> {
-  __$$SubsonicSettingsImplCopyWithImpl(_$SubsonicSettingsImpl _value,
+  __$$_SubsonicSettingsCopyWithImpl(
-      $Res Function(_$SubsonicSettingsImpl) _then)
+      _$_SubsonicSettings _value, $Res Function(_$_SubsonicSettings) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -495,7 +494,7 @@ class __$$SubsonicSettingsImplCopyWithImpl<$Res>
     Object? password = null,
     Object? useTokenAuth = null,
   }) {
-    return _then(_$SubsonicSettingsImpl(
+    return _then(_$_SubsonicSettings(
       id: null == id
           ? _value.id
           : id // ignore: cast_nullable_to_non_nullable
@@ -538,8 +537,8 @@ class __$$SubsonicSettingsImplCopyWithImpl<$Res>
 
 /// @nodoc
 
-class _$SubsonicSettingsImpl extends _SubsonicSettings {
+class _$_SubsonicSettings extends _SubsonicSettings {
-  const _$SubsonicSettingsImpl(
+  const _$_SubsonicSettings(
       {required this.id,
       this.features = const IListConst([]),
       required this.name,
@@ -578,10 +577,10 @@ class _$SubsonicSettingsImpl extends _SubsonicSettings {
   }
 
   @override
-  bool operator ==(Object other) {
+  bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$SubsonicSettingsImpl &&
+            other is _$_SubsonicSettings &&
             (identical(other.id, id) || other.id == id) &&
             const DeepCollectionEquality().equals(other.features, features) &&
             (identical(other.name, name) || other.name == name) &&
@@ -614,9 +613,8 @@ class _$SubsonicSettingsImpl extends _SubsonicSettings {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$SubsonicSettingsImplCopyWith<_$SubsonicSettingsImpl> get copyWith =>
+  _$$_SubsonicSettingsCopyWith<_$_SubsonicSettings> get copyWith =>
-      __$$SubsonicSettingsImplCopyWithImpl<_$SubsonicSettingsImpl>(
+      __$$_SubsonicSettingsCopyWithImpl<_$_SubsonicSettings>(this, _$identity);
-          this, _$identity);
 }
 
 abstract class _SubsonicSettings extends SubsonicSettings {
@@ -629,7 +627,7 @@ abstract class _SubsonicSettings extends SubsonicSettings {
       required final DateTime createdAt,
       required final String username,
       required final String password,
-      final bool useTokenAuth}) = _$SubsonicSettingsImpl;
+      final bool useTokenAuth}) = _$_SubsonicSettings;
   const _SubsonicSettings._() : super._();
 
   @override
@@ -652,7 +650,7 @@ abstract class _SubsonicSettings extends SubsonicSettings {
   bool get useTokenAuth;
   @override
   @JsonKey(ignore: true)
-  _$$SubsonicSettingsImplCopyWith<_$SubsonicSettingsImpl> get copyWith =>
+  _$$_SubsonicSettingsCopyWith<_$_SubsonicSettings> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -716,12 +714,11 @@ class _$SubsonicSourceSettingsCopyWithImpl<$Res,
 }
 
 /// @nodoc
-abstract class _$$SubsonicSourceSettingsImplCopyWith<$Res>
+abstract class _$$_SubsonicSourceSettingsCopyWith<$Res>
     implements $SubsonicSourceSettingsCopyWith<$Res> {
-  factory _$$SubsonicSourceSettingsImplCopyWith(
+  factory _$$_SubsonicSourceSettingsCopyWith(_$_SubsonicSourceSettings value,
-          _$SubsonicSourceSettingsImpl value,
+          $Res Function(_$_SubsonicSourceSettings) then) =
-          $Res Function(_$SubsonicSourceSettingsImpl) then) =
+      __$$_SubsonicSourceSettingsCopyWithImpl<$Res>;
-      __$$SubsonicSourceSettingsImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({SourceSettings source, SubsonicSettings subsonic});
@@ -731,13 +728,12 @@ abstract class _$$SubsonicSourceSettingsImplCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$SubsonicSourceSettingsImplCopyWithImpl<$Res>
+class __$$_SubsonicSourceSettingsCopyWithImpl<$Res>
     extends _$SubsonicSourceSettingsCopyWithImpl<$Res,
-        _$SubsonicSourceSettingsImpl>
+        _$_SubsonicSourceSettings>
-    implements _$$SubsonicSourceSettingsImplCopyWith<$Res> {
+    implements _$$_SubsonicSourceSettingsCopyWith<$Res> {
-  __$$SubsonicSourceSettingsImplCopyWithImpl(
+  __$$_SubsonicSourceSettingsCopyWithImpl(_$_SubsonicSourceSettings _value,
-      _$SubsonicSourceSettingsImpl _value,
+      $Res Function(_$_SubsonicSourceSettings) _then)
-      $Res Function(_$SubsonicSourceSettingsImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -746,7 +742,7 @@ class __$$SubsonicSourceSettingsImplCopyWithImpl<$Res>
     Object? source = null,
     Object? subsonic = null,
   }) {
-    return _then(_$SubsonicSourceSettingsImpl(
+    return _then(_$_SubsonicSourceSettings(
       source: null == source
           ? _value.source
           : source // ignore: cast_nullable_to_non_nullable
@@ -761,8 +757,8 @@ class __$$SubsonicSourceSettingsImplCopyWithImpl<$Res>
 
 /// @nodoc
 
-class _$SubsonicSourceSettingsImpl extends _SubsonicSourceSettings {
+class _$_SubsonicSourceSettings extends _SubsonicSourceSettings {
-  const _$SubsonicSourceSettingsImpl(
+  const _$_SubsonicSourceSettings(
       {required this.source, required this.subsonic})
       : super._();
 
@@ -777,10 +773,10 @@ class _$SubsonicSourceSettingsImpl extends _SubsonicSourceSettings {
   }
 
   @override
-  bool operator ==(Object other) {
+  bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$SubsonicSourceSettingsImpl &&
+            other is _$_SubsonicSourceSettings &&
             (identical(other.source, source) || other.source == source) &&
             (identical(other.subsonic, subsonic) ||
                 other.subsonic == subsonic));
@@ -792,15 +788,15 @@ class _$SubsonicSourceSettingsImpl extends _SubsonicSourceSettings {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$SubsonicSourceSettingsImplCopyWith<_$SubsonicSourceSettingsImpl>
+  _$$_SubsonicSourceSettingsCopyWith<_$_SubsonicSourceSettings> get copyWith =>
-      get copyWith => __$$SubsonicSourceSettingsImplCopyWithImpl<
+      __$$_SubsonicSourceSettingsCopyWithImpl<_$_SubsonicSourceSettings>(
-          _$SubsonicSourceSettingsImpl>(this, _$identity);
+          this, _$identity);
 }
 
 abstract class _SubsonicSourceSettings extends SubsonicSourceSettings {
   const factory _SubsonicSourceSettings(
       {required final SourceSettings source,
-      required final SubsonicSettings subsonic}) = _$SubsonicSourceSettingsImpl;
+      required final SubsonicSettings subsonic}) = _$_SubsonicSourceSettings;
   const _SubsonicSourceSettings._() : super._();
 
   @override
@@ -809,6 +805,6 @@ abstract class _SubsonicSourceSettings extends SubsonicSourceSettings {
   SubsonicSettings get subsonic;
   @override
   @JsonKey(ignore: true)
-  _$$SubsonicSourceSettingsImplCopyWith<_$SubsonicSourceSettingsImpl>
+  _$$_SubsonicSourceSettingsCopyWith<_$_SubsonicSourceSettings> get copyWith =>
-      get copyWith => throw _privateConstructorUsedError;
+      throw _privateConstructorUsedError;
 }

lib/models/support.g.dart

@@ -6,16 +6,15 @@ part of 'support.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$QueueItemStateImpl _$$QueueItemStateImplFromJson(Map<String, dynamic> json) =>
+_$_QueueItemState _$$_QueueItemStateFromJson(Map<String, dynamic> json) =>
-    _$QueueItemStateImpl(
+    _$_QueueItemState(
       id: json['id'] as String,
       contextType: $enumDecode(_$QueueContextTypeEnumMap, json['contextType']),
       contextId: json['contextId'] as String?,
       contextTitle: json['contextTitle'] as String?,
     );
 
-Map<String, dynamic> _$$QueueItemStateImplToJson(
+Map<String, dynamic> _$$_QueueItemStateToJson(_$_QueueItemState instance) =>
-        _$QueueItemStateImpl instance) =>
     <String, dynamic>{
       'id': instance.id,
       'contextType': _$QueueContextTypeEnumMap[instance.contextType]!,
@@ -32,9 +31,9 @@ const _$QueueContextTypeEnumMap = {
   QueueContextType.artist: 'artist',
 };
 
-_$MediaItemDataImpl _$$MediaItemDataImplFromJson(Map<String, dynamic> json) =>
+_$_MediaItemData _$$_MediaItemDataFromJson(Map<String, dynamic> json) =>
-    _$MediaItemDataImpl(
+    _$_MediaItemData(
-      sourceId: (json['sourceId'] as num).toInt(),
+      sourceId: json['sourceId'] as int,
       albumId: json['albumId'] as String?,
       artCache:
           _$JsonConverterFromJson<Map<String, dynamic>, MediaItemArtCache>(
@@ -43,7 +42,7 @@ _$MediaItemDataImpl _$$MediaItemDataImplFromJson(Map<String, dynamic> json) =>
       contextId: json['contextId'] as String?,
     );
 
-Map<String, dynamic> _$$MediaItemDataImplToJson(_$MediaItemDataImpl instance) =>
+Map<String, dynamic> _$$_MediaItemDataToJson(_$_MediaItemData instance) =>
     <String, dynamic>{
       'sourceId': instance.sourceId,
       'albumId': instance.albumId,
@@ -66,17 +65,16 @@ Json? _$JsonConverterToJson<Json, Value>(
 ) =>
     value == null ? null : toJson(value);
 
-_$MediaItemArtCacheImpl _$$MediaItemArtCacheImplFromJson(
+_$_MediaItemArtCache _$$_MediaItemArtCacheFromJson(Map<String, dynamic> json) =>
-        Map<String, dynamic> json) =>
+    _$_MediaItemArtCache(
-    _$MediaItemArtCacheImpl(
       fullArtUri: Uri.parse(json['fullArtUri'] as String),
       fullArtCacheKey: json['fullArtCacheKey'] as String,
       thumbnailArtUri: Uri.parse(json['thumbnailArtUri'] as String),
       thumbnailArtCacheKey: json['thumbnailArtCacheKey'] as String,
     );
 
-Map<String, dynamic> _$$MediaItemArtCacheImplToJson(
+Map<String, dynamic> _$$_MediaItemArtCacheToJson(
-        _$MediaItemArtCacheImpl instance) =>
+        _$_MediaItemArtCache instance) =>
     <String, dynamic>{
       'fullArtUri': instance.fullArtUri.toString(),
       'fullArtCacheKey': instance.fullArtCacheKey,

lib/services/audio_service.g.dart

@@ -35,5 +35,4 @@ final audioControlProvider = Provider<AudioControl>.internal(
 );
 
 typedef AudioControlRef = ProviderRef<AudioControl>;
-// ignore_for_file: type=lint
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

lib/services/cache_service.g.dart

@@ -20,5 +20,4 @@ final cacheServiceProvider = Provider<CacheService>.internal(
 );
 
 typedef CacheServiceRef = ProviderRef<CacheService>;
-// ignore_for_file: type=lint
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

lib/services/download_service.freezed.dart

@@ -12,7 +12,7 @@ part of 'download_service.dart';
 T _$identity<T>(T value) => value;
 
 final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
 
 /// @nodoc
 mixin _$DownloadState {
@@ -86,11 +86,11 @@ class _$DownloadStateCopyWithImpl<$Res, $Val extends DownloadState>
 }
 
 /// @nodoc
-abstract class _$$DownloadStateImplCopyWith<$Res>
+abstract class _$$_DownloadStateCopyWith<$Res>
     implements $DownloadStateCopyWith<$Res> {
-  factory _$$DownloadStateImplCopyWith(
+  factory _$$_DownloadStateCopyWith(
-          _$DownloadStateImpl value, $Res Function(_$DownloadStateImpl) then) =
+          _$_DownloadState value, $Res Function(_$_DownloadState) then) =
-      __$$DownloadStateImplCopyWithImpl<$Res>;
+      __$$_DownloadStateCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -102,11 +102,11 @@ abstract class _$$DownloadStateImplCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$DownloadStateImplCopyWithImpl<$Res>
+class __$$_DownloadStateCopyWithImpl<$Res>
-    extends _$DownloadStateCopyWithImpl<$Res, _$DownloadStateImpl>
+    extends _$DownloadStateCopyWithImpl<$Res, _$_DownloadState>
-    implements _$$DownloadStateImplCopyWith<$Res> {
+    implements _$$_DownloadStateCopyWith<$Res> {
-  __$$DownloadStateImplCopyWithImpl(
+  __$$_DownloadStateCopyWithImpl(
-      _$DownloadStateImpl _value, $Res Function(_$DownloadStateImpl) _then)
+      _$_DownloadState _value, $Res Function(_$_DownloadState) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -118,7 +118,7 @@ class __$$DownloadStateImplCopyWithImpl<$Res>
     Object? listCancels = null,
     Object? saveDir = null,
   }) {
-    return _then(_$DownloadStateImpl(
+    return _then(_$_DownloadState(
       downloads: null == downloads
           ? _value.downloads
           : downloads // ignore: cast_nullable_to_non_nullable
@@ -145,8 +145,8 @@ class __$$DownloadStateImplCopyWithImpl<$Res>
 
 /// @nodoc
 
-class _$DownloadStateImpl implements _DownloadState {
+class _$_DownloadState implements _DownloadState {
-  const _$DownloadStateImpl(
+  const _$_DownloadState(
       {this.downloads = const IListConst([]),
       this.deletes = const IListConst([]),
       this.listDownloads = const IListConst([]),
@@ -174,10 +174,10 @@ class _$DownloadStateImpl implements _DownloadState {
   }
 
   @override
-  bool operator ==(Object other) {
+  bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$DownloadStateImpl &&
+            other is _$_DownloadState &&
             const DeepCollectionEquality().equals(other.downloads, downloads) &&
             const DeepCollectionEquality().equals(other.deletes, deletes) &&
             const DeepCollectionEquality()
@@ -199,8 +199,8 @@ class _$DownloadStateImpl implements _DownloadState {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$DownloadStateImplCopyWith<_$DownloadStateImpl> get copyWith =>
+  _$$_DownloadStateCopyWith<_$_DownloadState> get copyWith =>
-      __$$DownloadStateImplCopyWithImpl<_$DownloadStateImpl>(this, _$identity);
+      __$$_DownloadStateCopyWithImpl<_$_DownloadState>(this, _$identity);
 }
 
 abstract class _DownloadState implements DownloadState {
@@ -209,7 +209,7 @@ abstract class _DownloadState implements DownloadState {
       final IList<SourceId> deletes,
       final IList<SourceId> listDownloads,
       final IList<SourceId> listCancels,
-      required final String saveDir}) = _$DownloadStateImpl;
+      required final String saveDir}) = _$_DownloadState;
 
   @override
   IList<Download> get downloads;
@@ -223,7 +223,7 @@ abstract class _DownloadState implements DownloadState {
   String get saveDir;
   @override
   @JsonKey(ignore: true)
-  _$$DownloadStateImplCopyWith<_$DownloadStateImpl> get copyWith =>
+  _$$_DownloadStateCopyWith<_$_DownloadState> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
@@ -319,11 +319,10 @@ class _$DownloadCopyWithImpl<$Res, $Val extends Download>
 }
 
 /// @nodoc
-abstract class _$$DownloadImplCopyWith<$Res>
+abstract class _$$_DownloadCopyWith<$Res> implements $DownloadCopyWith<$Res> {
-    implements $DownloadCopyWith<$Res> {
+  factory _$$_DownloadCopyWith(
-  factory _$$DownloadImplCopyWith(
+          _$_Download value, $Res Function(_$_Download) then) =
-          _$DownloadImpl value, $Res Function(_$DownloadImpl) then) =
+      __$$_DownloadCopyWithImpl<$Res>;
-      __$$DownloadImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -338,11 +337,11 @@ abstract class _$$DownloadImplCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$DownloadImplCopyWithImpl<$Res>
+class __$$_DownloadCopyWithImpl<$Res>
-    extends _$DownloadCopyWithImpl<$Res, _$DownloadImpl>
+    extends _$DownloadCopyWithImpl<$Res, _$_Download>
-    implements _$$DownloadImplCopyWith<$Res> {
+    implements _$$_DownloadCopyWith<$Res> {
-  __$$DownloadImplCopyWithImpl(
+  __$$_DownloadCopyWithImpl(
-      _$DownloadImpl _value, $Res Function(_$DownloadImpl) _then)
+      _$_Download _value, $Res Function(_$_Download) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -357,7 +356,7 @@ class __$$DownloadImplCopyWithImpl<$Res>
     Object? timeCreated = null,
     Object? allowCellular = null,
   }) {
-    return _then(_$DownloadImpl(
+    return _then(_$_Download(
       taskId: null == taskId
           ? _value.taskId
           : taskId // ignore: cast_nullable_to_non_nullable
@@ -396,8 +395,8 @@ class __$$DownloadImplCopyWithImpl<$Res>
 
 /// @nodoc
 
-class _$DownloadImpl extends _Download {
+class _$_Download extends _Download {
-  const _$DownloadImpl(
+  const _$_Download(
       {required this.taskId,
       required this.status,
       required this.progress,
@@ -431,10 +430,10 @@ class _$DownloadImpl extends _Download {
   }
 
   @override
-  bool operator ==(Object other) {
+  bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$DownloadImpl &&
+            other is _$_Download &&
             (identical(other.taskId, taskId) || other.taskId == taskId) &&
             (identical(other.status, status) || other.status == status) &&
             (identical(other.progress, progress) ||
@@ -457,8 +456,8 @@ class _$DownloadImpl extends _Download {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$DownloadImplCopyWith<_$DownloadImpl> get copyWith =>
+  _$$_DownloadCopyWith<_$_Download> get copyWith =>
-      __$$DownloadImplCopyWithImpl<_$DownloadImpl>(this, _$identity);
+      __$$_DownloadCopyWithImpl<_$_Download>(this, _$identity);
 }
 
 abstract class _Download extends Download {
@@ -470,7 +469,7 @@ abstract class _Download extends Download {
       required final String? filename,
       required final String savedDir,
       required final int timeCreated,
-      required final bool allowCellular}) = _$DownloadImpl;
+      required final bool allowCellular}) = _$_Download;
   const _Download._() : super._();
 
   @override
@@ -491,6 +490,6 @@ abstract class _Download extends Download {
   bool get allowCellular;
   @override
   @JsonKey(ignore: true)
-  _$$DownloadImplCopyWith<_$DownloadImpl> get copyWith =>
+  _$$_DownloadCopyWith<_$_Download> get copyWith =>
       throw _privateConstructorUsedError;
 }

lib/services/download_service.g.dart

@@ -6,7 +6,7 @@ part of 'download_service.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$downloadServiceHash() => r'd2aeed2c026de4dc7fa26b2331244b49e7e9f003';
+String _$downloadServiceHash() => r'c72c49f980e307f3013467e76b6564d14a34a736';
 
 /// See also [DownloadService].
 @ProviderFor(DownloadService)
@@ -22,5 +22,4 @@ final downloadServiceProvider =
 );
 
 typedef _$DownloadService = Notifier<DownloadState>;
-// ignore_for_file: type=lint
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

lib/services/settings_service.g.dart

@@ -6,7 +6,7 @@ part of 'settings_service.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$settingsServiceHash() => r'b53814d7d06c5d0a7ac82f447ac510e59a9598f0';
+String _$settingsServiceHash() => r'85f2bd5eedc3f791fe03a6707748bc95277c6aaf';
 
 /// See also [SettingsService].
 @ProviderFor(SettingsService)
@@ -22,5 +22,4 @@ final settingsServiceProvider =
 );
 
 typedef _$SettingsService = Notifier<Settings>;
-// ignore_for_file: type=lint
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

lib/services/sync_service.g.dart

@@ -20,5 +20,4 @@ final syncServiceProvider = NotifierProvider<SyncService, DateTime>.internal(
 );
 
 typedef _$SyncService = Notifier<DateTime>;
-// ignore_for_file: type=lint
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

lib/state/audio.g.dart

@@ -226,5 +226,4 @@ final lastAudioStateServiceProvider =
 );
 
 typedef _$LastAudioStateService = AsyncNotifier<void>;
-// ignore_for_file: type=lint
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

lib/state/init.g.dart

@@ -94,5 +94,4 @@ final initProvider = FutureProvider<void>.internal(
 );
 
 typedef InitRef = FutureProviderRef<void>;
-// ignore_for_file: type=lint
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

lib/state/settings.g.dart

@@ -76,5 +76,4 @@ final offlineModeProvider = NotifierProvider<OfflineMode, bool>.internal(
 );
 
 typedef _$OfflineMode = Notifier<bool>;
-// ignore_for_file: type=lint
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

lib/state/theme.g.dart

@@ -6,7 +6,7 @@ part of 'theme.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$colorThemeHash() => r'37d4eb17395341800b67f4f257c2cc49bf3dc91b';
+String _$colorThemeHash() => r'f5cc23cb5e2af379c02ae4b9756df72f9f6da5e6';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -29,6 +29,8 @@ class _SystemHash {
   }
 }
 
+typedef _ColorThemeRef = AutoDisposeProviderRef<ColorTheme>;
+
 /// See also [_colorTheme].
 @ProviderFor(_colorTheme)
 const _colorThemeProvider = _ColorThemeFamily();
@@ -75,10 +77,10 @@ class _ColorThemeFamily extends Family<ColorTheme> {
 class _ColorThemeProvider extends AutoDisposeProvider<ColorTheme> {
   /// See also [_colorTheme].
   _ColorThemeProvider(
-    Palette palette,
+    this.palette,
-  ) : this._internal(
+  ) : super.internal(
           (ref) => _colorTheme(
-            ref as _ColorThemeRef,
+            ref,
             palette,
           ),
           from: _colorThemeProvider,
@@ -90,44 +92,10 @@ class _ColorThemeProvider extends AutoDisposeProvider<ColorTheme> {
           dependencies: _ColorThemeFamily._dependencies,
           allTransitiveDependencies:
               _ColorThemeFamily._allTransitiveDependencies,
-          palette: palette,
         );
 
-  _ColorThemeProvider._internal(
-    super._createNotifier, {
-    required super.name,
-    required super.dependencies,
-    required super.allTransitiveDependencies,
-    required super.debugGetCreateSourceHash,
-    required super.from,
-    required this.palette,
-  }) : super.internal();
-
   final Palette palette;
 
-  @override
-  Override overrideWith(
-    ColorTheme Function(_ColorThemeRef provider) create,
-  ) {
-    return ProviderOverride(
-      origin: this,
-      override: _ColorThemeProvider._internal(
-        (ref) => create(ref as _ColorThemeRef),
-        from: from,
-        name: null,
-        dependencies: null,
-        allTransitiveDependencies: null,
-        debugGetCreateSourceHash: null,
-        palette: palette,
-      ),
-    );
-  }
-
-  @override
-  AutoDisposeProviderElement<ColorTheme> createElement() {
-    return _ColorThemeProviderElement(this);
-  }
-
   @override
   bool operator ==(Object other) {
     return other is _ColorThemeProvider && other.palette == palette;
@@ -142,20 +110,7 @@ class _ColorThemeProvider extends AutoDisposeProvider<ColorTheme> {
   }
 }
 
-mixin _ColorThemeRef on AutoDisposeProviderRef<ColorTheme> {
+String _$baseThemeHash() => r'317a5ef77def208357a54b7938ef3d91666fce70';
-  /// The parameter `palette` of this provider.
-  Palette get palette;
-}
-
-class _ColorThemeProviderElement extends AutoDisposeProviderElement<ColorTheme>
-    with _ColorThemeRef {
-  _ColorThemeProviderElement(super.provider);
-
-  @override
-  Palette get palette => (origin as _ColorThemeProvider).palette;
-}
-
-String _$baseThemeHash() => r'489ea7dcf66a57e6eda300c75d8af5fcaef85e8e';
 
 /// See also [baseTheme].
 @ProviderFor(baseTheme)
@@ -170,6 +125,7 @@ final baseThemeProvider = AutoDisposeProvider<ColorTheme>.internal(
 
 typedef BaseThemeRef = AutoDisposeProviderRef<ColorTheme>;
 String _$albumArtPaletteHash() => r'8130b954ee3c67f53207593d4ed3dfbffb00c95d';
+typedef AlbumArtPaletteRef = AutoDisposeFutureProviderRef<Palette>;
 
 /// See also [albumArtPalette].
 @ProviderFor(albumArtPalette)
@@ -217,10 +173,10 @@ class AlbumArtPaletteFamily extends Family<AsyncValue<Palette>> {
 class AlbumArtPaletteProvider extends AutoDisposeFutureProvider<Palette> {
   /// See also [albumArtPalette].
   AlbumArtPaletteProvider(
-    String id,
+    this.id,
-  ) : this._internal(
+  ) : super.internal(
           (ref) => albumArtPalette(
-            ref as AlbumArtPaletteRef,
+            ref,
             id,
           ),
           from: albumArtPaletteProvider,
@@ -232,44 +188,10 @@ class AlbumArtPaletteProvider extends AutoDisposeFutureProvider<Palette> {
           dependencies: AlbumArtPaletteFamily._dependencies,
           allTransitiveDependencies:
               AlbumArtPaletteFamily._allTransitiveDependencies,
-          id: id,
         );
 
-  AlbumArtPaletteProvider._internal(
-    super._createNotifier, {
-    required super.name,
-    required super.dependencies,
-    required super.allTransitiveDependencies,
-    required super.debugGetCreateSourceHash,
-    required super.from,
-    required this.id,
-  }) : super.internal();
-
   final String id;
 
-  @override
-  Override overrideWith(
-    FutureOr<Palette> Function(AlbumArtPaletteRef provider) create,
-  ) {
-    return ProviderOverride(
-      origin: this,
-      override: AlbumArtPaletteProvider._internal(
-        (ref) => create(ref as AlbumArtPaletteRef),
-        from: from,
-        name: null,
-        dependencies: null,
-        allTransitiveDependencies: null,
-        debugGetCreateSourceHash: null,
-        id: id,
-      ),
-    );
-  }
-
-  @override
-  AutoDisposeFutureProviderElement<Palette> createElement() {
-    return _AlbumArtPaletteProviderElement(this);
-  }
-
   @override
   bool operator ==(Object other) {
     return other is AlbumArtPaletteProvider && other.id == id;
@@ -284,21 +206,9 @@ class AlbumArtPaletteProvider extends AutoDisposeFutureProvider<Palette> {
   }
 }
 
-mixin AlbumArtPaletteRef on AutoDisposeFutureProviderRef<Palette> {
-  /// The parameter `id` of this provider.
-  String get id;
-}
-
-class _AlbumArtPaletteProviderElement
-    extends AutoDisposeFutureProviderElement<Palette> with AlbumArtPaletteRef {
-  _AlbumArtPaletteProviderElement(super.provider);
-
-  @override
-  String get id => (origin as AlbumArtPaletteProvider).id;
-}
-
 String _$playlistArtPaletteHash() =>
     r'6bc015688f354ea8d91dde86e2a7191ef1ef6496';
+typedef PlaylistArtPaletteRef = AutoDisposeFutureProviderRef<Palette>;
 
 /// See also [playlistArtPalette].
 @ProviderFor(playlistArtPalette)
@@ -346,10 +256,10 @@ class PlaylistArtPaletteFamily extends Family<AsyncValue<Palette>> {
 class PlaylistArtPaletteProvider extends AutoDisposeFutureProvider<Palette> {
   /// See also [playlistArtPalette].
   PlaylistArtPaletteProvider(
-    String id,
+    this.id,
-  ) : this._internal(
+  ) : super.internal(
           (ref) => playlistArtPalette(
-            ref as PlaylistArtPaletteRef,
+            ref,
             id,
           ),
           from: playlistArtPaletteProvider,
@@ -361,44 +271,10 @@ class PlaylistArtPaletteProvider extends AutoDisposeFutureProvider<Palette> {
           dependencies: PlaylistArtPaletteFamily._dependencies,
           allTransitiveDependencies:
               PlaylistArtPaletteFamily._allTransitiveDependencies,
-          id: id,
         );
 
-  PlaylistArtPaletteProvider._internal(
-    super._createNotifier, {
-    required super.name,
-    required super.dependencies,
-    required super.allTransitiveDependencies,
-    required super.debugGetCreateSourceHash,
-    required super.from,
-    required this.id,
-  }) : super.internal();
-
   final String id;
 
-  @override
-  Override overrideWith(
-    FutureOr<Palette> Function(PlaylistArtPaletteRef provider) create,
-  ) {
-    return ProviderOverride(
-      origin: this,
-      override: PlaylistArtPaletteProvider._internal(
-        (ref) => create(ref as PlaylistArtPaletteRef),
-        from: from,
-        name: null,
-        dependencies: null,
-        allTransitiveDependencies: null,
-        debugGetCreateSourceHash: null,
-        id: id,
-      ),
-    );
-  }
-
-  @override
-  AutoDisposeFutureProviderElement<Palette> createElement() {
-    return _PlaylistArtPaletteProviderElement(this);
-  }
-
   @override
   bool operator ==(Object other) {
     return other is PlaylistArtPaletteProvider && other.id == id;
@@ -413,20 +289,6 @@ class PlaylistArtPaletteProvider extends AutoDisposeFutureProvider<Palette> {
   }
 }
 
-mixin PlaylistArtPaletteRef on AutoDisposeFutureProviderRef<Palette> {
-  /// The parameter `id` of this provider.
-  String get id;
-}
-
-class _PlaylistArtPaletteProviderElement
-    extends AutoDisposeFutureProviderElement<Palette>
-    with PlaylistArtPaletteRef {
-  _PlaylistArtPaletteProviderElement(super.provider);
-
-  @override
-  String get id => (origin as PlaylistArtPaletteProvider).id;
-}
-
 String _$mediaItemPaletteHash() => r'2f2744aa735c6056919197c283a367714d7e04e4';
 
 /// See also [mediaItemPalette].
@@ -458,6 +320,7 @@ final mediaItemThemeProvider = AutoDisposeFutureProvider<ColorTheme>.internal(
 
 typedef MediaItemThemeRef = AutoDisposeFutureProviderRef<ColorTheme>;
 String _$albumArtThemeHash() => r'd3ee71b2df856f1763ec925e158ae2e0f613b9e0';
+typedef AlbumArtThemeRef = AutoDisposeFutureProviderRef<ColorTheme>;
 
 /// See also [albumArtTheme].
 @ProviderFor(albumArtTheme)
@@ -505,10 +368,10 @@ class AlbumArtThemeFamily extends Family<AsyncValue<ColorTheme>> {
 class AlbumArtThemeProvider extends AutoDisposeFutureProvider<ColorTheme> {
   /// See also [albumArtTheme].
   AlbumArtThemeProvider(
-    String id,
+    this.id,
-  ) : this._internal(
+  ) : super.internal(
           (ref) => albumArtTheme(
-            ref as AlbumArtThemeRef,
+            ref,
             id,
           ),
           from: albumArtThemeProvider,
@@ -520,44 +383,10 @@ class AlbumArtThemeProvider extends AutoDisposeFutureProvider<ColorTheme> {
           dependencies: AlbumArtThemeFamily._dependencies,
           allTransitiveDependencies:
               AlbumArtThemeFamily._allTransitiveDependencies,
-          id: id,
         );
 
-  AlbumArtThemeProvider._internal(
-    super._createNotifier, {
-    required super.name,
-    required super.dependencies,
-    required super.allTransitiveDependencies,
-    required super.debugGetCreateSourceHash,
-    required super.from,
-    required this.id,
-  }) : super.internal();
-
   final String id;
 
-  @override
-  Override overrideWith(
-    FutureOr<ColorTheme> Function(AlbumArtThemeRef provider) create,
-  ) {
-    return ProviderOverride(
-      origin: this,
-      override: AlbumArtThemeProvider._internal(
-        (ref) => create(ref as AlbumArtThemeRef),
-        from: from,
-        name: null,
-        dependencies: null,
-        allTransitiveDependencies: null,
-        debugGetCreateSourceHash: null,
-        id: id,
-      ),
-    );
-  }
-
-  @override
-  AutoDisposeFutureProviderElement<ColorTheme> createElement() {
-    return _AlbumArtThemeProviderElement(this);
-  }
-
   @override
   bool operator ==(Object other) {
     return other is AlbumArtThemeProvider && other.id == id;
@@ -572,20 +401,8 @@ class AlbumArtThemeProvider extends AutoDisposeFutureProvider<ColorTheme> {
   }
 }
 
-mixin AlbumArtThemeRef on AutoDisposeFutureProviderRef<ColorTheme> {
-  /// The parameter `id` of this provider.
-  String get id;
-}
-
-class _AlbumArtThemeProviderElement
-    extends AutoDisposeFutureProviderElement<ColorTheme> with AlbumArtThemeRef {
-  _AlbumArtThemeProviderElement(super.provider);
-
-  @override
-  String get id => (origin as AlbumArtThemeProvider).id;
-}
-
 String _$playlistArtThemeHash() => r'1629552e1f3aa2a1e7d223ac1e078893042e5e3b';
+typedef PlaylistArtThemeRef = AutoDisposeFutureProviderRef<ColorTheme>;
 
 /// See also [playlistArtTheme].
 @ProviderFor(playlistArtTheme)
@@ -633,10 +450,10 @@ class PlaylistArtThemeFamily extends Family<AsyncValue<ColorTheme>> {
 class PlaylistArtThemeProvider extends AutoDisposeFutureProvider<ColorTheme> {
   /// See also [playlistArtTheme].
   PlaylistArtThemeProvider(
-    String id,
+    this.id,
-  ) : this._internal(
+  ) : super.internal(
           (ref) => playlistArtTheme(
-            ref as PlaylistArtThemeRef,
+            ref,
             id,
           ),
           from: playlistArtThemeProvider,
@@ -648,44 +465,10 @@ class PlaylistArtThemeProvider extends AutoDisposeFutureProvider<ColorTheme> {
           dependencies: PlaylistArtThemeFamily._dependencies,
           allTransitiveDependencies:
               PlaylistArtThemeFamily._allTransitiveDependencies,
-          id: id,
         );
 
-  PlaylistArtThemeProvider._internal(
-    super._createNotifier, {
-    required super.name,
-    required super.dependencies,
-    required super.allTransitiveDependencies,
-    required super.debugGetCreateSourceHash,
-    required super.from,
-    required this.id,
-  }) : super.internal();
-
   final String id;
 
-  @override
-  Override overrideWith(
-    FutureOr<ColorTheme> Function(PlaylistArtThemeRef provider) create,
-  ) {
-    return ProviderOverride(
-      origin: this,
-      override: PlaylistArtThemeProvider._internal(
-        (ref) => create(ref as PlaylistArtThemeRef),
-        from: from,
-        name: null,
-        dependencies: null,
-        allTransitiveDependencies: null,
-        debugGetCreateSourceHash: null,
-        id: id,
-      ),
-    );
-  }
-
-  @override
-  AutoDisposeFutureProviderElement<ColorTheme> createElement() {
-    return _PlaylistArtThemeProviderElement(this);
-  }
-
   @override
   bool operator ==(Object other) {
     return other is PlaylistArtThemeProvider && other.id == id;
@@ -699,19 +482,4 @@ class PlaylistArtThemeProvider extends AutoDisposeFutureProvider<ColorTheme> {
     return _SystemHash.finish(hash);
   }
 }
-
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
-mixin PlaylistArtThemeRef on AutoDisposeFutureProviderRef<ColorTheme> {
-  /// The parameter `id` of this provider.
-  String get id;
-}
-
-class _PlaylistArtThemeProviderElement
-    extends AutoDisposeFutureProviderElement<ColorTheme>
-    with PlaylistArtThemeRef {
-  _PlaylistArtThemeProviderElement(super.provider);
-
-  @override
-  String get id => (origin as PlaylistArtThemeProvider).id;
-}
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

pubspec.lock

@@ -274,6 +274,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.2"
+  coverage:
+    dependency: transitive
+    description:
+      name: coverage
+      sha256: e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.11.1"
   cross_file:
     dependency: transitive
     description:
@@ -330,6 +338,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.15.0"
+  fake_async:
+    dependency: transitive
+    description:
+      name: fake_async
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.1"
   fast_immutable_collections:
     dependency: "direct main"
     description:
@@ -484,6 +500,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.9"
+  flutter_test:
+    dependency: "direct dev"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   flutter_web_plugins:
     dependency: transitive
     description: flutter
@@ -633,6 +654,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.4.13"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.5"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.5"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
   lints:
     dependency: transitive
     description:
@@ -689,6 +734,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.5.0"
+  node_preamble:
+    dependency: transitive
+    description:
+      name: node_preamble
+      sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
   octo_image:
     dependency: transitive
     description:
@@ -913,6 +966,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.1"
+  shelf_packages_handler:
+    dependency: transitive
+    description:
+      name: shelf_packages_handler
+      sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
+  shelf_static:
+    dependency: transitive
+    description:
+      name: shelf_static
+      sha256: c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.3"
   shelf_web_socket:
     dependency: transitive
     description:
@@ -950,6 +1019,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.4"
+  source_map_stack_trace:
+    dependency: transitive
+    description:
+      name: source_map_stack_trace
+      sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  source_maps:
+    dependency: transitive
+    description:
+      name: source_maps
+      sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.10.12"
   source_span:
     dependency: transitive
     description:
@@ -1086,6 +1171,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
+  test:
+    dependency: "direct dev"
+    description:
+      name: test
+      sha256: "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.25.7"
   test_api:
     dependency: transitive
     description:
@@ -1094,6 +1187,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.7.2"
+  test_core:
+    dependency: transitive
+    description:
+      name: test_core
+      sha256: "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.4"
   text_scroll:
     dependency: "direct main"
     description:
@@ -1222,6 +1323,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "14.2.5"
   watcher:
     dependency: transitive
     description:
@@ -1254,6 +1363,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.1"
+  webkit_inspection_protocol:
+    dependency: transitive
+    description:
+      name: webkit_inspection_protocol
+      sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
   win32:
     dependency: transitive
     description:

pubspec.yaml

@@ -7,7 +7,7 @@ publish_to: 'none'
 version: 2.0.0-alpha.3+12
 
 environment:
-  sdk: '>=3.5.0 <4.0.0'
+  sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
   flutter:
@@ -22,7 +22,7 @@ dependencies:
   path: ^1.8.2
   path_provider: ^2.0.12
   flutter_dotenv: ^5.0.2 # TODO: remove before release
-  collection: ^1.17.1
+  collection: ^1.17.0
   intl: any
   flutter_hooks: ^0.18.5+1
   hooks_riverpod: ^2.3.2
@@ -65,7 +65,10 @@ dependency_overrides:
   intl: ^0.18.0
 
 dev_dependencies:
+  flutter_test:
+    sdk: flutter
   flutter_lints: ^2.0.0
+  test: ^1.22.0
   build_runner: 
   riverpod_generator: ^2.1.4
   freezed: ^2.3.2