rfact: more refactoring ofcourse

lib/main.dart

@@ -1,9 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_ebook_app/src/features/features.dart';
-import 'package:flutter_ebook_app/src/router/app_router.dart';
-import 'package:flutter_ebook_app/src/theme/theme_config.dart';
+import 'package:flutter_ebook_app/src/app.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:sembast/sembast.dart';
 
 void main() async {
@@ -12,38 +10,3 @@ void main() async {
   await DatabaseConfig.init(StoreRef<dynamic, dynamic>.main());
   runApp(ProviderScope(child: MyApp()));
 }
-
-class MyApp extends ConsumerWidget {
-  MyApp({super.key});
-
-  final _appRouter = AppRouter();
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final currentAppTheme = ref.watch(currentAppThemeNotifierProvider);
-    return MaterialApp.router(
-      debugShowCheckedModeBanner: false,
-      title: Strings.appName,
-      theme: themeData(
-        currentAppTheme.value == CurrentAppTheme.dark
-            ? ThemeConfig.darkTheme
-            : ThemeConfig.lightTheme,
-      ),
-      darkTheme: themeData(ThemeConfig.darkTheme),
-      themeMode: currentAppTheme.value?.themeMode,
-      routerConfig: _appRouter.config(),
-    );
-  }
-
-  // Apply font to our app's theme
-  ThemeData themeData(ThemeData theme) {
-    return theme.copyWith(
-      textTheme: GoogleFonts.sourceSansProTextTheme(
-        theme.textTheme,
-      ),
-      colorScheme: theme.colorScheme.copyWith(
-        secondary: ThemeConfig.lightAccent,
-      ),
-    );
-  }
-}

lib/src/app.dart

@@ -0,0 +1,39 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:google_fonts/google_fonts.dart';
+
+class MyApp extends ConsumerWidget {
+  MyApp({super.key});
+
+  final _appRouter = AppRouter();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final currentAppTheme = ref.watch(currentAppThemeNotifierProvider);
+    return MaterialApp.router(
+      debugShowCheckedModeBanner: false,
+      title: Strings.appName,
+      theme: themeData(
+        currentAppTheme.value == CurrentAppTheme.dark
+            ? ThemeConfig.darkTheme
+            : ThemeConfig.lightTheme,
+      ),
+      darkTheme: themeData(ThemeConfig.darkTheme),
+      themeMode: currentAppTheme.value?.themeMode,
+      routerConfig: _appRouter.config(),
+    );
+  }
+
+  // Apply font to our app's theme
+  ThemeData themeData(ThemeData theme) {
+    return theme.copyWith(
+      textTheme: GoogleFonts.sourceSansProTextTheme(
+        theme.textTheme,
+      ),
+      colorScheme: theme.colorScheme.copyWith(
+        secondary: ThemeConfig.lightAccent,
+      ),
+    );
+  }
+}

lib/src/features/common/application/services/current_app_theme_service.dart → lib/src/common/application/services/current_app_theme_service.dart

@@ -1,4 +1,4 @@
-import 'package:flutter_ebook_app/src/features/features.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 

lib/src/features/common/common.dart → lib/src/common/common.dart

@@ -4,3 +4,4 @@ export 'data/data.dart';
 export 'domain/domain.dart';
 export 'extensions/extensions.dart';
 export 'presentation/presentation.dart';
+export 'router/app_router.dart';

lib/src/features/common/data/data_sources/downloads/downloads_local_data_source_impl.dart → lib/src/common/data/data_sources/downloads/downloads_local_data_source_impl.dart

@@ -1,4 +1,4 @@
-import 'package:flutter_ebook_app/src/features/features.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:sembast/sembast.dart';
 

lib/src/features/common/data/data_sources/favorites/favorites_local_data_source.dart → lib/src/common/data/data_sources/favorites/favorites_local_data_source.dart

@@ -1,4 +1,4 @@
-import 'package:flutter_ebook_app/src/features/features.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 
 abstract class FavoritesLocalDataSource {
   const FavoritesLocalDataSource();

lib/src/features/common/data/data_sources/favorites/favorites_local_data_source_impl.dart → lib/src/common/data/data_sources/favorites/favorites_local_data_source_impl.dart

@@ -1,4 +1,4 @@
-import 'package:flutter_ebook_app/src/features/features.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:sembast/sembast.dart';
 

lib/src/features/common/data/remote/app_dio.dart → lib/src/common/data/remote/app_dio.dart

@@ -1,6 +1,6 @@
 import 'package:dio/dio.dart';
 import 'package:dio/io.dart';
-import 'package:flutter_ebook_app/src/features/common/constants/api.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 
 class AppDio with DioMixin implements Dio {
   AppDio._() {

lib/src/features/common/data/repositories/book/book_repository.dart → lib/src/common/data/repositories/book/book_repository.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 
 import 'package:dio/dio.dart';
-import 'package:flutter_ebook_app/src/features/features.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:xml2json/xml2json.dart';
 
 typedef BookRepositoryData = ({CategoryFeed? feed, HttpFailure? failure});

lib/src/features/common/data/repositories/downloads/downloads_repository.dart → lib/src/common/data/repositories/downloads/downloads_repository.dart

@@ -1,5 +1,4 @@
-import 'package:flutter_ebook_app/src/features/common/data/data_sources/downloads/downloads_local_data_source.dart';
-import 'package:flutter_ebook_app/src/features/common/data/data_sources/downloads/downloads_local_data_source_impl.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 abstract class DownloadsRepository {

lib/src/features/common/data/repositories/favorites/favorites_repository.dart → lib/src/common/data/repositories/favorites/favorites_repository.dart

@@ -1,4 +1,4 @@
-import 'package:flutter_ebook_app/src/features/features.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 abstract class FavoritesRepository {

lib/src/features/common/presentation/notifiers/current_app_theme/current_app_theme_notifier.dart → lib/src/common/presentation/notifiers/current_app_theme/current_app_theme_notifier.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_ebook_app/src/features/features.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'current_app_theme_notifier.g.dart';

lib/src/features/common/presentation/notifiers/downloads/downloads_notifier.dart → lib/src/common/presentation/notifiers/downloads/downloads_notifier.dart

@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:flutter_ebook_app/src/features/features.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'downloads_notifier.g.dart';

lib/src/features/common/presentation/notifiers/favorites/favorites_notifier.dart → lib/src/common/presentation/notifiers/favorites/favorites_notifier.dart

@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:flutter_ebook_app/src/features/features.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'favorites_notifier.g.dart';

lib/src/features/common/presentation/presentation.dart → lib/src/common/presentation/presentation.dart

@@ -1,3 +1,4 @@
 export 'notifiers/notifiers.dart';
 export 'providers/providers.dart';
+export 'theme/theme_config.dart';
 export 'ui/ui.dart';

lib/src/features/common/presentation/providers/database_provider.dart → lib/src/common/presentation/providers/database_provider.dart

@@ -1,4 +1,4 @@
-import 'package:flutter_ebook_app/src/features/features.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:sembast/sembast.dart';
 

lib/src/features/common/presentation/providers/dio_provider.dart → lib/src/common/presentation/providers/dio_provider.dart

@@ -1,5 +1,5 @@
 import 'package:dio/dio.dart';
-import 'package:flutter_ebook_app/src/features/common/data/remote/app_dio.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 final dioProvider = Provider<Dio>((ref) => AppDio.getInstance());

lib/src/features/common/presentation/providers/shared_preferences_provider.dart → lib/src/common/presentation/providers/shared_preferences_provider.dart

@@ -1,4 +1,4 @@
-import 'package:flutter_ebook_app/src/features/common/data/local/local_storage.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 

lib/src/features/common/presentation/ui/widgets/book_card.dart → lib/src/common/presentation/ui/widgets/book_card.dart

@@ -1,8 +1,8 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_ebook_app/src/features/features.dart';
-import 'package:flutter_ebook_app/src/router/app_router.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:uuid/uuid.dart';
 
@@ -33,7 +33,8 @@ class BookCard extends ConsumerWidget {
         child: InkWell(
           borderRadius: const BorderRadius.all(Radius.circular(10.0)),
           onTap: () {
-            final bool isHomeTab = ref.read(currentTabNotifierProvider).isHomeTab;
+            final bool isHomeTab =
+                ref.read(currentTabNotifierProvider).isHomeTab;
             final route = BookDetailsRoute(
               entry: entry,
               imgTag: imgTag,

lib/src/features/common/presentation/ui/widgets/book_item.dart → lib/src/common/presentation/ui/widgets/book_item.dart

@@ -1,8 +1,8 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_ebook_app/src/features/features.dart';
-import 'package:flutter_ebook_app/src/router/app_router.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:uuid/uuid.dart';
 

lib/src/features/common/presentation/ui/widgets/book_list_item.dart → lib/src/common/presentation/ui/widgets/book_list_item.dart

@@ -1,8 +1,8 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_ebook_app/src/features/features.dart';
-import 'package:flutter_ebook_app/src/router/app_router.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:uuid/uuid.dart';
 

lib/src/features/common/presentation/ui/widgets/description_text.dart → lib/src/common/presentation/ui/widgets/description_text.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_ebook_app/src/features/features.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 
 class DescriptionTextWidget extends StatefulWidget {
   final String text;

lib/src/features/common/presentation/ui/widgets/error_widget.dart → lib/src/common/presentation/ui/widgets/error_widget.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_ebook_app/src/features/features.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 
 class MyErrorWidget extends StatelessWidget {
   final Function refreshCallBack;

lib/src/features/common/presentation/ui/widgets/loading_widget.dart → lib/src/common/presentation/ui/widgets/loading_widget.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_ebook_app/src/features/features.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
 
 class LoadingWidget extends StatelessWidget {

lib/src/features/common/presentation/ui/widgets/modal_dialogs/download_alert.dart → lib/src/common/presentation/ui/widgets/modal_dialogs/download_alert.dart

@@ -3,7 +3,7 @@ import 'dart:io';
 import 'package:dio/dio.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_ebook_app/src/features/features.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:path/path.dart' as path;
 import 'package:path_provider/path_provider.dart';

lib/src/features/common/presentation/ui/widgets/modal_dialogs/exit_modal_dialog.dart → lib/src/common/presentation/ui/widgets/modal_dialogs/exit_modal_dialog.dart

@@ -1,7 +1,7 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_ebook_app/src/features/features.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 
 class ExitModalDialog extends StatelessWidget {
   const ExitModalDialog({super.key});

lib/src/router/app_router.dart → lib/src/common/router/app_router.dart

@@ -1,5 +1,6 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_ebook_app/src/features/features.dart';
 
 part 'app_router.gr.dart';

lib/src/features/book_details/data/repositories/book_details_repository.dart

@@ -1,4 +1,4 @@
-import 'package:flutter_ebook_app/src/features/features.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 class BookDetailsRepository extends BookRepository {

lib/src/features/book_details/presentation/notifier/book_details_notifier.dart

@@ -1,5 +1,5 @@
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_ebook_app/src/features/book_details/data/repositories/book_details_repository.dart';
-import 'package:flutter_ebook_app/src/features/common/common.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'book_details_notifier.g.dart';

lib/src/features/book_details/presentation/ui/screens/book_details_screen.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:auto_route/auto_route.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_ebook_app/src/features/features.dart';
 import 'package:flutter_icons/flutter_icons.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';

lib/src/features/downloads/presentation/ui/screens/download_screen.dart

@@ -3,7 +3,7 @@ import 'dart:io';
 import 'package:auto_route/auto_route.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_ebook_app/src/features/features.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_icons/flutter_icons.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:iridium_reader_widget/views/viewers/epub_screen.dart';

lib/src/features/explore/data/repositories/explore_repository.dart

@@ -1,4 +1,4 @@
-import 'package:flutter_ebook_app/src/features/features.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 class ExploreRepository extends BookRepository {

lib/src/features/explore/presentation/notifiers/genre_feed/genre_feed_notifier.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_ebook_app/src/features/features.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 

lib/src/features/explore/presentation/ui/screens/explore_screen.dart

@@ -1,5 +1,6 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_ebook_app/src/features/features.dart';
 
 @RoutePage()

lib/src/features/explore/presentation/ui/screens/explore_screen_large.dart

@@ -1,7 +1,6 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
-
-import 'package:flutter_ebook_app/src/router/app_router.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 
 class ExploreScreenLarge extends StatefulWidget {
   const ExploreScreenLarge({super.key});

lib/src/features/explore/presentation/ui/screens/explore_screen_small.dart

@@ -1,7 +1,7 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_ebook_app/src/features/features.dart';
-import 'package:flutter_ebook_app/src/router/app_router.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 @RoutePage()

lib/src/features/explore/presentation/ui/screens/genre_screen.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_ebook_app/src/features/features.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 

lib/src/features/favorites/presentation/ui/screens/favorites_screen.dart

@@ -1,6 +1,6 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_ebook_app/src/features/features.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 @RoutePage()

lib/src/features/features.dart

@@ -1,5 +1,4 @@
 export 'book_details/book_details.dart';
-export 'common/common.dart';
 export 'downloads/downloads.dart';
 export 'explore/explore.dart';
 export 'favorites/favourites.dart';

lib/src/features/home/data/repositories/home_repository.dart

@@ -1,4 +1,4 @@
-import 'package:flutter_ebook_app/src/features/features.dart';
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 

lib/src/features/home/presentation/notifiers/home_feed_notifier.dart

@@ -1,3 +1,4 @@
+import 'package:flutter_ebook_app/src/common/common.dart';
 import 'package:flutter_ebook_app/src/features/features.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
@@ -25,8 +26,8 @@ class HomeFeedNotifier extends _$HomeFeedNotifier {
     final popularFeedSuccessOrFailure =
         await homeRepository.getPopularHomeFeed();
     final recentFeedSuccessOrFailure = await homeRepository.getRecentHomeFeed();
-    CategoryFeed? popularFeed = popularFeedSuccessOrFailure.feed;
-    CategoryFeed? recentFeed = recentFeedSuccessOrFailure.feed;
+    final popularFeed = popularFeedSuccessOrFailure.feed;
+    final recentFeed = recentFeedSuccessOrFailure.feed;
     if (popularFeed == null) {
       throw popularFeedSuccessOrFailure.failure!.description;
     }