update

lib/modules/anime/providers/anime_player_controller_provider.g.dart

@@ -158,6 +158,8 @@ class AnimeStreamControllerProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin AnimeStreamControllerRef on AutoDisposeNotifierProviderRef<void> {
   /// The parameter `episode` of this provider.
   Chapter get episode;
@@ -172,4 +174,4 @@ class _AnimeStreamControllerProviderElement
   Chapter get episode => (origin as AnimeStreamControllerProvider).episode;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/anime/providers/state_provider.g.dart

@@ -24,4 +24,4 @@ final subtitleSettingsStateProvider = AutoDisposeNotifierProvider<
 
 typedef _$SubtitleSettingsState = AutoDisposeNotifier<PlayerSubtitleSettings>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/browse/extension/providers/extensions_provider.dart

@@ -2,11 +2,11 @@ import 'package:isar/isar.dart';
 import 'package:mangayomi/main.dart';
 import 'package:mangayomi/models/source.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'extensions_provider.g.dart';
 
 @riverpod
-Stream<List<Source>> getExtensionsStream(
+Stream<List<Source>> getExtensionsStream(Ref ref, bool? isManga) async* {
-    GetExtensionsStreamRef ref, bool? isManga) async* {
   yield* isar.sources
       .filter()
       .idIsNotNull()

lib/modules/browse/extension/providers/extensions_provider.g.dart

@@ -7,7 +7,7 @@ part of 'extensions_provider.dart';
 // **************************************************************************
 
 String _$getExtensionsStreamHash() =>
-    r'010b67dcc4ccc0736c5ca779c33751302ab28cd8';
+    r'62f2884dd64a2f3d8928f7399c6b2547f0311078';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -144,6 +144,8 @@ class GetExtensionsStreamProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin GetExtensionsStreamRef on AutoDisposeStreamProviderRef<List<Source>> {
   /// The parameter `isManga` of this provider.
   bool? get isManga;
@@ -158,4 +160,4 @@ class _GetExtensionsStreamProviderElement
   bool? get isManga => (origin as GetExtensionsStreamProvider).isManga;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/history/providers/isar_providers.dart

@@ -5,10 +5,11 @@ import 'package:mangayomi/models/update.dart';
 import 'package:mangayomi/models/history.dart';
 import 'package:mangayomi/models/manga.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'isar_providers.g.dart';
 
 @riverpod
-Stream<List<History>> getAllHistoryStream(GetAllHistoryStreamRef ref,
+Stream<List<History>> getAllHistoryStream(Ref ref,
     {required bool isManga}) async* {
   yield* isar.historys
       .filter()
@@ -19,7 +20,7 @@ Stream<List<History>> getAllHistoryStream(GetAllHistoryStreamRef ref,
 }
 
 @riverpod
-Stream<List<Update>> getAllUpdateStream(GetAllUpdateStreamRef ref,
+Stream<List<Update>> getAllUpdateStream(Ref ref,
     {required bool isManga}) async* {
   yield* isar.updates
       .filter()

lib/modules/history/providers/isar_providers.g.dart

@@ -7,7 +7,7 @@ part of 'isar_providers.dart';
 // **************************************************************************
 
 String _$getAllHistoryStreamHash() =>
-    r'32dc5fa16315f199a5c86ee99cf59b7190c4d28e';
+    r'53b3a7837efab9e7d2808930e5070dbd788c59f8';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -144,6 +144,8 @@ class GetAllHistoryStreamProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin GetAllHistoryStreamRef on AutoDisposeStreamProviderRef<List<History>> {
   /// The parameter `isManga` of this provider.
   bool get isManga;
@@ -159,7 +161,7 @@ class _GetAllHistoryStreamProviderElement
 }
 
 String _$getAllUpdateStreamHash() =>
-    r'9f62b36ef0b268ee8c3cc93a10f8963def8dfbb0';
+    r'01f77807c8be11f471b6acee6e7bc358ce600a65';
 
 /// See also [getAllUpdateStream].
 @ProviderFor(getAllUpdateStream)
@@ -275,6 +277,8 @@ class GetAllUpdateStreamProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin GetAllUpdateStreamRef on AutoDisposeStreamProviderRef<List<Update>> {
   /// The parameter `isManga` of this provider.
   bool get isManga;
@@ -289,4 +293,4 @@ class _GetAllUpdateStreamProviderElement
   bool get isManga => (origin as GetAllUpdateStreamProvider).isManga;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/library/providers/add_torrent.dart

@@ -4,11 +4,11 @@ import 'package:mangayomi/models/chapter.dart';
 import 'package:mangayomi/models/manga.dart';
 import 'package:mangayomi/services/torrent_server.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'add_torrent.g.dart';
 
 @riverpod
-Future addTorrentFromUrlOrFromFile(
+Future addTorrentFromUrlOrFromFile(Ref ref, Manga? mManga,
-    AddTorrentFromUrlOrFromFileRef ref, Manga? mManga,
     {required bool init, String? url}) async {
   FilePickerResult? result;
   if (url == null) {

lib/modules/library/providers/add_torrent.g.dart

@@ -7,7 +7,7 @@ part of 'add_torrent.dart';
 // **************************************************************************
 
 String _$addTorrentFromUrlOrFromFileHash() =>
-    r'473a3494fd8c5089afdd460637f37faf2a498400';
+    r'8102259b30765a5c5cc57870f5c583bd5d421eee';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -167,6 +167,8 @@ class AddTorrentFromUrlOrFromFileProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin AddTorrentFromUrlOrFromFileRef on AutoDisposeFutureProviderRef<Object?> {
   /// The parameter `mManga` of this provider.
   Manga? get mManga;
@@ -191,4 +193,4 @@ class _AddTorrentFromUrlOrFromFileProviderElement
   String? get url => (origin as AddTorrentFromUrlOrFromFileProvider).url;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/library/providers/isar_providers.dart

@@ -3,10 +3,11 @@ import 'package:mangayomi/main.dart';
 import 'package:mangayomi/models/manga.dart';
 import 'package:mangayomi/models/settings.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'isar_providers.g.dart';
 
 @riverpod
-Stream<List<Manga>> getAllMangaStream(GetAllMangaStreamRef ref,
+Stream<List<Manga>> getAllMangaStream(Ref ref,
     {required int? categoryId, required bool? isManga}) async* {
   yield* categoryId == null
       ? isar.mangas
@@ -28,8 +29,7 @@ Stream<List<Manga>> getAllMangaStream(GetAllMangaStreamRef ref,
 }
 
 @riverpod
-Stream<List<Manga>> getAllMangaWithoutCategoriesStream(
+Stream<List<Manga>> getAllMangaWithoutCategoriesStream(Ref ref,
-    GetAllMangaWithoutCategoriesStreamRef ref,
     {required bool? isManga}) async* {
   yield* isar.mangas
       .filter()
@@ -48,7 +48,7 @@ Stream<List<Manga>> getAllMangaWithoutCategoriesStream(
 }
 
 @riverpod
-Stream<List<Settings>> getSettingsStream(GetSettingsStreamRef ref) async* {
+Stream<List<Settings>> getSettingsStream(Ref ref) async* {
   yield* isar.settings
       .filter()
       .idIsNotNull()

lib/modules/library/providers/isar_providers.g.dart

@@ -6,7 +6,7 @@ part of 'isar_providers.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$getAllMangaStreamHash() => r'd06c3a94ba847055746f2d52566cc94db4c28b7e';
+String _$getAllMangaStreamHash() => r'1c0b5442ae86b2fa899d509a555f5d375f0ff79a';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -154,6 +154,8 @@ class GetAllMangaStreamProvider extends AutoDisposeStreamProvider<List<Manga>> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin GetAllMangaStreamRef on AutoDisposeStreamProviderRef<List<Manga>> {
   /// The parameter `categoryId` of this provider.
   int? get categoryId;
@@ -174,7 +176,7 @@ class _GetAllMangaStreamProviderElement
 }
 
 String _$getAllMangaWithoutCategoriesStreamHash() =>
-    r'03581754f330a87894f953f8eaae528642b0afc2';
+    r'78076f291274b7defd9567e55314002d9aeecab1';
 
 /// See also [getAllMangaWithoutCategoriesStream].
 @ProviderFor(getAllMangaWithoutCategoriesStream)
@@ -294,6 +296,8 @@ class GetAllMangaWithoutCategoriesStreamProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin GetAllMangaWithoutCategoriesStreamRef
     on AutoDisposeStreamProviderRef<List<Manga>> {
   /// The parameter `isManga` of this provider.
@@ -310,7 +314,7 @@ class _GetAllMangaWithoutCategoriesStreamProviderElement
       (origin as GetAllMangaWithoutCategoriesStreamProvider).isManga;
 }
 
-String _$getSettingsStreamHash() => r'273ef0597a1078ab7c31af861628f1be7ab154d8';
+String _$getSettingsStreamHash() => r'c5a51e0e3473b25d2365025832a27ed2cc029b27';
 
 /// See also [getSettingsStream].
 @ProviderFor(getSettingsStream)
@@ -325,6 +329,8 @@ final getSettingsStreamProvider =
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef GetSettingsStreamRef = AutoDisposeStreamProviderRef<List<Settings>>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/library/providers/library_state_provider.g.dart

@@ -176,6 +176,8 @@ class LibraryDisplayTypeStateProvider extends AutoDisposeNotifierProviderImpl<
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin LibraryDisplayTypeStateRef
     on AutoDisposeNotifierProviderRef<DisplayType> {
   /// The parameter `isManga` of this provider.
@@ -327,6 +329,8 @@ class LibraryGridSizeStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin LibraryGridSizeStateRef on AutoDisposeNotifierProviderRef<int?> {
   /// The parameter `isManga` of this provider.
   bool get isManga;
@@ -505,6 +509,8 @@ class MangaFilterDownloadedStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin MangaFilterDownloadedStateRef on AutoDisposeNotifierProviderRef<int> {
   /// The parameter `mangaList` of this provider.
   List<Manga> get mangaList;
@@ -695,6 +701,8 @@ class MangaFilterUnreadStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin MangaFilterUnreadStateRef on AutoDisposeNotifierProviderRef<int> {
   /// The parameter `mangaList` of this provider.
   List<Manga> get mangaList;
@@ -884,6 +892,8 @@ class MangaFilterStartedStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin MangaFilterStartedStateRef on AutoDisposeNotifierProviderRef<int> {
   /// The parameter `mangaList` of this provider.
   List<Manga> get mangaList;
@@ -1073,6 +1083,8 @@ class MangaFilterBookmarkedStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin MangaFilterBookmarkedStateRef on AutoDisposeNotifierProviderRef<int> {
   /// The parameter `mangaList` of this provider.
   List<Manga> get mangaList;
@@ -1263,6 +1275,8 @@ class MangasFilterResultStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin MangasFilterResultStateRef on AutoDisposeNotifierProviderRef<bool> {
   /// The parameter `mangaList` of this provider.
   List<Manga> get mangaList;
@@ -1439,6 +1453,8 @@ class LibraryShowCategoryTabsStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin LibraryShowCategoryTabsStateRef on AutoDisposeNotifierProviderRef<bool> {
   /// The parameter `isManga` of this provider.
   bool get isManga;
@@ -1610,6 +1626,8 @@ class LibraryDownloadedChaptersStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin LibraryDownloadedChaptersStateRef
     on AutoDisposeNotifierProviderRef<bool> {
   /// The parameter `isManga` of this provider.
@@ -1781,6 +1799,8 @@ class LibraryLanguageStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin LibraryLanguageStateRef on AutoDisposeNotifierProviderRef<bool> {
   /// The parameter `isManga` of this provider.
   bool get isManga;
@@ -1949,6 +1969,8 @@ class LibraryLocalSourceStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin LibraryLocalSourceStateRef on AutoDisposeNotifierProviderRef<bool> {
   /// The parameter `isManga` of this provider.
   bool get isManga;
@@ -2119,6 +2141,8 @@ class LibraryShowNumbersOfItemsStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin LibraryShowNumbersOfItemsStateRef
     on AutoDisposeNotifierProviderRef<bool> {
   /// The parameter `isManga` of this provider.
@@ -2294,6 +2318,8 @@ class LibraryShowContinueReadingButtonStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin LibraryShowContinueReadingButtonStateRef
     on AutoDisposeNotifierProviderRef<bool> {
   /// The parameter `isManga` of this provider.
@@ -2466,6 +2492,8 @@ class SortLibraryMangaStateProvider extends AutoDisposeNotifierProviderImpl<
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin SortLibraryMangaStateRef
     on AutoDisposeNotifierProviderRef<SortLibraryManga> {
   /// The parameter `isManga` of this provider.
@@ -2650,6 +2678,8 @@ class MangasSetIsReadStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin MangasSetIsReadStateRef on AutoDisposeNotifierProviderRef<void> {
   /// The parameter `mangaIds` of this provider.
   List<int> get mangaIds;
@@ -2795,6 +2825,8 @@ class MangasSetUnReadStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin MangasSetUnReadStateRef on AutoDisposeNotifierProviderRef<void> {
   /// The parameter `mangaIds` of this provider.
   List<int> get mangaIds;
@@ -2809,4 +2841,4 @@ class _MangasSetUnReadStateProviderElement
   List<int> get mangaIds => (origin as MangasSetUnReadStateProvider).mangaIds;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/library/providers/local_archive.dart

@@ -6,10 +6,11 @@ import 'package:mangayomi/models/manga.dart';
 import 'package:mangayomi/modules/manga/archive_reader/models/models.dart';
 import 'package:mangayomi/modules/manga/archive_reader/providers/archive_reader_providers.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'local_archive.g.dart';
 
 @riverpod
-Future importArchivesFromFile(ImportArchivesFromFileRef ref, Manga? mManga,
+Future importArchivesFromFile(Ref ref, Manga? mManga,
     {required bool isManga, required bool init}) async {
   FilePickerResult? result = await FilePicker.platform.pickFiles(
       allowMultiple: true,

lib/modules/library/providers/local_archive.g.dart

@@ -7,7 +7,7 @@ part of 'local_archive.dart';
 // **************************************************************************
 
 String _$importArchivesFromFileHash() =>
-    r'4ac9e6c438919a1ea8cebd28cb554b13b5e53cc2';
+    r'8be95f0947ab5247e3305a355a6f17f0aaecad00';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -167,6 +167,8 @@ class ImportArchivesFromFileProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin ImportArchivesFromFileRef on AutoDisposeFutureProviderRef<Object?> {
   /// The parameter `mManga` of this provider.
   Manga? get mManga;
@@ -191,4 +193,4 @@ class _ImportArchivesFromFileProviderElement
   bool get init => (origin as ImportArchivesFromFileProvider).init;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/main_view/providers/migration.dart

@@ -6,10 +6,11 @@ import 'package:mangayomi/models/history.dart';
 import 'package:mangayomi/models/manga.dart';
 import 'package:mangayomi/models/track.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'migration.g.dart';
 
 @riverpod
-Future<void> migration(MigrationRef ref) async {
+Future<void> migration(Ref ref) async {
   final chapters =
       isar.chapters.filter().idIsNotNull().mangaIdIsNull().findAllSync();
   final downloads =

lib/modules/main_view/providers/migration.g.dart

@@ -6,7 +6,7 @@ part of 'migration.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$migrationHash() => r'6b3ff1b28168381079986d619b30c31ce44f341f';
+String _$migrationHash() => r'a302c6da3c1545c952a28e76a6d0b7af3fde1e7a';
 
 /// See also [migration].
 @ProviderFor(migration)
@@ -19,6 +19,8 @@ final migrationProvider = AutoDisposeFutureProvider<void>.internal(
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef MigrationRef = AutoDisposeFutureProviderRef<void>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/manga/archive_reader/providers/archive_reader_providers.dart

@@ -3,30 +3,29 @@ import 'package:archive/archive_io.dart';
 import 'package:flutter/foundation.dart';
 import 'package:mangayomi/modules/manga/archive_reader/models/models.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'archive_reader_providers.g.dart';
 
 @riverpod
 Future<List<(String, LocalExtensionType, Uint8List, String)>>
-    getArchivesDataFromDirectory(
+    getArchivesDataFromDirectory(Ref ref, String path) async {
-        GetArchivesDataFromDirectoryRef ref, String path) async {
   return compute(_extractOnly, path);
 }
 
 @riverpod
 Future<List<LocalArchive>> getArchiveDataFromDirectory(
-    GetArchiveDataFromDirectoryRef ref, String path) async {
+    Ref ref, String path) async {
   return compute(_extract, path);
 }
 
 @riverpod
 Future<(String, LocalExtensionType, Uint8List, String)> getArchivesDataFromFile(
-    GetArchivesDataFromFileRef ref, String path) async {
+    Ref ref, String path) async {
   return compute(_extractArchiveOnly, path);
 }
 
 @riverpod
-Future<LocalArchive> getArchiveDataFromFile(
+Future<LocalArchive> getArchiveDataFromFile(Ref ref, String path) async {
-    GetArchiveDataFromFileRef ref, String path) async {
   return compute(_extractArchive, path);
 }
 

lib/modules/manga/archive_reader/providers/archive_reader_providers.g.dart

@@ -7,7 +7,7 @@ part of 'archive_reader_providers.dart';
 // **************************************************************************
 
 String _$getArchivesDataFromDirectoryHash() =>
-    r'7ca5e7d4a2a79745c92dd0370703c614406be2ad';
+    r'2a4d1a11e2b028e569ffd8a2700e4a1779bb9264';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -149,6 +149,8 @@ class GetArchivesDataFromDirectoryProvider extends AutoDisposeFutureProvider<
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin GetArchivesDataFromDirectoryRef on AutoDisposeFutureProviderRef<
     List<(String, LocalExtensionType, Uint8List, String)>> {
   /// The parameter `path` of this provider.
@@ -166,7 +168,7 @@ class _GetArchivesDataFromDirectoryProviderElement
 }
 
 String _$getArchiveDataFromDirectoryHash() =>
-    r'fb85bd2b43ae73f083bdfa0760d8185ef989dd09';
+    r'49aa47895feafd9fa0c4f20e25d7674a3d54b212';
 
 /// See also [getArchiveDataFromDirectory].
 @ProviderFor(getArchiveDataFromDirectory)
@@ -285,6 +287,8 @@ class GetArchiveDataFromDirectoryProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin GetArchiveDataFromDirectoryRef
     on AutoDisposeFutureProviderRef<List<LocalArchive>> {
   /// The parameter `path` of this provider.
@@ -301,7 +305,7 @@ class _GetArchiveDataFromDirectoryProviderElement
 }
 
 String _$getArchivesDataFromFileHash() =>
-    r'f118f903a693c2f2ad5ec2452430a1eb10b661b2';
+    r'79874b548614b4410c19bca5f74978ec761742c5';
 
 /// See also [getArchivesDataFromFile].
 @ProviderFor(getArchivesDataFromFile)
@@ -421,6 +425,8 @@ class GetArchivesDataFromFileProvider extends AutoDisposeFutureProvider<
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin GetArchivesDataFromFileRef on AutoDisposeFutureProviderRef<
     (String, LocalExtensionType, Uint8List, String)> {
   /// The parameter `path` of this provider.
@@ -438,7 +444,7 @@ class _GetArchivesDataFromFileProviderElement
 }
 
 String _$getArchiveDataFromFileHash() =>
-    r'e5dc60fea6c36346c47542c141703bb027173215';
+    r'a5d8bf8246bfa250af6a7fd3c09bba6a012e0b2d';
 
 /// See also [getArchiveDataFromFile].
 @ProviderFor(getArchiveDataFromFile)
@@ -554,6 +560,8 @@ class GetArchiveDataFromFileProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin GetArchiveDataFromFileRef on AutoDisposeFutureProviderRef<LocalArchive> {
   /// The parameter `path` of this provider.
   String get path;
@@ -568,4 +576,4 @@ class _GetArchiveDataFromFileProviderElement
   String get path => (origin as GetArchiveDataFromFileProvider).path;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/manga/detail/providers/isar_providers.dart

@@ -3,17 +3,17 @@ import 'package:mangayomi/main.dart';
 import 'package:mangayomi/models/chapter.dart';
 import 'package:mangayomi/models/manga.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'isar_providers.g.dart';
 
 @riverpod
-Stream<Manga?> getMangaDetailStream(GetMangaDetailStreamRef ref,
+Stream<Manga?> getMangaDetailStream(Ref ref, {required int mangaId}) async* {
-    {required int mangaId}) async* {
   yield* isar.mangas.watchObject(mangaId, fireImmediately: true);
 }
 
 @riverpod
 Stream<List<Chapter>> getChaptersStream(
-  GetChaptersStreamRef ref, {
+  Ref ref, {
   required int mangaId,
 }) async* {
   yield* isar.chapters

lib/modules/manga/detail/providers/isar_providers.g.dart

@@ -7,7 +7,7 @@ part of 'isar_providers.dart';
 // **************************************************************************
 
 String _$getMangaDetailStreamHash() =>
-    r'1c8bd2eb2db6f3384626fae22bcc93422aa0e118';
+    r'6e7c5dc20ee7d32a091e884ac6980e191f698c8c';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -143,6 +143,8 @@ class GetMangaDetailStreamProvider extends AutoDisposeStreamProvider<Manga?> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin GetMangaDetailStreamRef on AutoDisposeStreamProviderRef<Manga?> {
   /// The parameter `mangaId` of this provider.
   int get mangaId;
@@ -157,7 +159,7 @@ class _GetMangaDetailStreamProviderElement
   int get mangaId => (origin as GetMangaDetailStreamProvider).mangaId;
 }
 
-String _$getChaptersStreamHash() => r'31879a8ff45e1cd61255de50d030a0141450180d';
+String _$getChaptersStreamHash() => r'0f03db54c5a639c4356a81e4bad50fa8a077ceac';
 
 /// See also [getChaptersStream].
 @ProviderFor(getChaptersStream)
@@ -273,6 +275,8 @@ class GetChaptersStreamProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin GetChaptersStreamRef on AutoDisposeStreamProviderRef<List<Chapter>> {
   /// The parameter `mangaId` of this provider.
   int get mangaId;
@@ -287,4 +291,4 @@ class _GetChaptersStreamProviderElement
   int get mangaId => (origin as GetChaptersStreamProvider).mangaId;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/manga/detail/providers/state_providers.g.dart

@@ -206,6 +206,8 @@ class SortChapterStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin SortChapterStateRef on AutoDisposeNotifierProviderRef<SortChapter> {
   /// The parameter `mangaId` of this provider.
   int get mangaId;
@@ -353,6 +355,8 @@ class ChapterFilterDownloadedStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin ChapterFilterDownloadedStateRef on AutoDisposeNotifierProviderRef<int> {
   /// The parameter `mangaId` of this provider.
   int get mangaId;
@@ -499,6 +503,8 @@ class ChapterFilterUnreadStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin ChapterFilterUnreadStateRef on AutoDisposeNotifierProviderRef<int> {
   /// The parameter `mangaId` of this provider.
   int get mangaId;
@@ -646,6 +652,8 @@ class ChapterFilterBookmarkedStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin ChapterFilterBookmarkedStateRef on AutoDisposeNotifierProviderRef<int> {
   /// The parameter `mangaId` of this provider.
   int get mangaId;
@@ -791,6 +799,8 @@ class ChapterFilterResultStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin ChapterFilterResultStateRef on AutoDisposeNotifierProviderRef<bool> {
   /// The parameter `manga` of this provider.
   Manga get manga;
@@ -936,6 +946,8 @@ class ChapterSetIsBookmarkStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin ChapterSetIsBookmarkStateRef on AutoDisposeNotifierProviderRef<void> {
   /// The parameter `manga` of this provider.
   Manga get manga;
@@ -1081,6 +1093,8 @@ class ChapterSetIsReadStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin ChapterSetIsReadStateRef on AutoDisposeNotifierProviderRef<void> {
   /// The parameter `manga` of this provider.
   Manga get manga;
@@ -1226,6 +1240,8 @@ class ChapterSetDownloadStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin ChapterSetDownloadStateRef on AutoDisposeNotifierProviderRef<void> {
   /// The parameter `manga` of this provider.
   Manga get manga;
@@ -1389,6 +1405,8 @@ class ScanlatorsFilterStateProvider extends AutoDisposeNotifierProviderImpl<
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin ScanlatorsFilterStateRef on AutoDisposeNotifierProviderRef<
     (List<String>, List<String>, List<String>)> {
   /// The parameter `manga` of this provider.
@@ -1405,4 +1423,4 @@ class _ScanlatorsFilterStateProviderElement
   Manga get manga => (origin as ScanlatorsFilterStateProvider).manga;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/manga/detail/providers/track_state_providers.g.dart

@@ -173,6 +173,8 @@ class TrackStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin TrackStateRef on AutoDisposeNotifierProviderRef<Track> {
   /// The parameter `track` of this provider.
   Track? get track;
@@ -192,4 +194,4 @@ class _TrackStateProviderElement
   bool? get isManga => (origin as TrackStateProvider).isManga;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/manga/detail/providers/update_manga_detail_providers.dart

@@ -8,10 +8,11 @@ import 'package:mangayomi/modules/more/settings/sync/providers/sync_providers.da
 import 'package:mangayomi/services/get_detail.dart';
 import 'package:mangayomi/utils/utils.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'update_manga_detail_providers.g.dart';
 
 @riverpod
-Future<dynamic> updateMangaDetail(UpdateMangaDetailRef ref,
+Future<dynamic> updateMangaDetail(Ref ref,
     {required int? mangaId, required bool isInit}) async {
   final manga = isar.mangas.getSync(mangaId!);
   if (manga!.chapters.isNotEmpty && isInit) {

lib/modules/manga/detail/providers/update_manga_detail_providers.g.dart

@@ -6,7 +6,7 @@ part of 'update_manga_detail_providers.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$updateMangaDetailHash() => r'736b68c65f624da85b15c0a7a2a263aab8e8df7e';
+String _$updateMangaDetailHash() => r'29a10d49454febb4fe88ca9c007d3512d812bf84';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -154,6 +154,8 @@ class UpdateMangaDetailProvider extends AutoDisposeFutureProvider<dynamic> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin UpdateMangaDetailRef on AutoDisposeFutureProviderRef<dynamic> {
   /// The parameter `mangaId` of this provider.
   int? get mangaId;
@@ -173,4 +175,4 @@ class _UpdateMangaDetailProviderElement
   bool get isInit => (origin as UpdateMangaDetailProvider).isInit;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/manga/download/providers/convert_to_cbz.dart

@@ -2,11 +2,12 @@ import 'dart:io';
 import 'package:archive/archive_io.dart';
 import 'package:flutter/foundation.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'convert_to_cbz.g.dart';
 
 @riverpod
-Future<List<String>> convertToCBZ(ConvertToCBZRef ref, String chapterDir,
+Future<List<String>> convertToCBZ(Ref ref, String chapterDir, String mangaDir,
-    String mangaDir, String chapterName, List<String> pageList) async {
+    String chapterName, List<String> pageList) async {
   return compute(_convertToCBZ, (chapterDir, mangaDir, chapterName, pageList));
 }
 

lib/modules/manga/download/providers/convert_to_cbz.g.dart

@@ -6,7 +6,7 @@ part of 'convert_to_cbz.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$convertToCBZHash() => r'a0aed321ca44ee59f46f04ecf6f37e496dc55c87';
+String _$convertToCBZHash() => r'56f4320034ec2420c8c2c2b22a2522721181ab54';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -176,6 +176,8 @@ class ConvertToCBZProvider extends AutoDisposeFutureProvider<List<String>> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin ConvertToCBZRef on AutoDisposeFutureProviderRef<List<String>> {
   /// The parameter `chapterDir` of this provider.
   String get chapterDir;
@@ -205,4 +207,4 @@ class _ConvertToCBZProviderElement
   List<String> get pageList => (origin as ConvertToCBZProvider).pageList;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/manga/download/providers/download_provider.dart

@@ -20,11 +20,12 @@ import 'package:mangayomi/utils/headers.dart';
 import 'package:mangayomi/utils/reg_exp_matcher.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'download_provider.g.dart';
 
 @riverpod
 Future<List<PageUrl>> downloadChapter(
-  DownloadChapterRef ref, {
+  Ref ref, {
   required Chapter chapter,
   bool? useWifi,
 }) async {

lib/modules/manga/download/providers/download_provider.g.dart

@@ -6,7 +6,7 @@ part of 'download_provider.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$downloadChapterHash() => r'ef2852f888f93e5f344241bc6b486c9dd9037251';
+String _$downloadChapterHash() => r'f407f5839eff9754f9590f2f2189bcb604f3fa06';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -154,6 +154,8 @@ class DownloadChapterProvider extends AutoDisposeFutureProvider<List<PageUrl>> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin DownloadChapterRef on AutoDisposeFutureProviderRef<List<PageUrl>> {
   /// The parameter `chapter` of this provider.
   Chapter get chapter;
@@ -173,4 +175,4 @@ class _DownloadChapterProviderElement
   bool? get useWifi => (origin as DownloadChapterProvider).useWifi;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/manga/home/providers/state_provider.g.dart

@@ -24,4 +24,4 @@ final mangaHomeDisplayTypeStateProvider = AutoDisposeNotifierProvider<
 
 typedef _$MangaHomeDisplayTypeState = AutoDisposeNotifier<DisplayType>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/manga/reader/providers/color_filter_provider.g.dart

@@ -58,4 +58,4 @@ final colorFilterBlendModeStateProvider = AutoDisposeNotifierProvider<
 
 typedef _$ColorFilterBlendModeState = AutoDisposeNotifier<ColorFilterBlendMode>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/manga/reader/providers/crop_borders_provider.dart

@@ -6,10 +6,11 @@ import 'package:mangayomi/src/rust/api/image.dart';
 import 'package:mangayomi/src/rust/frb_generated.dart';
 import 'package:mangayomi/utils/extensions/others.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'crop_borders_provider.g.dart';
 
 @Riverpod(keepAlive: true)
-Future<Uint8List?> cropBorders(CropBordersRef ref,
+Future<Uint8List?> cropBorders(Ref ref,
     {required UChapDataPreload data, required bool cropBorder}) async {
   Uint8List? imageBytes;
 

lib/modules/manga/reader/providers/crop_borders_provider.g.dart

@@ -6,7 +6,7 @@ part of 'crop_borders_provider.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$cropBordersHash() => r'b275a01ce80a3322b70a6c1e87abe1df0d35dc64';
+String _$cropBordersHash() => r'04b24357737d6cc75caa38feca77bb5d41f00aa6';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -154,6 +154,8 @@ class CropBordersProvider extends FutureProvider<Uint8List?> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin CropBordersRef on FutureProviderRef<Uint8List?> {
   /// The parameter `data` of this provider.
   UChapDataPreload get data;
@@ -172,4 +174,4 @@ class _CropBordersProviderElement extends FutureProviderElement<Uint8List?>
   bool get cropBorder => (origin as CropBordersProvider).cropBorder;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/manga/reader/providers/reader_controller_provider.dart

@@ -368,7 +368,7 @@ class ReaderController extends _$ReaderController {
 
 extension ChapterExtensions on Chapter {
   void updateTrackChapterRead(dynamic ref) {
-    if (!(ref is WidgetRef || ref is AutoDisposeNotifierProviderRef)) return;
+    if (!(ref is WidgetRef || ref is Ref)) return;
     final updateProgressAfterReading =
         ref.watch(updateProgressAfterReadingStateProvider);
     if (!updateProgressAfterReading) return;
@@ -418,47 +418,51 @@ extension MangaExtensions on Manga {
   List<Chapter> getFilteredChapterList() {
     final data = this.chapters.toList().reversed.toList();
     final filterUnread = (isar.settings
-        .getSync(227)!
+                .getSync(227)!
-        .chapterFilterUnreadList!
+                .chapterFilterUnreadList!
-        .where((element) => element.mangaId == id)
+                .where((element) => element.mangaId == id)
-        .toList()
+                .toList()
-        .firstOrNull ?? ChapterFilterUnread(
+                .firstOrNull ??
-          mangaId: id,
+            ChapterFilterUnread(
-          type: 0,
+              mangaId: id,
-        ))
+              type: 0,
+            ))
         .type!;
 
     final filterBookmarked = (isar.settings
-        .getSync(227)!
+                .getSync(227)!
-        .chapterFilterBookmarkedList!
+                .chapterFilterBookmarkedList!
-        .where((element) => element.mangaId == id)
+                .where((element) => element.mangaId == id)
-        .toList()
+                .toList()
-        .firstOrNull ?? ChapterFilterBookmarked(
+                .firstOrNull ??
-          mangaId: id,
+            ChapterFilterBookmarked(
-          type: 0,
+              mangaId: id,
-        ))
+              type: 0,
+            ))
         .type!;
     final filterDownloaded = (isar.settings
-        .getSync(227)!
+                .getSync(227)!
-        .chapterFilterDownloadedList!
+                .chapterFilterDownloadedList!
-        .where((element) => element.mangaId == id)
+                .where((element) => element.mangaId == id)
-        .toList()
+                .toList()
-        .firstOrNull ?? ChapterFilterDownloaded(
+                .firstOrNull ??
-          mangaId: id,
+            ChapterFilterDownloaded(
-          type: 0,
+              mangaId: id,
-        ))
+              type: 0,
+            ))
         .type!;
 
     final sortChapter = (isar.settings
-        .getSync(227)!
+                .getSync(227)!
-        .sortChapterList!
+                .sortChapterList!
-        .where((element) => element.mangaId == id)
+                .where((element) => element.mangaId == id)
-        .toList()
+                .toList()
-        .firstOrNull ?? SortChapter(
+                .firstOrNull ??
-          mangaId: id,
+            SortChapter(
-          index: 1,
+              mangaId: id,
-          reverse: false,
+              index: 1,
-        ))
+              reverse: false,
+            ))
         .index;
     final filterScanlator = _getFilterScanlator(this) ?? [];
     List<Chapter>? chapterList;

lib/modules/manga/reader/providers/reader_controller_provider.g.dart

@@ -155,6 +155,8 @@ class CurrentIndexProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin CurrentIndexRef on AutoDisposeNotifierProviderRef<int> {
   /// The parameter `chapter` of this provider.
   Chapter get chapter;
@@ -297,6 +299,8 @@ class ReaderControllerProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin ReaderControllerRef on AutoDisposeNotifierProviderRef<void> {
   /// The parameter `chapter` of this provider.
   Chapter get chapter;
@@ -311,4 +315,4 @@ class _ReaderControllerProviderElement
   Chapter get chapter => (origin as ReaderControllerProvider).chapter;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/more/about/providers/check_for_update.dart

@@ -9,11 +9,12 @@ import 'package:mangayomi/services/http/m_client.dart';
 import 'package:mangayomi/utils/extensions/string_extensions.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:url_launcher/url_launcher.dart';
 part 'check_for_update.g.dart';
 
 @riverpod
-Future<void> checkForUpdate(CheckForUpdateRef ref,
+Future<void> checkForUpdate(Ref ref,
     {BuildContext? context, bool? manualUpdate}) async {
   manualUpdate = manualUpdate ?? false;
   final l10n = l10nLocalizations(context!)!;

lib/modules/more/about/providers/check_for_update.g.dart

@@ -6,7 +6,7 @@ part of 'check_for_update.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$checkForUpdateHash() => r'f460e78c666e58d2a33037b160f5b0fd460cbb5d';
+String _$checkForUpdateHash() => r'ff9623d8b0b4a0485cde58c0a8b5447b64bb02ab';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -154,6 +154,8 @@ class CheckForUpdateProvider extends AutoDisposeFutureProvider<void> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin CheckForUpdateRef on AutoDisposeFutureProviderRef<void> {
   /// The parameter `context` of this provider.
   BuildContext? get context;
@@ -172,4 +174,4 @@ class _CheckForUpdateProviderElement
   bool? get manualUpdate => (origin as CheckForUpdateProvider).manualUpdate;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/more/about/providers/get_package_info.dart

@@ -1,8 +1,9 @@
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'get_package_info.g.dart';
 
 @riverpod
-Future<PackageInfo> getPackageInfo(GetPackageInfoRef ref) async {
+Future<PackageInfo> getPackageInfo(Ref ref) async {
   return (await PackageInfo.fromPlatform());
 }

lib/modules/more/about/providers/get_package_info.g.dart

@@ -6,7 +6,7 @@ part of 'get_package_info.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$getPackageInfoHash() => r'792f15659bdcbe4914a35d47d302aa0e61a207d6';
+String _$getPackageInfoHash() => r'41844966a85f413f78ccddac1f5c235d2547c33f';
 
 /// See also [getPackageInfo].
 @ProviderFor(getPackageInfo)
@@ -20,6 +20,8 @@ final getPackageInfoProvider = AutoDisposeFutureProvider<PackageInfo>.internal(
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef GetPackageInfoRef = AutoDisposeFutureProviderRef<PackageInfo>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/more/backup_and_restore/providers/auto_backup.dart

@@ -4,6 +4,7 @@ import 'package:mangayomi/models/settings.dart';
 import 'package:mangayomi/modules/more/backup_and_restore/providers/backup.dart';
 import 'package:mangayomi/providers/storage_provider.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'auto_backup.g.dart';
 
 @riverpod
@@ -65,7 +66,7 @@ class AutoBackupLocationState extends _$AutoBackupLocationState {
 }
 
 @riverpod
-Future<void> checkAndBackup(CheckAndBackupRef ref) async {
+Future<void> checkAndBackup(Ref ref) async {
   final settings = isar.settings.getSync(227);
   if (settings!.backupFrequency != null) {
     final backupFrequency = _duration(settings.backupFrequency);

lib/modules/more/backup_and_restore/providers/auto_backup.g.dart

@@ -6,7 +6,7 @@ part of 'auto_backup.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$checkAndBackupHash() => r'8d15908fe42ebd4d64ed4cc309fb4b0918ee14ac';
+String _$checkAndBackupHash() => r'bfc4ff93674f9e7caa7fb54f6a7c65b9b87fd571';
 
 /// See also [checkAndBackup].
 @ProviderFor(checkAndBackup)
@@ -20,6 +20,8 @@ final checkAndBackupProvider = AutoDisposeFutureProvider<void>.internal(
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef CheckAndBackupRef = AutoDisposeFutureProviderRef<void>;
 String _$backupFrequencyStateHash() =>
     r'2e73e3fe54456978ff92f49cdc67e84f2af6de7c';
@@ -73,4 +75,4 @@ final autoBackupLocationStateProvider = AutoDisposeNotifierProvider<
 
 typedef _$AutoBackupLocationState = AutoDisposeNotifier<(String, String)>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/more/backup_and_restore/providers/backup.dart

@@ -17,11 +17,12 @@ import 'package:mangayomi/models/track.dart';
 import 'package:mangayomi/models/track_preference.dart';
 import 'package:mangayomi/providers/l10n_providers.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:share_plus/share_plus.dart';
 part 'backup.g.dart';
 
 @riverpod
-void doBackUp(DoBackUpRef ref,
+void doBackUp(Ref ref,
     {required List<int> list,
     required String path,
     required BuildContext? context}) {

lib/modules/more/backup_and_restore/providers/backup.g.dart

@@ -6,7 +6,7 @@ part of 'backup.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$doBackUpHash() => r'0d6e453341320645998071e8888a6f07c3e28cfc';
+String _$doBackUpHash() => r'2d631e10437666ce38354969c7c05e22a0237b29';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -164,6 +164,8 @@ class DoBackUpProvider extends AutoDisposeProvider<void> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin DoBackUpRef on AutoDisposeProviderRef<void> {
   /// The parameter `list` of this provider.
   List<int> get list;
@@ -187,4 +189,4 @@ class _DoBackUpProviderElement extends AutoDisposeProviderElement<void>
   BuildContext? get context => (origin as DoBackUpProvider).context;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/more/backup_and_restore/providers/restore.dart

@@ -22,11 +22,11 @@ import 'package:mangayomi/modules/more/settings/appearance/providers/pure_black_
 import 'package:mangayomi/modules/more/settings/appearance/providers/theme_mode_state_provider.dart';
 import 'package:mangayomi/providers/l10n_providers.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'restore.g.dart';
 
 @riverpod
-void doRestore(DoRestoreRef ref,
+void doRestore(Ref ref, {required String path, required BuildContext context}) {
-    {required String path, required BuildContext context}) {
   final inputStream = InputFileStream(path);
   final archive = ZipDecoder().decodeBuffer(inputStream);
   final backup = jsonDecode(utf8.decode(archive.files.first.content))

lib/modules/more/backup_and_restore/providers/restore.g.dart

@@ -6,7 +6,7 @@ part of 'restore.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$doRestoreHash() => r'69153ba0467229d219346aab9e6ec87c52f66095';
+String _$doRestoreHash() => r'a14a93347e059b6cf4478e8e299dc67d5e151b64';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -153,6 +153,8 @@ class DoRestoreProvider extends AutoDisposeProvider<void> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin DoRestoreRef on AutoDisposeProviderRef<void> {
   /// The parameter `path` of this provider.
   String get path;
@@ -171,4 +173,4 @@ class _DoRestoreProviderElement extends AutoDisposeProviderElement<void>
   BuildContext get context => (origin as DoRestoreProvider).context;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/more/categories/providers/isar_providers.dart

@@ -2,10 +2,11 @@ import 'package:isar/isar.dart';
 import 'package:mangayomi/main.dart';
 import 'package:mangayomi/models/category.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'isar_providers.g.dart';
 
 @riverpod
-Stream<List<Category>> getMangaCategorieStream(GetMangaCategorieStreamRef ref,
+Stream<List<Category>> getMangaCategorieStream(Ref ref,
     {required bool isManga}) async* {
   yield* isar.categorys
       .filter()

lib/modules/more/categories/providers/isar_providers.g.dart

@@ -7,7 +7,7 @@ part of 'isar_providers.dart';
 // **************************************************************************
 
 String _$getMangaCategorieStreamHash() =>
-    r'16b3a35e4962b39a2948a257eba66124bbff139a';
+    r'97e90977f4696eedcf597c655a40dd6ccd47ed37';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -144,6 +144,8 @@ class GetMangaCategorieStreamProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin GetMangaCategorieStreamRef
     on AutoDisposeStreamProviderRef<List<Category>> {
   /// The parameter `isManga` of this provider.
@@ -159,4 +161,4 @@ class _GetMangaCategorieStreamProviderElement
   bool get isManga => (origin as GetMangaCategorieStreamProvider).isManga;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/more/providers/incognito_mode_state_provider.g.dart

@@ -24,4 +24,4 @@ final incognitoModeStateProvider =
 
 typedef _$IncognitoModeState = AutoDisposeNotifier<bool>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/more/settings/appearance/providers/app_font_family.g.dart

@@ -23,4 +23,4 @@ final appFontFamilyProvider =
 
 typedef _$AppFontFamily = AutoDisposeNotifier<String?>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/more/settings/appearance/providers/blend_level_state_provider.g.dart

@@ -23,4 +23,4 @@ final blendLevelStateProvider =
 
 typedef _$BlendLevelState = AutoDisposeNotifier<double>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/more/settings/appearance/providers/date_format_state_provider.g.dart

@@ -40,4 +40,4 @@ final relativeTimesTampsStateProvider =
 
 typedef _$RelativeTimesTampsState = AutoDisposeNotifier<int>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/more/settings/appearance/providers/flex_scheme_color_state_provider.g.dart

@@ -24,4 +24,4 @@ final flexSchemeColorStateProvider =
 
 typedef _$FlexSchemeColorState = AutoDisposeNotifier<FlexSchemeColor>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/more/settings/appearance/providers/pure_black_dark_mode_state_provider.g.dart

@@ -24,4 +24,4 @@ final pureBlackDarkModeStateProvider =
 
 typedef _$PureBlackDarkModeState = AutoDisposeNotifier<bool>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/more/settings/appearance/providers/theme_mode_state_provider.g.dart

@@ -23,4 +23,4 @@ final themeModeStateProvider =
 
 typedef _$ThemeModeState = AutoDisposeNotifier<bool>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/more/settings/browse/providers/browse_state_provider.g.dart

@@ -58,4 +58,4 @@ final checkForExtensionsUpdateStateProvider =
 
 typedef _$CheckForExtensionsUpdateState = AutoDisposeNotifier<bool>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/more/settings/downloads/providers/downloads_state_provider.g.dart

@@ -57,4 +57,4 @@ final downloadLocationStateProvider = AutoDisposeNotifierProvider<
 
 typedef _$DownloadLocationState = AutoDisposeNotifier<(String, String)>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/more/settings/player/providers/player_state_provider.g.dart

@@ -142,4 +142,4 @@ final useLibassStateProvider =
 
 typedef _$UseLibassState = AutoDisposeNotifier<bool>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/more/settings/reader/providers/reader_state_provider.g.dart

@@ -158,4 +158,4 @@ final fullScreenReaderStateProvider =
 
 typedef _$FullScreenReaderState = AutoDisposeNotifier<bool>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/more/settings/sync/providers/sync_providers.dart

@@ -10,10 +10,11 @@ import 'package:mangayomi/models/settings.dart';
 import 'package:mangayomi/models/sync_preference.dart';
 import 'package:mangayomi/services/sync_server.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'sync_providers.g.dart';
 
 @riverpod
-void addUpdatedChapterIndependent(AddUpdatedChapterIndependentRef ref,
+void addUpdatedChapterIndependent(Ref ref,
     Chapter chapter, bool deleted, bool txn) {
   final changedItems = isar.changedItems.getSync(1) ?? ChangedItems();
   bool updated = false;
@@ -47,7 +48,7 @@ void addUpdatedChapterIndependent(AddUpdatedChapterIndependentRef ref,
 }
 
 @riverpod
-void checkForSyncIndependent(CheckForSyncIndependentRef ref, bool silent) {
+void checkForSyncIndependent(Ref ref, bool silent) {
   ref.read(SyncServerProvider(syncId: 1).notifier).checkForSync(silent);
 }
 

lib/modules/more/settings/sync/providers/sync_providers.g.dart

@@ -7,7 +7,7 @@ part of 'sync_providers.dart';
 // **************************************************************************
 
 String _$addUpdatedChapterIndependentHash() =>
-    r'2a609f968ab03f617df4957fdd1ace6f013a3d2a';
+    r'7abb8f085a229ec0573c730234fa4fc4ff86d794';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -167,6 +167,8 @@ class AddUpdatedChapterIndependentProvider extends AutoDisposeProvider<void> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin AddUpdatedChapterIndependentRef on AutoDisposeProviderRef<void> {
   /// The parameter `chapter` of this provider.
   Chapter get chapter;
@@ -193,7 +195,7 @@ class _AddUpdatedChapterIndependentProviderElement
 }
 
 String _$checkForSyncIndependentHash() =>
-    r'7f3820bbb551ad5a98145c0f05106bb104f2db26';
+    r'3a3658a67cd6cb210e76126b33592bd1ea67e3f0';
 
 /// See also [checkForSyncIndependent].
 @ProviderFor(checkForSyncIndependent)
@@ -308,6 +310,8 @@ class CheckForSyncIndependentProvider extends AutoDisposeProvider<void> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin CheckForSyncIndependentRef on AutoDisposeProviderRef<void> {
   /// The parameter `silent` of this provider.
   bool get silent;
@@ -452,6 +456,8 @@ class ChangedItemsManagerProvider extends AutoDisposeNotifierProviderImpl<
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin ChangedItemsManagerRef on AutoDisposeNotifierProviderRef<ChangedItems?> {
   /// The parameter `managerId` of this provider.
   int? get managerId;
@@ -595,6 +601,8 @@ class SynchingProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin SynchingRef on AutoDisposeNotifierProviderRef<SyncPreference?> {
   /// The parameter `syncId` of this provider.
   int? get syncId;
@@ -644,4 +652,4 @@ final syncAfterReadingStateProvider =
 
 typedef _$SyncAfterReadingState = AutoDisposeNotifier<bool>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/modules/more/settings/track/providers/track_providers.g.dart

@@ -154,6 +154,8 @@ class TracksProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin TracksRef on AutoDisposeNotifierProviderRef<TrackPreference?> {
   /// The parameter `syncId` of this provider.
   int? get syncId;
@@ -186,4 +188,4 @@ final updateProgressAfterReadingStateProvider =
 
 typedef _$UpdateProgressAfterReadingState = AutoDisposeNotifier<bool>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/providers/l10n_providers.g.dart

@@ -23,4 +23,4 @@ final l10nLocaleStateProvider =
 
 typedef _$L10nLocaleState = AutoDisposeNotifier<Locale>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/router/router.dart

@@ -38,12 +38,13 @@ import 'package:mangayomi/modules/more/settings/general/general_screen.dart';
 import 'package:mangayomi/modules/more/settings/reader/reader_screen.dart';
 import 'package:mangayomi/modules/more/settings/settings_screen.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter/cupertino.dart';
 part 'router.g.dart';
 
 final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
 @riverpod
-GoRouter router(RouterRef ref) {
+GoRouter router(Ref ref) {
   final router = RouterNotifier();
 
   return GoRouter(

lib/router/router.g.dart

@@ -6,7 +6,7 @@ part of 'router.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$routerHash() => r'b08b3dc93b39ca2a8b7ef3dfbb5e47d516411c9d';
+String _$routerHash() => r'898ce90fa3d611eeb9ada09b0b29672c5accb22a';
 
 /// See also [router].
 @ProviderFor(router)
@@ -19,6 +19,8 @@ final routerProvider = AutoDisposeProvider<GoRouter>.internal(
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef RouterRef = AutoDisposeProviderRef<GoRouter>;
 String _$routerCurrentLocationStateHash() =>
     r'6d08e611ff9bb4c7b91e02b7ffc456df010990aa';
@@ -174,6 +176,8 @@ class RouterCurrentLocationStateProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin RouterCurrentLocationStateRef on AutoDisposeNotifierProviderRef<String?> {
   /// The parameter `context` of this provider.
   BuildContext get context;
@@ -189,4 +193,4 @@ class _RouterCurrentLocationStateProviderElement
       (origin as RouterCurrentLocationStateProvider).context;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/services/aniskip.g.dart

@@ -21,4 +21,4 @@ final aniSkipProvider = AutoDisposeNotifierProvider<AniSkip, void>.internal(
 
 typedef _$AniSkip = AutoDisposeNotifier<void>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/services/fetch_anime_sources.dart

@@ -1,11 +1,11 @@
 import 'package:mangayomi/modules/more/settings/browse/providers/browse_state_provider.dart';
 import 'package:mangayomi/services/fetch_sources_list.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'fetch_anime_sources.g.dart';
 
 @riverpod
-Future fetchAnimeSourcesList(FetchAnimeSourcesListRef ref,
+Future fetchAnimeSourcesList(Ref ref, {int? id, required bool reFresh}) async {
-    {int? id, required bool reFresh}) async {
   if (ref.watch(checkForExtensionsUpdateStateProvider) || reFresh) {
     await fetchSourcesList(
         sourcesIndexUrl:

lib/services/fetch_anime_sources.g.dart

@@ -7,7 +7,7 @@ part of 'fetch_anime_sources.dart';
 // **************************************************************************
 
 String _$fetchAnimeSourcesListHash() =>
-    r'd3bd9a4e8842f55c823ba355a8666b6ffedbb590';
+    r'8fbe1642aee4d475583a1f04b2d236984c6fcfb4';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -155,6 +155,8 @@ class FetchAnimeSourcesListProvider extends AutoDisposeFutureProvider<Object?> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin FetchAnimeSourcesListRef on AutoDisposeFutureProviderRef<Object?> {
   /// The parameter `id` of this provider.
   int? get id;
@@ -174,4 +176,4 @@ class _FetchAnimeSourcesListProviderElement
   bool get reFresh => (origin as FetchAnimeSourcesListProvider).reFresh;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/services/fetch_manga_sources.dart

@@ -1,10 +1,11 @@
 import 'package:mangayomi/modules/more/settings/browse/providers/browse_state_provider.dart';
 import 'package:mangayomi/services/fetch_sources_list.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'fetch_manga_sources.g.dart';
 
 @riverpod
-Future fetchMangaSourcesList(FetchMangaSourcesListRef ref,
+Future fetchMangaSourcesList(Ref ref,
     {int? id, required reFresh}) async {
   if (ref.watch(checkForExtensionsUpdateStateProvider) || reFresh) {
     await fetchSourcesList(

lib/services/fetch_manga_sources.g.dart

@@ -7,7 +7,7 @@ part of 'fetch_manga_sources.dart';
 // **************************************************************************
 
 String _$fetchMangaSourcesListHash() =>
-    r'f32cfd3a729d0659a98a35d06e3df940173bb077';
+    r'8bc08c334cfdba887227c154e249355f33e69da4';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -155,6 +155,8 @@ class FetchMangaSourcesListProvider extends AutoDisposeFutureProvider<Object?> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin FetchMangaSourcesListRef on AutoDisposeFutureProviderRef<Object?> {
   /// The parameter `id` of this provider.
   int? get id;
@@ -174,4 +176,4 @@ class _FetchMangaSourcesListProviderElement
   dynamic get reFresh => (origin as FetchMangaSourcesListProvider).reFresh;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/services/fetch_sources_list.dart

@@ -13,7 +13,7 @@ Future<void> fetchSourcesList(
     {int? id,
     required bool refresh,
     required String sourcesIndexUrl,
-    required AutoDisposeRef ref,
+    required Ref ref,
     required bool isManga}) async {
   final http = MClient.init(reqcopyWith: {'useDartHttpClient': true});
   final req = await http.get(Uri.parse(sourcesIndexUrl));

lib/services/get_chapter_pages.dart

@@ -16,6 +16,7 @@ import 'package:mangayomi/utils/utils.dart';
 import 'package:mangayomi/utils/reg_exp_matcher.dart';
 import 'package:mangayomi/modules/more/providers/incognito_mode_state_provider.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'get_chapter_pages.g.dart';
 
 class GetChapterPagesModel {
@@ -34,7 +35,7 @@ class GetChapterPagesModel {
 
 @riverpod
 Future<GetChapterPagesModel> getChapterPages(
-  GetChapterPagesRef ref, {
+  Ref ref, {
   required Chapter chapter,
 }) async {
   List<UChapDataPreload> uChapDataPreloadp = [];

lib/services/get_chapter_pages.g.dart

@@ -6,7 +6,7 @@ part of 'get_chapter_pages.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$getChapterPagesHash() => r'8c7b5e87ced01c6b1c4c54115b44cf3ea3ae72c7';
+String _$getChapterPagesHash() => r'c806798536b6d4ca5b2a51417f12c648100cfc44';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -143,6 +143,8 @@ class GetChapterPagesProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin GetChapterPagesRef on AutoDisposeFutureProviderRef<GetChapterPagesModel> {
   /// The parameter `chapter` of this provider.
   Chapter get chapter;
@@ -157,4 +159,4 @@ class _GetChapterPagesProviderElement
   Chapter get chapter => (origin as GetChapterPagesProvider).chapter;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/services/get_detail.dart

@@ -3,11 +3,12 @@ import 'package:mangayomi/eval/javascript/service.dart';
 import 'package:mangayomi/eval/dart/model/m_manga.dart';
 import 'package:mangayomi/models/source.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'get_detail.g.dart';
 
 @riverpod
 Future<MManga> getDetail(
-  GetDetailRef ref, {
+  Ref ref, {
   required String url,
   required Source source,
 }) async {

lib/services/get_detail.g.dart

@@ -6,7 +6,7 @@ part of 'get_detail.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$getDetailHash() => r'c782ef7d6b995a9788fa4072e3f5dc54afe32909';
+String _$getDetailHash() => r'c9e268bb19e786b3bb160023f74336b80da65b6c';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -153,6 +153,8 @@ class GetDetailProvider extends AutoDisposeFutureProvider<MManga> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin GetDetailRef on AutoDisposeFutureProviderRef<MManga> {
   /// The parameter `url` of this provider.
   String get url;
@@ -171,4 +173,4 @@ class _GetDetailProviderElement extends AutoDisposeFutureProviderElement<MManga>
   Source get source => (origin as GetDetailProvider).source;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/services/get_latest_updates.dart

@@ -3,11 +3,12 @@ import 'package:mangayomi/eval/javascript/service.dart';
 import 'package:mangayomi/eval/dart/model/m_pages.dart';
 import 'package:mangayomi/models/source.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'get_latest_updates.g.dart';
 
 @riverpod
 Future<MPages?> getLatestUpdates(
-  GetLatestUpdatesRef ref, {
+  Ref ref, {
   required Source source,
   required int page,
 }) async {

lib/services/get_latest_updates.g.dart

@@ -6,7 +6,7 @@ part of 'get_latest_updates.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$getLatestUpdatesHash() => r'5ca26c8679972d70a77ca12d38cadc360b14b372';
+String _$getLatestUpdatesHash() => r'ed983c23ad7d8a1af4332230537daede29b9275e';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -154,6 +154,8 @@ class GetLatestUpdatesProvider extends AutoDisposeFutureProvider<MPages?> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin GetLatestUpdatesRef on AutoDisposeFutureProviderRef<MPages?> {
   /// The parameter `source` of this provider.
   Source get source;
@@ -172,4 +174,4 @@ class _GetLatestUpdatesProviderElement
   int get page => (origin as GetLatestUpdatesProvider).page;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/services/get_popular.dart

@@ -3,11 +3,12 @@ import 'package:mangayomi/eval/javascript/service.dart';
 import 'package:mangayomi/eval/dart/model/m_pages.dart';
 import 'package:mangayomi/models/source.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'get_popular.g.dart';
 
 @riverpod
 Future<MPages?> getPopular(
-  GetPopularRef ref, {
+  Ref ref, {
   required Source source,
   required int page,
 }) async {

lib/services/get_popular.g.dart

@@ -6,7 +6,7 @@ part of 'get_popular.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$getPopularHash() => r'e6ab4a663361dea09f7b430e1101101cdf3f1577';
+String _$getPopularHash() => r'2db0191dd013043970cfac2153e22054b0927ad1';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -154,6 +154,8 @@ class GetPopularProvider extends AutoDisposeFutureProvider<MPages?> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin GetPopularRef on AutoDisposeFutureProviderRef<MPages?> {
   /// The parameter `source` of this provider.
   Source get source;
@@ -172,4 +174,4 @@ class _GetPopularProviderElement
   int get page => (origin as GetPopularProvider).page;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/services/get_source_baseurl.dart

@@ -1,13 +1,14 @@
 import 'package:mangayomi/eval/dart/service.dart';
 import 'package:mangayomi/models/source.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'get_source_baseurl.g.dart';
 
 @riverpod
-String sourceBaseUrl(SourceBaseUrlRef ref, {required Source source}) {
+String sourceBaseUrl(Ref ref, {required Source source}) {
   String? baseUrl;
   if (source.sourceCodeLanguage == SourceCodeLanguage.dart) {
-   baseUrl =  DartExtensionService(source).sourceBaseUrl;
+    baseUrl = DartExtensionService(source).sourceBaseUrl;
   } else {}
   if (baseUrl == null || baseUrl.isEmpty) {
     baseUrl = source.baseUrl;

lib/services/get_source_baseurl.g.dart

@@ -6,7 +6,7 @@ part of 'get_source_baseurl.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$sourceBaseUrlHash() => r'c5700cf74e688979c8ded7a2ceee43e833649165';
+String _$sourceBaseUrlHash() => r'853fdcc3b12f567c7570a8569c7832234d2bf7bf';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -142,6 +142,8 @@ class SourceBaseUrlProvider extends AutoDisposeProvider<String> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin SourceBaseUrlRef on AutoDisposeProviderRef<String> {
   /// The parameter `source` of this provider.
   Source get source;
@@ -155,4 +157,4 @@ class _SourceBaseUrlProviderElement extends AutoDisposeProviderElement<String>
   Source get source => (origin as SourceBaseUrlProvider).source;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/services/get_video_list.dart

@@ -10,10 +10,11 @@ import 'package:mangayomi/services/torrent_server.dart';
 import 'package:mangayomi/utils/utils.dart';
 import 'package:mangayomi/utils/extensions/string_extensions.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'get_video_list.g.dart';
 
 @riverpod
-Future<(List<Video>, bool, String?)> getVideoList(GetVideoListRef ref,
+Future<(List<Video>, bool, String?)> getVideoList(Ref ref,
     {required Chapter episode}) async {
   final storageProvider = StorageProvider();
   final mangaDirectory = await storageProvider.getMangaMainDirectory(episode);

lib/services/get_video_list.g.dart

@@ -6,7 +6,7 @@ part of 'get_video_list.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$getVideoListHash() => r'e5cc579c492bdf4cd226b93c42766599cece4cd6';
+String _$getVideoListHash() => r'1c62b1a5bef8b55a73ba7a436f23609ec8270436';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -146,6 +146,8 @@ class GetVideoListProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin GetVideoListRef
     on AutoDisposeFutureProviderRef<(List<Video>, bool, String?)> {
   /// The parameter `episode` of this provider.
@@ -161,4 +163,4 @@ class _GetVideoListProviderElement
   Chapter get episode => (origin as GetVideoListProvider).episode;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/services/search.dart

@@ -5,10 +5,11 @@ import 'package:mangayomi/eval/dart/model/filter.dart';
 import 'package:mangayomi/eval/dart/model/m_pages.dart';
 import 'package:mangayomi/models/source.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'search.g.dart';
 
 @riverpod
-Future<MPages?> search(SearchRef ref,
+Future<MPages?> search(Ref ref,
     {required Source source,
     required String query,
     required int page,

lib/services/search.g.dart

@@ -6,7 +6,7 @@ part of 'search.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$searchHash() => r'63c879037c1c174f6fc01605a83c00e5c2092b23';
+String _$searchHash() => r'c0e7eb3604d2a065762e444cff1dfc5b44ae7da4';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -175,6 +175,8 @@ class SearchProvider extends AutoDisposeFutureProvider<MPages?> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin SearchRef on AutoDisposeFutureProviderRef<MPages?> {
   /// The parameter `source` of this provider.
   Source get source;
@@ -203,4 +205,4 @@ class _SearchProviderElement extends AutoDisposeFutureProviderElement<MPages?>
   List<dynamic> get filterList => (origin as SearchProvider).filterList;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/services/supports_latest.dart

@@ -1,10 +1,11 @@
 import 'package:mangayomi/eval/dart/service.dart';
 import 'package:mangayomi/models/source.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'supports_latest.g.dart';
 
 @riverpod
-bool supportsLatest(SupportsLatestRef ref, {required Source source}) {
+bool supportsLatest(Ref ref, {required Source source}) {
   bool? supportsLatest;
   if (source.sourceCodeLanguage == SourceCodeLanguage.dart) {
     supportsLatest = DartExtensionService(source).supportsLatest;

lib/services/supports_latest.g.dart

@@ -6,7 +6,7 @@ part of 'supports_latest.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$supportsLatestHash() => r'5a9bf0c37678c1d6105a7b438157d17a734c8d8a';
+String _$supportsLatestHash() => r'40a9aae51c276645115e9ac18fcebeadb7a0d9cd';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -142,6 +142,8 @@ class SupportsLatestProvider extends AutoDisposeProvider<bool> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin SupportsLatestRef on AutoDisposeProviderRef<bool> {
   /// The parameter `source` of this provider.
   Source get source;
@@ -155,4 +157,4 @@ class _SupportsLatestProviderElement extends AutoDisposeProviderElement<bool>
   Source get source => (origin as SupportsLatestProvider).source;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/services/sync_server.g.dart

@@ -6,7 +6,7 @@ part of 'sync_server.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$syncServerHash() => r'546749093c21066a77c7bba22c1354a2bdf06e24';
+String _$syncServerHash() => r'99e16d503937f2973f00c0cf2e834a03cf4aa245';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -155,6 +155,8 @@ class SyncServerProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin SyncServerRef on AutoDisposeNotifierProviderRef<void> {
   /// The parameter `syncId` of this provider.
   int get syncId;
@@ -169,4 +171,4 @@ class _SyncServerProviderElement
   int get syncId => (origin as SyncServerProvider).syncId;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/services/trackers/anilist.g.dart

@@ -171,6 +171,8 @@ class AnilistProvider extends AutoDisposeNotifierProviderImpl<Anilist, void> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin AnilistRef on AutoDisposeNotifierProviderRef<void> {
   /// The parameter `syncId` of this provider.
   int get syncId;
@@ -189,4 +191,4 @@ class _AnilistProviderElement
   bool? get isManga => (origin as AnilistProvider).isManga;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/services/trackers/kitsu.g.dart

@@ -171,6 +171,8 @@ class KitsuProvider extends AutoDisposeNotifierProviderImpl<Kitsu, void> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin KitsuRef on AutoDisposeNotifierProviderRef<void> {
   /// The parameter `syncId` of this provider.
   int get syncId;
@@ -189,4 +191,4 @@ class _KitsuProviderElement
   bool? get isManga => (origin as KitsuProvider).isManga;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/services/trackers/myanimelist.g.dart

@@ -173,6 +173,8 @@ class MyAnimeListProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin MyAnimeListRef on AutoDisposeNotifierProviderRef<void> {
   /// The parameter `syncId` of this provider.
   int get syncId;
@@ -192,4 +194,4 @@ class _MyAnimeListProviderElement
   bool? get isManga => (origin as MyAnimeListProvider).isManga;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/src/rust/api/image.dart

@@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// @generated by `flutter_rust_bridge`@ 2.5.0.
+// @generated by `flutter_rust_bridge`@ 2.6.0.
 
 // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
 

lib/src/rust/api/rhttp/client.dart

@@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// @generated by `flutter_rust_bridge`@ 2.5.0.
+// @generated by `flutter_rust_bridge`@ 2.6.0.
 
 // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
 

lib/src/rust/api/rhttp/error.dart

@@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// @generated by `flutter_rust_bridge`@ 2.5.0.
+// @generated by `flutter_rust_bridge`@ 2.6.0.
 
 // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
 

lib/src/rust/api/rhttp/http.dart

@@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// @generated by `flutter_rust_bridge`@ 2.5.0.
+// @generated by `flutter_rust_bridge`@ 2.6.0.
 
 // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
 

lib/src/rust/frb_generated.dart

@@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// @generated by `flutter_rust_bridge`@ 2.5.0.
+// @generated by `flutter_rust_bridge`@ 2.6.0.
 
 // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field
 
@@ -67,7 +67,7 @@ class RustLib extends BaseEntrypoint<RustLibApi, RustLibApiImpl, RustLibWire> {
       kDefaultExternalLibraryLoaderConfig;
 
   @override
-  String get codegenVersion => '2.5.0';
+  String get codegenVersion => '2.6.0';
 
   @override
   int get rustContentHash => 107666026;
@@ -81,16 +81,14 @@ class RustLib extends BaseEntrypoint<RustLibApi, RustLibApiImpl, RustLibWire> {
 }
 
 abstract class RustLibApi extends BaseApi {
-  Uint8List crateApiImageProcessCropImage({required List<int> image});
-
-  Future<ClientSettings> crateApiRhttpClientClientSettingsDefault();
-
   Future<void> crateApiRhttpHttpCancelRequest(
       {required CancellationToken token});
 
   Future<void> crateApiRhttpHttpCancelRunningRequests(
       {required RequestClient client});
 
+  Future<ClientSettings> crateApiRhttpClientClientSettingsDefault();
+
   Stream<Uint8List> crateApiRhttpHttpMakeHttpRequestReceiveStream(
       {RequestClient? client,
       ClientSettings? settings,
@@ -104,6 +102,8 @@ abstract class RustLibApi extends BaseApi {
       required FutureOr<void> Function(CancellationToken) onCancelToken,
       required bool cancelable});
 
+  Uint8List crateApiImageProcessCropImage({required List<int> image});
+
   Future<RequestClient> crateApiRhttpHttpRegisterClient(
       {required ClientSettings settings});
 
@@ -137,54 +137,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
     required super.portManager,
   });
 
-  @override
-  Uint8List crateApiImageProcessCropImage({required List<int> image}) {
-    return handler.executeSync(SyncTask(
-      callFfi: () {
-        final serializer = SseSerializer(generalizedFrbRustBinding);
-        sse_encode_list_prim_u_8_loose(image, serializer);
-        return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 1)!;
-      },
-      codec: SseCodec(
-        decodeSuccessData: sse_decode_list_prim_u_8_strict,
-        decodeErrorData: null,
-      ),
-      constMeta: kCrateApiImageProcessCropImageConstMeta,
-      argValues: [image],
-      apiImpl: this,
-    ));
-  }
-
-  TaskConstMeta get kCrateApiImageProcessCropImageConstMeta =>
-      const TaskConstMeta(
-        debugName: "process_crop_image",
-        argNames: ["image"],
-      );
-
-  @override
-  Future<ClientSettings> crateApiRhttpClientClientSettingsDefault() {
-    return handler.executeNormal(NormalTask(
-      callFfi: (port_) {
-        final serializer = SseSerializer(generalizedFrbRustBinding);
-        pdeCallFfi(generalizedFrbRustBinding, serializer,
-            funcId: 2, port: port_);
-      },
-      codec: SseCodec(
-        decodeSuccessData: sse_decode_client_settings,
-        decodeErrorData: null,
-      ),
-      constMeta: kCrateApiRhttpClientClientSettingsDefaultConstMeta,
-      argValues: [],
-      apiImpl: this,
-    ));
-  }
-
-  TaskConstMeta get kCrateApiRhttpClientClientSettingsDefaultConstMeta =>
-      const TaskConstMeta(
-        debugName: "client_settings_default",
-        argNames: [],
-      );
-
   @override
   Future<void> crateApiRhttpHttpCancelRequest(
       {required CancellationToken token}) {
@@ -194,7 +146,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
         sse_encode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerCancellationToken(
             token, serializer);
         pdeCallFfi(generalizedFrbRustBinding, serializer,
-            funcId: 3, port: port_);
+            funcId: 1, port: port_);
       },
       codec: SseCodec(
         decodeSuccessData: sse_decode_unit,
@@ -221,7 +173,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
         sse_encode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerRequestClient(
             client, serializer);
         pdeCallFfi(generalizedFrbRustBinding, serializer,
-            funcId: 4, port: port_);
+            funcId: 2, port: port_);
       },
       codec: SseCodec(
         decodeSuccessData: sse_decode_unit,
@@ -239,6 +191,30 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
         argNames: ["client"],
       );
 
+  @override
+  Future<ClientSettings> crateApiRhttpClientClientSettingsDefault() {
+    return handler.executeNormal(NormalTask(
+      callFfi: (port_) {
+        final serializer = SseSerializer(generalizedFrbRustBinding);
+        pdeCallFfi(generalizedFrbRustBinding, serializer,
+            funcId: 3, port: port_);
+      },
+      codec: SseCodec(
+        decodeSuccessData: sse_decode_client_settings,
+        decodeErrorData: null,
+      ),
+      constMeta: kCrateApiRhttpClientClientSettingsDefaultConstMeta,
+      argValues: [],
+      apiImpl: this,
+    ));
+  }
+
+  TaskConstMeta get kCrateApiRhttpClientClientSettingsDefaultConstMeta =>
+      const TaskConstMeta(
+        debugName: "client_settings_default",
+        argNames: [],
+      );
+
   @override
   Stream<Uint8List> crateApiRhttpHttpMakeHttpRequestReceiveStream(
       {RequestClient? client,
@@ -273,7 +249,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
             onCancelToken, serializer);
         sse_encode_bool(cancelable, serializer);
         pdeCallFfi(generalizedFrbRustBinding, serializer,
-            funcId: 5, port: port_);
+            funcId: 4, port: port_);
       },
       codec: SseCodec(
         decodeSuccessData: sse_decode_unit,
@@ -318,6 +294,30 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
         ],
       );
 
+  @override
+  Uint8List crateApiImageProcessCropImage({required List<int> image}) {
+    return handler.executeSync(SyncTask(
+      callFfi: () {
+        final serializer = SseSerializer(generalizedFrbRustBinding);
+        sse_encode_list_prim_u_8_loose(image, serializer);
+        return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 5)!;
+      },
+      codec: SseCodec(
+        decodeSuccessData: sse_decode_list_prim_u_8_strict,
+        decodeErrorData: null,
+      ),
+      constMeta: kCrateApiImageProcessCropImageConstMeta,
+      argValues: [image],
+      apiImpl: this,
+    ));
+  }
+
+  TaskConstMeta get kCrateApiImageProcessCropImageConstMeta =>
+      const TaskConstMeta(
+        debugName: "process_crop_image",
+        argNames: ["image"],
+      );
+
   @override
   Future<RequestClient> crateApiRhttpHttpRegisterClient(
       {required ClientSettings settings}) {

lib/src/rust/frb_generated.io.dart

@@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// @generated by `flutter_rust_bridge`@ 2.5.0.
+// @generated by `flutter_rust_bridge`@ 2.6.0.
 
 // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field
 

lib/src/rust/frb_generated.web.dart

@@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// @generated by `flutter_rust_bridge`@ 2.5.0.
+// @generated by `flutter_rust_bridge`@ 2.6.0.
 
 // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field
 

lib/src/rust/lib.dart

@@ -1,5 +1,5 @@
 // This file is automatically generated, so please do not edit it.
-// @generated by `flutter_rust_bridge`@ 2.5.0.
+// @generated by `flutter_rust_bridge`@ 2.6.0.
 
 // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
 

lib/utils/headers.dart

@@ -4,10 +4,11 @@ import 'package:mangayomi/services/fetch_sources_list.dart';
 import 'package:mangayomi/services/http/m_client.dart';
 import 'package:mangayomi/utils/utils.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 part 'headers.g.dart';
 
 @riverpod
-Map<String, String> headers(HeadersRef ref,
+Map<String, String> headers(Ref ref,
     {required String source, required String lang}) {
   final mSource = getSource(lang, source);
   if (mSource == null) return {};

lib/utils/headers.g.dart

@@ -6,7 +6,7 @@ part of 'headers.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$headersHash() => r'9ec5e31ef5ee097be7de6bed89a65b0afa5a51da';
+String _$headersHash() => r'05b066bcfad24a9238d4f7cefdabc7aec01d2e26';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -153,6 +153,8 @@ class HeadersProvider extends AutoDisposeProvider<Map<String, String>> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin HeadersRef on AutoDisposeProviderRef<Map<String, String>> {
   /// The parameter `source` of this provider.
   String get source;
@@ -171,4 +173,4 @@ class _HeadersProviderElement
   String get lang => (origin as HeadersProvider).lang;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

pubspec.lock

@@ -5,23 +5,23 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77"
+      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
       url: "https://pub.dev"
     source: hosted
-    version: "73.0.0"
+    version: "72.0.0"
   _macros:
     dependency: transitive
     description: dart
     source: sdk
     version: "0.3.2"
   analyzer:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
       name: analyzer
-      sha256: "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a"
+      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
       url: "https://pub.dev"
     source: hosted
-    version: "6.8.0"
+    version: "6.7.0"
   analyzer_plugin:
     dependency: transitive
     description:
@@ -186,10 +186,10 @@ packages:
     dependency: transitive
     description:
       name: charcode
-      sha256: fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306
+      sha256: fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.4.0"
   checked_yaml:
     dependency: transitive
     description:
@@ -282,10 +282,10 @@ packages:
     dependency: transitive
     description:
       name: custom_lint_visitor
-      sha256: bfe9b7a09c4775a587b58d10ebb871d4fe618237639b1e84d5ec62d7dfef25f9
+      sha256: "8aeb3b6ae2bb765e7716b93d1d10e8356d04e0ff6d7592de6ee04e0dd7d6587d"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0+6.11.0"
+    version: "1.0.0+6.7.0"
   dart_eval:
     dependency: "direct main"
     description:
@@ -606,10 +606,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_rust_bridge
-      sha256: "0ad5079de35d317650fec59b26cb4d0c116ebc2ce703a29f9367513b8a91c287"
+      sha256: fb9d3c9395eae3c71d4fe3ec343b9f30636c9988150c8bb33b60047549b34e3d
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.0"
+    version: "2.6.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -1179,10 +1179,10 @@ packages:
     dependency: transitive
     description:
       name: permission_handler_html
-      sha256: af26edbbb1f2674af65a8f4b56e1a6f526156bc273d0e65dd8075fab51c78851
+      sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.3+2"
+    version: "0.1.3+5"
   permission_handler_platform_interface:
     dependency: transitive
     description:
@@ -1307,10 +1307,10 @@ packages:
     dependency: transitive
     description:
       name: riverpod_analyzer_utils
-      sha256: dc53a659cb543b203cdc35cd4e942ed08ea893eb6ef12029301323bdf18c5d95
+      sha256: c6b8222b2b483cb87ae77ad147d6408f400c64f060df7a225b127f4afef4f8c8
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.7"
+    version: "0.5.8"
   riverpod_annotation:
     dependency: "direct main"
     description:
@@ -1323,10 +1323,10 @@ packages:
     dependency: "direct dev"
     description:
       name: riverpod_generator
-      sha256: "54458dac2fea976990dc9ed379060db6ae5c8790143f1963fedd0fb99980a326"
+      sha256: "63546d70952015f0981361636bf8f356d9cfd9d7f6f0815e3c07789a41233188"
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.2"
+    version: "2.6.3"
   rust_lib_mangayomi:
     dependency: "direct main"
     description:
@@ -1551,10 +1551,10 @@ packages:
     dependency: transitive
     description:
       name: time
-      sha256: ad8e018a6c9db36cb917a031853a1aae49467a93e0d464683e029537d848c221
+      sha256: "370572cf5d1e58adcb3e354c47515da3f7469dac3a95b447117e728e7be6f461"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   timing:
     dependency: transitive
     description:

pubspec.yaml

@@ -12,8 +12,8 @@ dependencies:
   flutter_localizations:
     sdk: flutter
   go_router: ^14.2.0
-  flutter_riverpod: ^2.5.1
+  flutter_riverpod: ^2.6.1
-  riverpod_annotation: ^2.3.5
+  riverpod_annotation: ^2.6.1
   html: ^0.15.4
   font_awesome_flutter: ^10.7.0
   expandable_text: ^2.3.0
@@ -36,7 +36,7 @@ dependencies:
   file_picker: ^8.0.5
   path_provider: ^2.1.3
   scrollable_positioned_list: ^0.3.8
-  dart_eval: ^0.7.9
+  dart_eval: ^0.7.10
   json_path: ^0.7.2
   bot_toast: ^4.1.3
   flutter_web_auth_2: ^3.1.2
@@ -62,7 +62,7 @@ dependencies:
   highlight: ^0.7.0
   json_view: ^0.4.2
   super_sliver_list: ^0.4.1
-  flutter_rust_bridge: 2.5.0
+  flutter_rust_bridge: 2.6.0
   rust_lib_mangayomi:
     path: rust_builder
   pseudom: ^1.0.1
@@ -78,7 +78,6 @@ dependency_overrides:
   http: ^1.2.1
   ffi: ^2.1.2
   flex_seed_scheme: ^2.0.0
-  analyzer: ">=5.2.0 <7.0.0"
   html: ^0.15.4
   media_kit_native_event_loop:
     git:
@@ -133,7 +132,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   build_runner: ^2.4.6
-  riverpod_generator: ^2.4.2
+  riverpod_generator: ^2.6.3
   flutter_launcher_icons: ^0.13.1
   isar_generator: ^3.1.0+1
   flutter_lints: ^4.0.0