diff --git a/lib/modules/archive_reader/providers/archive_reader_providers.g.dart b/lib/modules/archive_reader/providers/archive_reader_providers.g.dart
index 927b30e5..ba79585c 100644
--- a/lib/modules/archive_reader/providers/archive_reader_providers.g.dart
+++ b/lib/modules/archive_reader/providers/archive_reader_providers.g.dart
@@ -370,5 +370,4 @@ class GetArchiveDataFromFileProvider
     return _SystemHash.finish(hash);
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/browse/extension/providers/fetch_anime_sources.g.dart b/lib/modules/browse/extension/providers/fetch_anime_sources.g.dart
index d24b4e50..3cff32d8 100644
--- a/lib/modules/browse/extension/providers/fetch_anime_sources.g.dart
+++ b/lib/modules/browse/extension/providers/fetch_anime_sources.g.dart
@@ -110,5 +110,4 @@ class FetchAnimeSourcesListProvider extends AutoDisposeFutureProvider<dynamic> {
     return _SystemHash.finish(hash);
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/browse/extension/providers/fetch_manga_sources.g.dart b/lib/modules/browse/extension/providers/fetch_manga_sources.g.dart
index aa64cf69..c3fd0a21 100644
--- a/lib/modules/browse/extension/providers/fetch_manga_sources.g.dart
+++ b/lib/modules/browse/extension/providers/fetch_manga_sources.g.dart
@@ -110,5 +110,4 @@ class FetchMangaSourcesListProvider extends AutoDisposeFutureProvider<dynamic> {
     return _SystemHash.finish(hash);
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/history/providers/isar_providers.g.dart b/lib/modules/history/providers/isar_providers.g.dart
index 79029d41..c0334de7 100644
--- a/lib/modules/history/providers/isar_providers.g.dart
+++ b/lib/modules/history/providers/isar_providers.g.dart
@@ -111,5 +111,4 @@ class GetAllHistoryStreamProvider
     return _SystemHash.finish(hash);
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/library/library_screen.dart b/lib/modules/library/library_screen.dart
index 9b2fc06a..f6f1b861 100644
--- a/lib/modules/library/library_screen.dart
+++ b/lib/modules/library/library_screen.dart
@@ -1146,9 +1146,12 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
         context,
         DraggableMenu(
             ui: SoftModernDraggableMenu(barItem: Container(), radius: 20),
-            expandable: true,
-            expandedHeight: mediaHeight(context, 0.8),
-            maxHeight: mediaHeight(context, 0.6),
+            minimizeThreshold: 0.6,
+            levels: [
+              DraggableMenuLevel.ratio(ratio: 1 / 3),
+              DraggableMenuLevel.ratio(ratio: 2 / 3),
+              DraggableMenuLevel.ratio(ratio: 0.9),
+            ],
             minimizeBeforeFastDrag: true,
             child: DefaultTabController(
                 length: 3,
diff --git a/lib/modules/library/providers/isar_providers.g.dart b/lib/modules/library/providers/isar_providers.g.dart
index 6406c8a7..63bcf71e 100644
--- a/lib/modules/library/providers/isar_providers.g.dart
+++ b/lib/modules/library/providers/isar_providers.g.dart
@@ -206,5 +206,4 @@ class GetAllMangaWithoutCategoriesStreamProvider
     return _SystemHash.finish(hash);
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/library/providers/library_state_provider.g.dart b/lib/modules/library/providers/library_state_provider.g.dart
index 608ec613..396b11fe 100644
--- a/lib/modules/library/providers/library_state_provider.g.dart
+++ b/lib/modules/library/providers/library_state_provider.g.dart
@@ -1607,5 +1607,4 @@ class MangasSetUnReadStateProvider
     );
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/library/providers/local_archive.g.dart b/lib/modules/library/providers/local_archive.g.dart
index 198b469a..fdcc564c 100644
--- a/lib/modules/library/providers/local_archive.g.dart
+++ b/lib/modules/library/providers/local_archive.g.dart
@@ -128,5 +128,4 @@ class ImportArchivesFromFileProvider
     return _SystemHash.finish(hash);
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/main_view/main_screen.dart b/lib/modules/main_view/main_screen.dart
index bc20e04c..0c6fa89b 100644
--- a/lib/modules/main_view/main_screen.dart
+++ b/lib/modules/main_view/main_screen.dart
@@ -5,41 +5,44 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:mangayomi/providers/l10n_providers.dart';
+import 'package:mangayomi/router/router.dart';
 import 'package:mangayomi/utils/colors.dart';
 import 'package:mangayomi/utils/media_query.dart';
 import 'package:mangayomi/modules/library/providers/library_state_provider.dart';
 import 'package:mangayomi/modules/more/providers/incognito_mode_state_provider.dart';
 
-class MainScreen extends StatefulWidget {
+class MainScreen extends StatelessWidget {
   const MainScreen({super.key, required this.child});
 
   final Widget child;
 
-  @override
-  State<MainScreen> createState() => _MainScreenState();
-}
-
-class _MainScreenState extends State<MainScreen> {
   @override
   Widget build(BuildContext context) {
     final l10n = l10nLocalizations(context)!;
     final route = GoRouter.of(context);
-    int currentIndex = route.location == '/MangaLibrary'
-        ? 0
-        : route.location == '/AnimeLibrary'
-            ? 1
-            : route.location == '/updates'
-                ? 2
-                : route.location == '/browse'
-                    ? 3
-                    : 4;
-    bool isReadingScreen = route.location == '/mangareaderview';
-    return Column(
-      children: [
-        if (!isReadingScreen)
-          Consumer(builder: (context, ref, child) {
-            final incognitoMode = ref.watch(incognitoModeStateProvider);
-            return Material(
+
+    return Consumer(builder: (context, ref, chuld) {
+      final location = ref.watch(
+        routerCurrentLocationStateProvider(context),
+      );
+      bool isReadingScreen = location == '/mangareaderview';
+      int currentIndex = location == null
+          ? 0
+          : location == '/MangaLibrary'
+              ? 0
+              : location == '/AnimeLibrary'
+                  ? 1
+                  : location == '/updates'
+                      ? 2
+                      : location == '/browse'
+                          ? 3
+                          : 4;
+      final incognitoMode = ref.watch(incognitoModeStateProvider);
+      final isLongPressed = ref.watch(isLongPressedMangaStateProvider);
+      return Column(
+        children: [
+          if (!isReadingScreen)
+            Material(
               child: AnimatedContainer(
                 height: incognitoMode
                     ? Platform.isAndroid || Platform.isIOS
@@ -66,27 +69,25 @@ class _MainScreenState extends State<MainScreen> {
                   ],
                 ),
               ),
-            );
-          }),
-        Flexible(
-          child: Scaffold(
-            body: isTablet(context)
-                ? Row(
-                    children: [
-                      Consumer(builder: (context, ref, child) {
-                        final isLongPressed =
-                            ref.watch(isLongPressedMangaStateProvider);
-                        return AnimatedContainer(
+            ),
+          Flexible(
+            child: Scaffold(
+              body: isTablet(context)
+                  ? Row(
+                      children: [
+                        AnimatedContainer(
                           duration: const Duration(milliseconds: 0),
                           width: isLongPressed
                               ? 0
-                              : route.location != '/MangaLibrary' &&
-                                      route.location != '/AnimeLibrary' &&
-                                      route.location != '/updates' &&
-                                      route.location != '/browse' &&
-                                      route.location != '/more'
-                                  ? 0
-                                  : 100,
+                              : location == null
+                                  ? 100
+                                  : location != '/MangaLibrary' &&
+                                          location != '/AnimeLibrary' &&
+                                          location != '/updates' &&
+                                          location != '/browse' &&
+                                          location != '/more'
+                                      ? 0
+                                      : 100,
                           child: NavigationRailTheme(
                             data: NavigationRailThemeData(
                               indicatorShape: RoundedRectangleBorder(
@@ -152,11 +153,6 @@ class _MainScreenState extends State<MainScreen> {
                               ],
                               selectedIndex: currentIndex,
                               onDestinationSelected: (newIndex) {
-                                if (mounted) {
-                                  setState(() {
-                                    currentIndex = newIndex;
-                                  });
-                                }
                                 if (newIndex == 0) {
                                   route.go('/MangaLibrary');
                                 } else if (newIndex == 1) {
@@ -171,29 +167,27 @@ class _MainScreenState extends State<MainScreen> {
                               },
                             ),
                           ),
-                        );
-                      }),
-                      Expanded(child: widget.child)
-                    ],
-                  )
-                : widget.child,
-            bottomNavigationBar: isTablet(context)
-                ? null
-                : Consumer(builder: (context, ref, child) {
-                    final isLongPressed =
-                        ref.watch(isLongPressedMangaStateProvider);
-                    return AnimatedContainer(
+                        ),
+                        Expanded(child: child)
+                      ],
+                    )
+                  : child,
+              bottomNavigationBar: isTablet(context)
+                  ? null
+                  : AnimatedContainer(
                       duration: const Duration(milliseconds: 0),
                       width: mediaWidth(context, 1),
                       height: isLongPressed
                           ? 0
-                          : route.location != '/MangaLibrary' &&
-                                  route.location != '/AnimeLibrary' &&
-                                  route.location != '/updates' &&
-                                  route.location != '/browse' &&
-                                  route.location != '/more'
-                              ? 0
-                              : 80,
+                          : location == null
+                              ? 80
+                              : location != '/MangaLibrary' &&
+                                      location != '/AnimeLibrary' &&
+                                      location != '/updates' &&
+                                      location != '/browse' &&
+                                      location != '/more'
+                                  ? 0
+                                  : 80,
                       child: NavigationBarTheme(
                         data: NavigationBarThemeData(
                           indicatorShape: RoundedRectangleBorder(
@@ -246,11 +240,6 @@ class _MainScreenState extends State<MainScreen> {
                                 label: l10n.more),
                           ],
                           onDestinationSelected: (newIndex) {
-                            if (mounted) {
-                              setState(() {
-                                currentIndex = newIndex;
-                              });
-                            }
                             if (newIndex == 0) {
                               route.go('/MangaLibrary');
                             } else if (newIndex == 1) {
@@ -265,11 +254,11 @@ class _MainScreenState extends State<MainScreen> {
                           },
                         ),
                       ),
-                    );
-                  }),
+                    ),
+            ),
           ),
-        ),
-      ],
-    );
+        ],
+      );
+    });
   }
 }
diff --git a/lib/modules/manga/detail/manga_detail_view.dart b/lib/modules/manga/detail/manga_detail_view.dart
index 87314261..136953b8 100644
--- a/lib/modules/manga/detail/manga_detail_view.dart
+++ b/lib/modules/manga/detail/manga_detail_view.dart
@@ -794,8 +794,10 @@ class _MangaDetailViewState extends ConsumerState<MangaDetailView>
         final l10n = l10nLocalizations(context)!;
         return DraggableMenu(
           ui: ClassicDraggableMenu(barItem: Container(), radius: 20),
-          expandable: false,
-          maxHeight: scanlators.$1.isEmpty ? 240 : 260,
+          levels: [
+            DraggableMenuLevel.ratio(
+                ratio: scanlators.$1.isEmpty ? 1 / 3.6 : 1 / 3.3),
+          ],
           fastDrag: false,
           minimizeBeforeFastDrag: false,
           child: DefaultTabController(
@@ -1630,8 +1632,9 @@ class _MangaDetailViewState extends ConsumerState<MangaDetailView>
         context,
         DraggableMenu(
           ui: SoftModernDraggableMenu(radius: 20, barItem: Container()),
-          maxHeight: mediaHeight(context, 0.9),
-          minHeight: 80,
+          levels: [
+            DraggableMenuLevel.ratio(ratio: 0.9),
+          ],
           child: Material(
             color: isLight(context)
                 ? Theme.of(context).scaffoldBackgroundColor.withOpacity(0.9)
diff --git a/lib/modules/manga/detail/providers/isar_providers.g.dart b/lib/modules/manga/detail/providers/isar_providers.g.dart
index 04684b28..e8a33b09 100644
--- a/lib/modules/manga/detail/providers/isar_providers.g.dart
+++ b/lib/modules/manga/detail/providers/isar_providers.g.dart
@@ -193,5 +193,4 @@ class GetChaptersStreamProvider
     return _SystemHash.finish(hash);
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/manga/detail/providers/state_providers.g.dart b/lib/modules/manga/detail/providers/state_providers.g.dart
index 6c0841ed..16c2020c 100644
--- a/lib/modules/manga/detail/providers/state_providers.g.dart
+++ b/lib/modules/manga/detail/providers/state_providers.g.dart
@@ -979,5 +979,4 @@ class ScanlatorsFilterStateProvider extends AutoDisposeNotifierProviderImpl<
     );
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/manga/detail/providers/track_state_providers.g.dart b/lib/modules/manga/detail/providers/track_state_providers.g.dart
index 6c333d4a..d41412cc 100644
--- a/lib/modules/manga/detail/providers/track_state_providers.g.dart
+++ b/lib/modules/manga/detail/providers/track_state_providers.g.dart
@@ -135,5 +135,4 @@ class TrackStateProvider
     );
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/manga/detail/providers/update_manga_detail_providers.g.dart b/lib/modules/manga/detail/providers/update_manga_detail_providers.g.dart
index a450ed6a..9fcc0710 100644
--- a/lib/modules/manga/detail/providers/update_manga_detail_providers.g.dart
+++ b/lib/modules/manga/detail/providers/update_manga_detail_providers.g.dart
@@ -118,5 +118,4 @@ class UpdateMangaDetailProvider extends AutoDisposeFutureProvider<dynamic> {
     return _SystemHash.finish(hash);
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/manga/detail/widgets/tracker_search_widget.dart b/lib/modules/manga/detail/widgets/tracker_search_widget.dart
index 55f73dc0..330ccb24 100644
--- a/lib/modules/manga/detail/widgets/tracker_search_widget.dart
+++ b/lib/modules/manga/detail/widgets/tracker_search_widget.dart
@@ -243,7 +243,10 @@ trackersSearchraggableMenu(BuildContext context,
                   ],
                 ),
               )),
-          maxHeight: mediaHeight(context, 0.9),
+          levels: [
+            DraggableMenuLevel.ratio(ratio: 0.9),
+          ],
+          minimizeBeforeFastDrag: true,
           child: TrackerWidgetSearch(
             track: track,
             isManga: isManga,
diff --git a/lib/modules/manga/download/providers/convert_to_cbz.g.dart b/lib/modules/manga/download/providers/convert_to_cbz.g.dart
index 378df4f7..95749022 100644
--- a/lib/modules/manga/download/providers/convert_to_cbz.g.dart
+++ b/lib/modules/manga/download/providers/convert_to_cbz.g.dart
@@ -134,5 +134,4 @@ class ConvertToCBZProvider extends AutoDisposeFutureProvider<List<String>> {
     return _SystemHash.finish(hash);
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/manga/download/providers/download_provider.g.dart b/lib/modules/manga/download/providers/download_provider.g.dart
index f8d3ed57..213fda8c 100644
--- a/lib/modules/manga/download/providers/download_provider.g.dart
+++ b/lib/modules/manga/download/providers/download_provider.g.dart
@@ -6,7 +6,7 @@ part of 'download_provider.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$downloadChapterHash() => r'2af3ee0a570e8521336179f60dc1f9f2be919b9b';
+String _$downloadChapterHash() => r'20dc52124bda6a0d1bfeb675e9320917889fc108';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -118,5 +118,4 @@ class DownloadChapterProvider extends AutoDisposeFutureProvider<List<String>> {
     return _SystemHash.finish(hash);
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/manga/reader/providers/auto_crop_image_provider.g.dart b/lib/modules/manga/reader/providers/auto_crop_image_provider.g.dart
index e915cfe1..3a8d2501 100644
--- a/lib/modules/manga/reader/providers/auto_crop_image_provider.g.dart
+++ b/lib/modules/manga/reader/providers/auto_crop_image_provider.g.dart
@@ -135,5 +135,4 @@ class AutoCropBorderProvider
     return _SystemHash.finish(hash);
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/manga/reader/providers/reader_controller_provider.g.dart b/lib/modules/manga/reader/providers/reader_controller_provider.g.dart
index 639754a7..470da814 100644
--- a/lib/modules/manga/reader/providers/reader_controller_provider.g.dart
+++ b/lib/modules/manga/reader/providers/reader_controller_provider.g.dart
@@ -122,5 +122,4 @@ class CurrentIndexProvider
     );
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/manga/reader/reader_view.dart b/lib/modules/manga/reader/reader_view.dart
index bfe7dcb7..de7cc073 100644
--- a/lib/modules/manga/reader/reader_view.dart
+++ b/lib/modules/manga/reader/reader_view.dart
@@ -11,6 +11,7 @@ import 'package:mangayomi/main.dart';
 import 'package:mangayomi/models/chapter.dart';
 import 'package:mangayomi/models/settings.dart';
 import 'package:mangayomi/modules/more/settings/reader/providers/reader_state_provider.dart';
+import 'package:mangayomi/providers/l10n_providers.dart';
 import 'package:mangayomi/sources/utils/utils.dart';
 import 'package:mangayomi/modules/manga/reader/providers/push_router.dart';
 import 'package:mangayomi/services/get_chapter_url.dart';
@@ -1448,12 +1449,14 @@ class _MangaChapterPageGalleryState
         context,
         DraggableMenu(
             ui: ClassicDraggableMenu(barItem: Container()),
-            expandable: false,
-            maxHeight: mediaHeight(context, 0.4),
+            levels: [
+              DraggableMenuLevel.ratio(ratio: 0.4),
+            ],
             fastDrag: false,
             minimizeBeforeFastDrag: false,
             child: StatefulBuilder(
               builder: (context, setState) {
+                final l10n = l10nLocalizations(context)!;
                 return Scaffold(
                   body: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
@@ -1461,11 +1464,11 @@ class _MangaChapterPageGalleryState
                       const SizedBox(
                         height: 10,
                       ),
-                      const Padding(
-                        padding: EdgeInsets.all(8.0),
+                      Padding(
+                        padding: const EdgeInsets.all(8.0),
                         child: Text(
-                          'Settings',
-                          style: TextStyle(
+                          l10n.settings,
+                          style: const TextStyle(
                               fontSize: 17, fontWeight: FontWeight.bold),
                         ),
                       ),
@@ -1476,7 +1479,7 @@ class _MangaChapterPageGalleryState
                           children: [
                             SwitchListTile(
                               dense: true,
-                              title: const Text('Show Page Number'),
+                              title: Text(l10n.show_page_number),
                               value: _showPagesNumber,
                               onChanged: (value) {
                                 setState(() {
diff --git a/lib/modules/more/categories/providers/isar_providers.g.dart b/lib/modules/more/categories/providers/isar_providers.g.dart
index 8d4e1810..2676c8e7 100644
--- a/lib/modules/more/categories/providers/isar_providers.g.dart
+++ b/lib/modules/more/categories/providers/isar_providers.g.dart
@@ -112,5 +112,4 @@ class GetMangaCategorieStreamProvider
     return _SystemHash.finish(hash);
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/more/providers/incognito_mode_state_provider.g.dart b/lib/modules/more/providers/incognito_mode_state_provider.g.dart
index c11bdc1d..f7ef5ef7 100644
--- a/lib/modules/more/providers/incognito_mode_state_provider.g.dart
+++ b/lib/modules/more/providers/incognito_mode_state_provider.g.dart
@@ -23,5 +23,4 @@ final incognitoModeStateProvider =
 );
 
 typedef _$IncognitoModeState = AutoDisposeNotifier<bool>;
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/more/settings/appearance/providers/blend_level_state_provider.g.dart b/lib/modules/more/settings/appearance/providers/blend_level_state_provider.g.dart
index 5555987f..ac418054 100644
--- a/lib/modules/more/settings/appearance/providers/blend_level_state_provider.g.dart
+++ b/lib/modules/more/settings/appearance/providers/blend_level_state_provider.g.dart
@@ -22,5 +22,4 @@ final blendLevelStateProvider =
 );
 
 typedef _$BlendLevelState = AutoDisposeNotifier<double>;
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/more/settings/appearance/providers/date_format_state_provider.g.dart b/lib/modules/more/settings/appearance/providers/date_format_state_provider.g.dart
index bbcfa1ec..4aa2d66e 100644
--- a/lib/modules/more/settings/appearance/providers/date_format_state_provider.g.dart
+++ b/lib/modules/more/settings/appearance/providers/date_format_state_provider.g.dart
@@ -39,5 +39,4 @@ final relativeTimesTampsStateProvider =
 );
 
 typedef _$RelativeTimesTampsState = AutoDisposeNotifier<int>;
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/more/settings/appearance/providers/flex_scheme_color_state_provider.g.dart b/lib/modules/more/settings/appearance/providers/flex_scheme_color_state_provider.g.dart
index 7a7da4de..4dec183f 100644
--- a/lib/modules/more/settings/appearance/providers/flex_scheme_color_state_provider.g.dart
+++ b/lib/modules/more/settings/appearance/providers/flex_scheme_color_state_provider.g.dart
@@ -23,5 +23,4 @@ final flexSchemeColorStateProvider =
 );
 
 typedef _$FlexSchemeColorState = AutoDisposeNotifier<FlexSchemeColor>;
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/more/settings/appearance/providers/pure_black_dark_mode_state_provider.g.dart b/lib/modules/more/settings/appearance/providers/pure_black_dark_mode_state_provider.g.dart
index 01e66adb..59401fb0 100644
--- a/lib/modules/more/settings/appearance/providers/pure_black_dark_mode_state_provider.g.dart
+++ b/lib/modules/more/settings/appearance/providers/pure_black_dark_mode_state_provider.g.dart
@@ -23,5 +23,4 @@ final pureBlackDarkModeStateProvider =
 );
 
 typedef _$PureBlackDarkModeState = AutoDisposeNotifier<bool>;
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/more/settings/appearance/providers/theme_mode_state_provider.g.dart b/lib/modules/more/settings/appearance/providers/theme_mode_state_provider.g.dart
index ff9279f2..db49e4be 100644
--- a/lib/modules/more/settings/appearance/providers/theme_mode_state_provider.g.dart
+++ b/lib/modules/more/settings/appearance/providers/theme_mode_state_provider.g.dart
@@ -22,5 +22,4 @@ final themeModeStateProvider =
 );
 
 typedef _$ThemeModeState = AutoDisposeNotifier<bool>;
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/more/settings/browse/providers/browse_state_provider.g.dart b/lib/modules/more/settings/browse/providers/browse_state_provider.g.dart
index d0eaa3a9..4281073b 100644
--- a/lib/modules/more/settings/browse/providers/browse_state_provider.g.dart
+++ b/lib/modules/more/settings/browse/providers/browse_state_provider.g.dart
@@ -39,5 +39,4 @@ final showNSFWStateProvider =
 );
 
 typedef _$ShowNSFWState = AutoDisposeNotifier<bool>;
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/more/settings/downloads/providers/downloads_state_provider.g.dart b/lib/modules/more/settings/downloads/providers/downloads_state_provider.g.dart
index 0d663d61..09ae6aad 100644
--- a/lib/modules/more/settings/downloads/providers/downloads_state_provider.g.dart
+++ b/lib/modules/more/settings/downloads/providers/downloads_state_provider.g.dart
@@ -56,5 +56,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
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/more/settings/reader/providers/reader_state_provider.g.dart b/lib/modules/more/settings/reader/providers/reader_state_provider.g.dart
index a544d69e..82ab9c1f 100644
--- a/lib/modules/more/settings/reader/providers/reader_state_provider.g.dart
+++ b/lib/modules/more/settings/reader/providers/reader_state_provider.g.dart
@@ -73,5 +73,4 @@ final cropBordersStateProvider =
 );
 
 typedef _$CropBordersState = AutoDisposeNotifier<bool>;
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/modules/more/settings/track/providers/track_providers.g.dart b/lib/modules/more/settings/track/providers/track_providers.g.dart
index bc2d5e3a..72c74f25 100644
--- a/lib/modules/more/settings/track/providers/track_providers.g.dart
+++ b/lib/modules/more/settings/track/providers/track_providers.g.dart
@@ -121,5 +121,4 @@ class TracksProvider
     );
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/providers/l10n_providers.g.dart b/lib/providers/l10n_providers.g.dart
index 393407fc..f70ba927 100644
--- a/lib/providers/l10n_providers.g.dart
+++ b/lib/providers/l10n_providers.g.dart
@@ -22,5 +22,4 @@ final l10nLocaleStateProvider =
 );
 
 typedef _$L10nLocaleState = AutoDisposeNotifier<Locale>;
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/router/router.dart b/lib/router/router.dart
index e9e8b9e1..0be356b3 100644
--- a/lib/router/router.dart
+++ b/lib/router/router.dart
@@ -44,6 +44,27 @@ GoRouter router(RouterRef ref) {
   );
 }
 
+@riverpod
+class RouterCurrentLocationState extends _$RouterCurrentLocationState {
+  @override
+  String? build(BuildContext context) {
+    _listener();
+    return null;
+  }
+
+  _listener() {
+    final router = GoRouter.of(context);
+    router.routerDelegate.addListener(() {
+      final RouteMatch lastMatch =
+          router.routerDelegate.currentConfiguration.last;
+      final RouteMatchList matchList = lastMatch is ImperativeRouteMatch
+          ? lastMatch.matches
+          : router.routerDelegate.currentConfiguration;
+      state = matchList.uri.toString();
+    });
+  }
+}
+
 class RouterNotifier extends ChangeNotifier {
   List<RouteBase> get _routes => [
         ShellRoute(
diff --git a/lib/router/router.g.dart b/lib/router/router.g.dart
index bb1116ad..b81a0deb 100644
--- a/lib/router/router.g.dart
+++ b/lib/router/router.g.dart
@@ -20,5 +20,124 @@ final routerProvider = AutoDisposeProvider<GoRouter>.internal(
 );
 
 typedef RouterRef = AutoDisposeProviderRef<GoRouter>;
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+String _$routerCurrentLocationStateHash() =>
+    r'6d08e611ff9bb4c7b91e02b7ffc456df010990aa';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+abstract class _$RouterCurrentLocationState
+    extends BuildlessAutoDisposeNotifier<String?> {
+  late final BuildContext context;
+
+  String? build(
+    BuildContext context,
+  );
+}
+
+/// See also [RouterCurrentLocationState].
+@ProviderFor(RouterCurrentLocationState)
+const routerCurrentLocationStateProvider = RouterCurrentLocationStateFamily();
+
+/// See also [RouterCurrentLocationState].
+class RouterCurrentLocationStateFamily extends Family<String?> {
+  /// See also [RouterCurrentLocationState].
+  const RouterCurrentLocationStateFamily();
+
+  /// See also [RouterCurrentLocationState].
+  RouterCurrentLocationStateProvider call(
+    BuildContext context,
+  ) {
+    return RouterCurrentLocationStateProvider(
+      context,
+    );
+  }
+
+  @override
+  RouterCurrentLocationStateProvider getProviderOverride(
+    covariant RouterCurrentLocationStateProvider provider,
+  ) {
+    return call(
+      provider.context,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'routerCurrentLocationStateProvider';
+}
+
+/// See also [RouterCurrentLocationState].
+class RouterCurrentLocationStateProvider
+    extends AutoDisposeNotifierProviderImpl<RouterCurrentLocationState,
+        String?> {
+  /// See also [RouterCurrentLocationState].
+  RouterCurrentLocationStateProvider(
+    this.context,
+  ) : super.internal(
+          () => RouterCurrentLocationState()..context = context,
+          from: routerCurrentLocationStateProvider,
+          name: r'routerCurrentLocationStateProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$routerCurrentLocationStateHash,
+          dependencies: RouterCurrentLocationStateFamily._dependencies,
+          allTransitiveDependencies:
+              RouterCurrentLocationStateFamily._allTransitiveDependencies,
+        );
+
+  final BuildContext context;
+
+  @override
+  bool operator ==(Object other) {
+    return other is RouterCurrentLocationStateProvider &&
+        other.context == context;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, context.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+
+  @override
+  String? runNotifierBuild(
+    covariant RouterCurrentLocationState notifier,
+  ) {
+    return notifier.build(
+      context,
+    );
+  }
+}
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/services/get_anime_servers.g.dart b/lib/services/get_anime_servers.g.dart
index 653706a5..b00c5ecf 100644
--- a/lib/services/get_anime_servers.g.dart
+++ b/lib/services/get_anime_servers.g.dart
@@ -109,5 +109,4 @@ class GetAnimeServersProvider extends AutoDisposeFutureProvider<List<Video>> {
     return _SystemHash.finish(hash);
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/services/get_chapter_url.g.dart b/lib/services/get_chapter_url.g.dart
index 15e9bb4c..ea1642d4 100644
--- a/lib/services/get_chapter_url.g.dart
+++ b/lib/services/get_chapter_url.g.dart
@@ -110,5 +110,4 @@ class GetChapterUrlProvider
     return _SystemHash.finish(hash);
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/services/get_latest_updates_manga.g.dart b/lib/services/get_latest_updates_manga.g.dart
index 6db1226a..43df8664 100644
--- a/lib/services/get_latest_updates_manga.g.dart
+++ b/lib/services/get_latest_updates_manga.g.dart
@@ -122,5 +122,4 @@ class GetLatestUpdatesMangaProvider
     return _SystemHash.finish(hash);
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/services/get_manga_detail.g.dart b/lib/services/get_manga_detail.g.dart
index e87cdc4a..9fbf9792 100644
--- a/lib/services/get_manga_detail.g.dart
+++ b/lib/services/get_manga_detail.g.dart
@@ -118,5 +118,4 @@ class GetMangaDetailProvider extends AutoDisposeFutureProvider<MangaModel> {
     return _SystemHash.finish(hash);
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/services/get_popular_manga.g.dart b/lib/services/get_popular_manga.g.dart
index 4c366c1f..7a2232b6 100644
--- a/lib/services/get_popular_manga.g.dart
+++ b/lib/services/get_popular_manga.g.dart
@@ -119,5 +119,4 @@ class GetPopularMangaProvider
     return _SystemHash.finish(hash);
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/services/http_service/cloudflare/cookie.g.dart b/lib/services/http_service/cloudflare/cookie.g.dart
index d2a85684..051572c6 100644
--- a/lib/services/http_service/cloudflare/cookie.g.dart
+++ b/lib/services/http_service/cloudflare/cookie.g.dart
@@ -117,5 +117,4 @@ class SetCookieProvider extends AutoDisposeFutureProvider<dynamic> {
     return _SystemHash.finish(hash);
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/services/http_service/cloudflare/providers/cookie_providers.g.dart b/lib/services/http_service/cloudflare/providers/cookie_providers.g.dart
index 3808a061..d1eb213b 100644
--- a/lib/services/http_service/cloudflare/providers/cookie_providers.g.dart
+++ b/lib/services/http_service/cloudflare/providers/cookie_providers.g.dart
@@ -122,5 +122,4 @@ class CookieStateProvider
     );
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/services/search_manga.g.dart b/lib/services/search_manga.g.dart
index 0a2c29bc..45bc52ea 100644
--- a/lib/services/search_manga.g.dart
+++ b/lib/services/search_manga.g.dart
@@ -126,5 +126,4 @@ class SearchMangaProvider extends AutoDisposeFutureProvider<List<MangaModel?>> {
     return _SystemHash.finish(hash);
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/services/trackers/anilist.g.dart b/lib/services/trackers/anilist.g.dart
index d3058502..4404e9a9 100644
--- a/lib/services/trackers/anilist.g.dart
+++ b/lib/services/trackers/anilist.g.dart
@@ -134,5 +134,4 @@ class AnilistProvider
     );
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/services/trackers/myanimelist.g.dart b/lib/services/trackers/myanimelist.g.dart
index d1ed50c2..73503bf5 100644
--- a/lib/services/trackers/myanimelist.g.dart
+++ b/lib/services/trackers/myanimelist.g.dart
@@ -135,5 +135,4 @@ class MyAnimeListProvider
     );
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/lib/utils/headers.g.dart b/lib/utils/headers.g.dart
index 92e6af0e..6bfe56ea 100644
--- a/lib/utils/headers.g.dart
+++ b/lib/utils/headers.g.dart
@@ -117,5 +117,4 @@ class HeadersProvider extends AutoDisposeProvider<Map<String, String>> {
     return _SystemHash.finish(hash);
   }
 }
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
diff --git a/pubspec.lock b/pubspec.lock
index 133d147e..ff14878f 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -69,10 +69,10 @@ packages:
     dependency: "direct main"
     description:
       name: background_downloader
-      sha256: "73fefa4cb4ec0a137662ab87a80587aa67b7629d922cc9ed1812cdabd4c638c2"
+      sha256: "55e2cb28b226e2c1e9a9fddd850a1531f29ffdb6e98130687d91163a4adf5391"
       url: "https://pub.dev"
     source: hosted
-    version: "7.7.1"
+    version: "7.8.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -329,14 +329,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.2.0"
-  dio:
-    dependency: "direct main"
-    description:
-      name: dio
-      sha256: "3866d67f93523161b643187af65f5ac08bc991a5bcdaf41a2d587fe4ccb49993"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.3.0"
   directed_graph:
     dependency: transitive
     description:
@@ -349,10 +341,10 @@ packages:
     dependency: "direct main"
     description:
       name: draggable_menu
-      sha256: bcca3fbdebb98e852ab91d11ea49242fe868758c97d5553333802fd74a5a8c9c
+      sha256: "51e3ba3b0abdfad2f54f17b3e383dde7b2154e5034fe8917dd332d3f06d6cbb8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "4.1.3"
   draggable_scrollbar:
     dependency: "direct main"
     description:
@@ -405,10 +397,10 @@ packages:
     dependency: transitive
     description:
       name: extended_image_library
-      sha256: b1de389378589e4dffb3564d782373238f19064037458092c49b3043b2791b2b
+      sha256: bb8d08c504ebc73d476ec1c99451a61f12e95538869e734fc4f55a3a2d5c98ec
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.1"
+    version: "3.5.3"
   fake_async:
     dependency: transitive
     description:
@@ -437,10 +429,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: "9d6e95ec73abbd31ec54d0e0df8a961017e165aba1395e462e5b31ea0c165daf"
+      sha256: "21145c9c268d54b1f771d8380c195d2d6f655e0567dc1ca2f9c134c02c819e0a"
       url: "https://pub.dev"
     source: hosted
-    version: "5.3.1"
+    version: "5.3.3"
   fixnum:
     dependency: transitive
     description:
@@ -453,18 +445,18 @@ packages:
     dependency: "direct main"
     description:
       name: flex_color_scheme
-      sha256: "5be124fa61821a684c0628ca5f687a8512db06738f784516278688eb727a3ef1"
+      sha256: "659cf59bd5ccaa1e7de9384342be8b666ff10b108ed57a7fd46c122fb8bf6aca"
       url: "https://pub.dev"
     source: hosted
-    version: "7.1.2"
+    version: "7.2.0"
   flex_seed_scheme:
     dependency: transitive
     description:
       name: flex_seed_scheme
-      sha256: e4168a6fc88a3e5bc3d6b7a748c6a6083eedc193d343ddc26bbad7fb1b258555
+      sha256: "29c12aba221eb8a368a119685371381f8035011d18de5ba277ad11d7dfb8657f"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -482,10 +474,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_cache_manager
-      sha256: "32cd900555219333326a2d0653aaaf8671264c29befa65bbd9856d204a4c9fb3"
+      sha256: "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.0"
+    version: "3.3.1"
   flutter_inappwebview:
     dependency: "direct main"
     description:
@@ -506,10 +498,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_js
-      sha256: "76f7b459d2d7c8c186528a0219e6b436821a63a1accfb0f4bc4b555761893e56"
+      sha256: "5bf5db354fe78fe24cb90a5fa6b4423d38712440c88e3445c3dc88bc134c452f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.0"
+    version: "0.8.0"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -593,10 +585,10 @@ packages:
     dependency: "direct main"
     description:
       name: font_awesome_flutter
-      sha256: "959ef4add147753f990b4a7c6cccb746d5792dbdc81b1cde99e62e7edb31b206"
+      sha256: "5fb789145cae1f4c3245c58b3f8fb287d055c26323879eab57a7bf0cfd1e45f3"
       url: "https://pub.dev"
     source: hosted
-    version: "10.4.0"
+    version: "10.5.0"
   freezed_annotation:
     dependency: transitive
     description:
@@ -633,18 +625,18 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: "6af43e0948b9f64a812afbb9ac3f76e2c8f5abe4efaba4188702a56af46b98c2"
+      sha256: b3cadd2cd59a4103fd5f6bc572ca75111264698784e927aa471921c3477d5475
       url: "https://pub.dev"
     source: hosted
-    version: "6.5.2"
+    version: "10.0.0"
   google_fonts:
     dependency: "direct main"
     description:
       name: google_fonts
-      sha256: "927573f2e8a8d65c17931e21918ad0ab0666b1b636537de7c4932bdb487b190f"
+      sha256: e20ff62b158b96f392bfc8afe29dee1503c94fbea2cbe8186fd59b756b8ae982
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.3"
+    version: "5.1.0"
   graphs:
     dependency: transitive
     description:
@@ -665,26 +657,26 @@ packages:
     dependency: "direct main"
     description:
       name: html
-      sha256: "79d498e6d6761925a34ee5ea8fa6dfef38607781d2fa91e37523474282af55cb"
+      sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.15.2"
+    version: "0.15.4"
   http:
     dependency: "direct main"
     description:
       name: http
-      sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482"
+      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.5"
+    version: "1.1.0"
   http_client_helper:
     dependency: transitive
     description:
       name: http_client_helper
-      sha256: "1f32359bd07a064ad256d1f84ae5f973f69bc972e7287223fa198abe1d969c28"
+      sha256: "8a9127650734da86b5c73760de2b404494c968a3fd55602045ffec789dac3cb1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.3"
+    version: "3.0.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -785,10 +777,10 @@ packages:
     dependency: "direct main"
     description:
       name: json_path
-      sha256: "28e1e2e7204c0645d73285a1b1765273e3fc5826122a47b0fd61221ceb385e02"
+      sha256: "0a38c33d6ab3a71795c4ce1867c6278bf1e87dabbc1f707307a00efc55750d9c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "0.6.2"
   lazy_memo:
     dependency: transitive
     description:
@@ -1017,58 +1009,50 @@ packages:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: d3f80b32e83ec208ac95253e0cd4d298e104fbc63cb29c5c69edaed43b0c69d6
+      sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.6"
-  pedantic:
-    dependency: transitive
-    description:
-      name: pedantic
-      sha256: "67fc27ed9639506c856c840ccce7594d0bdcd91bc8d53d6e52359449a1d50602"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.11.1"
+    version: "2.1.7"
   permission_handler:
     dependency: "direct main"
     description:
       name: permission_handler
-      sha256: "33c6a1253d1f95fd06fa74b65b7ba907ae9811f9d5c1d3150e51417d04b8d6a8"
+      sha256: "63e5216aae014a72fe9579ccd027323395ce7a98271d9defa9d57320d001af81"
       url: "https://pub.dev"
     source: hosted
-    version: "10.2.0"
+    version: "10.4.3"
   permission_handler_android:
     dependency: transitive
     description:
       name: permission_handler_android
-      sha256: "8028362b40c4a45298f1cbfccd227c8dd6caf0e27088a69f2ba2ab15464159e2"
+      sha256: "2ffaf52a21f64ac9b35fe7369bb9533edbd4f698e5604db8645b1064ff4cf221"
       url: "https://pub.dev"
     source: hosted
-    version: "10.2.0"
+    version: "10.3.3"
   permission_handler_apple:
     dependency: transitive
     description:
       name: permission_handler_apple
-      sha256: ee96ac32f5a8e6f80756e25b25b9f8e535816c8e6665a96b6d70681f8c4f7e85
+      sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5"
       url: "https://pub.dev"
     source: hosted
-    version: "9.0.8"
+    version: "9.1.4"
   permission_handler_platform_interface:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
-      sha256: "68abbc472002b5e6dfce47fe9898c6b7d8328d58b5d2524f75e277c07a97eb84"
+      sha256: "7c6b1500385dd1d2ca61bb89e2488ca178e274a69144d26bbd65e33eae7c02a9"
       url: "https://pub.dev"
     source: hosted
-    version: "3.9.0"
+    version: "3.11.3"
   permission_handler_windows:
     dependency: transitive
     description:
       name: permission_handler_windows
-      sha256: f67cab14b4328574938ecea2db3475dad7af7ead6afab6338772c5f88963e38b
+      sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.2"
+    version: "0.1.3"
   petitparser:
     dependency: transitive
     description:
@@ -1281,18 +1265,18 @@ packages:
     dependency: "direct main"
     description:
       name: scrollview_observer
-      sha256: "459ab67e3b1680e660d3bff24b64c9de4fc6f22a49bd3ecbbafece8e83f0b973"
+      sha256: "6bdd5c0a38690f0f0fcb9a839db9f404a5f10c9c002f6592ca33056c4a7c886c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.14.0"
+    version: "1.15.0"
   share_plus:
     dependency: "direct main"
     description:
       name: share_plus
-      sha256: "322a1ec9d9fe07e2e2252c098ce93d12dbd06133cc4c00ffe6a4ef505c295c17"
+      sha256: ed3fcea4f789ed95913328e629c0c53e69e80e08b6c24542f1b3576046c614e8
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "7.0.2"
   share_plus_platform_interface:
     dependency: transitive
     description:
@@ -1526,10 +1510,10 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "75f2846facd11168d007529d6cd8fcb2b750186bea046af9711f10b907e1587e"
+      sha256: "781bd58a1eb16069412365c98597726cd8810ae27435f04b3b4d3a470bacd61e"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.10"
+    version: "6.1.12"
   url_launcher_android:
     dependency: transitive
     description:
@@ -1694,10 +1678,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "5a751eddf9db89b3e5f9d50c20ab8612296e4e8db69009788d6c8b060a84191c"
+      sha256: "7dacfda1edcca378031db9905ad7d7bd56b29fd1a90b0908b71a52a12c41e36b"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.4"
+    version: "5.0.3"
   window_manager:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 77688f33..8d82a333 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -12,40 +12,40 @@ dependencies:
     sdk: flutter
   flutter_localizations:
     sdk: flutter
-  go_router: ^6.5.2
+  go_router: ^10.0.0
   flutter_riverpod: ^2.3.6
   cached_network_image: ^3.2.3
-  http: ^0.13.5
+  http: ^1.1.0
   riverpod_annotation: ^2.1.1
-  html: ^0.15.2
-  flutter_js: ^0.7.0
-  font_awesome_flutter: ^10.1.0
+  html: ^0.15.4
+  flutter_js: ^0.8.0
+  font_awesome_flutter: ^10.5.0
   expandable_text: ^2.3.0
-  flex_color_scheme: ^7.1.2
+  flex_color_scheme: ^7.2.0
   extended_image: ^ 8.0.2
   photo_view: ^0.14.0
   draggable_scrollbar: ^0.1.0
   grouped_list: ^5.1.2
   intl: ^0.18.0
-  google_fonts: ^4.0.3
-  url_launcher: ^6.1.10
+  google_fonts: ^5.1.0
+  url_launcher: ^6.1.12
   package_info_plus: ^4.0.2
-  background_downloader: ^7.4.0
-  permission_handler: ^10.2.0
+  background_downloader: ^7.8.0
+  permission_handler: ^10.4.3
   flutter_inappwebview: ^6.0.0-beta.24+1
-  draggable_menu: ^2.0.2
+  draggable_menu: ^4.1.3
   isar: 3.1.0+1
   isar_flutter_libs: 3.1.0+1
-  share_plus: ^7.0.0
+  share_plus: ^7.0.2
   xpath_selector_html_parser: ^3.0.1
   desktop_webview_window: ^0.2.0
   archive: ^3.3.7
-  file_picker: ^5.3.0
+  file_picker: ^5.3.3
   path_provider: ^2.0.15
   # image: ^3.3.0
-  scrollview_observer: ^1.14.0
+  scrollview_observer: ^1.15.0
   dart_eval: ^0.6.0
-  json_path: ^0.6.0
+  json_path: ^0.6.2
   bot_toast: ^4.0.4
   flutter_web_auth_2: ^2.1.5
   numberpicker: ^2.1.2
@@ -53,7 +53,7 @@ dependencies:
   flutter_meedu_videoplayer: ^4.2.20
   media_kit_libs_android_video: ^1.0.6
   media_kit_libs_ios_video: ^1.0.4
-  dio: ^5.3.0
+  # dio: ^5.3.0
 
 
   cupertino_icons: ^1.0.2