diff --git a/lib/main.dart b/lib/main.dart index 548b435..bc09db8 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -14,10 +14,10 @@ import 'package:mangayomi/models/settings.dart'; import 'package:mangayomi/models/source.dart'; import 'package:mangayomi/models/manga.dart'; import 'package:mangayomi/router/router.dart'; -import 'package:mangayomi/views/more/settings/appearance/providers/blend_level_state_provider.dart'; -import 'package:mangayomi/views/more/settings/appearance/providers/flex_scheme_color_state_provider.dart'; -import 'package:mangayomi/views/more/settings/appearance/providers/pure_black_dark_mode_state_provider.dart'; -import 'package:mangayomi/views/more/settings/appearance/providers/theme_mode_state_provider.dart'; +import 'package:mangayomi/modules/more/settings/appearance/providers/blend_level_state_provider.dart'; +import 'package:mangayomi/modules/more/settings/appearance/providers/flex_scheme_color_state_provider.dart'; +import 'package:mangayomi/modules/more/settings/appearance/providers/pure_black_dark_mode_state_provider.dart'; +import 'package:mangayomi/modules/more/settings/appearance/providers/theme_mode_state_provider.dart'; import 'package:path_provider/path_provider.dart'; import 'package:path/path.dart' as path; diff --git a/lib/views/browse/browse_screen.dart b/lib/modules/browse/browse_screen.dart similarity index 92% rename from lib/views/browse/browse_screen.dart rename to lib/modules/browse/browse_screen.dart index 530b889..c1c0f52 100644 --- a/lib/views/browse/browse_screen.dart +++ b/lib/modules/browse/browse_screen.dart @@ -3,11 +3,11 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:mangayomi/providers/storage_provider.dart'; import 'package:mangayomi/models/source.dart'; -import 'package:mangayomi/views/browse/extension/extension_screen.dart'; -import 'package:mangayomi/views/browse/extension/refresh_source_list_data.dart'; -import 'package:mangayomi/views/browse/migrate_screen.dart'; -import 'package:mangayomi/views/browse/sources/sources_screen.dart'; -import 'package:mangayomi/views/library/search_text_form_field.dart'; +import 'package:mangayomi/modules/browse/extension/extension_screen.dart'; +import 'package:mangayomi/modules/browse/extension/refresh_source_list_data.dart'; +import 'package:mangayomi/modules/browse/migrate_screen.dart'; +import 'package:mangayomi/modules/browse/sources/sources_screen.dart'; +import 'package:mangayomi/modules/library/search_text_form_field.dart'; class BrowseScreen extends ConsumerStatefulWidget { const BrowseScreen({super.key}); diff --git a/lib/views/browse/extension/extension_lang.dart b/lib/modules/browse/extension/extension_lang.dart similarity index 94% rename from lib/views/browse/extension/extension_lang.dart rename to lib/modules/browse/extension/extension_lang.dart index 82f6a2b..502d94d 100644 --- a/lib/views/browse/extension/extension_lang.dart +++ b/lib/modules/browse/extension/extension_lang.dart @@ -4,7 +4,7 @@ import 'package:isar/isar.dart'; import 'package:mangayomi/main.dart'; import 'package:mangayomi/models/source.dart'; import 'package:mangayomi/utils/lang.dart'; -import 'package:mangayomi/views/browse/extension/widgets/extension_lang_list_tile_widget.dart'; +import 'package:mangayomi/modules/browse/extension/widgets/extension_lang_list_tile_widget.dart'; class ExtensionsLang extends ConsumerWidget { const ExtensionsLang({super.key}); diff --git a/lib/views/browse/extension/extension_screen.dart b/lib/modules/browse/extension/extension_screen.dart similarity index 93% rename from lib/views/browse/extension/extension_screen.dart rename to lib/modules/browse/extension/extension_screen.dart index b71c7b1..f07ecaf 100644 --- a/lib/views/browse/extension/extension_screen.dart +++ b/lib/modules/browse/extension/extension_screen.dart @@ -5,8 +5,8 @@ import 'package:isar/isar.dart'; import 'package:mangayomi/main.dart'; import 'package:mangayomi/models/source.dart'; import 'package:mangayomi/utils/lang.dart'; -import 'package:mangayomi/views/browse/extension/widgets/extension_list_tile_widget.dart'; -import 'package:mangayomi/views/more/settings/browse/providers/browse_state_provider.dart'; +import 'package:mangayomi/modules/browse/extension/widgets/extension_list_tile_widget.dart'; +import 'package:mangayomi/modules/more/settings/browse/providers/browse_state_provider.dart'; class ExtensionScreen extends ConsumerWidget { final Function(dynamic) entriesData; diff --git a/lib/views/browse/extension/refresh_source_list_data.dart b/lib/modules/browse/extension/refresh_source_list_data.dart similarity index 100% rename from lib/views/browse/extension/refresh_source_list_data.dart rename to lib/modules/browse/extension/refresh_source_list_data.dart diff --git a/lib/views/browse/extension/refresh_source_list_data.g.dart b/lib/modules/browse/extension/refresh_source_list_data.g.dart similarity index 100% rename from lib/views/browse/extension/refresh_source_list_data.g.dart rename to lib/modules/browse/extension/refresh_source_list_data.g.dart diff --git a/lib/views/browse/extension/widgets/extension_lang_list_tile_widget.dart b/lib/modules/browse/extension/widgets/extension_lang_list_tile_widget.dart similarity index 100% rename from lib/views/browse/extension/widgets/extension_lang_list_tile_widget.dart rename to lib/modules/browse/extension/widgets/extension_lang_list_tile_widget.dart diff --git a/lib/views/browse/extension/widgets/extension_list_tile_widget.dart b/lib/modules/browse/extension/widgets/extension_list_tile_widget.dart similarity index 100% rename from lib/views/browse/extension/widgets/extension_list_tile_widget.dart rename to lib/modules/browse/extension/widgets/extension_list_tile_widget.dart diff --git a/lib/views/browse/global_search/global_search_screen.dart b/lib/modules/browse/global_search/global_search_screen.dart similarity index 95% rename from lib/views/browse/global_search/global_search_screen.dart rename to lib/modules/browse/global_search/global_search_screen.dart index 3d8ed20..fbc94f4 100644 --- a/lib/views/browse/global_search/global_search_screen.dart +++ b/lib/modules/browse/global_search/global_search_screen.dart @@ -11,10 +11,10 @@ import 'package:mangayomi/sources/source_list.dart'; import 'package:mangayomi/utils/cached_network.dart'; import 'package:mangayomi/utils/headers.dart'; import 'package:mangayomi/utils/lang.dart'; -import 'package:mangayomi/views/library/search_text_form_field.dart'; -import 'package:mangayomi/views/more/settings/browse/providers/browse_state_provider.dart'; -import 'package:mangayomi/views/widgets/bottom_text_widget.dart'; -import 'package:mangayomi/views/widgets/manga_image_card_widget.dart'; +import 'package:mangayomi/modules/library/search_text_form_field.dart'; +import 'package:mangayomi/modules/more/settings/browse/providers/browse_state_provider.dart'; +import 'package:mangayomi/modules/widgets/bottom_text_widget.dart'; +import 'package:mangayomi/modules/widgets/manga_image_card_widget.dart'; class GlobalSearchScreen extends ConsumerStatefulWidget { const GlobalSearchScreen({ diff --git a/lib/views/browse/migrate_screen.dart b/lib/modules/browse/migrate_screen.dart similarity index 100% rename from lib/views/browse/migrate_screen.dart rename to lib/modules/browse/migrate_screen.dart diff --git a/lib/views/browse/sources/sources_screen.dart b/lib/modules/browse/sources/sources_screen.dart similarity index 98% rename from lib/views/browse/sources/sources_screen.dart rename to lib/modules/browse/sources/sources_screen.dart index c765e93..d7d01da 100644 --- a/lib/views/browse/sources/sources_screen.dart +++ b/lib/modules/browse/sources/sources_screen.dart @@ -9,7 +9,7 @@ import 'package:mangayomi/models/manga_type.dart'; import 'package:mangayomi/models/source.dart'; import 'package:mangayomi/utils/headers.dart'; import 'package:mangayomi/utils/lang.dart'; -import 'package:mangayomi/views/more/settings/browse/providers/browse_state_provider.dart'; +import 'package:mangayomi/modules/more/settings/browse/providers/browse_state_provider.dart'; class SourcesScreen extends ConsumerWidget { const SourcesScreen({super.key}); diff --git a/lib/views/history/history_screen.dart b/lib/modules/history/history_screen.dart similarity index 97% rename from lib/views/history/history_screen.dart rename to lib/modules/history/history_screen.dart index 632bb6f..00a0adb 100644 --- a/lib/views/history/history_screen.dart +++ b/lib/modules/history/history_screen.dart @@ -4,14 +4,14 @@ import 'package:go_router/go_router.dart'; import 'package:grouped_list/grouped_list.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/modules/history/providers/isar_providers.dart'; +import 'package:mangayomi/modules/manga/reader/providers/push_router.dart'; import 'package:mangayomi/utils/cached_network.dart'; import 'package:mangayomi/utils/date.dart'; import 'package:mangayomi/utils/headers.dart'; -import 'package:mangayomi/views/library/search_text_form_field.dart'; -import 'package:mangayomi/views/widgets/error_text.dart'; -import 'package:mangayomi/views/widgets/progress_center.dart'; +import 'package:mangayomi/modules/library/search_text_form_field.dart'; +import 'package:mangayomi/modules/widgets/error_text.dart'; +import 'package:mangayomi/modules/widgets/progress_center.dart'; class HistoryScreen extends ConsumerStatefulWidget { const HistoryScreen({super.key}); diff --git a/lib/views/history/providers/isar_providers.dart b/lib/modules/history/providers/isar_providers.dart similarity index 100% rename from lib/views/history/providers/isar_providers.dart rename to lib/modules/history/providers/isar_providers.dart diff --git a/lib/views/history/providers/isar_providers.g.dart b/lib/modules/history/providers/isar_providers.g.dart similarity index 100% rename from lib/views/history/providers/isar_providers.g.dart rename to lib/modules/history/providers/isar_providers.g.dart diff --git a/lib/views/library/library_screen.dart b/lib/modules/library/library_screen.dart similarity index 98% rename from lib/views/library/library_screen.dart rename to lib/modules/library/library_screen.dart index bbe28db..2405888 100644 --- a/lib/views/library/library_screen.dart +++ b/lib/modules/library/library_screen.dart @@ -11,17 +11,17 @@ import 'package:mangayomi/models/settings.dart'; import 'package:mangayomi/providers/storage_provider.dart'; import 'package:mangayomi/utils/colors.dart'; import 'package:mangayomi/utils/media_query.dart'; -import 'package:mangayomi/views/library/providers/isar_providers.dart'; -import 'package:mangayomi/views/library/providers/library_state_provider.dart'; -import 'package:mangayomi/views/library/search_text_form_field.dart'; -import 'package:mangayomi/views/library/widgets/library_gridview_widget.dart'; -import 'package:mangayomi/views/library/widgets/library_listview_widget.dart'; -import 'package:mangayomi/views/library/widgets/list_tile_manga_category.dart'; -import 'package:mangayomi/views/manga/detail/widgets/chapter_filter_list_tile_widget.dart'; -import 'package:mangayomi/views/manga/detail/widgets/chapter_sort_list_tile_widget.dart'; -import 'package:mangayomi/views/more/categoties/providers/isar_providers.dart'; -import 'package:mangayomi/views/widgets/error_text.dart'; -import 'package:mangayomi/views/widgets/progress_center.dart'; +import 'package:mangayomi/modules/library/providers/isar_providers.dart'; +import 'package:mangayomi/modules/library/providers/library_state_provider.dart'; +import 'package:mangayomi/modules/library/search_text_form_field.dart'; +import 'package:mangayomi/modules/library/widgets/library_gridview_widget.dart'; +import 'package:mangayomi/modules/library/widgets/library_listview_widget.dart'; +import 'package:mangayomi/modules/library/widgets/list_tile_manga_category.dart'; +import 'package:mangayomi/modules/manga/detail/widgets/chapter_filter_list_tile_widget.dart'; +import 'package:mangayomi/modules/manga/detail/widgets/chapter_sort_list_tile_widget.dart'; +import 'package:mangayomi/modules/more/categoties/providers/isar_providers.dart'; +import 'package:mangayomi/modules/widgets/error_text.dart'; +import 'package:mangayomi/modules/widgets/progress_center.dart'; class LibraryScreen extends ConsumerStatefulWidget { const LibraryScreen({super.key}); diff --git a/lib/views/library/providers/isar_providers.dart b/lib/modules/library/providers/isar_providers.dart similarity index 100% rename from lib/views/library/providers/isar_providers.dart rename to lib/modules/library/providers/isar_providers.dart diff --git a/lib/views/library/providers/isar_providers.g.dart b/lib/modules/library/providers/isar_providers.g.dart similarity index 100% rename from lib/views/library/providers/isar_providers.g.dart rename to lib/modules/library/providers/isar_providers.g.dart diff --git a/lib/views/library/providers/library_state_provider.dart b/lib/modules/library/providers/library_state_provider.dart similarity index 100% rename from lib/views/library/providers/library_state_provider.dart rename to lib/modules/library/providers/library_state_provider.dart diff --git a/lib/views/library/providers/library_state_provider.g.dart b/lib/modules/library/providers/library_state_provider.g.dart similarity index 100% rename from lib/views/library/providers/library_state_provider.g.dart rename to lib/modules/library/providers/library_state_provider.g.dart diff --git a/lib/views/library/search_text_form_field.dart b/lib/modules/library/search_text_form_field.dart similarity index 100% rename from lib/views/library/search_text_form_field.dart rename to lib/modules/library/search_text_form_field.dart diff --git a/lib/views/library/widgets/library_gridview_widget.dart b/lib/modules/library/widgets/library_gridview_widget.dart similarity index 95% rename from lib/views/library/widgets/library_gridview_widget.dart rename to lib/modules/library/widgets/library_gridview_widget.dart index 6c5d6ae..44c99af 100644 --- a/lib/views/library/widgets/library_gridview_widget.dart +++ b/lib/modules/library/widgets/library_gridview_widget.dart @@ -3,20 +3,20 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:isar/isar.dart'; import 'package:mangayomi/main.dart'; import 'package:mangayomi/models/download.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'; +import 'package:mangayomi/modules/history/providers/isar_providers.dart'; +import 'package:mangayomi/modules/library/providers/library_state_provider.dart'; +import 'package:mangayomi/modules/manga/reader/providers/push_router.dart'; import 'package:mangayomi/models/manga.dart'; import 'package:mangayomi/utils/cached_network.dart'; import 'package:mangayomi/utils/colors.dart'; import 'package:mangayomi/utils/headers.dart'; -import 'package:mangayomi/views/more/providers/incognito_mode_state_provider.dart'; -import 'package:mangayomi/views/widgets/bottom_text_widget.dart'; -import 'package:mangayomi/views/widgets/cover_view_widget.dart'; -import 'package:mangayomi/views/widgets/error_text.dart'; -import 'package:mangayomi/views/widgets/gridview_widget.dart'; -import 'package:mangayomi/views/widgets/manga_image_card_widget.dart'; -import 'package:mangayomi/views/widgets/progress_center.dart'; +import 'package:mangayomi/modules/more/providers/incognito_mode_state_provider.dart'; +import 'package:mangayomi/modules/widgets/bottom_text_widget.dart'; +import 'package:mangayomi/modules/widgets/cover_view_widget.dart'; +import 'package:mangayomi/modules/widgets/error_text.dart'; +import 'package:mangayomi/modules/widgets/gridview_widget.dart'; +import 'package:mangayomi/modules/widgets/manga_image_card_widget.dart'; +import 'package:mangayomi/modules/widgets/progress_center.dart'; class LibraryGridViewWidget extends StatelessWidget { final bool isCoverOnlyGrid; diff --git a/lib/views/library/widgets/library_listview_widget.dart b/lib/modules/library/widgets/library_listview_widget.dart similarity index 95% rename from lib/views/library/widgets/library_listview_widget.dart rename to lib/modules/library/widgets/library_listview_widget.dart index 500359f..35220bf 100644 --- a/lib/views/library/widgets/library_listview_widget.dart +++ b/lib/modules/library/widgets/library_listview_widget.dart @@ -3,18 +3,18 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:isar/isar.dart'; import 'package:mangayomi/main.dart'; import 'package:mangayomi/models/download.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'; +import 'package:mangayomi/modules/history/providers/isar_providers.dart'; +import 'package:mangayomi/modules/library/providers/library_state_provider.dart'; +import 'package:mangayomi/modules/manga/reader/providers/push_router.dart'; import 'package:mangayomi/models/manga.dart'; import 'package:mangayomi/utils/cached_network.dart'; import 'package:mangayomi/utils/colors.dart'; import 'package:mangayomi/utils/headers.dart'; -import 'package:mangayomi/views/more/providers/incognito_mode_state_provider.dart'; -import 'package:mangayomi/views/widgets/error_text.dart'; -import 'package:mangayomi/views/widgets/listview_widget.dart'; -import 'package:mangayomi/views/widgets/manga_image_card_widget.dart'; -import 'package:mangayomi/views/widgets/progress_center.dart'; +import 'package:mangayomi/modules/more/providers/incognito_mode_state_provider.dart'; +import 'package:mangayomi/modules/widgets/error_text.dart'; +import 'package:mangayomi/modules/widgets/listview_widget.dart'; +import 'package:mangayomi/modules/widgets/manga_image_card_widget.dart'; +import 'package:mangayomi/modules/widgets/progress_center.dart'; class LibraryListViewWidget extends StatelessWidget { final List entriesManga; diff --git a/lib/views/library/widgets/list_tile_manga_category.dart b/lib/modules/library/widgets/list_tile_manga_category.dart similarity index 92% rename from lib/views/library/widgets/list_tile_manga_category.dart rename to lib/modules/library/widgets/list_tile_manga_category.dart index bbe5869..3abab1f 100644 --- a/lib/views/library/widgets/list_tile_manga_category.dart +++ b/lib/modules/library/widgets/list_tile_manga_category.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:mangayomi/models/category.dart'; import 'package:mangayomi/models/manga.dart'; -import 'package:mangayomi/views/manga/detail/widgets/chapter_filter_list_tile_widget.dart'; +import 'package:mangayomi/modules/manga/detail/widgets/chapter_filter_list_tile_widget.dart'; class ListTileMangaCategory extends StatefulWidget { final Category category; diff --git a/lib/views/main_view/main_screen.dart b/lib/modules/main_view/main_screen.dart similarity index 98% rename from lib/views/main_view/main_screen.dart rename to lib/modules/main_view/main_screen.dart index 0b04e7a..2e8ce13 100644 --- a/lib/views/main_view/main_screen.dart +++ b/lib/modules/main_view/main_screen.dart @@ -6,8 +6,8 @@ import 'package:go_router/go_router.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:mangayomi/utils/colors.dart'; import 'package:mangayomi/utils/media_query.dart'; -import 'package:mangayomi/views/library/providers/library_state_provider.dart'; -import 'package:mangayomi/views/more/providers/incognito_mode_state_provider.dart'; +import 'package:mangayomi/modules/library/providers/library_state_provider.dart'; +import 'package:mangayomi/modules/more/providers/incognito_mode_state_provider.dart'; class MainScreen extends StatefulWidget { const MainScreen({super.key, required this.child}); diff --git a/lib/views/manga/detail/manga_detail_main.dart b/lib/modules/manga/detail/manga_detail_main.dart similarity index 92% rename from lib/views/manga/detail/manga_detail_main.dart rename to lib/modules/manga/detail/manga_detail_main.dart index dbe1252..6721017 100644 --- a/lib/views/manga/detail/manga_detail_main.dart +++ b/lib/modules/manga/detail/manga_detail_main.dart @@ -4,10 +4,10 @@ import 'package:mangayomi/main.dart'; import 'package:mangayomi/models/chapter.dart'; import 'package:mangayomi/services/get_manga_detail.dart'; import 'package:mangayomi/sources/service.dart'; -import 'package:mangayomi/views/manga/detail/manga_details_view.dart'; -import 'package:mangayomi/views/manga/detail/providers/isar_providers.dart'; -import 'package:mangayomi/views/widgets/error_text.dart'; -import 'package:mangayomi/views/widgets/progress_center.dart'; +import 'package:mangayomi/modules/manga/detail/manga_details_view.dart'; +import 'package:mangayomi/modules/manga/detail/providers/isar_providers.dart'; +import 'package:mangayomi/modules/widgets/error_text.dart'; +import 'package:mangayomi/modules/widgets/progress_center.dart'; class MangaReaderDetail extends ConsumerStatefulWidget { final int mangaId; diff --git a/lib/views/manga/detail/manga_detail_view.dart b/lib/modules/manga/detail/manga_detail_view.dart similarity index 98% rename from lib/views/manga/detail/manga_detail_view.dart rename to lib/modules/manga/detail/manga_detail_view.dart index 7e18520..f520947 100644 --- a/lib/views/manga/detail/manga_detail_view.dart +++ b/lib/modules/manga/detail/manga_detail_view.dart @@ -16,15 +16,15 @@ import 'package:mangayomi/utils/colors.dart'; import 'package:mangayomi/utils/headers.dart'; import 'package:mangayomi/utils/media_query.dart'; import 'package:mangayomi/utils/utils.dart'; -import 'package:mangayomi/views/manga/detail/providers/isar_providers.dart'; -import 'package:mangayomi/views/manga/detail/providers/state_providers.dart'; -import 'package:mangayomi/views/manga/detail/widgets/readmore.dart'; -import 'package:mangayomi/views/manga/detail/widgets/chapter_filter_list_tile_widget.dart'; -import 'package:mangayomi/views/manga/detail/widgets/chapter_list_tile_widget.dart'; -import 'package:mangayomi/views/manga/detail/widgets/chapter_sort_list_tile_widget.dart'; -import 'package:mangayomi/views/manga/download/providers/download_provider.dart'; -import 'package:mangayomi/views/widgets/error_text.dart'; -import 'package:mangayomi/views/widgets/progress_center.dart'; +import 'package:mangayomi/modules/manga/detail/providers/isar_providers.dart'; +import 'package:mangayomi/modules/manga/detail/providers/state_providers.dart'; +import 'package:mangayomi/modules/manga/detail/widgets/readmore.dart'; +import 'package:mangayomi/modules/manga/detail/widgets/chapter_filter_list_tile_widget.dart'; +import 'package:mangayomi/modules/manga/detail/widgets/chapter_list_tile_widget.dart'; +import 'package:mangayomi/modules/manga/detail/widgets/chapter_sort_list_tile_widget.dart'; +import 'package:mangayomi/modules/manga/download/providers/download_provider.dart'; +import 'package:mangayomi/modules/widgets/error_text.dart'; +import 'package:mangayomi/modules/widgets/progress_center.dart'; import 'package:photo_view/photo_view.dart'; import 'package:photo_view/photo_view_gallery.dart'; import 'package:share_plus/share_plus.dart'; diff --git a/lib/views/manga/detail/manga_details_view.dart b/lib/modules/manga/detail/manga_details_view.dart similarity index 94% rename from lib/views/manga/detail/manga_details_view.dart rename to lib/modules/manga/detail/manga_details_view.dart index 4f1e020..0dddd90 100644 --- a/lib/views/manga/detail/manga_details_view.dart +++ b/lib/modules/manga/detail/manga_details_view.dart @@ -5,18 +5,18 @@ 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/views/history/providers/isar_providers.dart'; -import 'package:mangayomi/views/manga/detail/widgets/custom_floating_action_btn.dart'; -import 'package:mangayomi/views/manga/reader/providers/push_router.dart'; +import 'package:mangayomi/modules/history/providers/isar_providers.dart'; +import 'package:mangayomi/modules/manga/detail/widgets/custom_floating_action_btn.dart'; +import 'package:mangayomi/modules/manga/reader/providers/push_router.dart'; import 'package:mangayomi/models/manga.dart'; import 'package:mangayomi/utils/colors.dart'; import 'package:mangayomi/utils/media_query.dart'; -import 'package:mangayomi/views/manga/detail/manga_detail_view.dart'; -import 'package:mangayomi/views/manga/detail/providers/state_providers.dart'; -import 'package:mangayomi/views/manga/detail/widgets/chapter_filter_list_tile_widget.dart'; -import 'package:mangayomi/views/more/providers/incognito_mode_state_provider.dart'; -import 'package:mangayomi/views/widgets/error_text.dart'; -import 'package:mangayomi/views/widgets/progress_center.dart'; +import 'package:mangayomi/modules/manga/detail/manga_detail_view.dart'; +import 'package:mangayomi/modules/manga/detail/providers/state_providers.dart'; +import 'package:mangayomi/modules/manga/detail/widgets/chapter_filter_list_tile_widget.dart'; +import 'package:mangayomi/modules/more/providers/incognito_mode_state_provider.dart'; +import 'package:mangayomi/modules/widgets/error_text.dart'; +import 'package:mangayomi/modules/widgets/progress_center.dart'; class MangaDetailsView extends ConsumerStatefulWidget { final Manga manga; diff --git a/lib/views/manga/detail/providers/isar_providers.dart b/lib/modules/manga/detail/providers/isar_providers.dart similarity index 100% rename from lib/views/manga/detail/providers/isar_providers.dart rename to lib/modules/manga/detail/providers/isar_providers.dart diff --git a/lib/views/manga/detail/providers/isar_providers.g.dart b/lib/modules/manga/detail/providers/isar_providers.g.dart similarity index 100% rename from lib/views/manga/detail/providers/isar_providers.g.dart rename to lib/modules/manga/detail/providers/isar_providers.g.dart diff --git a/lib/views/manga/detail/providers/state_providers.dart b/lib/modules/manga/detail/providers/state_providers.dart similarity index 99% rename from lib/views/manga/detail/providers/state_providers.dart rename to lib/modules/manga/detail/providers/state_providers.dart index 076390d..1c3f052 100644 --- a/lib/views/manga/detail/providers/state_providers.dart +++ b/lib/modules/manga/detail/providers/state_providers.dart @@ -4,7 +4,7 @@ import 'package:mangayomi/models/chapter.dart'; import 'package:mangayomi/models/download.dart'; import 'package:mangayomi/models/manga.dart'; import 'package:mangayomi/models/settings.dart'; -import 'package:mangayomi/views/manga/download/providers/download_provider.dart'; +import 'package:mangayomi/modules/manga/download/providers/download_provider.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'state_providers.g.dart'; diff --git a/lib/views/manga/detail/providers/state_providers.g.dart b/lib/modules/manga/detail/providers/state_providers.g.dart similarity index 100% rename from lib/views/manga/detail/providers/state_providers.g.dart rename to lib/modules/manga/detail/providers/state_providers.g.dart diff --git a/lib/views/manga/detail/widgets/chapter_filter_list_tile_widget.dart b/lib/modules/manga/detail/widgets/chapter_filter_list_tile_widget.dart similarity index 100% rename from lib/views/manga/detail/widgets/chapter_filter_list_tile_widget.dart rename to lib/modules/manga/detail/widgets/chapter_filter_list_tile_widget.dart diff --git a/lib/views/manga/detail/widgets/chapter_list_tile_widget.dart b/lib/modules/manga/detail/widgets/chapter_list_tile_widget.dart similarity index 93% rename from lib/views/manga/detail/widgets/chapter_list_tile_widget.dart rename to lib/modules/manga/detail/widgets/chapter_list_tile_widget.dart index 10cfe79..e63e354 100644 --- a/lib/views/manga/detail/widgets/chapter_list_tile_widget.dart +++ b/lib/modules/manga/detail/widgets/chapter_list_tile_widget.dart @@ -2,11 +2,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:mangayomi/models/chapter.dart'; import 'package:mangayomi/utils/date.dart'; -import 'package:mangayomi/views/manga/reader/providers/push_router.dart'; +import 'package:mangayomi/modules/manga/reader/providers/push_router.dart'; import 'package:mangayomi/utils/colors.dart'; import 'package:mangayomi/utils/utils.dart'; -import 'package:mangayomi/views/manga/detail/providers/state_providers.dart'; -import 'package:mangayomi/views/manga/download/download_page_widget.dart'; +import 'package:mangayomi/modules/manga/detail/providers/state_providers.dart'; +import 'package:mangayomi/modules/manga/download/download_page_widget.dart'; class ChapterListTileWidget extends ConsumerWidget { final Chapter chapter; diff --git a/lib/views/manga/detail/widgets/chapter_sort_list_tile_widget.dart b/lib/modules/manga/detail/widgets/chapter_sort_list_tile_widget.dart similarity index 100% rename from lib/views/manga/detail/widgets/chapter_sort_list_tile_widget.dart rename to lib/modules/manga/detail/widgets/chapter_sort_list_tile_widget.dart diff --git a/lib/views/manga/detail/widgets/custom_floating_action_btn.dart b/lib/modules/manga/detail/widgets/custom_floating_action_btn.dart similarity index 100% rename from lib/views/manga/detail/widgets/custom_floating_action_btn.dart rename to lib/modules/manga/detail/widgets/custom_floating_action_btn.dart diff --git a/lib/views/manga/detail/widgets/readmore.dart b/lib/modules/manga/detail/widgets/readmore.dart similarity index 100% rename from lib/views/manga/detail/widgets/readmore.dart rename to lib/modules/manga/detail/widgets/readmore.dart diff --git a/lib/views/manga/download/download_page_widget.dart b/lib/modules/manga/download/download_page_widget.dart similarity index 99% rename from lib/views/manga/download/download_page_widget.dart rename to lib/modules/manga/download/download_page_widget.dart index 8272cec..ea8c461 100644 --- a/lib/views/manga/download/download_page_widget.dart +++ b/lib/modules/manga/download/download_page_widget.dart @@ -8,7 +8,7 @@ import 'package:mangayomi/main.dart'; import 'package:mangayomi/models/chapter.dart'; import 'package:mangayomi/models/download.dart'; import 'package:mangayomi/providers/storage_provider.dart'; -import 'package:mangayomi/views/manga/download/providers/download_provider.dart'; +import 'package:mangayomi/modules/manga/download/providers/download_provider.dart'; class ChapterPageDownload extends ConsumerStatefulWidget { final Chapter chapter; diff --git a/lib/views/manga/download/providers/download_provider.dart b/lib/modules/manga/download/providers/download_provider.dart similarity index 100% rename from lib/views/manga/download/providers/download_provider.dart rename to lib/modules/manga/download/providers/download_provider.dart diff --git a/lib/views/manga/download/providers/download_provider.g.dart b/lib/modules/manga/download/providers/download_provider.g.dart similarity index 100% rename from lib/views/manga/download/providers/download_provider.g.dart rename to lib/modules/manga/download/providers/download_provider.g.dart diff --git a/lib/views/manga/home/manga_home_screen.dart b/lib/modules/manga/home/manga_home_screen.dart similarity index 95% rename from lib/views/manga/home/manga_home_screen.dart rename to lib/modules/manga/home/manga_home_screen.dart index 970a5ee..c1bf95f 100644 --- a/lib/views/manga/home/manga_home_screen.dart +++ b/lib/modules/manga/home/manga_home_screen.dart @@ -10,12 +10,12 @@ import 'package:mangayomi/sources/service.dart'; 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/widget/mangas_card_selector.dart'; -import 'package:mangayomi/views/widgets/bottom_text_widget.dart'; -import 'package:mangayomi/views/widgets/cover_view_widget.dart'; -import 'package:mangayomi/views/widgets/gridview_widget.dart'; -import 'package:mangayomi/views/widgets/manga_image_card_widget.dart'; +import 'package:mangayomi/modules/library/search_text_form_field.dart'; +import 'package:mangayomi/modules/manga/home/widget/mangas_card_selector.dart'; +import 'package:mangayomi/modules/widgets/bottom_text_widget.dart'; +import 'package:mangayomi/modules/widgets/cover_view_widget.dart'; +import 'package:mangayomi/modules/widgets/gridview_widget.dart'; +import 'package:mangayomi/modules/widgets/manga_image_card_widget.dart'; class MangaHomeScreen extends ConsumerStatefulWidget { final MangaType mangaType; diff --git a/lib/views/manga/home/manga_search_screen.dart b/lib/modules/manga/home/manga_search_screen.dart similarity index 96% rename from lib/views/manga/home/manga_search_screen.dart rename to lib/modules/manga/home/manga_search_screen.dart index adef571..cefd36e 100644 --- a/lib/views/manga/home/manga_search_screen.dart +++ b/lib/modules/manga/home/manga_search_screen.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:mangayomi/services/search_manga.dart'; -import 'package:mangayomi/views/manga/home/manga_home_screen.dart'; -import 'package:mangayomi/views/widgets/gridview_widget.dart'; +import 'package:mangayomi/modules/manga/home/manga_home_screen.dart'; +import 'package:mangayomi/modules/widgets/gridview_widget.dart'; class MangaSearchButton extends StatelessWidget { final String source; diff --git a/lib/views/manga/home/widget/mangas_card_selector.dart b/lib/modules/manga/home/widget/mangas_card_selector.dart similarity index 100% rename from lib/views/manga/home/widget/mangas_card_selector.dart rename to lib/modules/manga/home/widget/mangas_card_selector.dart diff --git a/lib/views/manga/reader/image_view_horizontal.dart b/lib/modules/manga/reader/image_view_horizontal.dart similarity index 100% rename from lib/views/manga/reader/image_view_horizontal.dart rename to lib/modules/manga/reader/image_view_horizontal.dart diff --git a/lib/views/manga/reader/image_view_vertical.dart b/lib/modules/manga/reader/image_view_vertical.dart similarity index 97% rename from lib/views/manga/reader/image_view_vertical.dart rename to lib/modules/manga/reader/image_view_vertical.dart index b73e317..f76f1d6 100644 --- a/lib/views/manga/reader/image_view_vertical.dart +++ b/lib/modules/manga/reader/image_view_vertical.dart @@ -6,7 +6,7 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:mangayomi/utils/headers.dart'; import 'package:mangayomi/utils/media_query.dart'; import 'package:mangayomi/utils/reg_exp_matcher.dart'; -import 'package:mangayomi/views/manga/reader/widgets/circular_progress_indicator_animate_rotate.dart'; +import 'package:mangayomi/modules/manga/reader/widgets/circular_progress_indicator_animate_rotate.dart'; class ImageViewVertical extends ConsumerWidget { final int length; diff --git a/lib/views/manga/reader/manga_reader_view.dart b/lib/modules/manga/reader/manga_reader_view.dart similarity index 98% rename from lib/views/manga/reader/manga_reader_view.dart rename to lib/modules/manga/reader/manga_reader_view.dart index e3d64ae..917ab34 100644 --- a/lib/views/manga/reader/manga_reader_view.dart +++ b/lib/modules/manga/reader/manga_reader_view.dart @@ -11,16 +11,16 @@ import 'package:mangayomi/main.dart'; import 'package:mangayomi/models/chapter.dart'; import 'package:mangayomi/models/settings.dart'; import 'package:mangayomi/sources/utils/utils.dart'; -import 'package:mangayomi/views/manga/reader/providers/push_router.dart'; +import 'package:mangayomi/modules/manga/reader/providers/push_router.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'; -import 'package:mangayomi/views/manga/reader/image_view_vertical.dart'; -import 'package:mangayomi/views/manga/reader/providers/reader_controller_provider.dart'; -import 'package:mangayomi/views/manga/reader/widgets/circular_progress_indicator_animate_rotate.dart'; -import 'package:mangayomi/views/more/settings/reader/reader_screen.dart'; -import 'package:mangayomi/views/widgets/progress_center.dart'; +import 'package:mangayomi/modules/manga/reader/image_view_horizontal.dart'; +import 'package:mangayomi/modules/manga/reader/image_view_vertical.dart'; +import 'package:mangayomi/modules/manga/reader/providers/reader_controller_provider.dart'; +import 'package:mangayomi/modules/manga/reader/widgets/circular_progress_indicator_animate_rotate.dart'; +import 'package:mangayomi/modules/more/settings/reader/reader_screen.dart'; +import 'package:mangayomi/modules/widgets/progress_center.dart'; import 'package:photo_view/photo_view.dart'; import 'package:photo_view/photo_view_gallery.dart'; import 'package:scrollable_positioned_list/scrollable_positioned_list.dart'; diff --git a/lib/views/manga/reader/providers/push_router.dart b/lib/modules/manga/reader/providers/push_router.dart similarity index 100% rename from lib/views/manga/reader/providers/push_router.dart rename to lib/modules/manga/reader/providers/push_router.dart diff --git a/lib/views/manga/reader/providers/reader_controller_provider.dart b/lib/modules/manga/reader/providers/reader_controller_provider.dart similarity index 98% rename from lib/views/manga/reader/providers/reader_controller_provider.dart rename to lib/modules/manga/reader/providers/reader_controller_provider.dart index b360a07..42e981c 100644 --- a/lib/views/manga/reader/providers/reader_controller_provider.dart +++ b/lib/modules/manga/reader/providers/reader_controller_provider.dart @@ -4,7 +4,7 @@ import 'package:mangayomi/models/chapter.dart'; import 'package:mangayomi/models/history.dart'; import 'package:mangayomi/models/manga.dart'; import 'package:mangayomi/models/settings.dart'; -import 'package:mangayomi/views/more/providers/incognito_mode_state_provider.dart'; +import 'package:mangayomi/modules/more/providers/incognito_mode_state_provider.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'reader_controller_provider.g.dart'; diff --git a/lib/views/manga/reader/providers/reader_controller_provider.g.dart b/lib/modules/manga/reader/providers/reader_controller_provider.g.dart similarity index 100% rename from lib/views/manga/reader/providers/reader_controller_provider.g.dart rename to lib/modules/manga/reader/providers/reader_controller_provider.g.dart diff --git a/lib/views/manga/reader/widgets/circular_progress_indicator_animate_rotate.dart b/lib/modules/manga/reader/widgets/circular_progress_indicator_animate_rotate.dart similarity index 100% rename from lib/views/manga/reader/widgets/circular_progress_indicator_animate_rotate.dart rename to lib/modules/manga/reader/widgets/circular_progress_indicator_animate_rotate.dart diff --git a/lib/views/more/about_screen.dart b/lib/modules/more/about_screen.dart similarity index 100% rename from lib/views/more/about_screen.dart rename to lib/modules/more/about_screen.dart diff --git a/lib/views/more/categoties/categories_screen.dart b/lib/modules/more/categoties/categories_screen.dart similarity index 98% rename from lib/views/more/categoties/categories_screen.dart rename to lib/modules/more/categoties/categories_screen.dart index eed6269..25fee21 100644 --- a/lib/views/more/categoties/categories_screen.dart +++ b/lib/modules/more/categoties/categories_screen.dart @@ -2,9 +2,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:mangayomi/main.dart'; import 'package:mangayomi/models/category.dart'; -import 'package:mangayomi/views/more/categoties/providers/isar_providers.dart'; -import 'package:mangayomi/views/more/categoties/widgets/custom_textfield.dart'; -import 'package:mangayomi/views/widgets/progress_center.dart'; +import 'package:mangayomi/modules/more/categoties/providers/isar_providers.dart'; +import 'package:mangayomi/modules/more/categoties/widgets/custom_textfield.dart'; +import 'package:mangayomi/modules/widgets/progress_center.dart'; class CategoriesScreen extends ConsumerStatefulWidget { const CategoriesScreen({super.key}); diff --git a/lib/views/more/categoties/providers/isar_providers.dart b/lib/modules/more/categoties/providers/isar_providers.dart similarity index 100% rename from lib/views/more/categoties/providers/isar_providers.dart rename to lib/modules/more/categoties/providers/isar_providers.dart diff --git a/lib/views/more/categoties/providers/isar_providers.g.dart b/lib/modules/more/categoties/providers/isar_providers.g.dart similarity index 100% rename from lib/views/more/categoties/providers/isar_providers.g.dart rename to lib/modules/more/categoties/providers/isar_providers.g.dart diff --git a/lib/views/more/categoties/widgets/custom_textfield.dart b/lib/modules/more/categoties/widgets/custom_textfield.dart similarity index 100% rename from lib/views/more/categoties/widgets/custom_textfield.dart rename to lib/modules/more/categoties/widgets/custom_textfield.dart diff --git a/lib/views/more/download_queue/download_queue_screen.dart b/lib/modules/more/download_queue/download_queue_screen.dart similarity index 100% rename from lib/views/more/download_queue/download_queue_screen.dart rename to lib/modules/more/download_queue/download_queue_screen.dart diff --git a/lib/views/more/more_screen.dart b/lib/modules/more/more_screen.dart similarity index 95% rename from lib/views/more/more_screen.dart rename to lib/modules/more/more_screen.dart index 7171f1b..46df8bc 100644 --- a/lib/views/more/more_screen.dart +++ b/lib/modules/more/more_screen.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import 'package:mangayomi/views/more/widgets/incognito_mode_widget.dart'; -import 'package:mangayomi/views/more/widgets/list_tile_widget.dart'; +import 'package:mangayomi/modules/more/widgets/incognito_mode_widget.dart'; +import 'package:mangayomi/modules/more/widgets/list_tile_widget.dart'; class MoreScreen extends StatelessWidget { const MoreScreen({super.key}); diff --git a/lib/views/more/providers/incognito_mode_state_provider.dart b/lib/modules/more/providers/incognito_mode_state_provider.dart similarity index 100% rename from lib/views/more/providers/incognito_mode_state_provider.dart rename to lib/modules/more/providers/incognito_mode_state_provider.dart diff --git a/lib/views/more/providers/incognito_mode_state_provider.g.dart b/lib/modules/more/providers/incognito_mode_state_provider.g.dart similarity index 100% rename from lib/views/more/providers/incognito_mode_state_provider.g.dart rename to lib/modules/more/providers/incognito_mode_state_provider.g.dart diff --git a/lib/views/more/settings/appearance/appearance_screen.dart b/lib/modules/more/settings/appearance/appearance_screen.dart similarity index 94% rename from lib/views/more/settings/appearance/appearance_screen.dart rename to lib/modules/more/settings/appearance/appearance_screen.dart index def53cc..9d1d6b9 100644 --- a/lib/views/more/settings/appearance/appearance_screen.dart +++ b/lib/modules/more/settings/appearance/appearance_screen.dart @@ -3,11 +3,11 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:mangayomi/utils/colors.dart'; import 'package:mangayomi/utils/date.dart'; import 'package:mangayomi/utils/media_query.dart'; -import 'package:mangayomi/views/more/settings/appearance/providers/date_format_state_provider.dart'; -import 'package:mangayomi/views/more/settings/appearance/providers/pure_black_dark_mode_state_provider.dart'; -import 'package:mangayomi/views/more/settings/appearance/widgets/blend_level_slider.dart'; -import 'package:mangayomi/views/more/settings/appearance/widgets/dark_mode_button.dart'; -import 'package:mangayomi/views/more/settings/appearance/widgets/theme_selector.dart'; +import 'package:mangayomi/modules/more/settings/appearance/providers/date_format_state_provider.dart'; +import 'package:mangayomi/modules/more/settings/appearance/providers/pure_black_dark_mode_state_provider.dart'; +import 'package:mangayomi/modules/more/settings/appearance/widgets/blend_level_slider.dart'; +import 'package:mangayomi/modules/more/settings/appearance/widgets/dark_mode_button.dart'; +import 'package:mangayomi/modules/more/settings/appearance/widgets/theme_selector.dart'; class AppearanceScreen extends ConsumerWidget { const AppearanceScreen({super.key}); diff --git a/lib/views/more/settings/appearance/providers/blend_level_state_provider.dart b/lib/modules/more/settings/appearance/providers/blend_level_state_provider.dart similarity index 100% rename from lib/views/more/settings/appearance/providers/blend_level_state_provider.dart rename to lib/modules/more/settings/appearance/providers/blend_level_state_provider.dart diff --git a/lib/views/more/settings/appearance/providers/blend_level_state_provider.g.dart b/lib/modules/more/settings/appearance/providers/blend_level_state_provider.g.dart similarity index 100% rename from lib/views/more/settings/appearance/providers/blend_level_state_provider.g.dart rename to lib/modules/more/settings/appearance/providers/blend_level_state_provider.g.dart diff --git a/lib/views/more/settings/appearance/providers/date_format_state_provider.dart b/lib/modules/more/settings/appearance/providers/date_format_state_provider.dart similarity index 100% rename from lib/views/more/settings/appearance/providers/date_format_state_provider.dart rename to lib/modules/more/settings/appearance/providers/date_format_state_provider.dart diff --git a/lib/views/more/settings/appearance/providers/date_format_state_provider.g.dart b/lib/modules/more/settings/appearance/providers/date_format_state_provider.g.dart similarity index 100% rename from lib/views/more/settings/appearance/providers/date_format_state_provider.g.dart rename to lib/modules/more/settings/appearance/providers/date_format_state_provider.g.dart diff --git a/lib/views/more/settings/appearance/providers/flex_scheme_color_state_provider.dart b/lib/modules/more/settings/appearance/providers/flex_scheme_color_state_provider.dart similarity index 90% rename from lib/views/more/settings/appearance/providers/flex_scheme_color_state_provider.dart rename to lib/modules/more/settings/appearance/providers/flex_scheme_color_state_provider.dart index 22a4b85..d8f99aa 100644 --- a/lib/views/more/settings/appearance/providers/flex_scheme_color_state_provider.dart +++ b/lib/modules/more/settings/appearance/providers/flex_scheme_color_state_provider.dart @@ -1,7 +1,7 @@ import 'package:flex_color_scheme/flex_color_scheme.dart'; import 'package:mangayomi/main.dart'; import 'package:mangayomi/models/settings.dart'; -import 'package:mangayomi/views/more/settings/appearance/providers/theme_mode_state_provider.dart'; +import 'package:mangayomi/modules/more/settings/appearance/providers/theme_mode_state_provider.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'flex_scheme_color_state_provider.g.dart'; diff --git a/lib/views/more/settings/appearance/providers/flex_scheme_color_state_provider.g.dart b/lib/modules/more/settings/appearance/providers/flex_scheme_color_state_provider.g.dart similarity index 100% rename from lib/views/more/settings/appearance/providers/flex_scheme_color_state_provider.g.dart rename to lib/modules/more/settings/appearance/providers/flex_scheme_color_state_provider.g.dart diff --git a/lib/views/more/settings/appearance/providers/pure_black_dark_mode_state_provider.dart b/lib/modules/more/settings/appearance/providers/pure_black_dark_mode_state_provider.dart similarity index 100% rename from lib/views/more/settings/appearance/providers/pure_black_dark_mode_state_provider.dart rename to lib/modules/more/settings/appearance/providers/pure_black_dark_mode_state_provider.dart diff --git a/lib/views/more/settings/appearance/providers/pure_black_dark_mode_state_provider.g.dart b/lib/modules/more/settings/appearance/providers/pure_black_dark_mode_state_provider.g.dart similarity index 100% rename from lib/views/more/settings/appearance/providers/pure_black_dark_mode_state_provider.g.dart rename to lib/modules/more/settings/appearance/providers/pure_black_dark_mode_state_provider.g.dart diff --git a/lib/views/more/settings/appearance/providers/theme_mode_state_provider.dart b/lib/modules/more/settings/appearance/providers/theme_mode_state_provider.dart similarity index 90% rename from lib/views/more/settings/appearance/providers/theme_mode_state_provider.dart rename to lib/modules/more/settings/appearance/providers/theme_mode_state_provider.dart index 489267e..9c1c1e1 100644 --- a/lib/views/more/settings/appearance/providers/theme_mode_state_provider.dart +++ b/lib/modules/more/settings/appearance/providers/theme_mode_state_provider.dart @@ -1,6 +1,6 @@ import 'package:mangayomi/main.dart'; import 'package:mangayomi/models/settings.dart'; -import 'package:mangayomi/views/more/settings/appearance/providers/flex_scheme_color_state_provider.dart'; +import 'package:mangayomi/modules/more/settings/appearance/providers/flex_scheme_color_state_provider.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'theme_mode_state_provider.g.dart'; diff --git a/lib/views/more/settings/appearance/providers/theme_mode_state_provider.g.dart b/lib/modules/more/settings/appearance/providers/theme_mode_state_provider.g.dart similarity index 100% rename from lib/views/more/settings/appearance/providers/theme_mode_state_provider.g.dart rename to lib/modules/more/settings/appearance/providers/theme_mode_state_provider.g.dart diff --git a/lib/views/more/settings/appearance/widgets/blend_level_slider.dart b/lib/modules/more/settings/appearance/widgets/blend_level_slider.dart similarity index 89% rename from lib/views/more/settings/appearance/widgets/blend_level_slider.dart rename to lib/modules/more/settings/appearance/widgets/blend_level_slider.dart index 3b24194..a324450 100644 --- a/lib/views/more/settings/appearance/widgets/blend_level_slider.dart +++ b/lib/modules/more/settings/appearance/widgets/blend_level_slider.dart @@ -1,7 +1,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:mangayomi/views/more/settings/appearance/providers/blend_level_state_provider.dart'; +import 'package:mangayomi/modules/more/settings/appearance/providers/blend_level_state_provider.dart'; class BlendLevelSlider extends ConsumerWidget { const BlendLevelSlider({super.key}); diff --git a/lib/views/more/settings/appearance/widgets/dark_mode_button.dart b/lib/modules/more/settings/appearance/widgets/dark_mode_button.dart similarity index 91% rename from lib/views/more/settings/appearance/widgets/dark_mode_button.dart rename to lib/modules/more/settings/appearance/widgets/dark_mode_button.dart index 28d24b9..4bd3df0 100644 --- a/lib/views/more/settings/appearance/widgets/dark_mode_button.dart +++ b/lib/modules/more/settings/appearance/widgets/dark_mode_button.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:mangayomi/utils/colors.dart'; -import 'package:mangayomi/views/more/settings/appearance/providers/theme_mode_state_provider.dart'; +import 'package:mangayomi/modules/more/settings/appearance/providers/theme_mode_state_provider.dart'; // import 'package:rive/rive.dart'; class DarkModeButton extends ConsumerStatefulWidget { diff --git a/lib/views/more/settings/appearance/widgets/theme_selector.dart b/lib/modules/more/settings/appearance/widgets/theme_selector.dart similarity index 97% rename from lib/views/more/settings/appearance/widgets/theme_selector.dart rename to lib/modules/more/settings/appearance/widgets/theme_selector.dart index c7f18a8..6f407f1 100644 --- a/lib/views/more/settings/appearance/widgets/theme_selector.dart +++ b/lib/modules/more/settings/appearance/widgets/theme_selector.dart @@ -5,7 +5,7 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:mangayomi/main.dart'; import 'package:mangayomi/models/settings.dart'; import 'package:mangayomi/utils/colors.dart'; -import 'package:mangayomi/views/more/settings/appearance/providers/flex_scheme_color_state_provider.dart'; +import 'package:mangayomi/modules/more/settings/appearance/providers/flex_scheme_color_state_provider.dart'; class ThemeSelector extends ConsumerStatefulWidget { const ThemeSelector({ diff --git a/lib/views/more/settings/browse/browse_screen.dart b/lib/modules/more/settings/browse/browse_screen.dart similarity index 97% rename from lib/views/more/settings/browse/browse_screen.dart rename to lib/modules/more/settings/browse/browse_screen.dart index 23b47ff..038b31d 100644 --- a/lib/views/more/settings/browse/browse_screen.dart +++ b/lib/modules/more/settings/browse/browse_screen.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:mangayomi/utils/colors.dart'; -import 'package:mangayomi/views/more/settings/browse/providers/browse_state_provider.dart'; +import 'package:mangayomi/modules/more/settings/browse/providers/browse_state_provider.dart'; class BrowseSScreen extends ConsumerWidget { const BrowseSScreen({super.key}); diff --git a/lib/views/more/settings/browse/providers/browse_state_provider.dart b/lib/modules/more/settings/browse/providers/browse_state_provider.dart similarity index 100% rename from lib/views/more/settings/browse/providers/browse_state_provider.dart rename to lib/modules/more/settings/browse/providers/browse_state_provider.dart diff --git a/lib/views/more/settings/browse/providers/browse_state_provider.g.dart b/lib/modules/more/settings/browse/providers/browse_state_provider.g.dart similarity index 100% rename from lib/views/more/settings/browse/providers/browse_state_provider.g.dart rename to lib/modules/more/settings/browse/providers/browse_state_provider.g.dart diff --git a/lib/views/more/settings/general/general_screen.dart b/lib/modules/more/settings/general/general_screen.dart similarity index 100% rename from lib/views/more/settings/general/general_screen.dart rename to lib/modules/more/settings/general/general_screen.dart diff --git a/lib/views/more/settings/reader/providers/reader_state_provider.dart b/lib/modules/more/settings/reader/providers/reader_state_provider.dart similarity index 100% rename from lib/views/more/settings/reader/providers/reader_state_provider.dart rename to lib/modules/more/settings/reader/providers/reader_state_provider.dart diff --git a/lib/views/more/settings/reader/providers/reader_state_provider.g.dart b/lib/modules/more/settings/reader/providers/reader_state_provider.g.dart similarity index 100% rename from lib/views/more/settings/reader/providers/reader_state_provider.g.dart rename to lib/modules/more/settings/reader/providers/reader_state_provider.g.dart diff --git a/lib/views/more/settings/reader/reader_screen.dart b/lib/modules/more/settings/reader/reader_screen.dart similarity index 98% rename from lib/views/more/settings/reader/reader_screen.dart rename to lib/modules/more/settings/reader/reader_screen.dart index d64a57c..79113d7 100644 --- a/lib/views/more/settings/reader/reader_screen.dart +++ b/lib/modules/more/settings/reader/reader_screen.dart @@ -3,7 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:mangayomi/models/settings.dart'; import 'package:mangayomi/utils/colors.dart'; import 'package:mangayomi/utils/media_query.dart'; -import 'package:mangayomi/views/more/settings/reader/providers/reader_state_provider.dart'; +import 'package:mangayomi/modules/more/settings/reader/providers/reader_state_provider.dart'; class ReaderScreen extends ConsumerWidget { const ReaderScreen({super.key}); diff --git a/lib/views/more/settings/settings_screen.dart b/lib/modules/more/settings/settings_screen.dart similarity index 95% rename from lib/views/more/settings/settings_screen.dart rename to lib/modules/more/settings/settings_screen.dart index 1c34c2a..fe42c47 100644 --- a/lib/views/more/settings/settings_screen.dart +++ b/lib/modules/more/settings/settings_screen.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import 'package:mangayomi/views/more/widgets/list_tile_widget.dart'; +import 'package:mangayomi/modules/more/widgets/list_tile_widget.dart'; class SettingsScreen extends StatelessWidget { const SettingsScreen({super.key}); diff --git a/lib/views/more/widgets/incognito_mode_widget.dart b/lib/modules/more/widgets/incognito_mode_widget.dart similarity index 85% rename from lib/views/more/widgets/incognito_mode_widget.dart rename to lib/modules/more/widgets/incognito_mode_widget.dart index 007c696..9b42592 100644 --- a/lib/views/more/widgets/incognito_mode_widget.dart +++ b/lib/modules/more/widgets/incognito_mode_widget.dart @@ -1,8 +1,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:mangayomi/views/more/providers/incognito_mode_state_provider.dart'; -import 'package:mangayomi/views/more/widgets/list_tile_widget.dart'; +import 'package:mangayomi/modules/more/providers/incognito_mode_state_provider.dart'; +import 'package:mangayomi/modules/more/widgets/list_tile_widget.dart'; class IncognitoModeWidget extends ConsumerWidget { const IncognitoModeWidget({super.key}); diff --git a/lib/views/more/widgets/list_tile_widget.dart b/lib/modules/more/widgets/list_tile_widget.dart similarity index 100% rename from lib/views/more/widgets/list_tile_widget.dart rename to lib/modules/more/widgets/list_tile_widget.dart diff --git a/lib/views/updates/updates_screen.dart b/lib/modules/updates/updates_screen.dart similarity index 100% rename from lib/views/updates/updates_screen.dart rename to lib/modules/updates/updates_screen.dart diff --git a/lib/views/webview/webview.dart b/lib/modules/webview/webview.dart similarity index 100% rename from lib/views/webview/webview.dart rename to lib/modules/webview/webview.dart diff --git a/lib/views/widgets/bottom_text_widget.dart b/lib/modules/widgets/bottom_text_widget.dart similarity index 100% rename from lib/views/widgets/bottom_text_widget.dart rename to lib/modules/widgets/bottom_text_widget.dart diff --git a/lib/views/widgets/cover_view_widget.dart b/lib/modules/widgets/cover_view_widget.dart similarity index 100% rename from lib/views/widgets/cover_view_widget.dart rename to lib/modules/widgets/cover_view_widget.dart diff --git a/lib/views/widgets/error_text.dart b/lib/modules/widgets/error_text.dart similarity index 100% rename from lib/views/widgets/error_text.dart rename to lib/modules/widgets/error_text.dart diff --git a/lib/views/widgets/gridview_widget.dart b/lib/modules/widgets/gridview_widget.dart similarity index 100% rename from lib/views/widgets/gridview_widget.dart rename to lib/modules/widgets/gridview_widget.dart diff --git a/lib/views/widgets/listview_widget.dart b/lib/modules/widgets/listview_widget.dart similarity index 100% rename from lib/views/widgets/listview_widget.dart rename to lib/modules/widgets/listview_widget.dart diff --git a/lib/views/widgets/manga_image_card_widget.dart b/lib/modules/widgets/manga_image_card_widget.dart similarity index 97% rename from lib/views/widgets/manga_image_card_widget.dart rename to lib/modules/widgets/manga_image_card_widget.dart index a4922bd..41f454b 100644 --- a/lib/views/widgets/manga_image_card_widget.dart +++ b/lib/modules/widgets/manga_image_card_widget.dart @@ -9,8 +9,8 @@ import 'package:mangayomi/models/settings.dart'; import 'package:mangayomi/sources/service.dart'; import 'package:mangayomi/utils/cached_network.dart'; import 'package:mangayomi/utils/headers.dart'; -import 'package:mangayomi/views/widgets/bottom_text_widget.dart'; -import 'package:mangayomi/views/widgets/cover_view_widget.dart'; +import 'package:mangayomi/modules/widgets/bottom_text_widget.dart'; +import 'package:mangayomi/modules/widgets/cover_view_widget.dart'; class MangaImageCardWidget extends ConsumerWidget { final String lang; diff --git a/lib/views/widgets/progress_center.dart b/lib/modules/widgets/progress_center.dart similarity index 100% rename from lib/views/widgets/progress_center.dart rename to lib/modules/widgets/progress_center.dart diff --git a/lib/router/router.dart b/lib/router/router.dart index 4643b1b..e5d7ef1 100644 --- a/lib/router/router.dart +++ b/lib/router/router.dart @@ -3,27 +3,27 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:mangayomi/models/chapter.dart'; import 'package:mangayomi/models/manga_type.dart'; -import 'package:mangayomi/views/webview/webview.dart'; -import 'package:mangayomi/views/browse/browse_screen.dart'; -import 'package:mangayomi/views/browse/extension/extension_lang.dart'; -import 'package:mangayomi/views/browse/global_search/global_search_screen.dart'; -import 'package:mangayomi/views/main_view/main_screen.dart'; -import 'package:mangayomi/views/history/history_screen.dart'; -import 'package:mangayomi/views/library/library_screen.dart'; -import 'package:mangayomi/views/manga/detail/manga_detail_main.dart'; -import 'package:mangayomi/views/manga/home/manga_home_screen.dart'; -import 'package:mangayomi/views/manga/home/manga_search_screen.dart'; -import 'package:mangayomi/views/manga/reader/manga_reader_view.dart'; -import 'package:mangayomi/views/more/about_screen.dart'; -import 'package:mangayomi/views/more/download_queue/download_queue_screen.dart'; -import 'package:mangayomi/views/more/more_screen.dart'; -import 'package:mangayomi/views/more/settings/appearance/appearance_screen.dart'; -import 'package:mangayomi/views/more/categoties/categories_screen.dart'; -import 'package:mangayomi/views/more/settings/browse/browse_screen.dart'; -import 'package:mangayomi/views/more/settings/general/general_screen.dart'; -import 'package:mangayomi/views/more/settings/reader/reader_screen.dart'; -import 'package:mangayomi/views/more/settings/settings_screen.dart'; -import 'package:mangayomi/views/updates/updates_screen.dart'; +import 'package:mangayomi/modules/webview/webview.dart'; +import 'package:mangayomi/modules/browse/browse_screen.dart'; +import 'package:mangayomi/modules/browse/extension/extension_lang.dart'; +import 'package:mangayomi/modules/browse/global_search/global_search_screen.dart'; +import 'package:mangayomi/modules/main_view/main_screen.dart'; +import 'package:mangayomi/modules/history/history_screen.dart'; +import 'package:mangayomi/modules/library/library_screen.dart'; +import 'package:mangayomi/modules/manga/detail/manga_detail_main.dart'; +import 'package:mangayomi/modules/manga/home/manga_home_screen.dart'; +import 'package:mangayomi/modules/manga/home/manga_search_screen.dart'; +import 'package:mangayomi/modules/manga/reader/manga_reader_view.dart'; +import 'package:mangayomi/modules/more/about_screen.dart'; +import 'package:mangayomi/modules/more/download_queue/download_queue_screen.dart'; +import 'package:mangayomi/modules/more/more_screen.dart'; +import 'package:mangayomi/modules/more/settings/appearance/appearance_screen.dart'; +import 'package:mangayomi/modules/more/categoties/categories_screen.dart'; +import 'package:mangayomi/modules/more/settings/browse/browse_screen.dart'; +import 'package:mangayomi/modules/more/settings/general/general_screen.dart'; +import 'package:mangayomi/modules/more/settings/reader/reader_screen.dart'; +import 'package:mangayomi/modules/more/settings/settings_screen.dart'; +import 'package:mangayomi/modules/updates/updates_screen.dart'; final routerProvider = Provider((ref) { final router = AsyncRouterNotifier(); diff --git a/lib/services/get_chapter_url.dart b/lib/services/get_chapter_url.dart index 48f014e..9298974 100644 --- a/lib/services/get_chapter_url.dart +++ b/lib/services/get_chapter_url.dart @@ -15,7 +15,7 @@ import 'package:mangayomi/sources/multisrc/mangathemesia/src/mangathemesia.dart' import 'package:mangayomi/sources/multisrc/mmrcms/src/mmrcms.dart'; import 'package:mangayomi/sources/utils/utils.dart'; import 'package:mangayomi/utils/reg_exp_matcher.dart'; -import 'package:mangayomi/views/more/providers/incognito_mode_state_provider.dart'; +import 'package:mangayomi/modules/more/providers/incognito_mode_state_provider.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'get_chapter_url.g.dart'; diff --git a/lib/utils/date.dart b/lib/utils/date.dart index 1871d10..8e0a68f 100644 --- a/lib/utils/date.dart +++ b/lib/utils/date.dart @@ -1,6 +1,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:intl/intl.dart'; -import 'package:mangayomi/views/more/settings/appearance/providers/date_format_state_provider.dart'; +import 'package:mangayomi/modules/more/settings/appearance/providers/date_format_state_provider.dart'; String dateFormat(String timestamp, {required WidgetRef ref,