Merge remote-tracking branch 'upstream/main'

This commit is contained in:
Username1548
2024-12-04 22:08:00 +07:00
37 changed files with 1513 additions and 380 deletions

View File

@@ -34,7 +34,7 @@ class FeedScreen extends StatefulWidget {
}
class _FeedScreenState extends State<FeedScreen> {
final FeedCubit feedCubit = sl<FeedCubit>()..loadFeedBlogPostList();
final FeedCubit feedCubit = sl<FeedCubit>();
final RecipesCubit recipesCubit = sl<RecipesCubit>()..loadRecipesList();
final DietsCubit dietsCubit = sl<DietsCubit>()..loadDiets();
final PlansCubit plansCubit = sl<PlansCubit>()..loadPlans();
@@ -49,6 +49,7 @@ class _FeedScreenState extends State<FeedScreen> {
@override
void initState() {
feedCubit.loadFeedBlogPostList();
blogPostsScrollController.addListener(_onScrollBlogPosts);
recipesScrollController.addListener(_onScrollRecipes);
dietsScrollController.addListener(_onScrollDiets);
@@ -185,7 +186,7 @@ class _FeedScreenState extends State<FeedScreen> {
if (index == state.feedBlogPostList.length) {
return const Loader();
}
return BlogPostWidget(feedBlogPostModel: state.feedBlogPostList[index]);
return BlogPostWidget(index: index);
},
separatorBuilder: (context, index) {
return SizedBox(height: 8);
@@ -445,7 +446,7 @@ class _FeedScreenState extends State<FeedScreen> {
GoRouter.of(context).pushNamed(CreatePlanScreen.name);
break;
default:
GoRouter.of(context).pushNamed('blogPostCreateScreen', extra: feedCubit);
GoRouter.of(context).pushNamed('blogPostCreateScreen');
}
},
borderRadius: BorderRadius.circular(64),
@@ -470,6 +471,7 @@ class _FeedScreenState extends State<FeedScreen> {
width: MediaQuery.of(context).size.width - 84,
child: TextFormField(
controller: searchController,
autofocus: false,
style: TextStyle(
fontSize: 12,
),