refactor

lib/features/categories/domain/repositories/category_repository.dart

@@ -1,10 +1,11 @@
 import 'package:dartz/dartz.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:recipes/features/categories/data/dto/category_model.dart';
 
 import '../../../../core/network/error_model.dart';
-import '../../data/data_sources/category_data_source.dart';
-import '../../data/repositories/category_repository_impl.dart';
+import '../../infrastructure/data_sources/category_data_source.dart';
+import '../../infrastructure/dto/category_model.dart';
+import '../../infrastructure/repositories/category_repository_impl.dart';
+
 
 final categoryRepositoryProvider = Provider<CategoryRepository>(
   (ref) => CategoryRepositoryImpl(

lib/features/categories/domain/use_cases/category_use_case.dart

@@ -1,8 +1,8 @@
 import 'package:dartz/dartz.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:recipes/features/categories/data/dto/category_model.dart';
 
 import '../../../../core/network/error_model.dart';
+import '../../infrastructure/dto/category_model.dart';
 import '../repositories/category_repository.dart';
 
 final categoryUseCaseProvider = Provider<CategoryUseCase>(

lib/features/categories/data/data_sources/category_data_source.dart → lib/features/categories/infrastructure/data_sources/category_data_source.dart

@@ -3,7 +3,7 @@ import 'package:dio/dio.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../../../../core/network/network.dart';
-import '../../data/data_sources/category_data_source_impl.dart';
+import 'category_data_source_impl.dart';
 
 final categoryDataSourceProvider = Provider<CategoryDataSource>(
   (ref) => CategoryDataSourceImpl(

lib/features/categories/presentation/providers/categories_provider.dart

@@ -1,9 +1,9 @@
 import 'dart:developer';
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:recipes/features/categories/data/dto/category_model.dart';
 
 import '../../domain/use_cases/category_use_case.dart';
+import '../../infrastructure/dto/category_model.dart';
 
 final categoriesProvider = FutureProvider<List<Category>>(
       (ref) async {

lib/features/categories/presentation/widgets/category_item.dart

@@ -1,7 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:recipes/configs/configs.dart';
 import 'package:recipes/core/core.dart';
-import 'package:recipes/features/categories/data/dto/category_model.dart';
+
+import '../../infrastructure/dto/category_model.dart';
 
 Widget categoryItem(
     {required Category category,

lib/features/drinks/domain/repositories/drink_details_repository.dart

@@ -1,10 +1,10 @@
 import 'package:dartz/dartz.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:recipes/features/drinks/data/dto/drink_details/drink_details_model.dart';
 
 import '../../../../core/network/error_model.dart';
-import '../../data/data_sources/drink_details/drink_details_data_source.dart';
-import '../../data/repositories/drink_details_repository_impl.dart';
+import '../../infrastructure/data_sources/drink_details/drink_details_data_source.dart';
+import '../../infrastructure/dto/drink_details/drink_details_model.dart';
+import '../../infrastructure/repositories/drink_details_repository_impl.dart';
 
 abstract class DrinkDetailsRepository {
   Future<Either<ErrorModel, List<DrinkDetails>>> drinkDetails(String drinkId);

lib/features/drinks/domain/repositories/drinks_repository.dart

@@ -1,10 +1,9 @@
 import 'package:dartz/dartz.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:recipes/features/drinks/data/dto/drink/drink_model.dart';
-
 import '../../../../core/network/error_model.dart';
-import '../../data/data_sources/drink/drinks_data_source.dart';
-import '../../data/repositories/drinks_repository_impl.dart';
+import '../../infrastructure/data_sources/drink/drinks_data_source.dart';
+import '../../infrastructure/dto/drink/drink_model.dart';
+import '../../infrastructure/repositories/drinks_repository_impl.dart';
 
 final drinksRepositoryProvider = Provider<DrinksRepository>(
       (ref) => DrinksRepositoryImpl(

lib/features/drinks/domain/use_cases/drink_details_use_case.dart

@@ -1,9 +1,9 @@
 import 'package:dartz/dartz.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:recipes/features/drinks/data/dto/drink_details/drink_details_model.dart';
 import 'package:recipes/features/drinks/domain/repositories/drink_details_repository.dart';
 
 import '../../../../core/network/error_model.dart';
+import '../../infrastructure/dto/drink_details/drink_details_model.dart';
 
 class DrinkDetailsUseCase {
   DrinkDetailsUseCase(this._drinkRepository);

lib/features/drinks/domain/use_cases/drinks_use_case.dart

@@ -1,9 +1,9 @@
 import 'package:dartz/dartz.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:recipes/features/drinks/data/dto/drink/drink_model.dart';
 import 'package:recipes/features/drinks/domain/repositories/drinks_repository.dart';
 
 import '../../../../core/network/error_model.dart';
+import '../../infrastructure/dto/drink/drink_model.dart';
 
 final drinkUseCaseProvider = Provider<DrinkUseCase>(
   (ref) => DrinkUseCase(

lib/features/drinks/data/data_sources/drink_details/drink_details_data_source.dart → lib/features/drinks/infrastructure/data_sources/drink_details/drink_details_data_source.dart

@@ -1,8 +1,8 @@
 import 'package:dio/dio.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:recipes/features/drinks/data/data_sources/drink_details/drink_details_data_source_impl.dart';
 
 import '../../../../../core/network/network.dart';
+import 'drink_details_data_source_impl.dart';
 
 abstract class DrinkDetailsDataSource {
   Future<Response> drinkDetails(String drinkId);

lib/features/drinks/data/data_sources/drink_details/drink_details_data_source_impl.dart → lib/features/drinks/infrastructure/data_sources/drink_details/drink_details_data_source_impl.dart

@@ -1,8 +1,8 @@
 import 'package:dio/dio.dart';
-import 'package:recipes/features/drinks/data/data_sources/drink_details/drink_details_data_source.dart';
 
 import '../../../../../core/network/endpoints.dart';
 import '../../../../../core/network/rest_client.dart';
+import 'drink_details_data_source.dart';
 
 class DrinkDetailsDataSourceImpl implements DrinkDetailsDataSource {
   DrinkDetailsDataSourceImpl({

lib/features/drinks/data/repositories/drink_details_repository_impl.dart → lib/features/drinks/infrastructure/repositories/drink_details_repository_impl.dart

@@ -1,10 +1,8 @@
 import 'package:dartz/dartz.dart';
 import 'package:recipes/core/core.dart';
-import 'package:recipes/features/drinks/data/data_sources/drink_details/drink_details_data_source.dart';
-import 'package:recipes/features/drinks/data/dto/drink_details/drink_details_model.dart';
-
-import '../../../../core/network/error_model.dart';
 import '../../domain/repositories/drink_details_repository.dart';
+import '../data_sources/drink_details/drink_details_data_source.dart';
+import '../dto/drink_details/drink_details_model.dart';
 
 class DrinkDetailsRepositoryImpl implements DrinkDetailsRepository {
   DrinkDetailsRepositoryImpl({

lib/features/drinks/data/repositories/drinks_repository_impl.dart → lib/features/drinks/infrastructure/repositories/drinks_repository_impl.dart

@@ -1,10 +1,9 @@
 import 'package:dartz/dartz.dart';
 import 'package:recipes/core/network/request_handler.dart';
-import 'package:recipes/features/drinks/data/data_sources/drink/drinks_data_source.dart';
-import 'package:recipes/features/drinks/data/dto/drink/drink_model.dart';
-
 import '../../../../core/network/error_model.dart';
 import '../../domain/repositories/drinks_repository.dart';
+import '../data_sources/drink/drinks_data_source.dart';
+import '../dto/drink/drink_model.dart';
 
 class DrinksRepositoryImpl implements DrinksRepository {
   DrinksRepositoryImpl({

lib/features/drinks/presentation/riverpod/drink/drinks_notifier.dart

@@ -1,11 +1,11 @@
 import 'dart:developer';
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:recipes/features/drinks/data/dto/drink/drink_model.dart';
 import 'package:recipes/features/drinks/domain/use_cases/drinks_use_case.dart';
 
 import '../../../../../core/state/base_state.dart';
 import '../../../../categories/presentation/providers/select_category_provider.dart';
+import '../../../infrastructure/dto/drink/drink_model.dart';
 
 class DrinksNotifier extends StateNotifier<BaseState> {
   DrinksNotifier({

lib/features/drinks/presentation/riverpod/drink_details/drink_details_notifier.dart

@@ -1,11 +1,11 @@
 import 'dart:developer';
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:recipes/features/drinks/data/dto/drink_details/drink_details_model.dart';
 import 'package:recipes/features/drinks/domain/use_cases/drink_details_use_case.dart';
 import 'package:recipes/features/drinks/presentation/riverpod/drink_details/selected_drink_provider.dart';
 
 import '../../../../../core/state/base_state.dart';
+import '../../../infrastructure/dto/drink_details/drink_details_model.dart';
 
 class DrinkDetailsNotifier extends StateNotifier<BaseState> {
   DrinkDetailsNotifier({

lib/features/drinks/presentation/screens/drinkDetails.dart

@@ -1,21 +1,10 @@
-import 'package:cached_network_image/cached_network_image.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-
-import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:recipes/features/drinks/data/dto/drink/drink_model.dart';
-import 'package:recipes/features/drinks/data/dto/drink_details/drink_details_model.dart';
-import 'package:recipes/features/drinks/presentation/riverpod/drink/drinks_provider.dart';
 import 'package:recipes/features/drinks/presentation/riverpod/drink_details/drink_details_provider.dart';
-import 'package:recipes/features/drinks/presentation/riverpod/drink_details/selected_drink_provider.dart';
-import 'package:recipes/features/drinks/presentation/widgets/drink_item.dart';
-import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
-import 'package:recipes/features/drinks/presentation/widgets/gradient_top_paint.dart';
 import '../../../../configs/configs.dart';
 import '../../../../core/core.dart';
+import '../../infrastructure/dto/drink_details/drink_details_model.dart';
 
 class DrinkDetailsScreen extends ConsumerWidget {
   const DrinkDetailsScreen({super.key});

lib/features/drinks/presentation/screens/drinks_by_category.dart

@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:recipes/features/drinks/data/dto/drink/drink_model.dart';
 import 'package:recipes/features/drinks/presentation/riverpod/drink/drinks_provider.dart';
 import 'package:recipes/features/drinks/presentation/riverpod/drink_details/selected_drink_provider.dart';
 import 'package:recipes/features/drinks/presentation/screens/drinkDetails.dart';
 import 'package:recipes/features/drinks/presentation/widgets/drink_item.dart';
 import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
 import '../../../../configs/configs.dart';
 import '../../../../core/core.dart';
+import '../../infrastructure/dto/drink/drink_model.dart';
 
 class DrinksByCategoryScreen extends ConsumerWidget {
   const DrinksByCategoryScreen({required this.categoryName, super.key});

lib/features/drinks/presentation/widgets/drink_item.dart

@@ -2,9 +2,12 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:recipes/core/core.dart';
 import 'package:recipes/configs/configs.dart';
-import 'package:recipes/features/drinks/data/dto/drink/drink_model.dart';
 
-Widget drinkItem({required Drink drink}) {
+import '../../infrastructure/dto/drink/drink_model.dart';
+
+Widget drinkItem({
+  required Drink drink,
+}) {
   return SizedBox(
     width: AppDimensions.normalize(39.38),
     child: Card(

lib/features/home/presentation/screens/home.dart

@@ -126,7 +126,7 @@ class HomeScreen extends ConsumerWidget {
                   viewportFraction: 0.75,
                   initialPage: 1,
                 );
-                /* Timer.periodic(const Duration(seconds: 3), (timer) {
+                 Timer.periodic(const Duration(seconds: 3), (timer) {
                   if (controller.page == 2) {
                     controller.animateToPage(
                       0,
@@ -139,7 +139,7 @@ class HomeScreen extends ConsumerWidget {
                       curve: Curves.easeInOut,
                     );
                   }
-                });*/
+                });
                 return SizedBox(
                     height: AppDimensions.normalize(140),
                     child: PageView.builder(

lib/features/recipe/domain/repositories/random_recipe_repository.dart

@@ -1,10 +1,9 @@
 import 'package:dartz/dartz.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:recipes/features/recipe/data/data_sources/random_recipe_data_source.dart';
-import 'package:recipes/features/recipe/data/dto/recipe_model.dart';
-
 import '../../../../core/network/error_model.dart';
-import '../../data/repositories/random_recipe_repository_impl.dart';
+import '../../infrastructure/data_sources/random_recipe_data_source.dart';
+import '../../infrastructure/dto/recipe_model.dart';
+import '../../infrastructure/repositories/random_recipe_repository_impl.dart';
 
 final randomRecipeRepositoryProvider = Provider<RandomRecipeRepository>(
   (ref) => RandomRecipeRepositoryImpl(

lib/features/recipe/domain/use_cases/random_recipe_usecase.dart

@@ -1,9 +1,9 @@
 import 'package:dartz/dartz.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:recipes/features/recipe/data/dto/recipe_model.dart';
 import 'package:recipes/features/recipe/domain/repositories/random_recipe_repository.dart';
 
 import '../../../../core/network/error_model.dart';
+import '../../infrastructure/dto/recipe_model.dart';
 
 final randomRecipeUseCaseProvider = Provider<RandomRecipeUseCase>(
   (ref) => RandomRecipeUseCase(

lib/features/recipe/data/data_sources/random_recipe_data_source.dart → lib/features/recipe/infrastructure/data_sources/random_recipe_data_source.dart

@@ -1,6 +1,6 @@
 import 'package:dio/dio.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:recipes/features/recipe/data/data_sources/random_recipe_data_source_impl.dart';
+import 'package:recipes/features/recipe/infrastructure/data_sources/random_recipe_data_source_impl.dart';
 
 import '../../../../core/network/network.dart';
 

lib/features/recipe/data/data_sources/random_recipe_data_source_impl.dart → lib/features/recipe/infrastructure/data_sources/random_recipe_data_source_impl.dart

@@ -1,5 +1,5 @@
 import 'package:dio/dio.dart';
-import 'package:recipes/features/recipe/data/data_sources/random_recipe_data_source.dart';
+import 'package:recipes/features/recipe/infrastructure/data_sources/random_recipe_data_source.dart';
 
 import '../../../../core/network/endpoints.dart';
 import '../../../../core/network/rest_client.dart';

lib/features/recipe/data/repositories/random_recipe_repository_impl.dart → lib/features/recipe/infrastructure/repositories/random_recipe_repository_impl.dart

@@ -1,9 +1,7 @@
 import 'package:dartz/dartz.dart';
 import 'package:recipes/core/core.dart';
-import 'package:recipes/features/recipe/data/data_sources/random_recipe_data_source.dart';
 import 'package:recipes/features/recipe/domain/repositories/random_recipe_repository.dart';
-
-import '../../../../core/network/error_model.dart';
+import '../data_sources/random_recipe_data_source.dart';
 import '../dto/recipe_model.dart';
 
 class RandomRecipeRepositoryImpl implements RandomRecipeRepository {

lib/features/recipe/presentation/providers/random_recipe_provider.dart

@@ -1,8 +1,7 @@
 import 'dart:developer';
-
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:recipes/features/recipe/data/dto/recipe_model.dart';
 import 'package:recipes/features/recipe/domain/use_cases/random_recipe_usecase.dart';
+import '../../infrastructure/dto/recipe_model.dart';
 
 final randomRecipeProvider = FutureProvider<List<Recipe>>(
   (ref) async {

lib/features/recipe/presentation/widgets/recipe_item.dart

@@ -1,13 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:recipes/configs/app.dart';
 import 'package:recipes/configs/configs.dart';
-
 import 'package:recipes/core/core.dart';
-
-import '../../data/dto/recipe_model.dart';
-import '../providers/random_recipe_provider.dart';
+import '../../infrastructure/dto/recipe_model.dart';
 
 class RecipeItem extends ConsumerWidget {
   const RecipeItem(this.recipe, {super.key});