refactor:

2024-09-11 16:22:12 +03:00
parent 3aa9e8cba8
commit 64bddf79b4
123 changed files with 652 additions and 522 deletions
--- a/lib/features/feed/presentation/bloc/comments_cubit/comments_cubit.dart
+++ b/lib/features/feed/presentation/bloc/comments_cubit/comments_cubit.dart
@@ -1,7 +1,7 @@
-import 'package:eatvio_app/core/app_export.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_state.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/comments_widget.dart';
 import 'package:eatvio_app/features/feed/repositories/feed_repository.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';

 class CommentsCubit extends Cubit<CommentsState> {
  final FeedRepository feedRepository;
--- a/lib/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart
+++ b/lib/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart
@@ -1,6 +1,6 @@
-import 'package:eatvio_app/core/app_export.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_state.dart';
 import 'package:eatvio_app/features/feed/repositories/feed_repository.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';

 class FeedCubit extends Cubit<FeedState> {
  final FeedRepository feedRepository;
--- a/lib/features/feed/presentation/pages/feed_screen.dart
+++ b/lib/features/feed/presentation/pages/feed_screen.dart
@@ -12,6 +12,7 @@ import 'package:eatvio_app/features/feed/presentation/widgets/recipes_widget.dar
 import 'package:eatvio_app/features/feed/presentation/widgets/tags_modal_widget.dart';
 import 'package:eatvio_app/features/plans/presentation/bloc/plans_cubit/plans_cubit.dart';
 import 'package:eatvio_app/features/plans/presentation/bloc/plans_cubit/plans_state.dart';
+import 'package:eatvio_app/locator_service.dart';
 import 'package:eatvio_app/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -27,6 +28,11 @@ class FeedScreen extends StatefulWidget {
 }

 class _FeedScreenState extends State<FeedScreen> {
+  final FeedCubit feedCubit = sl<FeedCubit>()..loadFeedBlogPostList();
+  final RecipesCubit recipesCubit = sl<RecipesCubit>()..loadRecipesList();
+  final DietsCubit dietsCubit = sl<DietsCubit>()..loadDiets();
+  final PlansCubit plansCubit = sl<PlansCubit>()..loadPlans();
+
  final searchController = TextEditingController();
  final List<String> chipsLabelList = ['Все', 'Рецепты', 'Диеты', 'Планы питания', 'Консультанты'];
  int _selectedChipIndex = 0;
@@ -46,7 +52,7 @@ class _FeedScreenState extends State<FeedScreen> {

  _onScrollBlogPosts() {
    if (blogPostsScrollController.offset >= blogPostsScrollController.position.maxScrollExtent && !blogPostsScrollController.position.outOfRange) {
-      context.read<FeedCubit>().loadNextPage();
+      feedCubit.loadNextPage();
    }
  }

@@ -154,168 +160,183 @@ class _FeedScreenState extends State<FeedScreen> {
  }

  _buildAllBlogPosts() {
-    return RefreshIndicator(
-      onRefresh: () => context.read<FeedCubit>().loadFeedBlogPostList(),
-      child: BlocBuilder<FeedCubit, FeedState>(
-        builder: (BuildContext context, FeedState state) {
-          if (state is FeedStateLoaded) {
-            return ListView.separated(
-              padding: EdgeInsets.symmetric(vertical: 8),
-              shrinkWrap: true,
-              physics: BouncingScrollPhysics(),
-              itemBuilder: (context, index) {
-                if (index == state.feedBlogPostList.length) {
-                  return CircularProgressIndicator();
-                }
-                return BlogPostWidget(feedBlogPostModel: state.feedBlogPostList[index]);
-              },
-              separatorBuilder: (context, index) {
-                return SizedBox(height: 8);
-              },
-              itemCount: state.isLoading ? state.feedBlogPostList.length + 1 : state.feedBlogPostList.length,
-            );
-          } else if (state is FeedStateError) {
-            return Scaffold(
-              backgroundColor: Colors.grey.shade200,
-              body: Padding(
-                padding: const EdgeInsets.all(16),
-                child: Center(
-                  child: Text(state.errorMessage),
+    return BlocProvider<FeedCubit>(
+      create: (context) => feedCubit,
+      child: RefreshIndicator(
+        onRefresh: () => feedCubit.loadFeedBlogPostList(),
+        child: BlocBuilder<FeedCubit, FeedState>(
+          builder: (BuildContext context, FeedState state) {
+            if (state is FeedStateLoaded) {
+              return ListView.separated(
+                padding: EdgeInsets.symmetric(vertical: 8),
+                shrinkWrap: true,
+                physics: BouncingScrollPhysics(),
+                itemBuilder: (context, index) {
+                  if (index == state.feedBlogPostList.length) {
+                    return Container(
+                      alignment: Alignment.center,
+                      child: CircularProgressIndicator(),
+                    );
+                  }
+                  return BlogPostWidget(feedBlogPostModel: state.feedBlogPostList[index]);
+                },
+                separatorBuilder: (context, index) {
+                  return SizedBox(height: 8);
+                },
+                itemCount: state.isLoading ? state.feedBlogPostList.length + 1 : state.feedBlogPostList.length,
+              );
+            } else if (state is FeedStateError) {
+              return Scaffold(
+                backgroundColor: Colors.grey.shade200,
+                body: Padding(
+                  padding: const EdgeInsets.all(16),
+                  child: Center(
+                    child: Text(state.errorMessage),
+                  ),
                ),
-              ),
-            );
-          } else {
-            return Scaffold(
-              backgroundColor: Colors.grey.shade200,
-              body: Center(
-                child: CircularProgressIndicator(),
-              ),
-            );
-          }
-        },
+              );
+            } else {
+              return Scaffold(
+                backgroundColor: Colors.grey.shade200,
+                body: Center(
+                  child: CircularProgressIndicator(),
+                ),
+              );
+            }
+          },
+        ),
      ),
    );
  }

  _buildAllRecipes() {
-    return RefreshIndicator(
-      onRefresh: () => context.read<RecipesCubit>().loadRecipesList(),
-      child: BlocBuilder<RecipesCubit, RecipesState>(
-        builder: (BuildContext context, RecipesState state) {
-          if (state is RecipesStateLoaded) {
-            return ListView.separated(
-              padding: EdgeInsets.symmetric(vertical: 8),
-              shrinkWrap: true,
-              physics: BouncingScrollPhysics(),
-              itemBuilder: (context, index) {
-                return RecipesWidget(recipes: state.recipesList[index]);
-              },
-              separatorBuilder: (context, index) {
-                return SizedBox(height: 8);
-              },
-              itemCount: state.recipesList.length,
-            );
-          } else if (state is RecipesStateError) {
-            return Scaffold(
-              backgroundColor: Colors.grey.shade200,
-              body: Padding(
-                padding: const EdgeInsets.all(16),
-                child: Center(
-                  child: Text(state.errorMessage),
+    return BlocProvider<RecipesCubit>(
+      create: (context) => recipesCubit,
+      child: RefreshIndicator(
+        onRefresh: () => recipesCubit.loadRecipesList(),
+        child: BlocBuilder<RecipesCubit, RecipesState>(
+          builder: (BuildContext context, RecipesState state) {
+            if (state is RecipesStateLoaded) {
+              return ListView.separated(
+                padding: EdgeInsets.symmetric(vertical: 8),
+                shrinkWrap: true,
+                physics: BouncingScrollPhysics(),
+                itemBuilder: (context, index) {
+                  return RecipesWidget(recipes: state.recipesList[index]);
+                },
+                separatorBuilder: (context, index) {
+                  return SizedBox(height: 8);
+                },
+                itemCount: state.recipesList.length,
+              );
+            } else if (state is RecipesStateError) {
+              return Scaffold(
+                backgroundColor: Colors.grey.shade200,
+                body: Padding(
+                  padding: const EdgeInsets.all(16),
+                  child: Center(
+                    child: Text(state.errorMessage),
+                  ),
                ),
-              ),
-            );
-          } else {
-            return Scaffold(
-              backgroundColor: Colors.grey.shade200,
-              body: Center(
-                child: CircularProgressIndicator(),
-              ),
-            );
-          }
-        },
+              );
+            } else {
+              return Scaffold(
+                backgroundColor: Colors.grey.shade200,
+                body: Center(
+                  child: CircularProgressIndicator(),
+                ),
+              );
+            }
+          },
+        ),
      ),
    );
  }

  _buildDiets() {
-    return RefreshIndicator(
-      onRefresh: () => context.read<DietsCubit>().loadDiets(),
-      child: BlocBuilder<DietsCubit, DietsState>(
-        builder: (BuildContext context, DietsState state) {
-          if (state is DietsStateLoaded) {
-            return ListView.separated(
-              padding: EdgeInsets.symmetric(vertical: 8),
-              shrinkWrap: true,
-              physics: BouncingScrollPhysics(),
-              itemBuilder: (context, index) {
-                return DietsWidget(diet: state.diets.data[index]);
-              },
-              separatorBuilder: (context, index) {
-                return SizedBox(height: 8);
-              },
-              itemCount: state.diets.data.length,
-            );
-          } else if (state is DietsStateError) {
-            return Scaffold(
-              backgroundColor: Colors.grey.shade200,
-              body: Padding(
-                padding: const EdgeInsets.all(16),
-                child: Center(
-                  child: Text(state.errorMessage),
+    return BlocProvider<DietsCubit>(
+      create: (context) => dietsCubit,
+      child: RefreshIndicator(
+        onRefresh: () => dietsCubit.loadDiets(),
+        child: BlocBuilder<DietsCubit, DietsState>(
+          builder: (BuildContext context, DietsState state) {
+            if (state is DietsStateLoaded) {
+              return ListView.separated(
+                padding: EdgeInsets.symmetric(vertical: 8),
+                shrinkWrap: true,
+                physics: BouncingScrollPhysics(),
+                itemBuilder: (context, index) {
+                  return DietsWidget(diet: state.diets.data[index]);
+                },
+                separatorBuilder: (context, index) {
+                  return SizedBox(height: 8);
+                },
+                itemCount: state.diets.data.length,
+              );
+            } else if (state is DietsStateError) {
+              return Scaffold(
+                backgroundColor: Colors.grey.shade200,
+                body: Padding(
+                  padding: const EdgeInsets.all(16),
+                  child: Center(
+                    child: Text(state.errorMessage),
+                  ),
                ),
-              ),
-            );
-          } else {
-            return Scaffold(
-              backgroundColor: Colors.grey.shade200,
-              body: Center(
-                child: CircularProgressIndicator(),
-              ),
-            );
-          }
-        },
+              );
+            } else {
+              return Scaffold(
+                backgroundColor: Colors.grey.shade200,
+                body: Center(
+                  child: CircularProgressIndicator(),
+                ),
+              );
+            }
+          },
+        ),
      ),
    );
  }

  _buildPlans() {
-    return RefreshIndicator(
-      onRefresh: () => context.read<PlansCubit>().getPlans(),
-      child: BlocBuilder<PlansCubit, PlansState>(
-        builder: (BuildContext context, PlansState state) {
-          if (state is PlansStateLoaded) {
-            return ListView.separated(
-              padding: EdgeInsets.symmetric(vertical: 8),
-              shrinkWrap: true,
-              physics: BouncingScrollPhysics(),
-              itemBuilder: (context, index) {
-                return PlanWidget(planModel: state.plansModel.data[index]);
-              },
-              separatorBuilder: (context, index) {
-                return SizedBox(height: 8);
-              },
-              itemCount: state.plansModel.data.length,
-            );
-          } else if (state is PlansStateError) {
-            return Scaffold(
-              backgroundColor: Colors.grey.shade200,
-              body: Padding(
-                padding: const EdgeInsets.all(16),
-                child: Center(
-                  child: Text(state.errorMessage),
+    return BlocProvider<PlansCubit>(
+      create: (context) => plansCubit,
+      child: RefreshIndicator(
+        onRefresh: () => plansCubit.loadPlans(),
+        child: BlocBuilder<PlansCubit, PlansState>(
+          builder: (BuildContext context, PlansState state) {
+            if (state is PlansStateLoaded) {
+              return ListView.separated(
+                padding: EdgeInsets.symmetric(vertical: 8),
+                shrinkWrap: true,
+                physics: BouncingScrollPhysics(),
+                itemBuilder: (context, index) {
+                  return PlanWidget(planModel: state.plansModel.data[index]);
+                },
+                separatorBuilder: (context, index) {
+                  return SizedBox(height: 8);
+                },
+                itemCount: state.plansModel.data.length,
+              );
+            } else if (state is PlansStateError) {
+              return Scaffold(
+                backgroundColor: Colors.grey.shade200,
+                body: Padding(
+                  padding: const EdgeInsets.all(16),
+                  child: Center(
+                    child: Text(state.errorMessage),
+                  ),
                ),
-              ),
-            );
-          } else {
-            return Scaffold(
-              backgroundColor: Colors.grey.shade200,
-              body: Center(
-                child: CircularProgressIndicator(),
-              ),
-            );
-          }
-        },
+              );
+            } else {
+              return Scaffold(
+                backgroundColor: Colors.grey.shade200,
+                body: Center(
+                  child: CircularProgressIndicator(),
+                ),
+              );
+            }
+          },
+        ),
      ),
    );
  }
--- a/lib/features/feed/presentation/widgets/blog_post_widget.dart
+++ b/lib/features/feed/presentation/widgets/blog_post_widget.dart
@@ -1,10 +1,13 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:dismissible_page/dismissible_page.dart';
-import 'package:eatvio_app/core/app_export.dart';
+import 'package:eatvio_app/core/const.dart';
+import 'package:eatvio_app/core/utils/date_time_utils.dart';
 import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
 import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
+import 'package:eatvio_app/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_html/flutter_html.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:go_router/go_router.dart';
--- a/lib/features/feed/presentation/widgets/comments_widget.dart
+++ b/lib/features/feed/presentation/widgets/comments_widget.dart
@@ -1,7 +1,9 @@
-import 'package:eatvio_app/core/app_export.dart';
+import 'package:eatvio_app/core/utils/date_time_utils.dart';
 import 'package:eatvio_app/features/feed/models/comment_model.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_cubit.dart';
+import 'package:eatvio_app/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';

 enum CommentSourceType { blogPost, recipe, diet }

--- a/lib/features/feed/presentation/widgets/diets_widget.dart
+++ b/lib/features/feed/presentation/widgets/diets_widget.dart
@@ -1,5 +1,6 @@
 import 'package:cached_network_image/cached_network_image.dart';
-import 'package:eatvio_app/core/app_export.dart';
+import 'package:eatvio_app/core/const.dart';
+
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
--- a/lib/features/feed/presentation/widgets/plan_widget.dart
+++ b/lib/features/feed/presentation/widgets/plan_widget.dart
@@ -1,5 +1,5 @@
 import 'package:cached_network_image/cached_network_image.dart';
-import 'package:eatvio_app/core/constants/constants.dart';
+import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/features/plans/models/plan_pagination_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
--- a/lib/features/feed/presentation/widgets/recipes_widget.dart
+++ b/lib/features/feed/presentation/widgets/recipes_widget.dart
@@ -1,5 +1,6 @@
 import 'package:cached_network_image/cached_network_image.dart';
-import 'package:eatvio_app/core/app_export.dart';
+import 'package:eatvio_app/core/const.dart';
+
 import 'package:eatvio_app/features/feed/models/recipes_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';