Merge pull request 'Контекстное меню (три точки)' (#403) from mso7nueh/eatvio_app:main into main

Reviewed-on: eatvio/eatvio_app#403

lib/features/blog_post/presentation/pages/blog_post_screen.dart

@@ -3,10 +3,8 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/core/enums/complained_content.dart';
 import 'package:eatvio_app/core/utils/date_time_utils.dart';
-import 'package:eatvio_app/core/widgets/show_error_dialog.dart';
-import 'package:eatvio_app/features/complaining/presentation/complaining_bottom_sheet.dart';
+import 'package:eatvio_app/core/widgets/custom_popup.dart';
 import 'package:eatvio_app/core/widgets/loader.dart';
-import 'package:eatvio_app/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_cubit.dart';
 import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_state.dart';
@@ -14,7 +12,6 @@ import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit
 import 'package:eatvio_app/features/feed/presentation/widgets/comments_widget.dart';
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_html/flutter_html.dart';
@@ -163,39 +160,14 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
             appBar: AppBar(
               title: Text(widget.blogPost.title),
               actions: [
-                PopupMenuButton(
-                  onSelected: (value) async {
-                    if (value == 'delete') {
-                      final result = await sl<BlogPostCreateCubit>().deleteBlogPost(widget.blogPost.id);
-                      if (!context.mounted) return;
-                      if (!result) {
-                        showErrorDialog(context, title: S.current.could_not_delete_blog_post);
-                        return;
-                      }
-                      context.read<FeedCubit>().loadFeedBlogPostList();
-                      Navigator.of(context).pop();
-                    }
-                    if (value == 'edit') {
-                      GoRouter.of(context).replaceNamed('blogPostCreateScreen', extra: widget.blogPost);
-                    }
-                  },
-                  itemBuilder: (context) => [
-                    if (widget.blogPost.author.authorIsMe) const PopupMenuItem(value: 'edit', child: Text('Редактировать')),
-                    if (widget.blogPost.author.authorIsMe) const PopupMenuItem(value: 'delete', child: Text('Удалить')),
-                    if (!widget.blogPost.author.authorIsMe)
-                      PopupMenuItem(
-                        value: 'report',
-                        child: const Text('Пожаловаться'),
-                        onTap: () {
-                          showModalBottomSheet(
-                            context: context,
-                            isScrollControlled: true,
-                            builder: (context) => ComplainingBottomSheet(complainedContentType: ComplainedContent.posts, id: widget.blogPost.id),
-                          );
-                        },
-                      ),
-                  ],
+                CustomPopup(
+                  isAuthor: widget.blogPost.author.authorIsMe,
+                  complainedContentType: ComplainedContent.posts,
+                  path: 'blog_post/${(widget.blogPost.id)}',
+                  id: widget.blogPost.id,
+                  feedBlogPostModel: widget.blogPost,
                 ),
+                const SizedBox(width: 16),
               ],
             ),
             body: SingleChildScrollView(

lib/features/feed/presentation/widgets/blog_post_widget.dart

@@ -4,9 +4,9 @@ import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/core/enums/complained_content.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/core/utils/date_time_utils.dart';
+import 'package:eatvio_app/core/widgets/custom_popup.dart';
 import 'package:eatvio_app/core/widgets/feed_icon_button.dart';
 import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
-import 'package:eatvio_app/features/diets/presentation/widgets/more_options.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_state.dart';
@@ -14,7 +14,6 @@ import 'package:eatvio_app/features/feed/presentation/widgets/subscribe_button_w
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_html/flutter_html.dart';
-import 'package:flutter_portal/flutter_portal.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:go_router/go_router.dart';
 import 'package:share_plus/share_plus.dart';
@@ -119,30 +118,12 @@ class _BlogPostWidgetState extends State<BlogPostWidget> {
                               slug: state.feedBlogPostList[widget.index].author.authorSlug,
                             ),
                           ),
-                        PortalTarget(
-                          visible: isMoreOptionsVisible,
-                          portalFollower: MoreOptions(
-                            complainedContentType: ComplainedContent.posts,
-                            path: 'blog_post/${(state.feedBlogPostList[widget.index].id)}',
-                            id: state.feedBlogPostList[widget.index].id,
-                          ),
-                          anchor: const Aligned(shiftToWithinBound: AxisFlag(x: true, y: true), follower: Alignment.topRight, target: Alignment.bottomRight),
-                          child: InkWell(
-                            onTap: () {
-                              setState(() {
-                                isMoreOptionsVisible = !isMoreOptionsVisible;
-                              });
-                            },
-                            child: SizedBox(
-                              width: 32,
-                              height: 24,
-                              child: Material(
-                                color: Colors.white,
-                                borderRadius: BorderRadius.circular(4),
-                                child: const Icon(Icons.more_horiz),
-                              ),
-                            ),
-                          ),
+                        CustomPopup(
+                          isAuthor: state.feedBlogPostList[widget.index].author.authorIsMe,
+                          complainedContentType: ComplainedContent.posts,
+                          path: 'blog_post/${(state.feedBlogPostList[widget.index].id)}',
+                          id: state.feedBlogPostList[widget.index].id,
+                          feedBlogPostModel: state.feedBlogPostList[widget.index],
                         ),
                       ],
                     ),