From 2e6c6133c77b7bdc35db6c9bb68294ff874886bd Mon Sep 17 00:00:00 2001 From: aayush262 Date: Thu, 6 Feb 2025 21:35:43 +0530 Subject: [PATCH] =?UTF-8?q?feat:=20removed=20repos=20=F0=9F=91=8D?= =?UTF-8?q?=F0=9F=91=8D=F0=9F=91=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflows/extension-issue-handling.yml | 4 +- lib/Adaptor/Chapter/ChapterAdaptor.dart | 2 +- lib/Adaptor/Episode/EpisodeAdaptor.dart | 20 ++-- lib/DataClass/Chapter.dart | 2 +- lib/DataClass/Episode.dart | 2 +- lib/DataClass/MangaChapter.dart | 2 +- lib/DataClass/Media.dart | 2 +- lib/Functions/GetExtensions.dart | 66 +++++++++-- .../Detail/Tabs/Watch/Anime/AnimeParser.dart | 8 +- .../Anime/Widget/AnimeCompactSettings.dart | 2 +- .../Tabs/Watch/Anime/Widget/ContinueCard.dart | 2 +- lib/Screens/Detail/Tabs/Watch/BaseParser.dart | 10 +- .../Detail/Tabs/Watch/BaseWatchScreen.dart | 2 +- .../Detail/Tabs/Watch/Manga/MangaParser.dart | 8 +- .../Tabs/Watch/Manga/Widget/ContinueCard.dart | 2 +- .../Manga/Widget/MangaCompactSettings.dart | 2 +- .../Tabs/Watch/Widgets/SourceSelector.dart | 6 +- .../Detail/Tabs/Watch/Widgets/WrongTitle.dart | 8 +- lib/Screens/Extensions/ExtensionItem.dart | 18 +-- lib/Screens/Extensions/ExtensionList.dart | 14 +-- lib/Screens/Extensions/ExtensionScreen.dart | 111 ++++++++++++++---- .../ExtensionSettings/ExtensionSettings.dart | 6 +- lib/Screens/Player/Player.dart | 4 +- lib/Screens/Player/PlayerController.dart | 18 +-- .../Settings/SettingsPlayerScreen.dart | 4 +- lib/Screens/WebView/WebView.dart | 2 +- lib/StorageProvider.dart | 12 +- lib/api/Extensions/ExtensionsQueries.dart | 6 +- .../Screens/ExtensionsAnimeScreen.dart | 8 +- .../Screens/ExtensionsMangaScreen.dart | 8 +- .../Eval/dart/bridge/document.dart | 0 .../Eval/dart/bridge/element.dart | 0 .../Eval/dart/bridge/filter.dart | 0 .../Eval/dart/bridge/http.dart | 0 .../Eval/dart/bridge/m_chapter.dart | 0 .../Eval/dart/bridge/m_manga.dart | 0 .../Eval/dart/bridge/m_pages.dart | 0 .../Eval/dart/bridge/m_provider.dart | 2 +- .../Eval/dart/bridge/m_source.dart | 0 .../Eval/dart/bridge/m_status.dart | 0 .../Eval/dart/bridge/m_track.dart | 0 .../Eval/dart/bridge/m_video.dart | 0 .../Eval/dart/bridge/source_preference.dart | 0 .../Eval/dart/compiler/compiler.dart | 0 .../Eval/dart/model/document.dart | 2 +- .../Eval/dart/model/element.dart | 2 +- .../Eval/dart/model/filter.dart | 2 +- .../Eval/dart/model/m_bridge.dart | 4 +- .../Eval/dart/model/m_chapter.dart | 0 .../Eval/dart/model/m_manga.dart | 0 .../Eval/dart/model/m_pages.dart | 2 +- .../Eval/dart/model/m_provider.dart | 2 +- .../Eval/dart/model/m_source.dart | 0 .../Eval/dart/model/m_video.dart | 0 .../Eval/dart/model/page.dart | 2 +- .../Eval/dart/model/source_preference.dart | 0 .../Eval/dart/model/source_preference.g.dart | 0 .../Eval/dart/model/video.dart | 2 +- .../Eval/dart/plugin.dart | 0 .../Eval/dart/runtime/runtime.dart | 0 .../Eval/dart/service.dart | 4 +- .../Eval/javascript/dom_selector.dart | 2 +- .../Eval/javascript/extractors.dart | 0 .../Eval/javascript/http.dart | 0 .../Eval/javascript/preferences.dart | 0 .../Eval/javascript/service.dart | 4 +- .../Eval/javascript/utils.dart | 2 +- .../Extensions/GetSourceList.dart | 0 .../Extensions/extensions_provider.dart | 0 .../Extensions/extensions_provider.g.dart | 0 .../Extensions/fetch_anime_sources.dart | 7 +- .../Extensions/fetch_anime_sources.g.dart | 0 .../Extensions/fetch_manga_sources.dart | 7 +- .../Extensions/fetch_manga_sources.g.dart | 0 .../Extensions/fetch_novel_sources.dart | 7 +- .../Extensions/fetch_novel_sources.g.dart | 0 .../{Mangayomi => Sources}/Model/Manga.dart | 0 .../{Mangayomi => Sources}/Model/Manga.g.dart | 0 .../{Mangayomi => Sources}/Model/Source.dart | 0 .../Model/Source.g.dart | 0 .../{Mangayomi => Sources}/Model/chapter.dart | 0 .../Model/chapter.g.dart | 0 .../Model/settings.dart | 0 .../Model/settings.g.dart | 0 .../Search/getVideo.dart | 0 .../Search/get_detail.dart | 0 .../Search/get_popular.dart | 0 .../{Mangayomi => Sources}/Search/search.dart | 0 .../anime_extractors/dood_extractor.dart | 0 .../anime_extractors/filemoon.dart | 0 .../anime_extractors/gogocdn_extractor.dart | 0 .../anime_extractors/mp4upload_extractor.dart | 0 .../anime_extractors/mystream_extractor.dart | 0 .../anime_extractors/mytv_extractor.dart | 0 .../anime_extractors/okru_extractor.dart | 2 +- .../anime_extractors/quarkuc_extractor.dart | 0 .../anime_extractors/sendvid_extractor.dart | 0 .../anime_extractors/sibnet_extractor.dart | 0 .../streamlare_extractor.dart | 0 .../streamtape_extractor.dart | 0 .../streamwish_extractor.dart | 2 +- .../anime_extractors/vidbom_extractor.dart | 0 .../anime_extractors/voe_extractor.dart | 2 +- .../your_upload_extractor.dart | 0 .../cryptoaes/crypto_aes.dart | 0 .../cryptoaes/deobfuscator.dart | 0 .../cryptoaes/js_unpacker.dart | 0 .../dom_extensions.dart | 2 +- .../extension_preferences_providers.dart | 0 .../get_source_preference.dart | 0 .../{Mangayomi => Sources}/http/m_client.dart | 4 +- .../{Mangayomi => Sources}/http/rhttp/LICENSE | 0 .../http/rhttp/rhttp.dart | 0 .../rhttp/src/client/compatible_client.dart | 4 +- .../http/rhttp/src/client/rhttp_client.dart | 4 +- .../http/rhttp/src/model/cancel_token.dart | 0 .../http/rhttp/src/model/exception.dart | 4 +- .../http/rhttp/src/model/header.dart | 0 .../http/rhttp/src/model/request.dart | 2 +- .../http/rhttp/src/model/response.dart | 2 +- .../http/rhttp/src/model/settings.dart | 4 +- .../http/rhttp/src/request.dart | 14 +-- .../http/src/rust/api/image.dart | 0 .../http/src/rust/api/rhttp/client.dart | 0 .../src/rust/api/rhttp/client.freezed.dart | 0 .../http/src/rust/api/rhttp/error.dart | 0 .../src/rust/api/rhttp/error.freezed.dart | 0 .../http/src/rust/api/rhttp/http.dart | 0 .../http/src/rust/api/rhttp/http.freezed.dart | 0 .../http/src/rust/frb_generated.dart | 0 .../http/src/rust/frb_generated.io.dart | 0 .../http/src/rust/frb_generated.web.dart | 0 .../http/src/rust/lib.dart | 0 lib/api/{Mangayomi => Sources}/interface.dart | 0 lib/api/{Mangayomi => Sources}/lib.dart | 0 .../reg_exp_matcher.dart | 0 .../xpath_selector.dart | 0 lib/main.dart | 78 ++++++------ 138 files changed, 331 insertions(+), 207 deletions(-) rename lib/api/{Mangayomi => Sources}/Eval/dart/bridge/document.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/dart/bridge/element.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/dart/bridge/filter.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/dart/bridge/http.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/dart/bridge/m_chapter.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/dart/bridge/m_manga.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/dart/bridge/m_pages.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/dart/bridge/m_provider.dart (99%) rename lib/api/{Mangayomi => Sources}/Eval/dart/bridge/m_source.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/dart/bridge/m_status.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/dart/bridge/m_track.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/dart/bridge/m_video.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/dart/bridge/source_preference.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/dart/compiler/compiler.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/dart/model/document.dart (96%) rename lib/api/{Mangayomi => Sources}/Eval/dart/model/element.dart (96%) rename lib/api/{Mangayomi => Sources}/Eval/dart/model/filter.dart (99%) rename lib/api/{Mangayomi => Sources}/Eval/dart/model/m_bridge.dart (99%) rename lib/api/{Mangayomi => Sources}/Eval/dart/model/m_chapter.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/dart/model/m_manga.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/dart/model/m_pages.dart (95%) rename lib/api/{Mangayomi => Sources}/Eval/dart/model/m_provider.dart (90%) rename lib/api/{Mangayomi => Sources}/Eval/dart/model/m_source.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/dart/model/m_video.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/dart/model/page.dart (84%) rename lib/api/{Mangayomi => Sources}/Eval/dart/model/source_preference.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/dart/model/source_preference.g.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/dart/model/video.dart (95%) rename lib/api/{Mangayomi => Sources}/Eval/dart/plugin.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/dart/runtime/runtime.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/dart/service.dart (96%) rename lib/api/{Mangayomi => Sources}/Eval/javascript/dom_selector.dart (99%) rename lib/api/{Mangayomi => Sources}/Eval/javascript/extractors.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/javascript/http.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/javascript/preferences.dart (100%) rename lib/api/{Mangayomi => Sources}/Eval/javascript/service.dart (97%) rename lib/api/{Mangayomi => Sources}/Eval/javascript/utils.dart (98%) rename lib/api/{Mangayomi => Sources}/Extensions/GetSourceList.dart (100%) rename lib/api/{Mangayomi => Sources}/Extensions/extensions_provider.dart (100%) rename lib/api/{Mangayomi => Sources}/Extensions/extensions_provider.g.dart (100%) rename lib/api/{Mangayomi => Sources}/Extensions/fetch_anime_sources.dart (68%) rename lib/api/{Mangayomi => Sources}/Extensions/fetch_anime_sources.g.dart (100%) rename lib/api/{Mangayomi => Sources}/Extensions/fetch_manga_sources.dart (69%) rename lib/api/{Mangayomi => Sources}/Extensions/fetch_manga_sources.g.dart (100%) rename lib/api/{Mangayomi => Sources}/Extensions/fetch_novel_sources.dart (70%) rename lib/api/{Mangayomi => Sources}/Extensions/fetch_novel_sources.g.dart (100%) rename lib/api/{Mangayomi => Sources}/Model/Manga.dart (100%) rename lib/api/{Mangayomi => Sources}/Model/Manga.g.dart (100%) rename lib/api/{Mangayomi => Sources}/Model/Source.dart (100%) rename lib/api/{Mangayomi => Sources}/Model/Source.g.dart (100%) rename lib/api/{Mangayomi => Sources}/Model/chapter.dart (100%) rename lib/api/{Mangayomi => Sources}/Model/chapter.g.dart (100%) rename lib/api/{Mangayomi => Sources}/Model/settings.dart (100%) rename lib/api/{Mangayomi => Sources}/Model/settings.g.dart (100%) rename lib/api/{Mangayomi => Sources}/Search/getVideo.dart (100%) rename lib/api/{Mangayomi => Sources}/Search/get_detail.dart (100%) rename lib/api/{Mangayomi => Sources}/Search/get_popular.dart (100%) rename lib/api/{Mangayomi => Sources}/Search/search.dart (100%) rename lib/api/{Mangayomi => Sources}/anime_extractors/dood_extractor.dart (100%) rename lib/api/{Mangayomi => Sources}/anime_extractors/filemoon.dart (100%) rename lib/api/{Mangayomi => Sources}/anime_extractors/gogocdn_extractor.dart (100%) rename lib/api/{Mangayomi => Sources}/anime_extractors/mp4upload_extractor.dart (100%) rename lib/api/{Mangayomi => Sources}/anime_extractors/mystream_extractor.dart (100%) rename lib/api/{Mangayomi => Sources}/anime_extractors/mytv_extractor.dart (100%) rename lib/api/{Mangayomi => Sources}/anime_extractors/okru_extractor.dart (96%) rename lib/api/{Mangayomi => Sources}/anime_extractors/quarkuc_extractor.dart (100%) rename lib/api/{Mangayomi => Sources}/anime_extractors/sendvid_extractor.dart (100%) rename lib/api/{Mangayomi => Sources}/anime_extractors/sibnet_extractor.dart (100%) rename lib/api/{Mangayomi => Sources}/anime_extractors/streamlare_extractor.dart (100%) rename lib/api/{Mangayomi => Sources}/anime_extractors/streamtape_extractor.dart (100%) rename lib/api/{Mangayomi => Sources}/anime_extractors/streamwish_extractor.dart (96%) rename lib/api/{Mangayomi => Sources}/anime_extractors/vidbom_extractor.dart (100%) rename lib/api/{Mangayomi => Sources}/anime_extractors/voe_extractor.dart (98%) rename lib/api/{Mangayomi => Sources}/anime_extractors/your_upload_extractor.dart (100%) rename lib/api/{Mangayomi => Sources}/cryptoaes/crypto_aes.dart (100%) rename lib/api/{Mangayomi => Sources}/cryptoaes/deobfuscator.dart (100%) rename lib/api/{Mangayomi => Sources}/cryptoaes/js_unpacker.dart (100%) rename lib/api/{Mangayomi => Sources}/dom_extensions.dart (98%) rename lib/api/{Mangayomi => Sources}/extension_preferences_providers.dart (100%) rename lib/api/{Mangayomi => Sources}/get_source_preference.dart (100%) rename lib/api/{Mangayomi => Sources}/http/m_client.dart (98%) rename lib/api/{Mangayomi => Sources}/http/rhttp/LICENSE (100%) rename lib/api/{Mangayomi => Sources}/http/rhttp/rhttp.dart (100%) rename lib/api/{Mangayomi => Sources}/http/rhttp/src/client/compatible_client.dart (95%) rename lib/api/{Mangayomi => Sources}/http/rhttp/src/client/rhttp_client.dart (95%) rename lib/api/{Mangayomi => Sources}/http/rhttp/src/model/cancel_token.dart (100%) rename lib/api/{Mangayomi => Sources}/http/rhttp/src/model/exception.dart (96%) rename lib/api/{Mangayomi => Sources}/http/rhttp/src/model/header.dart (100%) rename lib/api/{Mangayomi => Sources}/http/rhttp/src/model/request.dart (95%) rename lib/api/{Mangayomi => Sources}/http/rhttp/src/model/response.dart (96%) rename lib/api/{Mangayomi => Sources}/http/rhttp/src/model/settings.dart (98%) rename lib/api/{Mangayomi => Sources}/http/rhttp/src/request.dart (77%) rename lib/api/{Mangayomi => Sources}/http/src/rust/api/image.dart (100%) rename lib/api/{Mangayomi => Sources}/http/src/rust/api/rhttp/client.dart (100%) rename lib/api/{Mangayomi => Sources}/http/src/rust/api/rhttp/client.freezed.dart (100%) rename lib/api/{Mangayomi => Sources}/http/src/rust/api/rhttp/error.dart (100%) rename lib/api/{Mangayomi => Sources}/http/src/rust/api/rhttp/error.freezed.dart (100%) rename lib/api/{Mangayomi => Sources}/http/src/rust/api/rhttp/http.dart (100%) rename lib/api/{Mangayomi => Sources}/http/src/rust/api/rhttp/http.freezed.dart (100%) rename lib/api/{Mangayomi => Sources}/http/src/rust/frb_generated.dart (100%) rename lib/api/{Mangayomi => Sources}/http/src/rust/frb_generated.io.dart (100%) rename lib/api/{Mangayomi => Sources}/http/src/rust/frb_generated.web.dart (100%) rename lib/api/{Mangayomi => Sources}/http/src/rust/lib.dart (100%) rename lib/api/{Mangayomi => Sources}/interface.dart (100%) rename lib/api/{Mangayomi => Sources}/lib.dart (100%) rename lib/api/{Mangayomi => Sources}/reg_exp_matcher.dart (100%) rename lib/api/{Mangayomi => Sources}/xpath_selector.dart (100%) diff --git a/.github/workflows/extension-issue-handling.yml b/.github/workflows/extension-issue-handling.yml index 2ead0166..9a6a92de 100644 --- a/.github/workflows/extension-issue-handling.yml +++ b/.github/workflows/extension-issue-handling.yml @@ -13,8 +13,8 @@ jobs: with: script: | const repos = [ - "https://kodjodevf.github.io/mangayomi-extensions/index.json", - "https://kodjodevf.github.io/mangayomi-extensions/anime_index.json" + "", + "" ]; const extensionNames = new Set(); diff --git a/lib/Adaptor/Chapter/ChapterAdaptor.dart b/lib/Adaptor/Chapter/ChapterAdaptor.dart index 9e550c0c..98817f92 100644 --- a/lib/Adaptor/Chapter/ChapterAdaptor.dart +++ b/lib/Adaptor/Chapter/ChapterAdaptor.dart @@ -4,7 +4,7 @@ import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart'; import '../../Animation/ScaleAnimation.dart'; import '../../DataClass/Chapter.dart'; import '../../DataClass/Media.dart'; -import '../../api/Mangayomi/Model/Source.dart'; +import '../../api/Sources/Model/Source.dart'; import 'ChapterCompactViewHolder.dart'; import 'ChapterListViewHolder.dart'; diff --git a/lib/Adaptor/Episode/EpisodeAdaptor.dart b/lib/Adaptor/Episode/EpisodeAdaptor.dart index 69e4ea90..95a71211 100644 --- a/lib/Adaptor/Episode/EpisodeAdaptor.dart +++ b/lib/Adaptor/Episode/EpisodeAdaptor.dart @@ -1,6 +1,6 @@ import 'package:dantotsu/Functions/Function.dart'; -import 'package:dantotsu/api/Mangayomi/Eval/dart/model/video.dart'; -import 'package:dantotsu/api/Mangayomi/Search/getVideo.dart'; +import 'package:dantotsu/api/Sources/Eval/dart/model/video.dart'; +import 'package:dantotsu/api/Sources/Search/getVideo.dart'; import 'package:flutter/material.dart'; import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart'; import 'package:get/get.dart'; @@ -10,7 +10,7 @@ import '../../DataClass/Episode.dart'; import '../../DataClass/Media.dart'; import '../../Screens/Player/Player.dart'; import '../../Widgets/CustomBottomDialog.dart'; -import '../../api/Mangayomi/Model/Source.dart'; +import '../../api/Sources/Model/Source.dart'; import 'EpisodeCompactViewHolder.dart'; import 'EpisodeGridViewHolder.dart'; import 'EpisodeListViewHolder.dart'; @@ -280,11 +280,15 @@ void onEpisodeClick( child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Text( - item.quality, - style: TextStyle( - fontSize: 16, - fontWeight: FontWeight.bold, + Expanded( + child: Text( + item.quality, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.bold, + overflow: TextOverflow.ellipsis, + ), + maxLines: 1, ), ), Icon( diff --git a/lib/DataClass/Chapter.dart b/lib/DataClass/Chapter.dart index 2170be91..24351a97 100644 --- a/lib/DataClass/Chapter.dart +++ b/lib/DataClass/Chapter.dart @@ -1,4 +1,4 @@ -import 'package:dantotsu/api/Mangayomi/Eval/dart/model/m_chapter.dart'; +import 'package:dantotsu/api/Sources/Eval/dart/model/m_chapter.dart'; import 'package:json_annotation/json_annotation.dart'; part 'Data/Chapter.g.dart'; diff --git a/lib/DataClass/Episode.dart b/lib/DataClass/Episode.dart index f061a146..8fcef702 100644 --- a/lib/DataClass/Episode.dart +++ b/lib/DataClass/Episode.dart @@ -1,4 +1,4 @@ -import 'package:dantotsu/api/Mangayomi/Eval/dart/model/m_chapter.dart'; +import 'package:dantotsu/api/Sources/Eval/dart/model/m_chapter.dart'; import 'package:json_annotation/json_annotation.dart'; part 'Data/Episode.g.dart'; diff --git a/lib/DataClass/MangaChapter.dart b/lib/DataClass/MangaChapter.dart index d08d3139..eea5a2ef 100644 --- a/lib/DataClass/MangaChapter.dart +++ b/lib/DataClass/MangaChapter.dart @@ -1,4 +1,4 @@ -import '../api/Mangayomi/Eval/dart/model/m_chapter.dart'; +import '../api/Sources/Eval/dart/model/m_chapter.dart'; class MangaChapter { final String number; diff --git a/lib/DataClass/Media.dart b/lib/DataClass/Media.dart index c8422f93..fbcc094c 100644 --- a/lib/DataClass/Media.dart +++ b/lib/DataClass/Media.dart @@ -1,5 +1,5 @@ import 'package:dantotsu/Functions/string_extensions.dart'; -import 'package:dantotsu/api/Mangayomi/Model/Source.dart'; +import 'package:dantotsu/api/Sources/Model/Source.dart'; import 'package:json_annotation/json_annotation.dart'; import '../Preferences/IsarDataClasses/Selected/Selected.dart'; diff --git a/lib/Functions/GetExtensions.dart b/lib/Functions/GetExtensions.dart index b14fd931..e190b717 100644 --- a/lib/Functions/GetExtensions.dart +++ b/lib/Functions/GetExtensions.dart @@ -1,24 +1,35 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:get/get.dart'; import '../Preferences/PrefManager.dart'; -import '../api/Mangayomi/Extensions/extensions_provider.dart'; -import '../api/Mangayomi/Extensions/fetch_anime_sources.dart'; -import '../api/Mangayomi/Extensions/fetch_manga_sources.dart'; -import '../api/Mangayomi/Extensions/fetch_novel_sources.dart'; -import '../api/Mangayomi/Model/Manga.dart'; -import '../api/Mangayomi/Model/Source.dart'; +import '../api/Sources/Extensions/extensions_provider.dart'; +import '../api/Sources/Extensions/fetch_anime_sources.dart'; +import '../api/Sources/Extensions/fetch_manga_sources.dart'; +import '../api/Sources/Extensions/fetch_novel_sources.dart'; +import '../api/Sources/Model/Manga.dart'; +import '../api/Sources/Model/Source.dart'; class Extensions { static final _provider = ProviderContainer(); + static final animeRepo = ''.obs; + static final mangaRepo = ''.obs; + static final novelRepo = ''.obs; static Future init() async { + animeRepo.value = loadCustomData('animeRepo') ?? ''; + mangaRepo.value = loadCustomData('mangaRepo') ?? ''; + novelRepo.value = loadCustomData('novelRepo') ?? ''; + await Future.wait([ - _provider - .read(fetchAnimeSourcesListProvider(id: null, reFresh: false).future), - _provider - .read(fetchMangaSourcesListProvider(id: null, reFresh: false).future), - _provider - .read(fetchNovelSourcesListProvider(id: null, reFresh: false).future), + if (animeRepo.value.isNotEmpty) + _provider.read( + fetchAnimeSourcesListProvider(id: null, reFresh: false).future), + if (mangaRepo.value.isNotEmpty) + _provider.read( + fetchMangaSourcesListProvider(id: null, reFresh: false).future), + if (novelRepo.value.isNotEmpty) + _provider.read( + fetchNovelSourcesListProvider(id: null, reFresh: false).future), ]); } @@ -51,4 +62,35 @@ class Extensions { ]; return sortedInstalledSources; } + + static Future setRepo(ItemType itemType, String repo) async { + if (itemType == ItemType.manga) { + mangaRepo.value = repo; + saveCustomData('mangaRepo', repo); + await _provider + .read(fetchMangaSourcesListProvider(id: null, reFresh: true).future); + } else if (itemType == ItemType.anime) { + animeRepo.value = repo; + saveCustomData('animeRepo', repo); + await _provider + .read(fetchAnimeSourcesListProvider(id: null, reFresh: true).future); + } else { + novelRepo.value = repo; + saveCustomData('novelRepo', repo); + await _provider + .read(fetchNovelSourcesListProvider(id: null, reFresh: true).future); + } + } + static Future removeRepo(ItemType itemType) async { + if (itemType == ItemType.manga) { + mangaRepo.value = ''; + removeCustomData('mangaRepo'); + } else if (itemType == ItemType.anime) { + animeRepo.value = ''; + removeCustomData('animeRepo'); + } else { + novelRepo.value = ''; + removeCustomData('novelRepo'); + } + } } diff --git a/lib/Screens/Detail/Tabs/Watch/Anime/AnimeParser.dart b/lib/Screens/Detail/Tabs/Watch/Anime/AnimeParser.dart index 828a4e62..be23a35c 100644 --- a/lib/Screens/Detail/Tabs/Watch/Anime/AnimeParser.dart +++ b/lib/Screens/Detail/Tabs/Watch/Anime/AnimeParser.dart @@ -9,10 +9,10 @@ import '../../../../../DataClass/Media.dart'; import '../../../../../api/EpisodeDetails/Anify/Anify.dart'; import '../../../../../api/EpisodeDetails/Jikan/Jikan.dart'; import '../../../../../api/EpisodeDetails/Kitsu/Kitsu.dart'; -import '../../../../../api/Mangayomi/Eval/dart/model/m_chapter.dart'; -import '../../../../../api/Mangayomi/Eval/dart/model/m_manga.dart'; -import '../../../../../api/Mangayomi/Model/Source.dart'; -import '../../../../../api/Mangayomi/Search/get_detail.dart'; +import '../../../../../api/Sources/Eval/dart/model/m_chapter.dart'; +import '../../../../../api/Sources/Eval/dart/model/m_manga.dart'; +import '../../../../../api/Sources/Model/Source.dart'; +import '../../../../../api/Sources/Search/get_detail.dart'; import '../Functions/ParseChapterNumber.dart'; import 'Widget/AnimeCompactSettings.dart'; diff --git a/lib/Screens/Detail/Tabs/Watch/Anime/Widget/AnimeCompactSettings.dart b/lib/Screens/Detail/Tabs/Watch/Anime/Widget/AnimeCompactSettings.dart index 6cc70a32..232a2021 100644 --- a/lib/Screens/Detail/Tabs/Watch/Anime/Widget/AnimeCompactSettings.dart +++ b/lib/Screens/Detail/Tabs/Watch/Anime/Widget/AnimeCompactSettings.dart @@ -9,7 +9,7 @@ import '../../../../../../Functions/Function.dart'; import '../../../../../../Preferences/IsarDataClasses/Selected/Selected.dart'; import '../../../../../../Preferences/PrefManager.dart'; import '../../../../../../Services/ServiceSwitcher.dart'; -import '../../../../../../api/Mangayomi/Model/Source.dart'; +import '../../../../../../api/Sources/Model/Source.dart'; import '../../../../../WebView/WebView.dart'; class AnimeCompactSettings { diff --git a/lib/Screens/Detail/Tabs/Watch/Anime/Widget/ContinueCard.dart b/lib/Screens/Detail/Tabs/Watch/Anime/Widget/ContinueCard.dart index 0f04731e..5e3a9e4d 100644 --- a/lib/Screens/Detail/Tabs/Watch/Anime/Widget/ContinueCard.dart +++ b/lib/Screens/Detail/Tabs/Watch/Anime/Widget/ContinueCard.dart @@ -5,7 +5,7 @@ import '../../../../../../Adaptor/Episode/EpisodeAdaptor.dart'; import '../../../../../../Adaptor/Episode/Widget/HandleProgress.dart'; import '../../../../../../DataClass/Episode.dart'; import '../../../../../../DataClass/Media.dart'; -import '../../../../../../api/Mangayomi/Model/Source.dart'; +import '../../../../../../api/Sources/Model/Source.dart'; class ContinueCard extends StatelessWidget { final Media mediaData; diff --git a/lib/Screens/Detail/Tabs/Watch/BaseParser.dart b/lib/Screens/Detail/Tabs/Watch/BaseParser.dart index 15bea664..9843f15f 100644 --- a/lib/Screens/Detail/Tabs/Watch/BaseParser.dart +++ b/lib/Screens/Detail/Tabs/Watch/BaseParser.dart @@ -11,11 +11,11 @@ import '../../../../Preferences/IsarDataClasses/ShowResponse/ShowResponse.dart'; import '../../../../Preferences/PrefManager.dart'; import '../../../../Services/ServiceSwitcher.dart'; import '../../../../Widgets/CustomBottomDialog.dart'; -import '../../../../api/Mangayomi/Eval/dart/model/m_manga.dart'; -import '../../../../api/Mangayomi/Extensions/extensions_provider.dart'; -import '../../../../api/Mangayomi/Model/Manga.dart'; -import '../../../../api/Mangayomi/Model/Source.dart'; -import '../../../../api/Mangayomi/Search/search.dart'; +import '../../../../api/Sources/Eval/dart/model/m_manga.dart'; +import '../../../../api/Sources/Extensions/extensions_provider.dart'; +import '../../../../api/Sources/Model/Manga.dart'; +import '../../../../api/Sources/Model/Source.dart'; +import '../../../../api/Sources/Search/search.dart'; import '../../../Settings/language.dart'; import 'Widgets/WrongTitle.dart'; diff --git a/lib/Screens/Detail/Tabs/Watch/BaseWatchScreen.dart b/lib/Screens/Detail/Tabs/Watch/BaseWatchScreen.dart index 2a9c2cf2..5c7ccada 100644 --- a/lib/Screens/Detail/Tabs/Watch/BaseWatchScreen.dart +++ b/lib/Screens/Detail/Tabs/Watch/BaseWatchScreen.dart @@ -4,7 +4,7 @@ import 'package:get/get_state_manager/src/rx_flutter/rx_obx_widget.dart'; import '../../../../Functions/Function.dart'; import '../../../../Preferences/PrefManager.dart'; -import '../../../../api/Mangayomi/Model/Source.dart'; +import '../../../../api/Sources/Model/Source.dart'; import '../../Widgets/Releasing.dart'; import 'BaseParser.dart'; import 'Widgets/SourceSelector.dart'; diff --git a/lib/Screens/Detail/Tabs/Watch/Manga/MangaParser.dart b/lib/Screens/Detail/Tabs/Watch/Manga/MangaParser.dart index c62257f0..3997c049 100644 --- a/lib/Screens/Detail/Tabs/Watch/Manga/MangaParser.dart +++ b/lib/Screens/Detail/Tabs/Watch/Manga/MangaParser.dart @@ -3,10 +3,10 @@ import 'package:get/get_rx/src/rx_types/rx_types.dart'; import '../../../../../DataClass/Chapter.dart'; import '../../../../../DataClass/Media.dart'; -import '../../../../../api/Mangayomi/Eval/dart/model/m_chapter.dart'; -import '../../../../../api/Mangayomi/Eval/dart/model/m_manga.dart'; -import '../../../../../api/Mangayomi/Model/Source.dart'; -import '../../../../../api/Mangayomi/Search/get_detail.dart'; +import '../../../../../api/Sources/Eval/dart/model/m_chapter.dart'; +import '../../../../../api/Sources/Eval/dart/model/m_manga.dart'; +import '../../../../../api/Sources/Model/Source.dart'; +import '../../../../../api/Sources/Search/get_detail.dart'; import '../BaseParser.dart'; import '../Functions/ParseChapterNumber.dart'; import 'Widget/MangaCompactSettings.dart'; diff --git a/lib/Screens/Detail/Tabs/Watch/Manga/Widget/ContinueCard.dart b/lib/Screens/Detail/Tabs/Watch/Manga/Widget/ContinueCard.dart index aaa4e692..e8f492df 100644 --- a/lib/Screens/Detail/Tabs/Watch/Manga/Widget/ContinueCard.dart +++ b/lib/Screens/Detail/Tabs/Watch/Manga/Widget/ContinueCard.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import '../../../../../../Adaptor/Episode/Widget/HandleProgress.dart'; import '../../../../../../DataClass/Chapter.dart'; import '../../../../../../DataClass/Media.dart'; -import '../../../../../../api/Mangayomi/Model/Source.dart'; +import '../../../../../../api/Sources/Model/Source.dart'; class ContinueCard extends StatelessWidget { final Media mediaData; diff --git a/lib/Screens/Detail/Tabs/Watch/Manga/Widget/MangaCompactSettings.dart b/lib/Screens/Detail/Tabs/Watch/Manga/Widget/MangaCompactSettings.dart index 89bf338e..70144abe 100644 --- a/lib/Screens/Detail/Tabs/Watch/Manga/Widget/MangaCompactSettings.dart +++ b/lib/Screens/Detail/Tabs/Watch/Manga/Widget/MangaCompactSettings.dart @@ -10,7 +10,7 @@ import '../../../../../../DataClass/Media.dart'; import '../../../../../../Preferences/IsarDataClasses/Selected/Selected.dart'; import '../../../../../../Preferences/PrefManager.dart'; import '../../../../../../Services/ServiceSwitcher.dart'; -import '../../../../../../api/Mangayomi/Model/Source.dart'; +import '../../../../../../api/Sources/Model/Source.dart'; class MangaCompactSettings { final BuildContext context; diff --git a/lib/Screens/Detail/Tabs/Watch/Widgets/SourceSelector.dart b/lib/Screens/Detail/Tabs/Watch/Widgets/SourceSelector.dart index 2a6a3bbb..26bdbae0 100644 --- a/lib/Screens/Detail/Tabs/Watch/Widgets/SourceSelector.dart +++ b/lib/Screens/Detail/Tabs/Watch/Widgets/SourceSelector.dart @@ -6,9 +6,9 @@ import '../../../../../DataClass/Media.dart'; import '../../../../../Functions/Function.dart'; import '../../../../../Preferences/PrefManager.dart'; import '../../../../../Widgets/DropdownMenu.dart'; -import '../../../../../api/Mangayomi/Model/Source.dart'; -import '../../../../../api/Mangayomi/extension_preferences_providers.dart'; -import '../../../../../api/Mangayomi/get_source_preference.dart'; +import '../../../../../api/Sources/Model/Source.dart'; +import '../../../../../api/Sources/extension_preferences_providers.dart'; +import '../../../../../api/Sources/get_source_preference.dart'; import '../../../../Extensions/ExtensionSettings/ExtensionSettings.dart'; import '../../../../Settings/language.dart'; diff --git a/lib/Screens/Detail/Tabs/Watch/Widgets/WrongTitle.dart b/lib/Screens/Detail/Tabs/Watch/Widgets/WrongTitle.dart index 5cb63ef8..a462c557 100644 --- a/lib/Screens/Detail/Tabs/Watch/Widgets/WrongTitle.dart +++ b/lib/Screens/Detail/Tabs/Watch/Widgets/WrongTitle.dart @@ -4,10 +4,10 @@ import 'package:get/get_rx/src/rx_types/rx_types.dart'; import '../../../../../DataClass/Media.dart'; import '../../../../../Widgets/CustomBottomDialog.dart'; -import '../../../../../api/Mangayomi/Eval/dart/model/m_manga.dart'; -import '../../../../../api/Mangayomi/Eval/dart/model/m_pages.dart'; -import '../../../../../api/Mangayomi/Model/Source.dart'; -import '../../../../../api/Mangayomi/Search/search.dart'; +import '../../../../../api/Sources/Eval/dart/model/m_manga.dart'; +import '../../../../../api/Sources/Eval/dart/model/m_pages.dart'; +import '../../../../../api/Sources/Model/Source.dart'; +import '../../../../../api/Sources/Search/search.dart'; class WrongTitleDialog extends StatefulWidget { final Source source; diff --git a/lib/Screens/Extensions/ExtensionItem.dart b/lib/Screens/Extensions/ExtensionItem.dart index af71197f..b65c57d8 100644 --- a/lib/Screens/Extensions/ExtensionItem.dart +++ b/lib/Screens/Extensions/ExtensionItem.dart @@ -1,20 +1,20 @@ import 'package:dantotsu/Functions/Function.dart'; import 'package:dantotsu/Widgets/AlertDialogBuilder.dart'; -import 'package:dantotsu/api/Mangayomi/Eval/dart/model/source_preference.dart'; -import 'package:dantotsu/api/Mangayomi/Model/Source.dart'; +import 'package:dantotsu/api/Sources/Eval/dart/model/source_preference.dart'; +import 'package:dantotsu/api/Sources/Model/Source.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:icons_plus/icons_plus.dart'; import 'package:isar/isar.dart'; import '../../Widgets/CachedNetworkImage.dart'; -import '../../api/Mangayomi/Extensions/GetSourceList.dart'; -import '../../api/Mangayomi/Extensions/fetch_anime_sources.dart'; -import '../../api/Mangayomi/Extensions/fetch_manga_sources.dart'; -import '../../api/Mangayomi/Extensions/fetch_novel_sources.dart'; -import '../../api/Mangayomi/Model/Manga.dart'; -import '../../api/Mangayomi/extension_preferences_providers.dart'; -import '../../api/Mangayomi/get_source_preference.dart'; +import '../../api/Sources/Extensions/GetSourceList.dart'; +import '../../api/Sources/Extensions/fetch_anime_sources.dart'; +import '../../api/Sources/Extensions/fetch_manga_sources.dart'; +import '../../api/Sources/Extensions/fetch_novel_sources.dart'; +import '../../api/Sources/Model/Manga.dart'; +import '../../api/Sources/extension_preferences_providers.dart'; +import '../../api/Sources/get_source_preference.dart'; import '../../main.dart'; import '../Settings/language.dart'; import 'ExtensionSettings/ExtensionSettings.dart'; diff --git a/lib/Screens/Extensions/ExtensionList.dart b/lib/Screens/Extensions/ExtensionList.dart index dba73328..5b881b60 100644 --- a/lib/Screens/Extensions/ExtensionList.dart +++ b/lib/Screens/Extensions/ExtensionList.dart @@ -3,13 +3,13 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:grouped_list/sliver_grouped_list.dart'; -import '../../api/Mangayomi/Extensions/GetSourceList.dart'; -import '../../api/Mangayomi/Extensions/extensions_provider.dart'; -import '../../api/Mangayomi/Extensions/fetch_anime_sources.dart'; -import '../../api/Mangayomi/Extensions/fetch_manga_sources.dart'; -import '../../api/Mangayomi/Extensions/fetch_novel_sources.dart'; -import '../../api/Mangayomi/Model/Manga.dart'; -import '../../api/Mangayomi/Model/Source.dart'; +import '../../api/Sources/Extensions/GetSourceList.dart'; +import '../../api/Sources/Extensions/extensions_provider.dart'; +import '../../api/Sources/Extensions/fetch_anime_sources.dart'; +import '../../api/Sources/Extensions/fetch_manga_sources.dart'; +import '../../api/Sources/Extensions/fetch_novel_sources.dart'; +import '../../api/Sources/Model/Manga.dart'; +import '../../api/Sources/Model/Source.dart'; import '../Settings/language.dart'; import 'ExtensionItem.dart'; diff --git a/lib/Screens/Extensions/ExtensionScreen.dart b/lib/Screens/Extensions/ExtensionScreen.dart index 25cfd3dd..7e99ea4e 100644 --- a/lib/Screens/Extensions/ExtensionScreen.dart +++ b/lib/Screens/Extensions/ExtensionScreen.dart @@ -1,16 +1,20 @@ import 'package:dantotsu/Screens/Extensions/ExtensionList.dart'; import 'package:dantotsu/Widgets/AlertDialogBuilder.dart'; -import 'package:dantotsu/api/Mangayomi/Model/Source.dart'; +import 'package:dantotsu/api/Sources/Model/Source.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:get/get.dart'; +import 'package:icons_plus/icons_plus.dart'; import 'package:isar/isar.dart'; +import '../../Functions/Function.dart'; +import '../../Functions/GetExtensions.dart'; import '../../Preferences/PrefManager.dart'; import '../../StorageProvider.dart'; import '../../Theme/LanguageSwitcher.dart'; import '../../Widgets/ScrollConfig.dart'; -import '../../api/Mangayomi/Model/Manga.dart'; +import '../../api/Sources/Model/Manga.dart'; import '../../main.dart'; import '../Settings/language.dart'; @@ -68,24 +72,91 @@ class _BrowseScreenState extends ConsumerState ), iconTheme: IconThemeData(color: theme.primary), actions: [ - IconButton( - icon: Icon(Icons.language_rounded, color: theme.primary), - onPressed: () { - AlertDialogBuilder(context) - ..setTitle(getString.language) - ..singleChoiceItems( - sortedLanguagesMap.keys.toList(), - sortedLanguagesMap.keys - .toList() - .indexOf(_selectedLanguage), - (index) { - setState(() => _selectedLanguage = - sortedLanguagesMap.keys.elementAt(index)); - }, - ) - ..show(); - }, - ), + if (_tabBarController.index == 1 || + _tabBarController.index == 3 || + _tabBarController.index == 5) ...[ + IconButton( + icon: Icon(Bootstrap.github), + onPressed: () { + var type = _tabBarController.index == 1 + ? ItemType.anime + : _tabBarController.index == 3 + ? ItemType.manga + : ItemType.novel; + var text = ''; + + + AlertDialogBuilder(context) + ..setTitle('${type.name.capitalize} ${getString.source}') + ..setCustomView( + Obx( + () { + var installedRepo = _tabBarController.index == 1 + ? Extensions.animeRepo.value + : _tabBarController.index == 3 + ? Extensions.mangaRepo.value + : Extensions.novelRepo.value; + return Column( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (installedRepo.isNotEmpty) ...[ + GestureDetector( + onTap: () => copyToClipboard(installedRepo), + onLongPress: () => + Extensions.removeRepo(type), + child: Text( + installedRepo, + style: TextStyle( + fontFamily: 'Poppins', + fontSize: 12.0, + color: theme.onSurface, + ), + ), + ), + const SizedBox(height: 8.0), + ], + TextField( + decoration: const InputDecoration( + hintText: 'Repo URL'), + onChanged: (value) => text = value, + ), + ], + ); + }, + ), + ) + ..setPositiveButton( + getString.ok, + () { + if (text.isEmpty) return; + Extensions.setRepo(type, text); + }, + ) + ..setNegativeButton(getString.cancel, null) + ..show(); + }, + ), + IconButton( + icon: Icon(Icons.language_rounded, color: theme.primary), + onPressed: () { + AlertDialogBuilder(context) + ..setTitle(getString.language) + ..singleChoiceItems( + sortedLanguagesMap.keys.toList(), + sortedLanguagesMap.keys + .toList() + .indexOf(_selectedLanguage), + (index) { + setState(() => _selectedLanguage = + sortedLanguagesMap.keys.elementAt(index)); + }, + ) + ..show(); + }, + ), + ], SizedBox(width: 8.0), ], ), diff --git a/lib/Screens/Extensions/ExtensionSettings/ExtensionSettings.dart b/lib/Screens/Extensions/ExtensionSettings/ExtensionSettings.dart index 3f0e312a..e955a486 100644 --- a/lib/Screens/Extensions/ExtensionSettings/ExtensionSettings.dart +++ b/lib/Screens/Extensions/ExtensionSettings/ExtensionSettings.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import '../../../api/Mangayomi/Eval/dart/model/source_preference.dart'; -import '../../../api/Mangayomi/Model/Source.dart'; -import '../../../api/Mangayomi/extension_preferences_providers.dart'; +import '../../../api/Sources/Eval/dart/model/source_preference.dart'; +import '../../../api/Sources/Model/Source.dart'; +import '../../../api/Sources/extension_preferences_providers.dart'; import 'ListTileChapterFilter.dart'; class SourcePreferenceWidget extends StatefulWidget { diff --git a/lib/Screens/Player/Player.dart b/lib/Screens/Player/Player.dart index 341d7bf8..c3dfe969 100644 --- a/lib/Screens/Player/Player.dart +++ b/lib/Screens/Player/Player.dart @@ -19,8 +19,8 @@ import '../../../../../../DataClass/Media.dart' as m; import '../../../../../../Preferences/IsarDataClasses/Selected/Selected.dart'; import '../../../../../../Services/ServiceSwitcher.dart'; import '../../../../../../Widgets/ScrollConfig.dart'; -import '../../../../../../api/Mangayomi/Eval/dart/model/video.dart' as v; -import '../../../../../../api/Mangayomi/Model/Source.dart'; +import '../../../../../../api/Sources/Eval/dart/model/video.dart' as v; +import '../../../../../../api/Sources/Model/Source.dart'; import '../Detail/Tabs/Watch/Anime/Widget/AnimeCompactSettings.dart'; import '../Detail/Tabs/Watch/Anime/Widget/BuildChunkSelector.dart'; import '../Settings/SettingsPlayerScreen.dart'; diff --git a/lib/Screens/Player/PlayerController.dart b/lib/Screens/Player/PlayerController.dart index aa4ebf0d..51ec97b6 100644 --- a/lib/Screens/Player/PlayerController.dart +++ b/lib/Screens/Player/PlayerController.dart @@ -12,8 +12,8 @@ import 'package:dantotsu/Screens/Player/Platform/WindowsPlayer.dart'; import 'package:dantotsu/Theme/LanguageSwitcher.dart'; import 'package:dantotsu/Widgets/AlertDialogBuilder.dart'; import 'package:dantotsu/Widgets/CustomBottomDialog.dart'; -import 'package:dantotsu/api/Mangayomi/Eval/dart/model/video.dart' as v; -import 'package:dantotsu/api/Mangayomi/Model/Source.dart'; +import 'package:dantotsu/api/Sources/Eval/dart/model/video.dart' as v; +import 'package:dantotsu/api/Sources/Model/Source.dart'; import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; @@ -934,11 +934,15 @@ class _PlayerControllerState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Text( - videos[index].quality, - style: TextStyle( - fontSize: 16, - fontWeight: FontWeight.bold, + Expanded( + child: Text( + videos[index].quality, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.bold, + overflow: TextOverflow.ellipsis, + ), + maxLines: 1, ), ), Icon( diff --git a/lib/Screens/Settings/SettingsPlayerScreen.dart b/lib/Screens/Settings/SettingsPlayerScreen.dart index d6b521e8..7e5d8786 100644 --- a/lib/Screens/Settings/SettingsPlayerScreen.dart +++ b/lib/Screens/Settings/SettingsPlayerScreen.dart @@ -2,8 +2,8 @@ import 'dart:math'; import 'package:dantotsu/DataClass/Episode.dart'; import 'package:dantotsu/Functions/Function.dart'; -import 'package:dantotsu/api/Mangayomi/Eval/dart/model/video.dart'; -import 'package:dantotsu/api/Mangayomi/Model/Source.dart'; +import 'package:dantotsu/api/Sources/Eval/dart/model/video.dart'; +import 'package:dantotsu/api/Sources/Model/Source.dart'; import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; diff --git a/lib/Screens/WebView/WebView.dart b/lib/Screens/WebView/WebView.dart index 3162e015..bb9f60fa 100644 --- a/lib/Screens/WebView/WebView.dart +++ b/lib/Screens/WebView/WebView.dart @@ -9,7 +9,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:share_plus/share_plus.dart'; import 'package:url_launcher/url_launcher.dart'; -import '../../api/Mangayomi/http/m_client.dart'; +import '../../api/Sources/http/m_client.dart'; import '../../main.dart'; class MangaWebView extends ConsumerStatefulWidget { diff --git a/lib/StorageProvider.dart b/lib/StorageProvider.dart index 7bbf2daf..58b8c8c0 100644 --- a/lib/StorageProvider.dart +++ b/lib/StorageProvider.dart @@ -1,16 +1,16 @@ import 'dart:io'; -import 'package:dantotsu/api/Mangayomi/Model/settings.dart'; +import 'package:dantotsu/api/Sources/Model/settings.dart'; import 'package:device_info_plus/device_info_plus.dart'; import 'package:isar/isar.dart'; import 'package:path/path.dart' as path; import 'package:path_provider/path_provider.dart'; import 'package:permission_handler/permission_handler.dart'; -import 'api/Mangayomi/Eval/dart/model/source_preference.dart'; -import 'api/Mangayomi/Model/Manga.dart'; -import 'api/Mangayomi/Model/Source.dart'; -import 'api/Mangayomi/Model/chapter.dart'; +import 'api/Sources/Eval/dart/model/source_preference.dart'; +import 'api/Sources/Model/Manga.dart'; +import 'api/Sources/Model/Source.dart'; +import 'api/Sources/Model/chapter.dart'; class StorageProvider { static Future requestPermission() async { @@ -129,7 +129,7 @@ class StorageProvider { SettingsSchema, SourcePreferenceSchema, SourcePreferenceStringValueSchema, - ], directory: dir!.path, name: "dartotsuDb", inspector: inspector); + ], directory: dir!.path, name: "sources", inspector: inspector); if (isar.settings.filter().idEqualTo(227).isEmptySync()) { isar.writeTxnSync( diff --git a/lib/api/Extensions/ExtensionsQueries.dart b/lib/api/Extensions/ExtensionsQueries.dart index 29dd425d..986e2bcf 100644 --- a/lib/api/Extensions/ExtensionsQueries.dart +++ b/lib/api/Extensions/ExtensionsQueries.dart @@ -5,8 +5,8 @@ import 'package:dantotsu/DataClass/Media.dart'; import 'package:dantotsu/DataClass/SearchResults.dart'; import 'package:dantotsu/Functions/Function.dart'; import 'package:dantotsu/Functions/string_extensions.dart'; -import 'package:dantotsu/api/Mangayomi/Eval/dart/model/m_manga.dart'; -import 'package:dantotsu/api/Mangayomi/Model/Source.dart'; +import 'package:dantotsu/api/Sources/Eval/dart/model/m_manga.dart'; +import 'package:dantotsu/api/Sources/Model/Source.dart'; import 'package:get/get.dart'; import '../../DataClass/Author.dart'; @@ -15,7 +15,7 @@ import '../../Screens/Detail/Tabs/Watch/Anime/AnimeParser.dart'; import '../../Screens/Detail/Tabs/Watch/Manga/MangaParser.dart'; import '../../Services/Api/Queries.dart'; import '../../main.dart'; -import '../Mangayomi/Search/get_detail.dart'; +import '../Sources/Search/get_detail.dart'; import 'ExtensionsData.dart'; part 'ExtensionsQueries/GetHomePageData.dart'; diff --git a/lib/api/Extensions/Screens/ExtensionsAnimeScreen.dart b/lib/api/Extensions/Screens/ExtensionsAnimeScreen.dart index c7798da0..4ad7e649 100644 --- a/lib/api/Extensions/Screens/ExtensionsAnimeScreen.dart +++ b/lib/api/Extensions/Screens/ExtensionsAnimeScreen.dart @@ -1,4 +1,4 @@ -import 'package:dantotsu/api/Mangayomi/Eval/dart/model/m_pages.dart'; +import 'package:dantotsu/api/Sources/Eval/dart/model/m_pages.dart'; import 'package:flutter/material.dart'; import 'package:get/get_rx/src/rx_types/rx_types.dart'; @@ -8,9 +8,9 @@ import '../../../Functions/Function.dart'; import '../../../Functions/GetExtensions.dart'; import '../../../Services/Screens/BaseAnimeScreen.dart'; import '../../../logger.dart'; -import '../../Mangayomi/Model/Manga.dart'; -import '../../Mangayomi/Model/Source.dart'; -import '../../Mangayomi/Search/get_popular.dart'; +import '../../Sources/Model/Manga.dart'; +import '../../Sources/Model/Source.dart'; +import '../../Sources/Search/get_popular.dart'; class ExtensionsAnimeScreen extends BaseAnimeScreen { var data = Rxn>>({}); diff --git a/lib/api/Extensions/Screens/ExtensionsMangaScreen.dart b/lib/api/Extensions/Screens/ExtensionsMangaScreen.dart index 58c777fa..9afe632f 100644 --- a/lib/api/Extensions/Screens/ExtensionsMangaScreen.dart +++ b/lib/api/Extensions/Screens/ExtensionsMangaScreen.dart @@ -1,4 +1,4 @@ -import 'package:dantotsu/api/Mangayomi/Eval/dart/model/m_pages.dart'; +import 'package:dantotsu/api/Sources/Eval/dart/model/m_pages.dart'; import 'package:flutter/material.dart'; import 'package:get/get_rx/src/rx_types/rx_types.dart'; @@ -8,9 +8,9 @@ import '../../../Functions/Function.dart'; import '../../../Functions/GetExtensions.dart'; import '../../../Services/Screens/BaseMangaScreen.dart'; import '../../../logger.dart'; -import '../../Mangayomi/Model/Manga.dart'; -import '../../Mangayomi/Model/Source.dart'; -import '../../Mangayomi/Search/get_popular.dart'; +import '../../Sources/Model/Manga.dart'; +import '../../Sources/Model/Source.dart'; +import '../../Sources/Search/get_popular.dart'; class ExtensionsMangaScreen extends BaseMangaScreen { var data = Rxn>>({}); diff --git a/lib/api/Mangayomi/Eval/dart/bridge/document.dart b/lib/api/Sources/Eval/dart/bridge/document.dart similarity index 100% rename from lib/api/Mangayomi/Eval/dart/bridge/document.dart rename to lib/api/Sources/Eval/dart/bridge/document.dart diff --git a/lib/api/Mangayomi/Eval/dart/bridge/element.dart b/lib/api/Sources/Eval/dart/bridge/element.dart similarity index 100% rename from lib/api/Mangayomi/Eval/dart/bridge/element.dart rename to lib/api/Sources/Eval/dart/bridge/element.dart diff --git a/lib/api/Mangayomi/Eval/dart/bridge/filter.dart b/lib/api/Sources/Eval/dart/bridge/filter.dart similarity index 100% rename from lib/api/Mangayomi/Eval/dart/bridge/filter.dart rename to lib/api/Sources/Eval/dart/bridge/filter.dart diff --git a/lib/api/Mangayomi/Eval/dart/bridge/http.dart b/lib/api/Sources/Eval/dart/bridge/http.dart similarity index 100% rename from lib/api/Mangayomi/Eval/dart/bridge/http.dart rename to lib/api/Sources/Eval/dart/bridge/http.dart diff --git a/lib/api/Mangayomi/Eval/dart/bridge/m_chapter.dart b/lib/api/Sources/Eval/dart/bridge/m_chapter.dart similarity index 100% rename from lib/api/Mangayomi/Eval/dart/bridge/m_chapter.dart rename to lib/api/Sources/Eval/dart/bridge/m_chapter.dart diff --git a/lib/api/Mangayomi/Eval/dart/bridge/m_manga.dart b/lib/api/Sources/Eval/dart/bridge/m_manga.dart similarity index 100% rename from lib/api/Mangayomi/Eval/dart/bridge/m_manga.dart rename to lib/api/Sources/Eval/dart/bridge/m_manga.dart diff --git a/lib/api/Mangayomi/Eval/dart/bridge/m_pages.dart b/lib/api/Sources/Eval/dart/bridge/m_pages.dart similarity index 100% rename from lib/api/Mangayomi/Eval/dart/bridge/m_pages.dart rename to lib/api/Sources/Eval/dart/bridge/m_pages.dart diff --git a/lib/api/Mangayomi/Eval/dart/bridge/m_provider.dart b/lib/api/Sources/Eval/dart/bridge/m_provider.dart similarity index 99% rename from lib/api/Mangayomi/Eval/dart/bridge/m_provider.dart rename to lib/api/Sources/Eval/dart/bridge/m_provider.dart index 85c1bffe..fd4eaf98 100644 --- a/lib/api/Mangayomi/Eval/dart/bridge/m_provider.dart +++ b/lib/api/Sources/Eval/dart/bridge/m_provider.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:dantotsu/Functions/string_extensions.dart'; -import 'package:dantotsu/api/Mangayomi/Eval/javascript/http.dart'; +import 'package:dantotsu/api/Sources/Eval/javascript/http.dart'; import 'package:dart_eval/dart_eval_bridge.dart'; import 'package:dart_eval/stdlib/core.dart'; import 'package:flutter_qjs/flutter_qjs.dart'; diff --git a/lib/api/Mangayomi/Eval/dart/bridge/m_source.dart b/lib/api/Sources/Eval/dart/bridge/m_source.dart similarity index 100% rename from lib/api/Mangayomi/Eval/dart/bridge/m_source.dart rename to lib/api/Sources/Eval/dart/bridge/m_source.dart diff --git a/lib/api/Mangayomi/Eval/dart/bridge/m_status.dart b/lib/api/Sources/Eval/dart/bridge/m_status.dart similarity index 100% rename from lib/api/Mangayomi/Eval/dart/bridge/m_status.dart rename to lib/api/Sources/Eval/dart/bridge/m_status.dart diff --git a/lib/api/Mangayomi/Eval/dart/bridge/m_track.dart b/lib/api/Sources/Eval/dart/bridge/m_track.dart similarity index 100% rename from lib/api/Mangayomi/Eval/dart/bridge/m_track.dart rename to lib/api/Sources/Eval/dart/bridge/m_track.dart diff --git a/lib/api/Mangayomi/Eval/dart/bridge/m_video.dart b/lib/api/Sources/Eval/dart/bridge/m_video.dart similarity index 100% rename from lib/api/Mangayomi/Eval/dart/bridge/m_video.dart rename to lib/api/Sources/Eval/dart/bridge/m_video.dart diff --git a/lib/api/Mangayomi/Eval/dart/bridge/source_preference.dart b/lib/api/Sources/Eval/dart/bridge/source_preference.dart similarity index 100% rename from lib/api/Mangayomi/Eval/dart/bridge/source_preference.dart rename to lib/api/Sources/Eval/dart/bridge/source_preference.dart diff --git a/lib/api/Mangayomi/Eval/dart/compiler/compiler.dart b/lib/api/Sources/Eval/dart/compiler/compiler.dart similarity index 100% rename from lib/api/Mangayomi/Eval/dart/compiler/compiler.dart rename to lib/api/Sources/Eval/dart/compiler/compiler.dart diff --git a/lib/api/Mangayomi/Eval/dart/model/document.dart b/lib/api/Sources/Eval/dart/model/document.dart similarity index 96% rename from lib/api/Mangayomi/Eval/dart/model/document.dart rename to lib/api/Sources/Eval/dart/model/document.dart index cddd614d..0064a5df 100644 --- a/lib/api/Mangayomi/Eval/dart/model/document.dart +++ b/lib/api/Sources/Eval/dart/model/document.dart @@ -1,4 +1,4 @@ -import 'package:dantotsu/api/Mangayomi/dom_extensions.dart'; +import 'package:dantotsu/api/Sources/dom_extensions.dart'; import 'package:html/dom.dart'; import 'element.dart'; diff --git a/lib/api/Mangayomi/Eval/dart/model/element.dart b/lib/api/Sources/Eval/dart/model/element.dart similarity index 96% rename from lib/api/Mangayomi/Eval/dart/model/element.dart rename to lib/api/Sources/Eval/dart/model/element.dart index 0f1ef683..2c818780 100644 --- a/lib/api/Mangayomi/Eval/dart/model/element.dart +++ b/lib/api/Sources/Eval/dart/model/element.dart @@ -1,4 +1,4 @@ -import 'package:dantotsu/api/Mangayomi/dom_extensions.dart'; +import 'package:dantotsu/api/Sources/dom_extensions.dart'; import 'package:html/dom.dart'; class MElement { diff --git a/lib/api/Mangayomi/Eval/dart/model/filter.dart b/lib/api/Sources/Eval/dart/model/filter.dart similarity index 99% rename from lib/api/Mangayomi/Eval/dart/model/filter.dart rename to lib/api/Sources/Eval/dart/model/filter.dart index 513f5407..54de902c 100644 --- a/lib/api/Mangayomi/Eval/dart/model/filter.dart +++ b/lib/api/Sources/Eval/dart/model/filter.dart @@ -1,4 +1,4 @@ -import 'package:dantotsu/api/Mangayomi/Eval/javascript/http.dart'; +import 'package:dantotsu/api/Sources/Eval/javascript/http.dart'; class FilterList { List filters; diff --git a/lib/api/Mangayomi/Eval/dart/model/m_bridge.dart b/lib/api/Sources/Eval/dart/model/m_bridge.dart similarity index 99% rename from lib/api/Mangayomi/Eval/dart/model/m_bridge.dart rename to lib/api/Sources/Eval/dart/model/m_bridge.dart index cadb89ac..fd0bd093 100644 --- a/lib/api/Mangayomi/Eval/dart/model/m_bridge.dart +++ b/lib/api/Sources/Eval/dart/model/m_bridge.dart @@ -1,8 +1,8 @@ import 'dart:convert'; import 'package:dantotsu/Functions/string_extensions.dart'; -import 'package:dantotsu/api/Mangayomi/Eval/dart/model/video.dart'; -import 'package:dantotsu/api/Mangayomi/Eval/javascript/http.dart'; +import 'package:dantotsu/api/Sources/Eval/dart/model/video.dart'; +import 'package:dantotsu/api/Sources/Eval/javascript/http.dart'; import 'package:dart_eval/dart_eval_bridge.dart'; import 'package:dart_eval/stdlib/core.dart'; import 'package:encrypt/encrypt.dart' as encrypt; diff --git a/lib/api/Mangayomi/Eval/dart/model/m_chapter.dart b/lib/api/Sources/Eval/dart/model/m_chapter.dart similarity index 100% rename from lib/api/Mangayomi/Eval/dart/model/m_chapter.dart rename to lib/api/Sources/Eval/dart/model/m_chapter.dart diff --git a/lib/api/Mangayomi/Eval/dart/model/m_manga.dart b/lib/api/Sources/Eval/dart/model/m_manga.dart similarity index 100% rename from lib/api/Mangayomi/Eval/dart/model/m_manga.dart rename to lib/api/Sources/Eval/dart/model/m_manga.dart diff --git a/lib/api/Mangayomi/Eval/dart/model/m_pages.dart b/lib/api/Sources/Eval/dart/model/m_pages.dart similarity index 95% rename from lib/api/Mangayomi/Eval/dart/model/m_pages.dart rename to lib/api/Sources/Eval/dart/model/m_pages.dart index 2d01f711..b35c07db 100644 --- a/lib/api/Mangayomi/Eval/dart/model/m_pages.dart +++ b/lib/api/Sources/Eval/dart/model/m_pages.dart @@ -1,4 +1,4 @@ -import 'package:dantotsu/api/Mangayomi/Model/Source.dart'; +import 'package:dantotsu/api/Sources/Model/Source.dart'; import '../../../../../DataClass/Anime.dart'; import '../../../../../DataClass/Manga.dart'; diff --git a/lib/api/Mangayomi/Eval/dart/model/m_provider.dart b/lib/api/Sources/Eval/dart/model/m_provider.dart similarity index 90% rename from lib/api/Mangayomi/Eval/dart/model/m_provider.dart rename to lib/api/Sources/Eval/dart/model/m_provider.dart index 64a6b1a7..bded3b0b 100644 --- a/lib/api/Mangayomi/Eval/dart/model/m_provider.dart +++ b/lib/api/Sources/Eval/dart/model/m_provider.dart @@ -1,4 +1,4 @@ -import 'package:dantotsu/api/Mangayomi/Eval/dart/model/video.dart'; +import 'package:dantotsu/api/Sources/Eval/dart/model/video.dart'; import 'filter.dart'; import 'm_manga.dart'; diff --git a/lib/api/Mangayomi/Eval/dart/model/m_source.dart b/lib/api/Sources/Eval/dart/model/m_source.dart similarity index 100% rename from lib/api/Mangayomi/Eval/dart/model/m_source.dart rename to lib/api/Sources/Eval/dart/model/m_source.dart diff --git a/lib/api/Mangayomi/Eval/dart/model/m_video.dart b/lib/api/Sources/Eval/dart/model/m_video.dart similarity index 100% rename from lib/api/Mangayomi/Eval/dart/model/m_video.dart rename to lib/api/Sources/Eval/dart/model/m_video.dart diff --git a/lib/api/Mangayomi/Eval/dart/model/page.dart b/lib/api/Sources/Eval/dart/model/page.dart similarity index 84% rename from lib/api/Mangayomi/Eval/dart/model/page.dart rename to lib/api/Sources/Eval/dart/model/page.dart index 585aa69c..6c5ab78e 100644 --- a/lib/api/Mangayomi/Eval/dart/model/page.dart +++ b/lib/api/Sources/Eval/dart/model/page.dart @@ -1,4 +1,4 @@ -import 'package:dantotsu/api/Mangayomi/Eval/javascript/http.dart'; +import 'package:dantotsu/api/Sources/Eval/javascript/http.dart'; class PageUrl { String url; diff --git a/lib/api/Mangayomi/Eval/dart/model/source_preference.dart b/lib/api/Sources/Eval/dart/model/source_preference.dart similarity index 100% rename from lib/api/Mangayomi/Eval/dart/model/source_preference.dart rename to lib/api/Sources/Eval/dart/model/source_preference.dart diff --git a/lib/api/Mangayomi/Eval/dart/model/source_preference.g.dart b/lib/api/Sources/Eval/dart/model/source_preference.g.dart similarity index 100% rename from lib/api/Mangayomi/Eval/dart/model/source_preference.g.dart rename to lib/api/Sources/Eval/dart/model/source_preference.g.dart diff --git a/lib/api/Mangayomi/Eval/dart/model/video.dart b/lib/api/Sources/Eval/dart/model/video.dart similarity index 95% rename from lib/api/Mangayomi/Eval/dart/model/video.dart rename to lib/api/Sources/Eval/dart/model/video.dart index 8d2f98bd..51f50b17 100644 --- a/lib/api/Mangayomi/Eval/dart/model/video.dart +++ b/lib/api/Sources/Eval/dart/model/video.dart @@ -1,4 +1,4 @@ -import 'package:dantotsu/api/Mangayomi/Eval/javascript/http.dart'; +import 'package:dantotsu/api/Sources/Eval/javascript/http.dart'; class Video { String url; diff --git a/lib/api/Mangayomi/Eval/dart/plugin.dart b/lib/api/Sources/Eval/dart/plugin.dart similarity index 100% rename from lib/api/Mangayomi/Eval/dart/plugin.dart rename to lib/api/Sources/Eval/dart/plugin.dart diff --git a/lib/api/Mangayomi/Eval/dart/runtime/runtime.dart b/lib/api/Sources/Eval/dart/runtime/runtime.dart similarity index 100% rename from lib/api/Mangayomi/Eval/dart/runtime/runtime.dart rename to lib/api/Sources/Eval/dart/runtime/runtime.dart diff --git a/lib/api/Mangayomi/Eval/dart/service.dart b/lib/api/Sources/Eval/dart/service.dart similarity index 96% rename from lib/api/Mangayomi/Eval/dart/service.dart rename to lib/api/Sources/Eval/dart/service.dart index 53cf5b8c..45ffe27f 100644 --- a/lib/api/Mangayomi/Eval/dart/service.dart +++ b/lib/api/Sources/Eval/dart/service.dart @@ -1,5 +1,5 @@ -import 'package:dantotsu/api/Mangayomi/Eval/dart/runtime/runtime.dart'; -import 'package:dantotsu/api/Mangayomi/Eval/javascript/http.dart'; +import 'package:dantotsu/api/Sources/Eval/dart/runtime/runtime.dart'; +import 'package:dantotsu/api/Sources/Eval/javascript/http.dart'; import 'package:dart_eval/dart_eval_bridge.dart'; import 'package:dart_eval/stdlib/core.dart'; diff --git a/lib/api/Mangayomi/Eval/javascript/dom_selector.dart b/lib/api/Sources/Eval/javascript/dom_selector.dart similarity index 99% rename from lib/api/Mangayomi/Eval/javascript/dom_selector.dart rename to lib/api/Sources/Eval/javascript/dom_selector.dart index 55026aed..148b3478 100644 --- a/lib/api/Mangayomi/Eval/javascript/dom_selector.dart +++ b/lib/api/Sources/Eval/javascript/dom_selector.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import 'package:dantotsu/api/Mangayomi/dom_extensions.dart'; +import 'package:dantotsu/api/Sources/dom_extensions.dart'; import 'package:flutter_qjs/flutter_qjs.dart'; import 'package:html/dom.dart'; import 'package:html/parser.dart'; diff --git a/lib/api/Mangayomi/Eval/javascript/extractors.dart b/lib/api/Sources/Eval/javascript/extractors.dart similarity index 100% rename from lib/api/Mangayomi/Eval/javascript/extractors.dart rename to lib/api/Sources/Eval/javascript/extractors.dart diff --git a/lib/api/Mangayomi/Eval/javascript/http.dart b/lib/api/Sources/Eval/javascript/http.dart similarity index 100% rename from lib/api/Mangayomi/Eval/javascript/http.dart rename to lib/api/Sources/Eval/javascript/http.dart diff --git a/lib/api/Mangayomi/Eval/javascript/preferences.dart b/lib/api/Sources/Eval/javascript/preferences.dart similarity index 100% rename from lib/api/Mangayomi/Eval/javascript/preferences.dart rename to lib/api/Sources/Eval/javascript/preferences.dart diff --git a/lib/api/Mangayomi/Eval/javascript/service.dart b/lib/api/Sources/Eval/javascript/service.dart similarity index 97% rename from lib/api/Mangayomi/Eval/javascript/service.dart rename to lib/api/Sources/Eval/javascript/service.dart index 4ca8629c..88378aab 100644 --- a/lib/api/Mangayomi/Eval/javascript/service.dart +++ b/lib/api/Sources/Eval/javascript/service.dart @@ -1,7 +1,7 @@ import 'dart:convert'; -import 'package:dantotsu/api/Mangayomi/Eval/javascript/preferences.dart'; -import 'package:dantotsu/api/Mangayomi/Eval/javascript/utils.dart'; +import 'package:dantotsu/api/Sources/Eval/javascript/preferences.dart'; +import 'package:dantotsu/api/Sources/Eval/javascript/utils.dart'; import 'package:flutter_qjs/flutter_qjs.dart'; import '../../Model/Source.dart'; diff --git a/lib/api/Mangayomi/Eval/javascript/utils.dart b/lib/api/Sources/Eval/javascript/utils.dart similarity index 98% rename from lib/api/Mangayomi/Eval/javascript/utils.dart rename to lib/api/Sources/Eval/javascript/utils.dart index 975ea409..bee835fb 100644 --- a/lib/api/Mangayomi/Eval/javascript/utils.dart +++ b/lib/api/Sources/Eval/javascript/utils.dart @@ -1,4 +1,4 @@ -import 'package:dantotsu/api/Mangayomi/Eval/javascript/http.dart'; +import 'package:dantotsu/api/Sources/Eval/javascript/http.dart'; import 'package:flutter_qjs/flutter_qjs.dart'; import 'package:js_packer/js_packer.dart'; diff --git a/lib/api/Mangayomi/Extensions/GetSourceList.dart b/lib/api/Sources/Extensions/GetSourceList.dart similarity index 100% rename from lib/api/Mangayomi/Extensions/GetSourceList.dart rename to lib/api/Sources/Extensions/GetSourceList.dart diff --git a/lib/api/Mangayomi/Extensions/extensions_provider.dart b/lib/api/Sources/Extensions/extensions_provider.dart similarity index 100% rename from lib/api/Mangayomi/Extensions/extensions_provider.dart rename to lib/api/Sources/Extensions/extensions_provider.dart diff --git a/lib/api/Mangayomi/Extensions/extensions_provider.g.dart b/lib/api/Sources/Extensions/extensions_provider.g.dart similarity index 100% rename from lib/api/Mangayomi/Extensions/extensions_provider.g.dart rename to lib/api/Sources/Extensions/extensions_provider.g.dart diff --git a/lib/api/Mangayomi/Extensions/fetch_anime_sources.dart b/lib/api/Sources/Extensions/fetch_anime_sources.dart similarity index 68% rename from lib/api/Mangayomi/Extensions/fetch_anime_sources.dart rename to lib/api/Sources/Extensions/fetch_anime_sources.dart index 9d6a0a99..8abf1be8 100644 --- a/lib/api/Mangayomi/Extensions/fetch_anime_sources.dart +++ b/lib/api/Sources/Extensions/fetch_anime_sources.dart @@ -1,3 +1,4 @@ +import 'package:dantotsu/Functions/GetExtensions.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import '../../../Preferences/PrefManager.dart'; @@ -9,10 +10,10 @@ part 'fetch_anime_sources.g.dart'; @riverpod Future fetchAnimeSourcesList(FetchAnimeSourcesListRef ref, {int? id, required bool reFresh}) async { - if (loadData(PrefName.autoUpdateExtensions) || reFresh) { + var repo = Extensions.animeRepo.value; + if ((loadData(PrefName.autoUpdateExtensions) || reFresh) && repo.isNotEmpty) { await fetchSourcesList( - sourcesIndexUrl: - "https://kodjodevf.github.io/mangayomi-extensions/anime_index.json", + sourcesIndexUrl: repo, refresh: reFresh, id: id, ref: ref, diff --git a/lib/api/Mangayomi/Extensions/fetch_anime_sources.g.dart b/lib/api/Sources/Extensions/fetch_anime_sources.g.dart similarity index 100% rename from lib/api/Mangayomi/Extensions/fetch_anime_sources.g.dart rename to lib/api/Sources/Extensions/fetch_anime_sources.g.dart diff --git a/lib/api/Mangayomi/Extensions/fetch_manga_sources.dart b/lib/api/Sources/Extensions/fetch_manga_sources.dart similarity index 69% rename from lib/api/Mangayomi/Extensions/fetch_manga_sources.dart rename to lib/api/Sources/Extensions/fetch_manga_sources.dart index b6e37e7b..f74556b1 100644 --- a/lib/api/Mangayomi/Extensions/fetch_manga_sources.dart +++ b/lib/api/Sources/Extensions/fetch_manga_sources.dart @@ -1,5 +1,6 @@ import 'package:riverpod_annotation/riverpod_annotation.dart'; +import '../../../Functions/GetExtensions.dart'; import '../../../Preferences/PrefManager.dart'; import '../Model/Manga.dart'; import 'GetSourceList.dart'; @@ -9,10 +10,10 @@ part 'fetch_manga_sources.g.dart'; @riverpod Future fetchMangaSourcesList(FetchMangaSourcesListRef ref, {int? id, required reFresh}) async { - if (loadData(PrefName.autoUpdateExtensions) || reFresh) { + var repo = Extensions.mangaRepo.value; + if ((loadData(PrefName.autoUpdateExtensions) || reFresh) && repo.isNotEmpty) { await fetchSourcesList( - sourcesIndexUrl: - "https://kodjodevf.github.io/mangayomi-extensions/index.json", + sourcesIndexUrl: repo, refresh: reFresh, id: id, ref: ref, diff --git a/lib/api/Mangayomi/Extensions/fetch_manga_sources.g.dart b/lib/api/Sources/Extensions/fetch_manga_sources.g.dart similarity index 100% rename from lib/api/Mangayomi/Extensions/fetch_manga_sources.g.dart rename to lib/api/Sources/Extensions/fetch_manga_sources.g.dart diff --git a/lib/api/Mangayomi/Extensions/fetch_novel_sources.dart b/lib/api/Sources/Extensions/fetch_novel_sources.dart similarity index 70% rename from lib/api/Mangayomi/Extensions/fetch_novel_sources.dart rename to lib/api/Sources/Extensions/fetch_novel_sources.dart index 5843d9b7..63819912 100644 --- a/lib/api/Mangayomi/Extensions/fetch_novel_sources.dart +++ b/lib/api/Sources/Extensions/fetch_novel_sources.dart @@ -1,6 +1,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; +import '../../../Functions/GetExtensions.dart'; import '../../../Preferences/PrefManager.dart'; import '../Model/Manga.dart'; import 'GetSourceList.dart'; @@ -9,10 +10,10 @@ part 'fetch_novel_sources.g.dart'; @riverpod Future fetchNovelSourcesList(Ref ref, {int? id, required reFresh}) async { - if (loadData(PrefName.autoUpdateExtensions) || reFresh) { + var repo = Extensions.novelRepo.value; + if ((loadData(PrefName.autoUpdateExtensions) || reFresh) && repo.isNotEmpty) { await fetchSourcesList( - sourcesIndexUrl: - "https://kodjodevf.github.io/mangayomi-extensions/novel_index.json", + sourcesIndexUrl: repo, refresh: reFresh, id: id, ref: ref, diff --git a/lib/api/Mangayomi/Extensions/fetch_novel_sources.g.dart b/lib/api/Sources/Extensions/fetch_novel_sources.g.dart similarity index 100% rename from lib/api/Mangayomi/Extensions/fetch_novel_sources.g.dart rename to lib/api/Sources/Extensions/fetch_novel_sources.g.dart diff --git a/lib/api/Mangayomi/Model/Manga.dart b/lib/api/Sources/Model/Manga.dart similarity index 100% rename from lib/api/Mangayomi/Model/Manga.dart rename to lib/api/Sources/Model/Manga.dart diff --git a/lib/api/Mangayomi/Model/Manga.g.dart b/lib/api/Sources/Model/Manga.g.dart similarity index 100% rename from lib/api/Mangayomi/Model/Manga.g.dart rename to lib/api/Sources/Model/Manga.g.dart diff --git a/lib/api/Mangayomi/Model/Source.dart b/lib/api/Sources/Model/Source.dart similarity index 100% rename from lib/api/Mangayomi/Model/Source.dart rename to lib/api/Sources/Model/Source.dart diff --git a/lib/api/Mangayomi/Model/Source.g.dart b/lib/api/Sources/Model/Source.g.dart similarity index 100% rename from lib/api/Mangayomi/Model/Source.g.dart rename to lib/api/Sources/Model/Source.g.dart diff --git a/lib/api/Mangayomi/Model/chapter.dart b/lib/api/Sources/Model/chapter.dart similarity index 100% rename from lib/api/Mangayomi/Model/chapter.dart rename to lib/api/Sources/Model/chapter.dart diff --git a/lib/api/Mangayomi/Model/chapter.g.dart b/lib/api/Sources/Model/chapter.g.dart similarity index 100% rename from lib/api/Mangayomi/Model/chapter.g.dart rename to lib/api/Sources/Model/chapter.g.dart diff --git a/lib/api/Mangayomi/Model/settings.dart b/lib/api/Sources/Model/settings.dart similarity index 100% rename from lib/api/Mangayomi/Model/settings.dart rename to lib/api/Sources/Model/settings.dart diff --git a/lib/api/Mangayomi/Model/settings.g.dart b/lib/api/Sources/Model/settings.g.dart similarity index 100% rename from lib/api/Mangayomi/Model/settings.g.dart rename to lib/api/Sources/Model/settings.g.dart diff --git a/lib/api/Mangayomi/Search/getVideo.dart b/lib/api/Sources/Search/getVideo.dart similarity index 100% rename from lib/api/Mangayomi/Search/getVideo.dart rename to lib/api/Sources/Search/getVideo.dart diff --git a/lib/api/Mangayomi/Search/get_detail.dart b/lib/api/Sources/Search/get_detail.dart similarity index 100% rename from lib/api/Mangayomi/Search/get_detail.dart rename to lib/api/Sources/Search/get_detail.dart diff --git a/lib/api/Mangayomi/Search/get_popular.dart b/lib/api/Sources/Search/get_popular.dart similarity index 100% rename from lib/api/Mangayomi/Search/get_popular.dart rename to lib/api/Sources/Search/get_popular.dart diff --git a/lib/api/Mangayomi/Search/search.dart b/lib/api/Sources/Search/search.dart similarity index 100% rename from lib/api/Mangayomi/Search/search.dart rename to lib/api/Sources/Search/search.dart diff --git a/lib/api/Mangayomi/anime_extractors/dood_extractor.dart b/lib/api/Sources/anime_extractors/dood_extractor.dart similarity index 100% rename from lib/api/Mangayomi/anime_extractors/dood_extractor.dart rename to lib/api/Sources/anime_extractors/dood_extractor.dart diff --git a/lib/api/Mangayomi/anime_extractors/filemoon.dart b/lib/api/Sources/anime_extractors/filemoon.dart similarity index 100% rename from lib/api/Mangayomi/anime_extractors/filemoon.dart rename to lib/api/Sources/anime_extractors/filemoon.dart diff --git a/lib/api/Mangayomi/anime_extractors/gogocdn_extractor.dart b/lib/api/Sources/anime_extractors/gogocdn_extractor.dart similarity index 100% rename from lib/api/Mangayomi/anime_extractors/gogocdn_extractor.dart rename to lib/api/Sources/anime_extractors/gogocdn_extractor.dart diff --git a/lib/api/Mangayomi/anime_extractors/mp4upload_extractor.dart b/lib/api/Sources/anime_extractors/mp4upload_extractor.dart similarity index 100% rename from lib/api/Mangayomi/anime_extractors/mp4upload_extractor.dart rename to lib/api/Sources/anime_extractors/mp4upload_extractor.dart diff --git a/lib/api/Mangayomi/anime_extractors/mystream_extractor.dart b/lib/api/Sources/anime_extractors/mystream_extractor.dart similarity index 100% rename from lib/api/Mangayomi/anime_extractors/mystream_extractor.dart rename to lib/api/Sources/anime_extractors/mystream_extractor.dart diff --git a/lib/api/Mangayomi/anime_extractors/mytv_extractor.dart b/lib/api/Sources/anime_extractors/mytv_extractor.dart similarity index 100% rename from lib/api/Mangayomi/anime_extractors/mytv_extractor.dart rename to lib/api/Sources/anime_extractors/mytv_extractor.dart diff --git a/lib/api/Mangayomi/anime_extractors/okru_extractor.dart b/lib/api/Sources/anime_extractors/okru_extractor.dart similarity index 96% rename from lib/api/Mangayomi/anime_extractors/okru_extractor.dart rename to lib/api/Sources/anime_extractors/okru_extractor.dart index b7ccf5e0..d1b588ad 100644 --- a/lib/api/Mangayomi/anime_extractors/okru_extractor.dart +++ b/lib/api/Sources/anime_extractors/okru_extractor.dart @@ -1,5 +1,5 @@ import 'package:dantotsu/Functions/string_extensions.dart'; -import 'package:dantotsu/api/Mangayomi/dom_extensions.dart'; +import 'package:dantotsu/api/Sources/dom_extensions.dart'; import 'package:html/parser.dart' show parse; import 'package:http_interceptor/http_interceptor.dart'; import 'package:path/path.dart' as path; diff --git a/lib/api/Mangayomi/anime_extractors/quarkuc_extractor.dart b/lib/api/Sources/anime_extractors/quarkuc_extractor.dart similarity index 100% rename from lib/api/Mangayomi/anime_extractors/quarkuc_extractor.dart rename to lib/api/Sources/anime_extractors/quarkuc_extractor.dart diff --git a/lib/api/Mangayomi/anime_extractors/sendvid_extractor.dart b/lib/api/Sources/anime_extractors/sendvid_extractor.dart similarity index 100% rename from lib/api/Mangayomi/anime_extractors/sendvid_extractor.dart rename to lib/api/Sources/anime_extractors/sendvid_extractor.dart diff --git a/lib/api/Mangayomi/anime_extractors/sibnet_extractor.dart b/lib/api/Sources/anime_extractors/sibnet_extractor.dart similarity index 100% rename from lib/api/Mangayomi/anime_extractors/sibnet_extractor.dart rename to lib/api/Sources/anime_extractors/sibnet_extractor.dart diff --git a/lib/api/Mangayomi/anime_extractors/streamlare_extractor.dart b/lib/api/Sources/anime_extractors/streamlare_extractor.dart similarity index 100% rename from lib/api/Mangayomi/anime_extractors/streamlare_extractor.dart rename to lib/api/Sources/anime_extractors/streamlare_extractor.dart diff --git a/lib/api/Mangayomi/anime_extractors/streamtape_extractor.dart b/lib/api/Sources/anime_extractors/streamtape_extractor.dart similarity index 100% rename from lib/api/Mangayomi/anime_extractors/streamtape_extractor.dart rename to lib/api/Sources/anime_extractors/streamtape_extractor.dart diff --git a/lib/api/Mangayomi/anime_extractors/streamwish_extractor.dart b/lib/api/Sources/anime_extractors/streamwish_extractor.dart similarity index 96% rename from lib/api/Mangayomi/anime_extractors/streamwish_extractor.dart rename to lib/api/Sources/anime_extractors/streamwish_extractor.dart index 012fbe01..aab8ada8 100644 --- a/lib/api/Mangayomi/anime_extractors/streamwish_extractor.dart +++ b/lib/api/Sources/anime_extractors/streamwish_extractor.dart @@ -1,5 +1,5 @@ import 'package:dantotsu/Functions/string_extensions.dart'; -import 'package:dantotsu/api/Mangayomi/anime_extractors/streamlare_extractor.dart'; +import 'package:dantotsu/api/Sources/anime_extractors/streamlare_extractor.dart'; import 'package:http_interceptor/http_interceptor.dart'; import 'package:js_packer/js_packer.dart'; diff --git a/lib/api/Mangayomi/anime_extractors/vidbom_extractor.dart b/lib/api/Sources/anime_extractors/vidbom_extractor.dart similarity index 100% rename from lib/api/Mangayomi/anime_extractors/vidbom_extractor.dart rename to lib/api/Sources/anime_extractors/vidbom_extractor.dart diff --git a/lib/api/Mangayomi/anime_extractors/voe_extractor.dart b/lib/api/Sources/anime_extractors/voe_extractor.dart similarity index 98% rename from lib/api/Mangayomi/anime_extractors/voe_extractor.dart rename to lib/api/Sources/anime_extractors/voe_extractor.dart index 669912de..df4b04f3 100644 --- a/lib/api/Mangayomi/anime_extractors/voe_extractor.dart +++ b/lib/api/Sources/anime_extractors/voe_extractor.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:dantotsu/Functions/string_extensions.dart'; -import 'package:dantotsu/api/Mangayomi/dom_extensions.dart'; +import 'package:dantotsu/api/Sources/dom_extensions.dart'; import 'package:html/dom.dart'; import 'package:html/parser.dart'; import 'package:http_interceptor/http_interceptor.dart'; diff --git a/lib/api/Mangayomi/anime_extractors/your_upload_extractor.dart b/lib/api/Sources/anime_extractors/your_upload_extractor.dart similarity index 100% rename from lib/api/Mangayomi/anime_extractors/your_upload_extractor.dart rename to lib/api/Sources/anime_extractors/your_upload_extractor.dart diff --git a/lib/api/Mangayomi/cryptoaes/crypto_aes.dart b/lib/api/Sources/cryptoaes/crypto_aes.dart similarity index 100% rename from lib/api/Mangayomi/cryptoaes/crypto_aes.dart rename to lib/api/Sources/cryptoaes/crypto_aes.dart diff --git a/lib/api/Mangayomi/cryptoaes/deobfuscator.dart b/lib/api/Sources/cryptoaes/deobfuscator.dart similarity index 100% rename from lib/api/Mangayomi/cryptoaes/deobfuscator.dart rename to lib/api/Sources/cryptoaes/deobfuscator.dart diff --git a/lib/api/Mangayomi/cryptoaes/js_unpacker.dart b/lib/api/Sources/cryptoaes/js_unpacker.dart similarity index 100% rename from lib/api/Mangayomi/cryptoaes/js_unpacker.dart rename to lib/api/Sources/cryptoaes/js_unpacker.dart diff --git a/lib/api/Mangayomi/dom_extensions.dart b/lib/api/Sources/dom_extensions.dart similarity index 98% rename from lib/api/Mangayomi/dom_extensions.dart rename to lib/api/Sources/dom_extensions.dart index 7f29190b..1bb26b7a 100644 --- a/lib/api/Mangayomi/dom_extensions.dart +++ b/lib/api/Sources/dom_extensions.dart @@ -1,4 +1,4 @@ -import 'package:dantotsu/api/Mangayomi/reg_exp_matcher.dart'; +import 'package:dantotsu/api/Sources/reg_exp_matcher.dart'; import 'package:html/dom.dart'; import 'package:pseudom/pseudom.dart' as pseudom; import 'package:xpath_selector_html_parser/xpath_selector_html_parser.dart'; diff --git a/lib/api/Mangayomi/extension_preferences_providers.dart b/lib/api/Sources/extension_preferences_providers.dart similarity index 100% rename from lib/api/Mangayomi/extension_preferences_providers.dart rename to lib/api/Sources/extension_preferences_providers.dart diff --git a/lib/api/Mangayomi/get_source_preference.dart b/lib/api/Sources/get_source_preference.dart similarity index 100% rename from lib/api/Mangayomi/get_source_preference.dart rename to lib/api/Sources/get_source_preference.dart diff --git a/lib/api/Mangayomi/http/m_client.dart b/lib/api/Sources/http/m_client.dart similarity index 98% rename from lib/api/Mangayomi/http/m_client.dart rename to lib/api/Sources/http/m_client.dart index e0efd085..d2fe0dfd 100644 --- a/lib/api/Mangayomi/http/m_client.dart +++ b/lib/api/Sources/http/m_client.dart @@ -2,8 +2,8 @@ import 'dart:async'; import 'dart:io'; import 'package:dantotsu/Functions/Function.dart'; -import 'package:dantotsu/api/Mangayomi/Model/settings.dart'; -import 'package:dantotsu/api/Mangayomi/http/rhttp/src/model/settings.dart'; +import 'package:dantotsu/api/Sources/Model/settings.dart'; +import 'package:dantotsu/api/Sources/http/rhttp/src/model/settings.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart' as flutter_inappwebview; diff --git a/lib/api/Mangayomi/http/rhttp/LICENSE b/lib/api/Sources/http/rhttp/LICENSE similarity index 100% rename from lib/api/Mangayomi/http/rhttp/LICENSE rename to lib/api/Sources/http/rhttp/LICENSE diff --git a/lib/api/Mangayomi/http/rhttp/rhttp.dart b/lib/api/Sources/http/rhttp/rhttp.dart similarity index 100% rename from lib/api/Mangayomi/http/rhttp/rhttp.dart rename to lib/api/Sources/http/rhttp/rhttp.dart diff --git a/lib/api/Mangayomi/http/rhttp/src/client/compatible_client.dart b/lib/api/Sources/http/rhttp/src/client/compatible_client.dart similarity index 95% rename from lib/api/Mangayomi/http/rhttp/src/client/compatible_client.dart rename to lib/api/Sources/http/rhttp/src/client/compatible_client.dart index 76925646..039a6b99 100644 --- a/lib/api/Mangayomi/http/rhttp/src/client/compatible_client.dart +++ b/lib/api/Sources/http/rhttp/src/client/compatible_client.dart @@ -1,5 +1,5 @@ -import 'package:dantotsu/api/Mangayomi/http/rhttp/src/client/rhttp_client.dart'; -import 'package:dantotsu/api/Mangayomi/http/src/rust/api/rhttp/http.dart' +import 'package:dantotsu/api/Sources/http/rhttp/src/client/rhttp_client.dart'; +import 'package:dantotsu/api/Sources/http/src/rust/api/rhttp/http.dart' as rust; import 'package:http/http.dart'; diff --git a/lib/api/Mangayomi/http/rhttp/src/client/rhttp_client.dart b/lib/api/Sources/http/rhttp/src/client/rhttp_client.dart similarity index 95% rename from lib/api/Mangayomi/http/rhttp/src/client/rhttp_client.dart rename to lib/api/Sources/http/rhttp/src/client/rhttp_client.dart index 21984a2f..fd5bc960 100644 --- a/lib/api/Mangayomi/http/rhttp/src/client/rhttp_client.dart +++ b/lib/api/Sources/http/rhttp/src/client/rhttp_client.dart @@ -1,9 +1,9 @@ import 'dart:async'; import 'dart:typed_data'; -import 'package:dantotsu/api/Mangayomi/http/src/rust/api/rhttp/client.dart' +import 'package:dantotsu/api/Sources/http/src/rust/api/rhttp/client.dart' as rust_client; -import 'package:dantotsu/api/Mangayomi/http/src/rust/api/rhttp/http.dart' +import 'package:dantotsu/api/Sources/http/src/rust/api/rhttp/http.dart' as rust; import '../model/cancel_token.dart'; diff --git a/lib/api/Mangayomi/http/rhttp/src/model/cancel_token.dart b/lib/api/Sources/http/rhttp/src/model/cancel_token.dart similarity index 100% rename from lib/api/Mangayomi/http/rhttp/src/model/cancel_token.dart rename to lib/api/Sources/http/rhttp/src/model/cancel_token.dart diff --git a/lib/api/Mangayomi/http/rhttp/src/model/exception.dart b/lib/api/Sources/http/rhttp/src/model/exception.dart similarity index 96% rename from lib/api/Mangayomi/http/rhttp/src/model/exception.dart rename to lib/api/Sources/http/rhttp/src/model/exception.dart index 4414c00f..5c9ce8b3 100644 --- a/lib/api/Mangayomi/http/rhttp/src/model/exception.dart +++ b/lib/api/Sources/http/rhttp/src/model/exception.dart @@ -1,8 +1,8 @@ import 'dart:typed_data'; -import 'package:dantotsu/api/Mangayomi/http/src/rust/api/rhttp/error.dart' +import 'package:dantotsu/api/Sources/http/src/rust/api/rhttp/error.dart' as rust; -import 'package:dantotsu/api/Mangayomi/http/src/rust/api/rhttp/http.dart' +import 'package:dantotsu/api/Sources/http/src/rust/api/rhttp/http.dart' as rust_http; import 'request.dart'; diff --git a/lib/api/Mangayomi/http/rhttp/src/model/header.dart b/lib/api/Sources/http/rhttp/src/model/header.dart similarity index 100% rename from lib/api/Mangayomi/http/rhttp/src/model/header.dart rename to lib/api/Sources/http/rhttp/src/model/header.dart diff --git a/lib/api/Mangayomi/http/rhttp/src/model/request.dart b/lib/api/Sources/http/rhttp/src/model/request.dart similarity index 95% rename from lib/api/Mangayomi/http/rhttp/src/model/request.dart rename to lib/api/Sources/http/rhttp/src/model/request.dart index 5e0cda46..87310ac2 100644 --- a/lib/api/Mangayomi/http/rhttp/src/model/request.dart +++ b/lib/api/Sources/http/rhttp/src/model/request.dart @@ -1,6 +1,6 @@ import 'dart:typed_data'; -import 'package:dantotsu/api/Mangayomi/http/src/rust/api/rhttp/http.dart' +import 'package:dantotsu/api/Sources/http/src/rust/api/rhttp/http.dart' as rust; import '../client/rhttp_client.dart'; diff --git a/lib/api/Mangayomi/http/rhttp/src/model/response.dart b/lib/api/Sources/http/rhttp/src/model/response.dart similarity index 96% rename from lib/api/Mangayomi/http/rhttp/src/model/response.dart rename to lib/api/Sources/http/rhttp/src/model/response.dart index a8cee162..8d322fb0 100644 --- a/lib/api/Mangayomi/http/rhttp/src/model/response.dart +++ b/lib/api/Sources/http/rhttp/src/model/response.dart @@ -1,6 +1,6 @@ import 'dart:typed_data'; -import 'package:dantotsu/api/Mangayomi/http/src/rust/api/rhttp/http.dart' +import 'package:dantotsu/api/Sources/http/src/rust/api/rhttp/http.dart' as rust; import 'request.dart'; diff --git a/lib/api/Mangayomi/http/rhttp/src/model/settings.dart b/lib/api/Sources/http/rhttp/src/model/settings.dart similarity index 98% rename from lib/api/Mangayomi/http/rhttp/src/model/settings.dart rename to lib/api/Sources/http/rhttp/src/model/settings.dart index fefe66dc..440f2c62 100644 --- a/lib/api/Mangayomi/http/rhttp/src/model/settings.dart +++ b/lib/api/Sources/http/rhttp/src/model/settings.dart @@ -1,9 +1,9 @@ import 'dart:typed_data'; -import 'package:dantotsu/api/Mangayomi/http/src/rust/api/rhttp/client.dart' +import 'package:dantotsu/api/Sources/http/src/rust/api/rhttp/client.dart' as rust_client; -export 'package:dantotsu/api/Mangayomi/http/src/rust/api/rhttp/client.dart' +export 'package:dantotsu/api/Sources/http/src/rust/api/rhttp/client.dart' show TlsVersion; const _keepBaseUrl = '__rhttp_keep__'; diff --git a/lib/api/Mangayomi/http/rhttp/src/request.dart b/lib/api/Sources/http/rhttp/src/request.dart similarity index 77% rename from lib/api/Mangayomi/http/rhttp/src/request.dart rename to lib/api/Sources/http/rhttp/src/request.dart index 951c6655..181000a4 100644 --- a/lib/api/Mangayomi/http/rhttp/src/request.dart +++ b/lib/api/Sources/http/rhttp/src/request.dart @@ -1,14 +1,14 @@ import 'dart:async'; -import 'package:dantotsu/api/Mangayomi/http/rhttp/src/model/exception.dart'; -import 'package:dantotsu/api/Mangayomi/http/rhttp/src/model/request.dart'; -import 'package:dantotsu/api/Mangayomi/http/rhttp/src/model/response.dart'; -import 'package:dantotsu/api/Mangayomi/http/rhttp/src/model/settings.dart'; -import 'package:dantotsu/api/Mangayomi/http/src/rust/api/rhttp/error.dart' +import 'package:dantotsu/api/Sources/http/rhttp/src/model/exception.dart'; +import 'package:dantotsu/api/Sources/http/rhttp/src/model/request.dart'; +import 'package:dantotsu/api/Sources/http/rhttp/src/model/response.dart'; +import 'package:dantotsu/api/Sources/http/rhttp/src/model/settings.dart'; +import 'package:dantotsu/api/Sources/http/src/rust/api/rhttp/error.dart' as rust_error; -import 'package:dantotsu/api/Mangayomi/http/src/rust/api/rhttp/http.dart' +import 'package:dantotsu/api/Sources/http/src/rust/api/rhttp/http.dart' as rust; -import 'package:dantotsu/api/Mangayomi/http/src/rust/lib.dart' as rust_lib; +import 'package:dantotsu/api/Sources/http/src/rust/lib.dart' as rust_lib; import 'package:flutter/foundation.dart'; /// Non-Generated helper function that is used by diff --git a/lib/api/Mangayomi/http/src/rust/api/image.dart b/lib/api/Sources/http/src/rust/api/image.dart similarity index 100% rename from lib/api/Mangayomi/http/src/rust/api/image.dart rename to lib/api/Sources/http/src/rust/api/image.dart diff --git a/lib/api/Mangayomi/http/src/rust/api/rhttp/client.dart b/lib/api/Sources/http/src/rust/api/rhttp/client.dart similarity index 100% rename from lib/api/Mangayomi/http/src/rust/api/rhttp/client.dart rename to lib/api/Sources/http/src/rust/api/rhttp/client.dart diff --git a/lib/api/Mangayomi/http/src/rust/api/rhttp/client.freezed.dart b/lib/api/Sources/http/src/rust/api/rhttp/client.freezed.dart similarity index 100% rename from lib/api/Mangayomi/http/src/rust/api/rhttp/client.freezed.dart rename to lib/api/Sources/http/src/rust/api/rhttp/client.freezed.dart diff --git a/lib/api/Mangayomi/http/src/rust/api/rhttp/error.dart b/lib/api/Sources/http/src/rust/api/rhttp/error.dart similarity index 100% rename from lib/api/Mangayomi/http/src/rust/api/rhttp/error.dart rename to lib/api/Sources/http/src/rust/api/rhttp/error.dart diff --git a/lib/api/Mangayomi/http/src/rust/api/rhttp/error.freezed.dart b/lib/api/Sources/http/src/rust/api/rhttp/error.freezed.dart similarity index 100% rename from lib/api/Mangayomi/http/src/rust/api/rhttp/error.freezed.dart rename to lib/api/Sources/http/src/rust/api/rhttp/error.freezed.dart diff --git a/lib/api/Mangayomi/http/src/rust/api/rhttp/http.dart b/lib/api/Sources/http/src/rust/api/rhttp/http.dart similarity index 100% rename from lib/api/Mangayomi/http/src/rust/api/rhttp/http.dart rename to lib/api/Sources/http/src/rust/api/rhttp/http.dart diff --git a/lib/api/Mangayomi/http/src/rust/api/rhttp/http.freezed.dart b/lib/api/Sources/http/src/rust/api/rhttp/http.freezed.dart similarity index 100% rename from lib/api/Mangayomi/http/src/rust/api/rhttp/http.freezed.dart rename to lib/api/Sources/http/src/rust/api/rhttp/http.freezed.dart diff --git a/lib/api/Mangayomi/http/src/rust/frb_generated.dart b/lib/api/Sources/http/src/rust/frb_generated.dart similarity index 100% rename from lib/api/Mangayomi/http/src/rust/frb_generated.dart rename to lib/api/Sources/http/src/rust/frb_generated.dart diff --git a/lib/api/Mangayomi/http/src/rust/frb_generated.io.dart b/lib/api/Sources/http/src/rust/frb_generated.io.dart similarity index 100% rename from lib/api/Mangayomi/http/src/rust/frb_generated.io.dart rename to lib/api/Sources/http/src/rust/frb_generated.io.dart diff --git a/lib/api/Mangayomi/http/src/rust/frb_generated.web.dart b/lib/api/Sources/http/src/rust/frb_generated.web.dart similarity index 100% rename from lib/api/Mangayomi/http/src/rust/frb_generated.web.dart rename to lib/api/Sources/http/src/rust/frb_generated.web.dart diff --git a/lib/api/Mangayomi/http/src/rust/lib.dart b/lib/api/Sources/http/src/rust/lib.dart similarity index 100% rename from lib/api/Mangayomi/http/src/rust/lib.dart rename to lib/api/Sources/http/src/rust/lib.dart diff --git a/lib/api/Mangayomi/interface.dart b/lib/api/Sources/interface.dart similarity index 100% rename from lib/api/Mangayomi/interface.dart rename to lib/api/Sources/interface.dart diff --git a/lib/api/Mangayomi/lib.dart b/lib/api/Sources/lib.dart similarity index 100% rename from lib/api/Mangayomi/lib.dart rename to lib/api/Sources/lib.dart diff --git a/lib/api/Mangayomi/reg_exp_matcher.dart b/lib/api/Sources/reg_exp_matcher.dart similarity index 100% rename from lib/api/Mangayomi/reg_exp_matcher.dart rename to lib/api/Sources/reg_exp_matcher.dart diff --git a/lib/api/Mangayomi/xpath_selector.dart b/lib/api/Sources/xpath_selector.dart similarity index 100% rename from lib/api/Mangayomi/xpath_selector.dart rename to lib/api/Sources/xpath_selector.dart diff --git a/lib/main.dart b/lib/main.dart index ea737813..df60476c 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -126,49 +126,50 @@ class MyApp extends StatelessWidget { ), ); return KeyboardListener( - focusNode: FocusNode(), - onKeyEvent: (KeyEvent event) async { - if (event is KeyDownEvent) { - if (event.logicalKey == LogicalKeyboardKey.escape) { - if (Get.previousRoute.isNotEmpty) { - Get.back(); - } - } else if (event.logicalKey == LogicalKeyboardKey.f11) { + focusNode: FocusNode(), + onKeyEvent: (KeyEvent event) async { + if (event is KeyDownEvent) { + if (event.logicalKey == LogicalKeyboardKey.escape) { + if (Get.previousRoute.isNotEmpty) { + Get.back(); + } + } else if (event.logicalKey == LogicalKeyboardKey.f11) { + bool isFullScreen = await windowManager.isFullScreen(); + windowManager.setFullScreen(!isFullScreen); + } else if (event.logicalKey == LogicalKeyboardKey.enter) { + final isAltPressed = HardwareKeyboard.instance.logicalKeysPressed + .contains(LogicalKeyboardKey.altLeft) || + HardwareKeyboard.instance.logicalKeysPressed + .contains(LogicalKeyboardKey.altRight); + if (isAltPressed) { bool isFullScreen = await windowManager.isFullScreen(); windowManager.setFullScreen(!isFullScreen); - } else if (event.logicalKey == LogicalKeyboardKey.enter) { - final isAltPressed = HardwareKeyboard.instance.logicalKeysPressed - .contains(LogicalKeyboardKey.altLeft) || - HardwareKeyboard.instance.logicalKeysPressed - .contains(LogicalKeyboardKey.altRight); - if (isAltPressed) { - bool isFullScreen = await windowManager.isFullScreen(); - windowManager.setFullScreen(!isFullScreen); - } } } + } + }, + child: DynamicColorBuilder( + builder: (ColorScheme? lightDynamic, ColorScheme? darkDynamic) { + return GetMaterialApp( + localizationsDelegates: const [ + AppLocalizations.delegate, + GlobalMaterialLocalizations.delegate, + GlobalWidgetsLocalizations.delegate, + GlobalCupertinoLocalizations.delegate, + ], + supportedLocales: AppLocalizations.supportedLocales, + locale: Locale(loadData(PrefName.defaultLanguage)), + navigatorKey: navigatorKey, + title: 'Dartotsu', + themeMode: isDarkMode ? ThemeMode.dark : ThemeMode.light, + debugShowCheckedModeBanner: false, + theme: getTheme(lightDynamic, themeManager), + darkTheme: getTheme(darkDynamic, themeManager), + home: const MainActivity(), + ); }, - child: DynamicColorBuilder( - builder: (ColorScheme? lightDynamic, ColorScheme? darkDynamic) { - return GetMaterialApp( - localizationsDelegates: const [ - AppLocalizations.delegate, - GlobalMaterialLocalizations.delegate, - GlobalWidgetsLocalizations.delegate, - GlobalCupertinoLocalizations.delegate, - ], - supportedLocales: AppLocalizations.supportedLocales, - locale: Locale(loadData(PrefName.defaultLanguage)), - navigatorKey: navigatorKey, - title: 'Dartotsu', - themeMode: isDarkMode ? ThemeMode.dark : ThemeMode.light, - debugShowCheckedModeBanner: false, - theme: getTheme(lightDynamic, themeManager), - darkTheme: getTheme(darkDynamic, themeManager), - home: const MainActivity(), - ); - }, - )); + ), + ); } } @@ -188,7 +189,6 @@ class MainActivityState extends State { @override Widget build(BuildContext context) { - navbar = FloatingBottomNavBar( selectedIndex: _selectedIndex, onTabSelected: _onTabSelected,