fix: fixed analyzer issues and merge conflicts

lib/core/widgets/custom_drop_down.dart

@@ -56,7 +56,7 @@ class CustomDropDown extends StatelessWidget {
         : _buildDropDownWidget(context);
   }
 
-  _buildDropDownWidget(BuildContext context) {
+  DropdownButtonFormField<SelectionPopupModel> _buildDropDownWidget(BuildContext context) {
     return DropdownButtonFormField<SelectionPopupModel>(
       focusNode: focusNode ?? FocusNode(),
       icon: const Icon(Icons.keyboard_arrow_down_rounded),
@@ -84,7 +84,7 @@ class CustomDropDown extends StatelessWidget {
     );
   }
 
-  void onDropDownChanged(value) {
+  void onDropDownChanged(dynamic value) {
     onChanged!(value!);
   }
 

lib/core/widgets/custom_popup.dart

@@ -76,7 +76,7 @@ class CustomPopup extends StatelessWidget {
     );
   }
 
-  List<PopupMenuEntry> _buildMenuItems(s, context) {
+  List<PopupMenuEntry> _buildMenuItems(S s,BuildContext context) {
     final entries = <PopupMenuEntry>[];
 
     void addItem(String icon, String text, Function() onTap) {
@@ -110,28 +110,28 @@ class CustomPopup extends StatelessWidget {
       addItem('assets/icons/red_trash.svg', 'Удалить', () async {
         if (complainedContentType == ComplainedContent.posts) {
           final result = await sl<BlogPostCreateCubit>().deleteBlogPost(id!);
-          if (!result) {
+          if (!result && context.mounted) {
             showErrorDialog(context, title: S.current.could_not_delete_blog_post);
             return;
           }
           showSuccessToast('Пост удален, обновите ленту');
         } else if (complainedContentType == ComplainedContent.recipe) {
           final result = await sl<RecipesCubit>().deleteRecipe(slug!);
-          if (!result) {
+          if (!result && context.mounted) {
             showErrorDialog(context, title: 'Не удалось удалить рецепт');
             return;
           }
           showSuccessToast('Рецепт удален, обновите ленту');
         } else if (complainedContentType == ComplainedContent.diet) {
           final result = await sl<DietsCubit>().deleteDiet(id!);
-          if (!result) {
+          if (!result && context.mounted) {
             showErrorDialog(context, title: 'Не удалось удалить диету');
             return;
           }
           showSuccessToast('Диета удалена, обновите ленту');
         } else if (complainedContentType == ComplainedContent.plan) {
           final result = await sl<MyPlansCubit>().deletePlan(slug!);
-          if (!result) {
+          if (!result && context.mounted) {
             showErrorDialog(context, title: 'Не удалось удалить план');
             return;
           }