remove unused code & import

2023-05-15 09:43:51 +01:00 · 2023-05-15 09:43:51 +01:00 · 807bce8e91
commit 807bce8e91
parent b5fdccc7d9
38 changed files with 153 additions and 158 deletions
--- a/lib/models/history.dart
+++ b/lib/models/history.dart
@ -1,4 +1,3 @@
-import 'package:hive/hive.dart';
 import 'package:isar/isar.dart';
 import 'package:mangayomi/models/chapter.dart';
 part 'history.g.dart';
--- a/lib/models/source_model.dart
+++ b/lib/models/source_model.dart
@ -1,5 +1,4 @@
 import 'package:hive/hive.dart';
-import 'package:intl/intl.dart';
 part 'source_model.g.dart';

@HiveType(typeId: 3)
--- a/lib/router/router.dart
+++ b/lib/router/router.dart
@ -2,9 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:mangayomi/models/chapter.dart';
-import 'package:mangayomi/views/manga/reader/providers/push_router.dart';
 import 'package:mangayomi/models/manga_type.dart';
-import 'package:mangayomi/models/manga.dart';
 import 'package:mangayomi/services/webview.dart';
 import 'package:mangayomi/views/browse/browse_screen.dart';
 import 'package:mangayomi/views/browse/extension/extension_lang.dart';
--- a/lib/services/get_manga_chapter_url.dart
+++ b/lib/services/get_manga_chapter_url.dart
@ -16,19 +16,19 @@ import 'package:mangayomi/sources/utils/utils.dart';
 import 'package:mangayomi/utils/reg_exp_matcher.dart';
 import 'package:mangayomi/views/more/settings/providers/incognito_mode_state_provider.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-part 'get_manga_chapter_url.g.dart';
+part 'get_chapter_url.g.dart';

-class GetMangaChapterUrlModel {
+class GetChapterUrlModel {
  Directory? path;
  List pageUrls = [];
  List<bool> isLocaleList = [];
-  GetMangaChapterUrlModel(
+  GetChapterUrlModel(
      {required this.path, required this.pageUrls, required this.isLocaleList});
 }

@riverpod
-Future<GetMangaChapterUrlModel> getMangaChapterUrl(
-  GetMangaChapterUrlRef ref, {
+Future<GetChapterUrlModel> getChapterUrl(
+  GetChapterUrlRef ref, {
  required Chapter chapter,
 }) async {
  Directory? path;
@ -51,7 +51,7 @@ Future<GetMangaChapterUrlModel> getMangaChapterUrl(
  /********/

  else if (getMangaTypeSource(source) == TypeSource.comick) {
-    pageUrls = await Comick().getMangaChapterUrl(chapter: chapter);
+    pageUrls = await Comick().getChapterUrl(chapter: chapter);
  }

  /*************/
@ -59,7 +59,7 @@ Future<GetMangaChapterUrlModel> getMangaChapterUrl(
  /**************/

  else if (getMangaTypeSource(source) == TypeSource.mangathemesia) {
-    pageUrls = await MangaThemeSia().getMangaChapterUrl(chapter: chapter);
+    pageUrls = await MangaThemeSia().getChapterUrl(chapter: chapter);
  }

  /***********/
@ -67,7 +67,7 @@ Future<GetMangaChapterUrlModel> getMangaChapterUrl(
  /***********/

  else if (source == 'mangakawaii') {
-    pageUrls = await MangaKawaii().getMangaChapterUrl(chapter: chapter);
+    pageUrls = await MangaKawaii().getChapterUrl(chapter: chapter);
  }

  /***********/
@ -75,7 +75,7 @@ Future<GetMangaChapterUrlModel> getMangaChapterUrl(
  /***********/

  else if (getMangaTypeSource(source) == TypeSource.mmrcms) {
-    pageUrls = await Mmrcms().getMangaChapterUrl(chapter: chapter);
+    pageUrls = await Mmrcms().getChapterUrl(chapter: chapter);
  }

  /***********/
@ -83,7 +83,7 @@ Future<GetMangaChapterUrlModel> getMangaChapterUrl(
  /***********/

  else if (source == 'mangahere') {
-    pageUrls = await Mangahere().getMangaChapterUrl(chapter: chapter);
+    pageUrls = await Mangahere().getChapterUrl(chapter: chapter);
  }

  /***********/
@ -91,7 +91,7 @@ Future<GetMangaChapterUrlModel> getMangaChapterUrl(
  /***********/

  else if (source == 'japscan') {
-    pageUrls = await Japscan().getMangaChapterUrl(chapter: chapter);
+    pageUrls = await Japscan().getChapterUrl(chapter: chapter);
  }

  /***********/
@ -99,7 +99,7 @@ Future<GetMangaChapterUrlModel> getMangaChapterUrl(
  /***********/

  else if (getMangaTypeSource(source) == TypeSource.heancms) {
-    pageUrls = await HeanCms().getMangaChapterUrl(chapter: chapter);
+    pageUrls = await HeanCms().getChapterUrl(chapter: chapter);
  }

  if (pageUrls.isNotEmpty) {
@ -117,6 +117,6 @@ Future<GetMangaChapterUrlModel> getMangaChapterUrl(
    }
  }

-  return GetMangaChapterUrlModel(
+  return GetChapterUrlModel(
      path: path, pageUrls: pageUrls, isLocaleList: isLocaleList);
 }
--- a/lib/services/get_manga_chapter_url.g.dart
+++ b/lib/services/get_manga_chapter_url.g.dart
@ -1,13 +1,12 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND

-part of 'get_manga_chapter_url.dart';
+part of 'get_chapter_url.dart';

 // **************************************************************************
 // RiverpodGenerator
 // **************************************************************************

-String _$getMangaChapterUrlHash() =>
-    r'066c4d826fd17ba3d3682d806778fe1010378c05';
+String _$getChapterUrlHash() => r'a13c39db0b03f5c1575c94f76b24676ebaa4e3c6';

 /// Copied from Dart SDK
 class _SystemHash {
@ -30,31 +29,29 @@ class _SystemHash {
  }
 }

-typedef GetMangaChapterUrlRef
-    = AutoDisposeFutureProviderRef<GetMangaChapterUrlModel>;
+typedef GetChapterUrlRef = AutoDisposeFutureProviderRef<GetChapterUrlModel>;

-/// See also [getMangaChapterUrl].
-@ProviderFor(getMangaChapterUrl)
-const getMangaChapterUrlProvider = GetMangaChapterUrlFamily();
+/// See also [getChapterUrl].
+@ProviderFor(getChapterUrl)
+const getChapterUrlProvider = GetChapterUrlFamily();

-/// See also [getMangaChapterUrl].
-class GetMangaChapterUrlFamily
-    extends Family<AsyncValue<GetMangaChapterUrlModel>> {
-  /// See also [getMangaChapterUrl].
-  const GetMangaChapterUrlFamily();
+/// See also [getChapterUrl].
+class GetChapterUrlFamily extends Family<AsyncValue<GetChapterUrlModel>> {
+  /// See also [getChapterUrl].
+  const GetChapterUrlFamily();

-  /// See also [getMangaChapterUrl].
-  GetMangaChapterUrlProvider call({
+  /// See also [getChapterUrl].
+  GetChapterUrlProvider call({
    required Chapter chapter,
  }) {
-    return GetMangaChapterUrlProvider(
+    return GetChapterUrlProvider(
      chapter: chapter,
    );
  }

  @override
-  GetMangaChapterUrlProvider getProviderOverride(
-    covariant GetMangaChapterUrlProvider provider,
+  GetChapterUrlProvider getProviderOverride(
+    covariant GetChapterUrlProvider provider,
  ) {
    return call(
      chapter: provider.chapter,
@ -73,36 +70,36 @@ class GetMangaChapterUrlFamily
      _allTransitiveDependencies;

  @override
-  String? get name => r'getMangaChapterUrlProvider';
+  String? get name => r'getChapterUrlProvider';
 }

-/// See also [getMangaChapterUrl].
-class GetMangaChapterUrlProvider
-    extends AutoDisposeFutureProvider<GetMangaChapterUrlModel> {
-  /// See also [getMangaChapterUrl].
-  GetMangaChapterUrlProvider({
+/// See also [getChapterUrl].
+class GetChapterUrlProvider
+    extends AutoDisposeFutureProvider<GetChapterUrlModel> {
+  /// See also [getChapterUrl].
+  GetChapterUrlProvider({
    required this.chapter,
  }) : super.internal(
-          (ref) => getMangaChapterUrl(
+          (ref) => getChapterUrl(
            ref,
            chapter: chapter,
          ),
-          from: getMangaChapterUrlProvider,
-          name: r'getMangaChapterUrlProvider',
+          from: getChapterUrlProvider,
+          name: r'getChapterUrlProvider',
          debugGetCreateSourceHash:
              const bool.fromEnvironment('dart.vm.product')
                  ? null
-                  : _$getMangaChapterUrlHash,
-          dependencies: GetMangaChapterUrlFamily._dependencies,
+                  : _$getChapterUrlHash,
+          dependencies: GetChapterUrlFamily._dependencies,
          allTransitiveDependencies:
-              GetMangaChapterUrlFamily._allTransitiveDependencies,
+              GetChapterUrlFamily._allTransitiveDependencies,
        );

  final Chapter chapter;

  @override
  bool operator ==(Object other) {
-    return other is GetMangaChapterUrlProvider && other.chapter == chapter;
+    return other is GetChapterUrlProvider && other.chapter == chapter;
  }

  @override
--- a/lib/services/get_manga_detail.g.dart
+++ b/lib/services/get_manga_detail.g.dart
@ -6,7 +6,7 @@ part of 'get_manga_detail.dart';
 // RiverpodGenerator
 // **************************************************************************

-String _$getMangaDetailHash() => r'ee4c8c5203a9cc0d6de3697f96e5e46e80218fc2';
+String _$getMangaDetailHash() => r'a4e94e2023998f08d6c617ba26e56069cd89882a';

 /// Copied from Dart SDK
 class _SystemHash {
--- a/lib/services/get_popular_manga.g.dart
+++ b/lib/services/get_popular_manga.g.dart
@ -6,7 +6,7 @@ part of 'get_popular_manga.dart';
 // RiverpodGenerator
 // **************************************************************************

-String _$getPopularMangaHash() => r'0571fdcea7fc7aebb97c5748f6781e4075705382';
+String _$getPopularMangaHash() => r'09e78df804d440b2ab9777aab28bdc75f64f7fac';

 /// Copied from Dart SDK
 class _SystemHash {
--- a/lib/services/search_manga.g.dart
+++ b/lib/services/search_manga.g.dart
@ -6,7 +6,7 @@ part of 'search_manga.dart';
 // RiverpodGenerator
 // **************************************************************************

-String _$searchMangaHash() => r'881d305e97081528fa6259bc4c2ea0a28b63e1fd';
+String _$searchMangaHash() => r'4f5160d862404936b098269fe913bda960deb039';

 /// Copied from Dart SDK
 class _SystemHash {
--- a/lib/sources/multisrc/heancms/heancms.dart
+++ b/lib/sources/multisrc/heancms/heancms.dart
@ -15,7 +15,7 @@ class HeanCms extends MangaYomiServices {
        'Content-Type': 'application/json'
      };
  @override
-  Future<List<dynamic>> getMangaChapterUrl({required Chapter chapter}) async {
+  Future<List<dynamic>> getChapterUrl({required Chapter chapter}) async {
    final chapterId = chapter.url!.split("#").last;
    var request = http.Request(
        'GET',
--- a/lib/sources/multisrc/madara/madara_source_list.dart
+++ b/lib/sources/multisrc/madara/madara_source_list.dart
--- a/lib/sources/multisrc/madara/src/madara.dart
+++ b/lib/sources/multisrc/madara/src/madara.dart
@ -0,0 +1,31 @@
+import 'package:mangayomi/models/chapter.dart';
+import 'package:mangayomi/sources/service.dart';
+
+class Madara extends MangaYomiServices {
+  @override
+  Future<List?> getChapterUrl({required Chapter chapter}) {
+    // TODO: implement getChapterUrl
+    throw UnimplementedError();
+  }
+
+  @override
+  Future<GetManga?> getMangaDetail(
+      {required GetManga manga, required String lang, required String source}) {
+    // TODO: implement getMangaDetail
+    throw UnimplementedError();
+  }
+
+  @override
+  Future<List<GetManga?>> getPopularManga(
+      {required String source, required int page}) {
+    // TODO: implement getPopularManga
+    throw UnimplementedError();
+  }
+
+  @override
+  Future<List<GetManga?>> searchManga(
+      {required String source, required String query}) {
+    // TODO: implement searchManga
+    throw UnimplementedError();
+  }
+}
--- a/lib/sources/multisrc/mangathemesia/src/mangathemesia.dart
+++ b/lib/sources/multisrc/mangathemesia/src/mangathemesia.dart
@ -222,7 +222,7 @@ class MangaThemeSia extends MangaYomiServices {
  }

  @override
-  Future<List<dynamic>> getMangaChapterUrl({required Chapter chapter}) async {
+  Future<List<dynamic>> getChapterUrl({required Chapter chapter}) async {
    final dom = await httpGet(
        useUserAgent: true,
        url: chapter.url!,
--- a/lib/sources/multisrc/mmrcms/src/mmrcms.dart
+++ b/lib/sources/multisrc/mmrcms/src/mmrcms.dart
@ -151,7 +151,7 @@ class Mmrcms extends MangaYomiServices {
  }

  @override
-  Future<List<dynamic>> getMangaChapterUrl({required Chapter chapter}) async {
+  Future<List<dynamic>> getChapterUrl({required Chapter chapter}) async {
    final dom = await httpGet(
        useUserAgent: true,
        url: chapter.url!,
--- a/lib/sources/service.dart
+++ b/lib/sources/service.dart
@ -65,7 +65,7 @@ abstract class MangaYomiServices {
      {required String source, required int page});
  Future<GetManga?> getMangaDetail(
      {required GetManga manga, required String lang, required String source});
-  Future<List<dynamic>?> getMangaChapterUrl({
+  Future<List<dynamic>?> getChapterUrl({
    required Chapter chapter,
  });
  Future<List<GetManga?>> searchManga(
--- a/lib/sources/src/all/comick/src/comick.dart
+++ b/lib/sources/src/all/comick/src/comick.dart
@ -107,7 +107,7 @@ class Comick extends MangaYomiServices {
  }

  @override
-  Future<List<dynamic>> getMangaChapterUrl({required Chapter chapter}) async {
+  Future<List<dynamic>> getChapterUrl({required Chapter chapter}) async {
    String mangaId = chapter.url!.split('/').last.split('-').first;

    final response = await httpGet(
--- a/lib/sources/src/all/comick/src/utils/utils.dart
+++ b/lib/sources/src/all/comick/src/utils/utils.dart
@ -1,5 +1,3 @@
-import 'package:intl/intl.dart';
-import 'package:mangayomi/sources/utils/utils.dart';
 import 'package:mangayomi/utils/headers.dart';
 import 'package:http/http.dart' as http;

--- a/lib/sources/src/en/mangahere/src/mangahere.dart
+++ b/lib/sources/src/en/mangahere/src/mangahere.dart
@ -180,7 +180,7 @@ class Mangahere extends MangaYomiServices {
  }

  @override
-  Future<List<dynamic>> getMangaChapterUrl({required Chapter chapter}) async {
+  Future<List<dynamic>> getChapterUrl({required Chapter chapter}) async {
    JavascriptRuntime? flutterJs;
    flutterJs = getJavascriptRuntime();
    extractSecretKey(String response, JavascriptRuntime? flutterJs) {
@ -204,7 +204,7 @@ class Mangahere extends MangaYomiServices {

    var link = "http://www.mangahere.cc${chapter.url!}";
    final response =
-        await httpGet(url: link, source: "managhere", resDom: false) as String?;
+        await httpGet(url: link, source: "mangahere", resDom: false) as String?;

    dom.Document htmll = dom.Document.html(response!);
    int? pagesNumber = -1;
--- a/lib/sources/src/fr/japscan/src/japscan.dart
+++ b/lib/sources/src/fr/japscan/src/japscan.dart
@ -1,7 +1,6 @@
 // ignore_for_file: depend_on_referenced_packages

 import 'dart:convert';
-import 'dart:developer';
 import 'package:html/dom.dart' as dom;
 import 'package:html/dom.dart';
 import 'package:mangayomi/models/chapter.dart';
@ -120,7 +119,7 @@ class Japscan extends MangaYomiServices {
              '#top_mangas_week > ul > li > a.text-dark.font-weight-bold')
          .map((e) => e.innerHtml)
          .toList();
-      for (var ia in name) {
+      for (var i = 0; i < name.length; i++) {
        image.add("");
      }
    }
@ -160,7 +159,7 @@ class Japscan extends MangaYomiServices {
      }
      name = ta.toSet().toList();
      url = tt.toSet().toList();
-      for (var a in url) {
+      for (var i = 0; i < name.length; i++) {
        image.add("");
      }
    }
@ -168,7 +167,7 @@ class Japscan extends MangaYomiServices {
  }

  @override
-  Future<List<dynamic>> getMangaChapterUrl({required Chapter chapter}) async {
+  Future<List<dynamic>> getChapterUrl({required Chapter chapter}) async {
    final response = await httpGet(
        useUserAgent: true,
        url: chapter.url!,
--- a/lib/sources/src/fr/mangakawaii/src/mangakawaii.dart
+++ b/lib/sources/src/fr/mangakawaii/src/mangakawaii.dart
@ -3,7 +3,6 @@ import 'package:mangayomi/models/chapter.dart';
 import 'package:mangayomi/services/http_service/http_res_to_dom_html.dart';
 import 'package:mangayomi/services/http_service/http_service.dart';
 import 'package:mangayomi/sources/service.dart';
-import 'package:mangayomi/sources/src/all/comick/src/utils/utils.dart';
 import 'package:mangayomi/sources/utils/utils.dart';

 class MangaKawaii extends MangaYomiServices {
@ -135,7 +134,7 @@ class MangaKawaii extends MangaYomiServices {
          .querySelectorAll('a > div > div.hot-manga__item-name')
          .map((e) => e.innerHtml)
          .toList();
-      for (var ia in name) {
+      for (var i = 0; i < name.length; i++) {
        image.add("");
      }
    }
@ -178,7 +177,7 @@ class MangaKawaii extends MangaYomiServices {
  }

  @override
-  Future<List<dynamic>> getMangaChapterUrl({required Chapter chapter}) async {
+  Future<List<dynamic>> getChapterUrl({required Chapter chapter}) async {
    final response =
        await httpGet(url: chapter.url!, source: "mangakawaii", resDom: false)
            as String?;
--- a/lib/views/browse/extension/refresh_filter_data.dart
+++ b/lib/views/browse/extension/refresh_filter_data.dart
@ -50,6 +50,7 @@ refreshFilterData(RefreshFilterDataRef ref) async {
                baseUrl: element.baseUrl,
                apiUrl: element.apiUrl,
                lang: element.lang,
+                isCloudflare: element.isCloudflare,
                typeSource: element.typeSource,
                logoUrl: element.logoUrl,
                isFullData: element.isFullData,
--- a/lib/views/browse/extension/refresh_filter_data.g.dart
+++ b/lib/views/browse/extension/refresh_filter_data.g.dart
@ -6,7 +6,7 @@ part of 'refresh_filter_data.dart';
 // RiverpodGenerator
 // **************************************************************************

-String _$refreshFilterDataHash() => r'03aed46bb9e7b0ee3d7e99b99784d3080751895b';
+String _$refreshFilterDataHash() => r'e2e98a67c955e61c62392e39521fd968c5bcff8b';

 /// See also [refreshFilterData].
@ProviderFor(refreshFilterData)
--- a/lib/views/browse/sources_screen.dart
+++ b/lib/views/browse/sources_screen.dart
@ -109,11 +109,11 @@ class SourcesScreen extends ConsumerWidget {
                    ],
                  ),
                  title: Text(source.sourceName),
-                  trailing: SizedBox(
+                  trailing: const SizedBox(
                      width: 110,
                      child: Row(
                        mainAxisAlignment: MainAxisAlignment.end,
-                        children: const [
+                        children: [
                          Icon(
                            Icons.push_pin_outlined,
                            color: Colors.black,
--- a/lib/views/history/history_screen.dart
+++ b/lib/views/history/history_screen.dart
@ -2,12 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:grouped_list/grouped_list.dart';
-import 'package:hive_flutter/hive_flutter.dart';
 import 'package:mangayomi/main.dart';
 import 'package:mangayomi/models/history.dart';
 import 'package:mangayomi/views/history/providers/isar_providers.dart';
 import 'package:mangayomi/views/manga/reader/providers/push_router.dart';
-import 'package:mangayomi/providers/hive_provider.dart';
 import 'package:mangayomi/utils/cached_network.dart';
 import 'package:mangayomi/utils/date.dart';
 import 'package:mangayomi/utils/headers.dart';
--- a/lib/views/library/library_screen.dart
+++ b/lib/views/library/library_screen.dart
@ -1,5 +1,3 @@
-import 'dart:developer';
-
 import 'package:draggable_menu/draggable_menu.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@ -7,7 +5,6 @@ import 'package:go_router/go_router.dart';
 import 'package:isar/isar.dart';
 import 'package:mangayomi/main.dart';
 import 'package:mangayomi/models/category.dart';
-import 'package:mangayomi/models/history.dart';
 import 'package:mangayomi/models/manga.dart';
 import 'package:mangayomi/providers/hive_provider.dart';
 import 'package:mangayomi/providers/storage_provider.dart';
@ -1023,8 +1020,7 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
    DraggableMenu.open(
        context,
        DraggableMenu(
-            barItem: Container(),
-            uiType: DraggableMenuUiType.softModern,
+            ui: SoftModernDraggableMenu(barItem: Container()),
            expandable: true,
            expandedHeight: mediaHeight(context, 0.8),
            maxHeight: mediaHeight(context, 0.6),
@ -1145,11 +1141,10 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
                              physics: const NeverScrollableScrollPhysics(),
                              child: Column(
                                children: [
-                                  Padding(
-                                    padding: const EdgeInsets.only(
-                                        left: 20, top: 10),
+                                  const Padding(
+                                    padding: EdgeInsets.only(left: 20, top: 10),
                                    child: Row(
-                                      children: const [
+                                      children: [
                                        Text("Display mode"),
                                      ],
                                    ),
@ -1181,11 +1176,10 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
                                            ),
                                          )
                                          .toList()),
-                                  Padding(
-                                    padding: const EdgeInsets.only(
-                                        left: 20, top: 10),
+                                  const Padding(
+                                    padding: EdgeInsets.only(left: 20, top: 10),
                                    child: Row(
-                                      children: const [
+                                      children: [
                                        Text("Badges"),
                                      ],
                                    ),
@ -1218,11 +1212,10 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
                                      ],
                                    ),
                                  ),
-                                  Padding(
-                                    padding: const EdgeInsets.only(
-                                        left: 20, top: 10),
+                                  const Padding(
+                                    padding: EdgeInsets.only(left: 20, top: 10),
                                    child: Row(
-                                      children: const [
+                                      children: [
                                        Text("Tabs"),
                                      ],
                                    ),
@ -1255,11 +1248,10 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
                                      ],
                                    ),
                                  ),
-                                  Padding(
-                                    padding: const EdgeInsets.only(
-                                        left: 20, top: 10),
+                                  const Padding(
+                                    padding: EdgeInsets.only(left: 20, top: 10),
                                    child: Row(
-                                      children: const [
+                                      children: [
                                        Text("Others"),
                                      ],
                                    ),
--- a/lib/views/library/widgets/library_gridview_widget.dart
+++ b/lib/views/library/widgets/library_gridview_widget.dart
@ -1,10 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
-import 'package:hive_flutter/hive_flutter.dart';
 import 'package:mangayomi/views/history/providers/isar_providers.dart';
 import 'package:mangayomi/views/library/providers/library_state_provider.dart';
-import 'package:mangayomi/views/manga/detail/providers/state_providers.dart';
 import 'package:mangayomi/views/manga/reader/providers/push_router.dart';
 import 'package:mangayomi/models/manga.dart';
 import 'package:mangayomi/providers/hive_provider.dart';
--- a/lib/views/library/widgets/library_listview_widget.dart
+++ b/lib/views/library/widgets/library_listview_widget.dart
@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
-import 'package:hive_flutter/hive_flutter.dart';
 import 'package:mangayomi/views/history/providers/isar_providers.dart';
 import 'package:mangayomi/views/library/providers/library_state_provider.dart';
 import 'package:mangayomi/views/manga/reader/providers/push_router.dart';
--- a/lib/views/manga/detail/manga_detail_view.dart
+++ b/lib/views/manga/detail/manga_detail_view.dart
@ -551,8 +551,7 @@ class _MangaDetailViewState extends ConsumerState<MangaDetailView>
    DraggableMenu.open(
      context,
      DraggableMenu(
-        barItem: Container(),
-        uiType: DraggableMenuUiType.classic,
+        ui: ClassicDraggableMenu(barItem: Container()),
        expandable: false,
        maxHeight: 240,
        fastDrag: false,
--- a/lib/views/manga/detail/manga_details_view.dart
+++ b/lib/views/manga/detail/manga_details_view.dart
@ -213,8 +213,8 @@ class _MangaDetailsViewState extends ConsumerState<MangaDetailsView> {
                      isar.mangas.putSync(model);
                    });
                  },
-                  child: Column(
-                    children: const [
+                  child: const Column(
+                    children: [
                      Icon(
                        Icons.favorite,
                        size: 22,
--- a/lib/views/manga/download/providers/download_provider.dart
+++ b/lib/views/manga/download/providers/download_provider.dart
@ -6,7 +6,7 @@ import 'package:mangayomi/models/chapter.dart';
 import 'package:mangayomi/models/download_model.dart';
 import 'package:mangayomi/providers/hive_provider.dart';
 import 'package:mangayomi/providers/storage_provider.dart';
-import 'package:mangayomi/services/get_manga_chapter_url.dart';
+import 'package:mangayomi/services/get_chapter_url.dart';
 import 'package:mangayomi/utils/constant.dart';
 import 'package:mangayomi/utils/headers.dart';
 import 'package:mangayomi/utils/reg_exp_matcher.dart';
@ -35,7 +35,7 @@ Future<List<dynamic>> downloadChapter(
  path = Directory("${path1!.path}$finalPath/");
  log(scanlator);
  ref
-      .read(getMangaChapterUrlProvider(
+      .read(getChapterUrlProvider(
    chapter: chapter,
  ).future)
      .then((value) {
--- a/lib/views/manga/home/manga_home_screen.dart
+++ b/lib/views/manga/home/manga_home_screen.dart
@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:developer';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
@ -12,7 +11,6 @@ import 'package:mangayomi/sources/utils/utils.dart';
 import 'package:mangayomi/utils/colors.dart';
 import 'package:mangayomi/utils/media_query.dart';
 import 'package:mangayomi/views/library/search_text_form_field.dart';
-import 'package:mangayomi/views/manga/home/manga_search_screen.dart';
 import 'package:mangayomi/views/manga/home/widget/mangas_card_selector.dart';
 import 'package:mangayomi/views/widgets/bottom_text_widget.dart';
 import 'package:mangayomi/views/widgets/cover_view_widget.dart';
--- a/lib/views/manga/reader/manga_reader_view.dart
+++ b/lib/views/manga/reader/manga_reader_view.dart
@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:math';
-import 'dart:ui' as ui;
 import 'dart:io';
 import 'package:draggable_menu/draggable_menu.dart';
 import 'package:extended_image/extended_image.dart';
@ -9,7 +8,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter/material.dart';
 import 'package:mangayomi/models/chapter.dart';
 import 'package:mangayomi/views/manga/reader/providers/push_router.dart';
-import 'package:mangayomi/services/get_manga_chapter_url.dart';
+import 'package:mangayomi/services/get_chapter_url.dart';
 import 'package:mangayomi/utils/image_detail_info.dart';
 import 'package:mangayomi/utils/media_query.dart';
 import 'package:mangayomi/views/manga/reader/image_view_horizontal.dart';
@ -33,7 +32,7 @@ class MangaReaderView extends ConsumerWidget {
  Widget build(BuildContext context, WidgetRef ref) {
    SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky,
        overlays: []);
-    final chapterData = ref.watch(GetMangaChapterUrlProvider(
+    final chapterData = ref.watch(GetChapterUrlProvider(
      chapter: chapter,
    ));
    final readerController =
@ -264,9 +263,10 @@ class _MangaChapterPageGalleryState
    initialPage: _currentIndex,
    shouldIgnorePointerWhenScrolling: false,
  );
-  double get pixelRatio => ui.window.devicePixelRatio;

-  Size get size => ui.window.physicalSize / pixelRatio;
+  double get pixelRatio => View.of(context).devicePixelRatio;
+
+  Size get size => View.of(context).physicalSize / pixelRatio;
  Alignment _computeAlignmentByTapOffset(Offset offset) {
    return Alignment((offset.dx - size.width / 2) / (size.width / 2),
        (offset.dy - size.height / 2) / (size.height / 2));
@ -1044,8 +1044,7 @@ class _MangaChapterPageGalleryState
    DraggableMenu.open(
        context,
        DraggableMenu(
-            barItem: Container(),
-            uiType: DraggableMenuUiType.classic,
+            ui: ClassicDraggableMenu(barItem: Container()),
            expandable: false,
            maxHeight: mediaHeight(context, 0.4),
            fastDrag: false,
--- a/lib/views/manga/reader/providers/reader_controller_provider.dart
+++ b/lib/views/manga/reader/providers/reader_controller_provider.dart
@ -1,5 +1,3 @@
-import 'dart:developer';
-
 import 'package:isar/isar.dart';
 import 'package:mangayomi/main.dart';
 import 'package:mangayomi/models/chapter.dart';
--- a/lib/views/manga/reader/providers/reader_controller_provider.g.dart
+++ b/lib/views/manga/reader/providers/reader_controller_provider.g.dart
@ -64,7 +64,7 @@ class ReaderModeAdapter extends TypeAdapter<ReaderMode> {
 // RiverpodGenerator
 // **************************************************************************

-String _$currentIndexHash() => r'eaabf2b9ecb9a1238da037e067a6a7759d4cbe27';
+String _$currentIndexHash() => r'c2b912af925d9efd3e36e7a810914ef11393c1da';

 /// Copied from Dart SDK
 class _SystemHash {
--- a/lib/views/more/settings/appearance/appearance_screen.dart
+++ b/lib/views/more/settings/appearance/appearance_screen.dart
@ -1,5 +1,3 @@
-import 'dart:developer';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:mangayomi/utils/colors.dart';
--- a/lib/views/more/settings/categoties/categories_screen.dart
+++ b/lib/views/more/settings/categoties/categories_screen.dart
@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:isar/isar.dart';
 import 'package:mangayomi/main.dart';
 import 'package:mangayomi/models/category.dart';
 import 'package:mangayomi/views/more/settings/categoties/providers/isar_providers.dart';
@ -73,8 +72,8 @@ class _CategoriesScreenState extends ConsumerState<CategoriesScreen> {
                      Row(
                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
                        children: [
-                          Row(
-                            children: const [
+                          const Row(
+                            children: [
                              SizedBox(width: 10),
                              Icon(Icons.arrow_drop_up_outlined),
                              SizedBox(width: 10),
@ -243,8 +242,8 @@ class _CategoriesScreenState extends ConsumerState<CategoriesScreen> {
                  );
                });
          },
-          label: Row(
-            children: const [
+          label: const Row(
+            children: [
              Icon(Icons.add),
              SizedBox(
                width: 10,
--- a/lib/views/widgets/manga_image_card_widget.dart
+++ b/lib/views/widgets/manga_image_card_widget.dart
@ -4,7 +4,6 @@ import 'package:isar/isar.dart';
 import 'package:mangayomi/main.dart';
 import 'package:mangayomi/models/chapter.dart';
 import 'package:mangayomi/models/manga.dart';
-import 'package:mangayomi/services/get_manga_detail.dart';
 import 'package:mangayomi/sources/service.dart';
 import 'package:mangayomi/utils/cached_network.dart';
 import 'package:mangayomi/utils/headers.dart';
--- a/pubspec.lock
+++ b/pubspec.lock
@ -45,10 +45,10 @@ packages:
    dependency: transitive
    description:
      name: async
-      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
      url: "https://pub.dev"
    source: hosted
-    version: "2.10.0"
+    version: "2.11.0"
  background_downloader:
    dependency: "direct main"
    description:
@ -158,10 +158,10 @@ packages:
    dependency: transitive
    description:
      name: characters
-      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.1"
+    version: "1.3.0"
  checked_yaml:
    dependency: transitive
    description:
@ -206,10 +206,10 @@ packages:
    dependency: transitive
    description:
      name: collection
-      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
      url: "https://pub.dev"
    source: hosted
-    version: "1.17.0"
+    version: "1.17.1"
  convert:
    dependency: transitive
    description:
@ -286,10 +286,10 @@ packages:
    dependency: "direct main"
    description:
      name: draggable_menu
-      sha256: "2d6ecebf0e7386009cb4fa2f2645e075652b59beeb05cf2dd78adad497ee751a"
+      sha256: bcca3fbdebb98e852ab91d11ea49242fe868758c97d5553333802fd74a5a8c9c
      url: "https://pub.dev"
    source: hosted
-    version: "0.3.0"
+    version: "2.0.2"
  draggable_scrollbar:
    dependency: "direct main"
    description:
@ -310,10 +310,10 @@ packages:
    dependency: "direct main"
    description:
      name: extended_image
-      sha256: "75e4b0ad0f8f63eed7935ff2506c809a670f5e6dd0f61304525879d53fc41a17"
+      sha256: "73b7051722be79f9e8f8c120951fd9d3b22e6153fda6105c322fb88c066952d6"
      url: "https://pub.dev"
    source: hosted
-    version: "7.0.2"
+    version: "8.0.1"
  extended_image_library:
    dependency: transitive
    description:
@ -418,12 +418,11 @@ packages:
  flutter_js:
    dependency: "direct main"
    description:
-      path: "."
-      ref: HEAD
-      resolved-ref: "021297c5bdf30372dc94528583dc864951e43c39"
-      url: "https://github.com/kodjodevf/flutter_js.git"
-    source: git
-    version: "0.6.0"
+      name: flutter_js
+      sha256: "76f7b459d2d7c8c186528a0219e6b436821a63a1accfb0f4bc4b555761893e56"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.0"
  flutter_launcher_icons:
    dependency: "direct dev"
    description:
@ -603,10 +602,10 @@ packages:
    dependency: "direct main"
    description:
      name: intl
-      sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
+      sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
      url: "https://pub.dev"
    source: hosted
-    version: "0.17.0"
+    version: "0.18.0"
  io:
    dependency: transitive
    description:
@ -643,10 +642,10 @@ packages:
    dependency: transitive
    description:
      name: js
-      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
      url: "https://pub.dev"
    source: hosted
-    version: "0.6.5"
+    version: "0.6.7"
  json_annotation:
    dependency: transitive
    description:
@ -683,10 +682,10 @@ packages:
    dependency: transitive
    description:
      name: matcher
-      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
      url: "https://pub.dev"
    source: hosted
-    version: "0.12.13"
+    version: "0.12.15"
  material_color_utilities:
    dependency: transitive
    description:
@ -699,10 +698,10 @@ packages:
    dependency: transitive
    description:
      name: meta
-      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
      url: "https://pub.dev"
    source: hosted
-    version: "1.8.0"
+    version: "1.9.1"
  mime:
    dependency: transitive
    description:
@ -747,10 +746,10 @@ packages:
    dependency: transitive
    description:
      name: path
-      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
      url: "https://pub.dev"
    source: hosted
-    version: "1.8.2"
+    version: "1.8.3"
  path_provider:
    dependency: transitive
    description:
@ -1104,10 +1103,10 @@ packages:
    dependency: transitive
    description:
      name: test_api
-      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
      url: "https://pub.dev"
    source: hosted
-    version: "0.4.16"
+    version: "0.5.1"
  time:
    dependency: transitive
    description:
@ -1269,5 +1268,5 @@ packages:
    source: hosted
    version: "3.1.1"
 sdks:
-  dart: ">=2.19.5 <3.0.0"
-  flutter: ">=3.7.0"
+  dart: ">=3.0.0 <4.0.0"
+  flutter: ">=3.10.0"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -41,18 +41,16 @@ dependencies:
  http: ^0.13.5
  riverpod_annotation: ^2.0.2
  html: ^0.15.2
-  flutter_js:
-     git:
-      url: https://github.com/kodjodevf/flutter_js.git
+  flutter_js: ^0.7.0
  font_awesome_flutter: ^10.1.0
  expandable_text: ^2.3.0
  flex_color_scheme: ^7.0.0
  scrollable_positioned_list: ^0.3.5
-  extended_image: ^7.0.2
+  extended_image: ^8.0.1
  photo_view: ^0.14.0
  draggable_scrollbar: ^0.1.0
  grouped_list: ^5.1.2
-  intl: ^0.17.0
+  intl: ^0.18.0
  google_fonts: ^4.0.3
  url_launcher: ^6.1.10
  package_info_plus: ^3.0.2
@ -62,7 +60,7 @@ dependencies:
  permission_handler: ^10.2.0
  flutter_inappwebview: ^6.0.0-beta.22
  flutter_cache_manager: ^3.3.0
-  draggable_menu: ^0.3.0
+  draggable_menu: ^2.0.2
  fast_cached_network_image: ^1.2.0
  random_string: ^2.3.1
  isar: 3.1.0+1