rename views to modules

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;
 

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});

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});

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;

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({

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});

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});

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});

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;

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<Manga> entriesManga;

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;

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});

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;

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';

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;

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';
 

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;

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;

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;

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;

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;

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';

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';
 

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});

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});

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});

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';
 

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';
 

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});

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 {

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({

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});

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});

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});

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});

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;

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<GoRouter>((ref) {
   final router = AsyncRouterNotifier();

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';
 

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,