Merge remote-tracking branch 'upstream/main' into issue-689

lib/common/widgets/markdown_editor.dart

@@ -0,0 +1,502 @@
+import 'dart:async';
+import 'package:flutter/material.dart';
+import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
+
+class MarkdownEditor extends StatefulWidget {
+  const MarkdownEditor({
+    super.key,
+    this.initialText,
+    this.hintText,
+    this.hasError = false,
+    this.minLines = 4,
+    this.maxLines = 6,
+    this.heightPreview = 120,
+    this.onChanged,
+    this.onToolbarVisibilityChanged,
+    this.showInlineToolbar = true,
+  });
+
+  final String? initialText;
+  final String? hintText;
+  final bool hasError;
+  final int minLines;
+  final int maxLines;
+  final double heightPreview;
+  final void Function(String value)? onChanged;
+  final void Function(bool visible)? onToolbarVisibilityChanged;
+  final bool showInlineToolbar;
+
+  @override
+  State<MarkdownEditor> createState() => MarkdownEditorState();
+}
+
+class MarkdownEditorState extends State<MarkdownEditor> {
+  late final TextEditingController _controller;
+  final FocusNode _focusNode = FocusNode();
+  bool _isPreview = false;
+  bool _enablePanel = false;
+  late final KeyboardVisibilityController _keyboardVisibilityController;
+  late final StreamSubscription<bool> _keyboardSubscription;
+
+  bool get isToolbarVisible => _enablePanel || _isPreview;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = TextEditingController(text: widget.initialText ?? '');
+    _keyboardVisibilityController = KeyboardVisibilityController();
+    _keyboardSubscription = _keyboardVisibilityController.onChange.listen((visible) {
+      setState(() {
+        _enablePanel = visible;
+      });
+      widget.onToolbarVisibilityChanged?.call(isToolbarVisible);
+    });
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      widget.onToolbarVisibilityChanged?.call(isToolbarVisible);
+    });
+  }
+
+  @override
+  void dispose() {
+    _keyboardSubscription.cancel();
+    _focusNode.dispose();
+    _controller.dispose();
+    super.dispose();
+  }
+
+  bool _hasFormatting(String prefix, String suffix) {
+    final text = _controller.text;
+    final selection = _controller.selection;
+    if (selection.isValid && !selection.isCollapsed) {
+      final selectedText = text.substring(selection.start, selection.end);
+      return selectedText.startsWith(prefix) && selectedText.endsWith(suffix);
+    } else {
+      final cursorPosition = selection.baseOffset;
+      if (cursorPosition >= prefix.length && text.length >= cursorPosition + suffix.length) {
+        final beforeCursor = text.substring(cursorPosition - prefix.length, cursorPosition);
+        final afterCursor = text.substring(cursorPosition, cursorPosition + suffix.length);
+        return beforeCursor == prefix && afterCursor == suffix;
+      }
+    }
+    return false;
+  }
+
+  void _removeFormatting(String prefix, String suffix) {
+    final text = _controller.text;
+    final selection = _controller.selection;
+    if (selection.isValid && !selection.isCollapsed) {
+      final selectedText = text.substring(selection.start, selection.end);
+      final unformattedText = selectedText.substring(prefix.length, selectedText.length - suffix.length);
+      final newText = text.replaceRange(selection.start, selection.end, unformattedText);
+      _controller.text = newText;
+      _controller.selection = TextSelection(baseOffset: selection.start, extentOffset: selection.start + unformattedText.length);
+    } else {
+      final cursorPosition = selection.baseOffset;
+      if (cursorPosition >= prefix.length && text.length >= cursorPosition + suffix.length) {
+        final beforeCursor = text.substring(0, cursorPosition - prefix.length);
+        final afterCursor = text.substring(cursorPosition + suffix.length);
+        final newText = beforeCursor + afterCursor;
+        _controller.text = newText;
+        _controller.selection = TextSelection.collapsed(offset: cursorPosition - prefix.length);
+      }
+    }
+    widget.onChanged?.call(_controller.text);
+  }
+
+  void _applyMarkdownFormat(String prefix, String suffix) {
+    final text = _controller.text;
+    final selection = _controller.selection;
+    if (selection.isValid && !selection.isCollapsed) {
+      final selectedText = text.substring(selection.start, selection.end);
+      final formattedText = '$prefix$selectedText$suffix';
+      final newText = text.replaceRange(selection.start, selection.end, formattedText);
+      _controller.text = newText;
+      _controller.selection = TextSelection(baseOffset: selection.start, extentOffset: selection.start + formattedText.length);
+    } else {
+      final cursorPosition = selection.baseOffset;
+      final newText = '${text.substring(0, cursorPosition)}$prefix$suffix${text.substring(cursorPosition)}';
+      _controller.text = newText;
+      _controller.selection = TextSelection.collapsed(offset: cursorPosition + prefix.length);
+    }
+    widget.onChanged?.call(_controller.text);
+  }
+
+  void _applyHeading() {
+    if (_hasFormatting('# ', '')) {
+      _removeFormatting('# ', '');
+    } else {
+      _applyMarkdownFormat('# ', '');
+    }
+  }
+
+  void _applyBold() {
+    if (_hasFormatting('**', '**')) {
+      _removeFormatting('**', '**');
+    } else {
+      _applyMarkdownFormat('**', '**');
+    }
+  }
+
+  void _applyItalic() {
+    if (_hasFormatting('*', '*')) {
+      _removeFormatting('*', '*');
+    } else {
+      _applyMarkdownFormat('*', '*');
+    }
+  }
+
+  void _applyNumberedList() {
+    if (_hasFormatting('1. ', '')) {
+      _removeFormatting('1. ', '');
+    } else {
+      _applyMarkdownFormat('1. ', '');
+    }
+  }
+
+  void _applyBulletedList() {
+    if (_hasFormatting('- ', '')) {
+      _removeFormatting('- ', '');
+    } else {
+      _applyMarkdownFormat('- ', '');
+    }
+  }
+
+  void _applyLink() {
+    final text = _controller.text;
+    final selection = _controller.selection;
+    if (selection.isValid && !selection.isCollapsed) {
+      final selectedText = text.substring(selection.start, selection.end);
+      final linkRegex = RegExp(r'^\[(.*?)\]\((.*?)\)$');
+      if (linkRegex.hasMatch(selectedText)) {
+        final match = linkRegex.firstMatch(selectedText);
+        final linkText = match?.group(1) ?? selectedText;
+        final newText = text.replaceRange(selection.start, selection.end, linkText);
+        _controller.text = newText;
+        _controller.selection = TextSelection(baseOffset: selection.start, extentOffset: selection.start + linkText.length);
+      } else {
+        final formattedText = '[$selectedText](url)';
+        final newText = text.replaceRange(selection.start, selection.end, formattedText);
+        _controller.text = newText;
+        _controller.selection = TextSelection(baseOffset: selection.start + selectedText.length + 2, extentOffset: selection.start + selectedText.length + 5);
+      }
+    } else {
+      _applyMarkdownFormat('[', '](url)');
+    }
+    widget.onChanged?.call(_controller.text);
+  }
+
+  void _applyHorizontalRule() {
+    final cursorPosition = _controller.selection.baseOffset;
+    final text = _controller.text;
+    final newText = '${text.substring(0, cursorPosition)}\n---\n${text.substring(cursorPosition)}';
+    _controller.text = newText;
+    _controller.selection = TextSelection.collapsed(offset: cursorPosition + 5);
+    widget.onChanged?.call(_controller.text);
+  }
+
+  void _togglePreview() {
+    setState(() {
+      _isPreview = !_isPreview;
+    });
+    if (!_isPreview) {
+      Future.delayed(const Duration(milliseconds: 100), () {
+        _focusNode.requestFocus();
+      });
+    } else {
+      _focusNode.unfocus();
+    }
+    widget.onToolbarVisibilityChanged?.call(isToolbarVisible);
+  }
+
+  Widget _mdButton(IconData icon, VoidCallback onTap) {
+    return Expanded(
+      child: GestureDetector(
+        onTap: onTap,
+        child: Container(
+          height: 36,
+          decoration: BoxDecoration(color: const Color(0xFFF1F2F6), borderRadius: BorderRadius.circular(10)),
+          child: Icon(icon),
+        ),
+      ),
+    );
+  }
+
+  Widget _mdTextButton(String text, VoidCallback onTap) {
+    return Expanded(
+      child: GestureDetector(
+        onTap: onTap,
+        child: Container(
+          height: 36,
+          decoration: BoxDecoration(color: const Color(0xFFF1F2F6), borderRadius: BorderRadius.circular(10)),
+          child: Center(
+            child: Text(
+              text,
+              style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w900, color: Colors.black87),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildMarkdownPreview(BuildContext context) {
+    return Container(
+      height: widget.heightPreview,
+      padding: const EdgeInsets.all(16),
+      width: MediaQuery.of(context).size.width - 32,
+      decoration: BoxDecoration(
+        color: const Color(0xFFF6F6F6),
+        borderRadius: BorderRadius.circular(20),
+        border: Border.all(color: const Color(0xFFE0E0E0)),
+      ),
+      child: SingleChildScrollView(child: _parseMarkdown(_controller.text)),
+    );
+  }
+
+  Widget buildToolbar(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        Container(
+          width: MediaQuery.of(context).size.width - 76,
+          height: 52,
+          decoration: BoxDecoration(
+            color: Colors.white,
+            borderRadius: BorderRadius.circular(20),
+            boxShadow: [BoxShadow(color: const Color(0x00000000).withAlpha((255 * 0.2).toInt()), spreadRadius: 0, blurRadius: 32, offset: const Offset(0, 0))],
+          ),
+          child: Row(
+            children: [
+              const SizedBox(width: 8),
+              _mdTextButton('H', _applyHeading),
+              const SizedBox(width: 8),
+              _mdButton(Icons.format_bold, _applyBold),
+              const SizedBox(width: 8),
+              _mdButton(Icons.format_italic, _applyItalic),
+              const SizedBox(width: 8),
+              _mdButton(Icons.format_list_numbered, _applyNumberedList),
+              const SizedBox(width: 8),
+              _mdButton(Icons.format_list_bulleted, _applyBulletedList),
+              const SizedBox(width: 8),
+              _mdButton(Icons.link, _applyLink),
+              const SizedBox(width: 8),
+              _mdButton(Icons.horizontal_rule, _applyHorizontalRule),
+              const SizedBox(width: 8),
+            ],
+          ),
+        ),
+        const SizedBox(width: 8),
+        Container(
+          width: 52,
+          height: 52,
+          padding: const EdgeInsets.symmetric(horizontal: 8),
+          decoration: BoxDecoration(
+            color: Colors.white,
+            borderRadius: BorderRadius.circular(20),
+            boxShadow: [BoxShadow(color: const Color(0x00000000).withAlpha((255 * 0.2).toInt()), spreadRadius: 0, blurRadius: 32, offset: const Offset(0, 0))],
+          ),
+          child: Row(children: [_mdButton(_isPreview ? Icons.edit : Icons.visibility, _togglePreview)]),
+        ),
+      ],
+    );
+  }
+
+  Widget _parseMarkdown(String text) {
+    if (text.isEmpty) {
+      return Text(widget.hintText ?? '');
+    }
+    final lines = text.split('\n');
+    final widgets = <Widget>[];
+    for (int i = 0; i < lines.length; i++) {
+      final line = lines[i];
+      if (line.trim().isEmpty) {
+        widgets.add(const SizedBox(height: 8));
+        continue;
+      }
+      if (line.startsWith('# ')) {
+        widgets.add(
+          Text(
+            line.substring(2),
+            style: const TextStyle(fontSize: 24, fontWeight: FontWeight.bold, color: Colors.black),
+          ),
+        );
+      } else if (line.startsWith('## ')) {
+        widgets.add(
+          Text(
+            line.substring(3),
+            style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold, color: Colors.black),
+          ),
+        );
+      } else if (line.startsWith('### ')) {
+        widgets.add(
+          Text(
+            line.substring(4),
+            style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold, color: Colors.black),
+          ),
+        );
+      } else if (line.startsWith('- ') || line.startsWith('* ')) {
+        widgets.add(
+          Padding(
+            padding: const EdgeInsets.only(left: 16),
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const Text('• ', style: TextStyle(fontSize: 16)),
+                Expanded(child: _parseInlineMarkdown(line.substring(2))),
+              ],
+            ),
+          ),
+        );
+      } else if (RegExp(r'^\d+\. ').hasMatch(line)) {
+        final match = RegExp(r'^(\d+)\. ').firstMatch(line);
+        final number = match?.group(1) ?? '1';
+        widgets.add(
+          Padding(
+            padding: const EdgeInsets.only(left: 16),
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text('$number. ', style: const TextStyle(fontSize: 16)),
+                Expanded(child: _parseInlineMarkdown(line.substring(number.length + 2))),
+              ],
+            ),
+          ),
+        );
+      } else if (line.trim() == '---') {
+        widgets.add(const Divider(color: Colors.grey, thickness: 1));
+      } else {
+        widgets.add(_parseInlineMarkdown(line));
+      }
+      if (i < lines.length - 1) {
+        widgets.add(const SizedBox(height: 4));
+      }
+    }
+    return Column(crossAxisAlignment: CrossAxisAlignment.start, children: widgets);
+  }
+
+  Widget _parseInlineMarkdown(String text) {
+    final spans = <TextSpan>[];
+    final regex = RegExp(r'(\*\*.*?\*\*|\*.*?\*|\[.*?\]\(.*?\))');
+    int lastEnd = 0;
+    for (final match in regex.allMatches(text)) {
+      if (match.start > lastEnd) {
+        spans.add(
+          TextSpan(
+            text: text.substring(lastEnd, match.start),
+            style: const TextStyle(fontSize: 16, color: Colors.black),
+          ),
+        );
+      }
+      final matchedText = match.group(0)!;
+      if (matchedText.startsWith('**') && matchedText.endsWith('**')) {
+        spans.add(
+          TextSpan(
+            text: matchedText.substring(2, matchedText.length - 2),
+            style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold, color: Colors.black),
+          ),
+        );
+      } else if (matchedText.startsWith('*') && matchedText.endsWith('*')) {
+        spans.add(
+          TextSpan(
+            text: matchedText.substring(1, matchedText.length - 1),
+            style: const TextStyle(fontSize: 16, fontStyle: FontStyle.italic, color: Colors.black),
+          ),
+        );
+      } else if (matchedText.startsWith('[') && matchedText.contains('](')) {
+        final linkMatch = RegExp(r'\[(.*?)\]\((.*?)\)').firstMatch(matchedText);
+        if (linkMatch != null) {
+          final linkText = linkMatch.group(1)!;
+          spans.add(
+            TextSpan(
+              text: linkText,
+              style: const TextStyle(fontSize: 16, color: Colors.blue, decoration: TextDecoration.underline),
+            ),
+          );
+        }
+      }
+      lastEnd = match.end;
+    }
+    if (lastEnd < text.length) {
+      spans.add(
+        TextSpan(
+          text: text.substring(lastEnd),
+          style: const TextStyle(fontSize: 16, color: Colors.black),
+        ),
+      );
+    }
+    return RichText(text: TextSpan(children: spans));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        if (_isPreview)
+          _buildMarkdownPreview(context)
+        else
+          CustomTextFormField(
+            controller: _controller,
+            focusNode: _focusNode,
+            maxLines: widget.maxLines,
+            minLines: widget.minLines,
+            hintText: widget.hintText,
+            hasError: widget.hasError,
+            onChanged: (value) => widget.onChanged?.call(value),
+          ),
+        const SizedBox(height: 8),
+        if (widget.showInlineToolbar && (isToolbarVisible || !_isPreview))
+          Row(
+            children: [
+              Expanded(
+                child: Container(
+                  height: 52,
+                  decoration: BoxDecoration(
+                    color: Colors.white,
+                    borderRadius: BorderRadius.circular(20),
+                    boxShadow: [
+                      BoxShadow(color: const Color(0x00000000).withAlpha((255 * 0.2).toInt()), spreadRadius: 0, blurRadius: 32, offset: const Offset(0, 0)),
+                    ],
+                  ),
+                  child: Row(
+                    children: [
+                      const SizedBox(width: 8),
+                      _mdTextButton('H', _applyHeading),
+                      const SizedBox(width: 8),
+                      _mdButton(Icons.format_bold, _applyBold),
+                      const SizedBox(width: 8),
+                      _mdButton(Icons.format_italic, _applyItalic),
+                      const SizedBox(width: 8),
+                      _mdButton(Icons.format_list_numbered, _applyNumberedList),
+                      const SizedBox(width: 8),
+                      _mdButton(Icons.format_list_bulleted, _applyBulletedList),
+                      const SizedBox(width: 8),
+                      _mdButton(Icons.link, _applyLink),
+                      const SizedBox(width: 8),
+                      _mdButton(Icons.horizontal_rule, _applyHorizontalRule),
+                      const SizedBox(width: 8),
+                    ],
+                  ),
+                ),
+              ),
+              const SizedBox(width: 8),
+              Container(
+                width: 52,
+                height: 52,
+                padding: const EdgeInsets.symmetric(horizontal: 8),
+                decoration: BoxDecoration(
+                  color: Colors.white,
+                  borderRadius: BorderRadius.circular(20),
+                  boxShadow: [
+                    BoxShadow(color: const Color(0x00000000).withAlpha((255 * 0.2).toInt()), spreadRadius: 0, blurRadius: 32, offset: const Offset(0, 0)),
+                  ],
+                ),
+                child: Row(children: [_mdButton(_isPreview ? Icons.edit : Icons.visibility, _togglePreview)]),
+              ),
+            ],
+          ),
+      ],
+    );
+  }
+}

lib/core/di/cubit_registrations.dart

@@ -131,7 +131,7 @@ class CubitRegistrations {
     sl.registerFactory<RegisterConsultantCubit>(() => RegisterConsultantCubit(consultantRepository: sl()));
     sl.registerFactory<ComplainingCubit>(() => ComplainingCubit(repository: sl()));
     sl.registerFactory<UserCardsCubit>(() => UserCardsCubit(cardsRepository: sl()));
-    sl.registerFactory<OrderInfoCubit>(() => OrderInfoCubit(chatRepository: sl()));
+    sl.registerFactory<OrderInfoCubit>(() => OrderInfoCubit(chatRepository: sl(), profileRepository: sl()));
     sl.registerFactory<ConsultationsCubit>(() => ConsultationsCubit(consultationsRepository: sl()));
     sl.registerFactory<ConsultantCommentsCubit>(() => ConsultantCommentsCubit(diaryRepository: sl()));
     sl.registerFactory<CancelPlanCubit>(() => CancelPlanCubit(cancelPlanRepository: sl()));

lib/core/routing/other_routes.dart

@@ -215,7 +215,8 @@ class OtherRoutes {
           final data = state.extra as Map<String, dynamic>;
           final planId = data['planId'] as int;
           final successfulPayment = data['successfulPayment'] as bool?;
-          return InfoByOrderScreen(planId: planId, successfulPayment: successfulPayment);
+          final customerSlug = data['customerSlug'] as String?;
+          return InfoByOrderScreen(planId: planId, successfulPayment: successfulPayment, customerSlug: customerSlug);
         },
       ),
       GoRoute(

lib/features/blog_post/presentation/cubit/blog_post_cubit.dart

@@ -11,7 +11,9 @@ class BlogPostCubit extends Cubit<BlogPostState> {
   Future<void> getBlogPost(int id) async {
     try {
       emit(state.copyWith(isLoading: true));
+
       final postModel = await feedRepository.getBlogPost(id: id);
+      
       emit(state.copyWith(blogPostModel: postModel, isLoading: false));
     } catch (e, st) {
       log(e.toString(), stackTrace: st);

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

@@ -18,6 +18,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_html/flutter_html.dart';
 import 'package:go_router/go_router.dart';
 import 'package:share_plus/share_plus.dart';
+import 'package:markdown/markdown.dart' as md;
 
 class BlogPostScreen extends StatefulWidget {
   final int id;
@@ -231,10 +232,35 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
                         ),
                         if (blogPostState.blogPostModel?.description.isNotEmpty ?? false)
                           Padding(
-                            padding: const EdgeInsets.symmetric(horizontal: 8),
+                            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
                             child: Html(
-                              data: blogPostState.blogPostModel?.description.replaceAll('\n', '<br>'),
-                              style: {"*": Style(color: Colors.black87)},
+                              data: md.markdownToHtml(blogPostState.blogPostModel!.description.replaceAll('\n', '<br>')),
+                              style: {
+                                "body": Style(margin: Margins.zero, padding: HtmlPaddings.zero, fontSize: FontSize(16), lineHeight: const LineHeight(1.5)),
+                                "p": Style(margin: Margins.only(bottom: 12), color: Colors.black87),
+                                "h1, h2, h3, h4, h5, h6": Style(margin: Margins.only(top: 16, bottom: 8), color: Colors.black, fontWeight: FontWeight.bold),
+                                "h1": Style(fontSize: FontSize(24)),
+                                "h2": Style(fontSize: FontSize(20)),
+                                "h3": Style(fontSize: FontSize(18)),
+                                "ul, ol": Style(margin: Margins.only(bottom: 12), padding: HtmlPaddings.only(left: 16)),
+                                "li": Style(margin: Margins.only(bottom: 4), color: Colors.black87),
+                                "strong, b": Style(fontWeight: FontWeight.bold, color: Colors.black),
+                                "em, i": Style(fontStyle: FontStyle.italic),
+                                "code": Style(
+                                  backgroundColor: Colors.grey.shade100,
+                                  padding: HtmlPaddings.symmetric(horizontal: 4, vertical: 2),
+                                  fontFamily: 'monospace',
+                                ),
+                                "pre": Style(backgroundColor: Colors.grey.shade100, padding: HtmlPaddings.all(12), margin: Margins.only(bottom: 12)),
+                                "blockquote": Style(
+                                  padding: HtmlPaddings.only(left: 16),
+                                  margin: Margins.only(left: 8, bottom: 12),
+                                  fontStyle: FontStyle.italic,
+                                  color: Colors.grey.shade700,
+                                ),
+                                "a": Style(color: Colors.blue, textDecoration: TextDecoration.underline),
+                                "img": Style(width: Width(MediaQuery.of(context).size.width - 32)),
+                              },
                             ),
                           ),
                         const SizedBox(height: 8),

lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart

@@ -25,10 +25,7 @@ import 'package:permission_handler/permission_handler.dart';
 class BlogPostCreateScreen extends StatefulWidget {
   final FeedBlogPostModel? feedBlogPostModel;
 
-  const BlogPostCreateScreen({
-    super.key,
-    this.feedBlogPostModel,
-  });
+  const BlogPostCreateScreen({super.key, this.feedBlogPostModel});
 
   @override
   State<BlogPostCreateScreen> createState() => _BlogPostCreateScreenState();
@@ -43,6 +40,9 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
   final descriptionController = TextEditingController();
   final videoUrlController = TextEditingController();
   bool isLoading = false;
+  bool enableMdPanel = false;
+  bool isPreviewMode = false;
+  final FocusNode descriptionFocusNode = FocusNode();
 
   @override
   void initState() {
@@ -51,6 +51,7 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
     keyboardSubscription = keyboardVisibilityController.onChange.listen((bool visible) {
       setState(() {
         shrinkImage = visible;
+        enableMdPanel = visible;
       });
     });
     if (widget.feedBlogPostModel != null) {
@@ -63,9 +64,326 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
   @override
   void dispose() {
     keyboardSubscription.cancel();
+    descriptionFocusNode.dispose();
     super.dispose();
   }
 
+  bool _hasFormatting(String prefix, String suffix) {
+    final text = descriptionController.text;
+    final selection = descriptionController.selection;
+
+    if (selection.isValid && !selection.isCollapsed) {
+      final selectedText = text.substring(selection.start, selection.end);
+      return selectedText.startsWith(prefix) && selectedText.endsWith(suffix);
+    } else {
+      final cursorPosition = selection.baseOffset;
+      if (cursorPosition >= prefix.length && text.length >= cursorPosition + suffix.length) {
+        final beforeCursor = text.substring(cursorPosition - prefix.length, cursorPosition);
+        final afterCursor = text.substring(cursorPosition, cursorPosition + suffix.length);
+        return beforeCursor == prefix && afterCursor == suffix;
+      }
+    }
+    return false;
+  }
+
+  void _removeFormatting(String prefix, String suffix) {
+    final text = descriptionController.text;
+    final selection = descriptionController.selection;
+
+    if (selection.isValid && !selection.isCollapsed) {
+      final selectedText = text.substring(selection.start, selection.end);
+      final unformattedText = selectedText.substring(prefix.length, selectedText.length - suffix.length);
+
+      final newText = text.replaceRange(selection.start, selection.end, unformattedText);
+      descriptionController.text = newText;
+
+      final newSelection = TextSelection(baseOffset: selection.start, extentOffset: selection.start + unformattedText.length);
+      descriptionController.selection = newSelection;
+    } else {
+      final cursorPosition = selection.baseOffset;
+      if (cursorPosition >= prefix.length && text.length >= cursorPosition + suffix.length) {
+        final beforeCursor = text.substring(0, cursorPosition - prefix.length);
+        final afterCursor = text.substring(cursorPosition + suffix.length);
+        final newText = beforeCursor + afterCursor;
+        descriptionController.text = newText;
+
+        final newCursorPosition = cursorPosition - prefix.length;
+        descriptionController.selection = TextSelection.collapsed(offset: newCursorPosition);
+      }
+    }
+  }
+
+  void _applyMarkdownFormat(String prefix, String suffix) {
+    final text = descriptionController.text;
+    final selection = descriptionController.selection;
+
+    if (selection.isValid && !selection.isCollapsed) {
+      final selectedText = text.substring(selection.start, selection.end);
+      final formattedText = '$prefix$selectedText$suffix';
+
+      final newText = text.replaceRange(selection.start, selection.end, formattedText);
+      descriptionController.text = newText;
+
+      final newSelection = TextSelection(baseOffset: selection.start, extentOffset: selection.start + formattedText.length);
+      descriptionController.selection = newSelection;
+    } else {
+      final cursorPosition = selection.baseOffset;
+      final newText = '${text.substring(0, cursorPosition)}$prefix$suffix${text.substring(cursorPosition)}';
+      descriptionController.text = newText;
+
+      final newCursorPosition = cursorPosition + prefix.length;
+      descriptionController.selection = TextSelection.collapsed(offset: newCursorPosition);
+    }
+  }
+
+  void _applyHeading() {
+    if (_hasFormatting('# ', '')) {
+      _removeFormatting('# ', '');
+    } else {
+      _applyMarkdownFormat('# ', '');
+    }
+  }
+
+  void _applyBold() {
+    if (_hasFormatting('**', '**')) {
+      _removeFormatting('**', '**');
+    } else {
+      _applyMarkdownFormat('**', '**');
+    }
+  }
+
+  void _applyItalic() {
+    if (_hasFormatting('*', '*')) {
+      _removeFormatting('*', '*');
+    } else {
+      _applyMarkdownFormat('*', '*');
+    }
+  }
+
+  void _applyNumberedList() {
+    if (_hasFormatting('1. ', '')) {
+      _removeFormatting('1. ', '');
+    } else {
+      _applyMarkdownFormat('1. ', '');
+    }
+  }
+
+  void _applyBulletedList() {
+    if (_hasFormatting('- ', '')) {
+      _removeFormatting('- ', '');
+    } else {
+      _applyMarkdownFormat('- ', '');
+    }
+  }
+
+  void _applyLink() {
+    final text = descriptionController.text;
+    final selection = descriptionController.selection;
+
+    if (selection.isValid && !selection.isCollapsed) {
+      final selectedText = text.substring(selection.start, selection.end);
+
+      final linkRegex = RegExp(r'^\[(.*?)\]\((.*?)\)$');
+      if (linkRegex.hasMatch(selectedText)) {
+        final match = linkRegex.firstMatch(selectedText);
+        final linkText = match?.group(1) ?? selectedText;
+        final newText = text.replaceRange(selection.start, selection.end, linkText);
+        descriptionController.text = newText;
+
+        final newSelection = TextSelection(baseOffset: selection.start, extentOffset: selection.start + linkText.length);
+        descriptionController.selection = newSelection;
+      } else {
+        final formattedText = '[$selectedText](url)';
+        final newText = text.replaceRange(selection.start, selection.end, formattedText);
+        descriptionController.text = newText;
+
+        final newSelection = TextSelection(baseOffset: selection.start + selectedText.length + 2, extentOffset: selection.start + selectedText.length + 5);
+        descriptionController.selection = newSelection;
+      }
+    } else {
+      _applyMarkdownFormat('[', '](url)');
+    }
+  }
+
+  void _applyHorizontalRule() {
+    final cursorPosition = descriptionController.selection.baseOffset;
+    final text = descriptionController.text;
+    final newText = '${text.substring(0, cursorPosition)}\n---\n${text.substring(cursorPosition)}';
+    descriptionController.text = newText;
+
+    final newCursorPosition = cursorPosition + 5;
+    descriptionController.selection = TextSelection.collapsed(offset: newCursorPosition);
+  }
+
+  void _togglePreview() {
+    setState(() {
+      isPreviewMode = !isPreviewMode;
+    });
+
+    if (!isPreviewMode) {
+      Future.delayed(const Duration(milliseconds: 100), () {
+        descriptionFocusNode.requestFocus();
+      });
+    } else {
+      descriptionFocusNode.unfocus();
+    }
+  }
+
+  Widget _buildMarkdownPreview() {
+    return Container(
+      height: 120,
+      padding: const EdgeInsets.all(16),
+      width: MediaQuery.of(context).size.width - 32,
+      decoration: BoxDecoration(
+        color: const Color(0xFFF6F6F6),
+        borderRadius: BorderRadius.circular(20),
+        border: Border.all(color: const Color(0xFFE0E0E0)),
+      ),
+      child: SingleChildScrollView(child: _parseMarkdown(descriptionController.text)),
+    );
+  }
+
+  Widget _parseMarkdown(String text) {
+    if (text.isEmpty) {
+      return const Text(
+        'Описание',
+        style: TextStyle(fontSize: 16, color: Color(0xFF323F4B), fontWeight: FontWeight.w500),
+      );
+    }
+
+    final lines = text.split('\n');
+    final widgets = <Widget>[];
+
+    for (int i = 0; i < lines.length; i++) {
+      final line = lines[i];
+
+      if (line.trim().isEmpty) {
+        widgets.add(const SizedBox(height: 8));
+        continue;
+      }
+
+      if (line.startsWith('# ')) {
+        widgets.add(
+          Text(
+            line.substring(2),
+            style: const TextStyle(fontSize: 24, fontWeight: FontWeight.bold, color: Colors.black),
+          ),
+        );
+      } else if (line.startsWith('## ')) {
+        widgets.add(
+          Text(
+            line.substring(3),
+            style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold, color: Colors.black),
+          ),
+        );
+      } else if (line.startsWith('### ')) {
+        widgets.add(
+          Text(
+            line.substring(4),
+            style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold, color: Colors.black),
+          ),
+        );
+      } else if (line.startsWith('- ') || line.startsWith('* ')) {
+        widgets.add(
+          Padding(
+            padding: const EdgeInsets.only(left: 16),
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const Text('• ', style: TextStyle(fontSize: 16)),
+                Expanded(child: _parseInlineMarkdown(line.substring(2))),
+              ],
+            ),
+          ),
+        );
+      } else if (RegExp(r'^\d+\. ').hasMatch(line)) {
+        final match = RegExp(r'^(\d+)\. ').firstMatch(line);
+        final number = match?.group(1) ?? '1';
+        widgets.add(
+          Padding(
+            padding: const EdgeInsets.only(left: 16),
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text('$number. ', style: const TextStyle(fontSize: 16)),
+                Expanded(child: _parseInlineMarkdown(line.substring(number.length + 2))),
+              ],
+            ),
+          ),
+        );
+      } else if (line.trim() == '---') {
+        widgets.add(const Divider(color: Colors.grey, thickness: 1));
+      } else {
+        widgets.add(_parseInlineMarkdown(line));
+      }
+
+      if (i < lines.length - 1) {
+        widgets.add(const SizedBox(height: 4));
+      }
+    }
+
+    return Column(crossAxisAlignment: CrossAxisAlignment.start, children: widgets);
+  }
+
+  Widget _parseInlineMarkdown(String text) {
+    final spans = <TextSpan>[];
+    final regex = RegExp(r'(\*\*.*?\*\*|\*.*?\*|\[.*?\]\(.*?\))');
+    int lastEnd = 0;
+
+    for (final match in regex.allMatches(text)) {
+      if (match.start > lastEnd) {
+        spans.add(
+          TextSpan(
+            text: text.substring(lastEnd, match.start),
+            style: const TextStyle(fontSize: 16, color: Colors.black),
+          ),
+        );
+      }
+
+      final matchedText = match.group(0)!;
+
+      if (matchedText.startsWith('**') && matchedText.endsWith('**')) {
+        spans.add(
+          TextSpan(
+            text: matchedText.substring(2, matchedText.length - 2),
+            style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold, color: Colors.black),
+          ),
+        );
+      } else if (matchedText.startsWith('*') && matchedText.endsWith('*')) {
+        spans.add(
+          TextSpan(
+            text: matchedText.substring(1, matchedText.length - 1),
+            style: const TextStyle(fontSize: 16, fontStyle: FontStyle.italic, color: Colors.black),
+          ),
+        );
+      } else if (matchedText.startsWith('[') && matchedText.contains('](')) {
+        final linkMatch = RegExp(r'\[(.*?)\]\((.*?)\)').firstMatch(matchedText);
+        if (linkMatch != null) {
+          final linkText = linkMatch.group(1)!;
+          spans.add(
+            TextSpan(
+              text: linkText,
+              style: const TextStyle(fontSize: 16, color: Colors.blue, decoration: TextDecoration.underline),
+            ),
+          );
+        }
+      }
+
+      lastEnd = match.end;
+    }
+
+    if (lastEnd < text.length) {
+      spans.add(
+        TextSpan(
+          text: text.substring(lastEnd),
+          style: const TextStyle(fontSize: 16, color: Colors.black),
+        ),
+      );
+    }
+
+    return RichText(text: TextSpan(children: spans));
+  }
+
   @override
   Widget build(BuildContext context) {
     return BlocProvider<BlogPostCreateCubit>(
@@ -103,13 +421,7 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
                   context: context,
                 );
               },
-              child: const Row(
-                children: [
-                  Icon(Icons.photo_camera),
-                  SizedBox(width: 8),
-                  Text('Фото'),
-                ],
-              ),
+              child: const Row(children: [Icon(Icons.photo_camera), SizedBox(width: 8), Text('Фото')]),
             ),
             CupertinoActionSheetAction(
               onPressed: () async {
@@ -127,97 +439,102 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
                   context: context,
                 );
               },
-              child: const Row(
-                children: [
-                  Icon(Icons.photo),
-                  SizedBox(width: 8),
-                  Text('Галерея'),
-                ],
-              ),
+              child: const Row(children: [Icon(Icons.photo), SizedBox(width: 8), Text('Галерея')]),
             ),
           ],
-          cancelButton: CupertinoActionSheetAction(
-            onPressed: () => Navigator.of(context).pop(),
-            isDestructiveAction: true,
-            child: const Text('Отмена'),
-          ),
+          cancelButton: CupertinoActionSheetAction(onPressed: () => Navigator.of(context).pop(), isDestructiveAction: true, child: const Text('Отмена')),
         );
       },
     );
   }
 
+  Widget _mdButton(IconData icon, Function() onTap) {
+    return Expanded(
+      child: GestureDetector(
+        onTap: onTap,
+        child: Container(
+          height: 36,
+          decoration: BoxDecoration(color: const Color(0xFFF1F2F6), borderRadius: BorderRadius.circular(10)),
+          child: Icon(icon),
+        ),
+      ),
+    );
+  }
+
+  Widget _mdTextButton(String text, Function() onTap) {
+    return Expanded(
+      child: GestureDetector(
+        onTap: onTap,
+        child: Container(
+          height: 36,
+          decoration: BoxDecoration(color: const Color(0xFFF1F2F6), borderRadius: BorderRadius.circular(10)),
+          child: Center(
+            child: Text(
+              text,
+              style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w900, color: Colors.black87),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
   Scaffold _buildBlogPostCreate(BuildContext context) {
     return Scaffold(
       resizeToAvoidBottomInset: true,
-      appBar: AppBar(),
       floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
-      floatingActionButton: SizedBox(
-        width: MediaQuery.of(context).size.width - 32,
-        child: FloatingActionButton.extended(
-          key: AppKeys.blogPostCreateScreenCreateButton,
-          heroTag: 'createBlogPost',
-          highlightElevation: 0,
-          elevation: 0,
-          focusElevation: 0,
-          shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(16),
-          ),
-          backgroundColor: appTheme.blueA400,
-          label: isLoading
-              ? const CircularProgressIndicator()
-              : const Text(
-                  'Создать',
-                  style: TextStyle(
-                    color: Colors.white,
+      floatingActionButton: enableMdPanel || isPreviewMode
+          ? Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                if (!isPreviewMode) ...[
+                  Container(
+                    width: MediaQuery.of(context).size.width - 76,
+                    height: 52,
+                    decoration: BoxDecoration(
+                      color: Colors.white,
+                      borderRadius: BorderRadius.circular(20),
+                      boxShadow: [
+                        BoxShadow(color: const Color(0x00000000).withValues(alpha: 0.2), spreadRadius: 0, blurRadius: 32, offset: const Offset(0, 0)),
+                      ],
+                    ),
+                    child: Row(
+                      children: [
+                        const SizedBox(width: 8),
+                        _mdTextButton('H', _applyHeading),
+                        const SizedBox(width: 8),
+                        _mdButton(Icons.format_bold, _applyBold),
+                        const SizedBox(width: 8),
+                        _mdButton(Icons.format_italic, _applyItalic),
+                        const SizedBox(width: 8),
+                        _mdButton(Icons.format_list_numbered, _applyNumberedList),
+                        const SizedBox(width: 8),
+                        _mdButton(Icons.format_list_bulleted, _applyBulletedList),
+                        const SizedBox(width: 8),
+                        _mdButton(Icons.link, _applyLink),
+                        const SizedBox(width: 8),
+                        _mdButton(Icons.horizontal_rule, _applyHorizontalRule),
+                        const SizedBox(width: 8),
+                      ],
+                    ),
                   ),
+                  const SizedBox(width: 8),
+                ],
+                Container(
+                  width: 52,
+                  height: 52,
+                  padding: const EdgeInsets.symmetric(horizontal: 8),
+                  decoration: BoxDecoration(
+                    color: Colors.white,
+                    borderRadius: BorderRadius.circular(20),
+                    boxShadow: [BoxShadow(color: const Color(0x00000000).withValues(alpha: 0.2), spreadRadius: 0, blurRadius: 32, offset: const Offset(0, 0))],
+                  ),
+                  child: Row(children: [_mdButton(isPreviewMode ? Icons.edit : Icons.visibility, _togglePreview)]),
                 ),
-          onPressed: isLoading
-              ? null
-              : () async {
-                  setState(() {
-                    isLoading = true;
-                  });
-
-                  if (widget.feedBlogPostModel != null) {
-                    final result = await blogPostCubit.updateBlogPost(
-                      id: widget.feedBlogPostModel!.id,
-                      title: titleController.text,
-                      description: descriptionController.text,
-                      videoUrl: videoUrlController.text,
-                      image: image,
-                      oldImageUrl: widget.feedBlogPostModel!.image,
-                    );
-                    setState(() {
-                      isLoading = false;
-                    });
-                    if (!result) {
-                      if (!context.mounted) return;
-                      showErrorDialog(context, title: S.current.could_not_update_blog_post);
-                    } else {
-                      if (!context.mounted) return;
-                      context.pop();
-                    }
-                  } else {
-                    final result = await blogPostCubit.createBlogPost(
-                      title: titleController.text,
-                      description: descriptionController.text,
-                      videoUrl: videoUrlController.text,
-                      image: image,
-                    );
-                    setState(() {
-                      isLoading = false;
-                    });
-                    if (!result) {
-                      if (!context.mounted) return;
-                      showErrorDialog(context, title: S.current.could_not_publish_blog_post);
-                    } else {
-                      if (!context.mounted) return;
-                      context.pop();
-                    }
-                  }
-                },
-        ),
-      ),
+              ],
+            )
+          : null,
+      appBar: AppBar(),
       body: SingleChildScrollView(
         padding: const EdgeInsets.all(16),
         child: Column(
@@ -226,19 +543,19 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
             const SizedBox(height: 16),
             const Text('Заголовок'),
             const SizedBox(height: 8),
-            CustomTextFormField(
-              key: AppKeys.blogPostCreateScreenTitleTextField,
-              controller: titleController,
-            ),
+            CustomTextFormField(key: AppKeys.blogPostCreateScreenTitleTextField, controller: titleController),
             const SizedBox(height: 16),
             const Text('Описание'),
             const SizedBox(height: 8),
-            CustomTextFormField(
-              key: AppKeys.blogPostCreateScreenContentTextField,
-              controller: descriptionController,
-              maxLines: 6,
-              minLines: 4,
-            ),
+            isPreviewMode
+                ? _buildMarkdownPreview()
+                : CustomTextFormField(
+                    key: AppKeys.blogPostCreateScreenContentTextField,
+                    controller: descriptionController,
+                    focusNode: descriptionFocusNode,
+                    maxLines: 6,
+                    minLines: 4,
+                  ),
             const SizedBox(height: 16),
             if (videoUrlController.text.isEmpty) const Text('Изображение поста'),
             if (videoUrlController.text.isEmpty) const SizedBox(height: 8),
@@ -247,17 +564,75 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
             if (image == null && widget.feedBlogPostModel?.image == null) const Text('Ссылка на видео'),
             if (image == null && widget.feedBlogPostModel?.image == null) const SizedBox(height: 8),
             if (image == null && widget.feedBlogPostModel?.image == null)
-              CustomTextFormField(
-                key: AppKeys.blogPostCreateScreenVideoLinkTextField,
-                controller: videoUrlController,
-              ),
+              CustomTextFormField(key: AppKeys.blogPostCreateScreenVideoLinkTextField, controller: videoUrlController),
             const SizedBox(height: 80),
+            _createBlogPostButton(),
           ],
         ),
       ),
     );
   }
 
+  Widget _createBlogPostButton() {
+    return InkWell(
+      onTap: isLoading
+          ? null
+          : () async {
+              setState(() {
+                isLoading = true;
+              });
+              if (widget.feedBlogPostModel != null) {
+                final result = await blogPostCubit.updateBlogPost(
+                  id: widget.feedBlogPostModel!.id,
+                  title: titleController.text,
+                  description: descriptionController.text,
+                  videoUrl: videoUrlController.text,
+                  image: image,
+                  oldImageUrl: widget.feedBlogPostModel!.image,
+                );
+                setState(() {
+                  isLoading = false;
+                });
+                if (!result) {
+                  if (!mounted) return;
+                  showErrorDialog(context, title: S.current.could_not_update_blog_post);
+                } else {
+                  if (!mounted) return;
+                  context.pop();
+                }
+              } else {
+                final result = await blogPostCubit.createBlogPost(
+                  title: titleController.text,
+                  description: descriptionController.text,
+                  videoUrl: videoUrlController.text,
+                  image: image,
+                );
+                setState(() {
+                  isLoading = false;
+                });
+                if (!result) {
+                  if (!mounted) return;
+                  showErrorDialog(context, title: S.current.could_not_publish_blog_post);
+                } else {
+                  if (!mounted) return;
+                  context.pop();
+                }
+              }
+            },
+      borderRadius: BorderRadius.circular(16),
+      child: Ink(
+        width: MediaQuery.of(context).size.width - 32,
+        height: 52,
+        decoration: BoxDecoration(borderRadius: BorderRadius.circular(16), color: appTheme.blueA400),
+        child: isLoading
+            ? const Center(child: CircularProgressIndicator())
+            : const Center(
+                child: Text('Создать', style: TextStyle(color: Colors.white)),
+              ),
+      ),
+    );
+  }
+
   GestureDetector _buildAddPhoto() {
     return GestureDetector(
       onTap: () {
@@ -270,22 +645,14 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
               height: shrinkImage ? 52 : 128,
               curve: Curves.easeIn,
               duration: const Duration(milliseconds: 150),
-              decoration: AppDecoration.fillGray.copyWith(
-                borderRadius: BorderRadius.circular(16),
-              ),
+              decoration: AppDecoration.fillGray.copyWith(borderRadius: BorderRadius.circular(16)),
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.center,
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
-                  Icon(
-                    Icons.photo_library,
-                    color: appTheme.blueGray300,
-                  ),
+                  Icon(Icons.photo_library, color: appTheme.blueGray300),
                   const SizedBox(width: 8),
-                  Text(
-                    "Добавить фото",
-                    selectionColor: appTheme.blueA400,
-                  ),
+                  Text("Добавить фото", selectionColor: appTheme.blueA400),
                 ],
               ),
             ),
@@ -294,13 +661,7 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
               width: shrinkImage ? 52 : MediaQuery.of(context).size.width - 32,
               child: ClipRRect(
                 borderRadius: BorderRadius.circular(16),
-                child: Image(
-                  image: FileImage(
-                    File(
-                      image!.path,
-                    ),
-                  ),
-                ),
+                child: Image(image: FileImage(File(image!.path))),
               ),
             ),
           if (widget.feedBlogPostModel?.image != null && image == null)
@@ -308,9 +669,7 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
               width: shrinkImage ? 52 : MediaQuery.of(context).size.width - 32,
               child: ClipRRect(
                 borderRadius: BorderRadius.circular(16),
-                child: Image(
-                  image: NetworkImage('${sl<AppConfig>().baseUrl}/storage/${widget.feedBlogPostModel!.image}'),
-                ),
+                child: Image(image: NetworkImage('${sl<AppConfig>().baseUrl}/storage/${widget.feedBlogPostModel!.image}')),
               ),
             ),
         ],

lib/features/chat/presentation/pages/chat_screen.dart

@@ -149,10 +149,7 @@ class _ChatScreenState extends State<ChatScreen> {
         centerTitle: false,
         title: GestureDetector(
           onTap: () {
-            GoRouter.of(context).pushNamed(
-              'profileScreen',
-              extra: state.chatRoom.users.receiver.slug,
-            );
+            GoRouter.of(context).pushNamed('profileScreen', extra: state.chatRoom.users.receiver.slug);
           },
           child: Row(
             children: [
@@ -447,7 +444,7 @@ class _ChatScreenState extends State<ChatScreen> {
                               final blockedUsersCubit = sl<BlockedUsersCubit>();
                               await blockedUsersCubit.getBlockedUsers();
                               final blockedState = blockedUsersCubit.state;
-                              
+
                               if (blockedState is BlockedUsersStateLoaded) {
                                 final isBlocked = blockedState.profilesList.any((profile) => profile.slug == state.chatRoom.users.receiver.slug);
                                 if (isBlocked) {
@@ -462,7 +459,7 @@ class _ChatScreenState extends State<ChatScreen> {
                                   return;
                                 }
                               }
-                              
+
                               if (textEditingController.text.isNotEmpty || pickedFiles.isNotEmpty) {
                                 chatRoomCubit.sendMessage(
                                   data: textEditingController.text.isEmpty ? null : textEditingController.text.trim(),
@@ -497,6 +494,12 @@ class _ChatScreenState extends State<ChatScreen> {
                 left: 16,
                 child: AboutOrderButton(
                   onTap: () async {
+                    if (amIConsultant) {
+                      GoRouter.of(
+                        context,
+                      ).push(InfoByOrderScreen.path, extra: {'planId': state.chatRoom.chosenPlan?.id, 'customerSlug': state.chatRoom.users.receiver.slug});
+                      return;
+                    }
                     GoRouter.of(context).push(InfoByOrderScreen.path, extra: {'planId': state.chatRoom.chosenPlan?.id});
                   },
                 ),

lib/features/create_diet/presentation/create_diet_screen.dart

@@ -1,3 +1,4 @@
+import 'package:eatvio_app/common/widgets/markdown_editor.dart';
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
@@ -54,6 +55,8 @@ class _CreateDietScreenContentState extends State<CreateDietScreenContent> {
   final nameController = TextEditingController();
   final descriptionController = TextEditingController();
   final scaffoldKey = GlobalKey<ScaffoldState>();
+  final GlobalKey<MarkdownEditorState> _mdKey = GlobalKey<MarkdownEditorState>();
+  bool _mdToolbarVisible = false;
 
   @override
   void initState() {
@@ -76,9 +79,7 @@ class _CreateDietScreenContentState extends State<CreateDietScreenContent> {
             showBottomSheetWithBlur(
               userRootNavigator: true,
               context: context,
-              child: SuccessPublishedDietOrPlanBottomSheet(
-                title: state.dietData.name ?? 'Диета',
-              ),
+              child: SuccessPublishedDietOrPlanBottomSheet(title: state.dietData.name ?? 'Диета'),
             );
           });
         } else if (state.drafted) {
@@ -87,15 +88,15 @@ class _CreateDietScreenContentState extends State<CreateDietScreenContent> {
             context.pop();
             showBottomSheetWithBlur(
               context: context,
-              child: SuccessPublishedDietOrPlanBottomSheet(
-                title: '${state.dietData.name ?? 'Диета'} сохраненна в черновиках',
-              ),
+              child: SuccessPublishedDietOrPlanBottomSheet(title: '${state.dietData.name ?? 'Диета'} сохраненна в черновиках'),
             );
           });
         }
 
         return Scaffold(
           backgroundColor: appTheme.gray100,
+          floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
+          floatingActionButton: _mdToolbarVisible && _mdKey.currentState != null ? _mdKey.currentState!.buildToolbar(context) : null,
           appBar: AppBar(
             centerTitle: true,
             title: Text(
@@ -124,34 +125,23 @@ class _CreateDietScreenContentState extends State<CreateDietScreenContent> {
                           context.read<CreateDietCubit>().setName(value);
                         },
                       ),
-                      if (state.dietNameError != null) ...[
-                        const SizedBox(
-                          height: 4,
-                        ),
-                        ValidationErrorWidget(error: state.dietNameError ?? ''),
-                      ],
+                      if (state.dietNameError != null) ...[const SizedBox(height: 4), ValidationErrorWidget(error: state.dietNameError ?? '')],
                       const SizedBox(height: 12),
-                      SizedBox(
-                        height: 132,
-                        child: CustomTextFormField(
-                          hasError: state.dietDescriptionError != null,
-                          controller: descriptionController,
-                          textAlignVertical: TextAlignVertical.top,
-                          maxLines: null,
-                          minLines: null,
-                          expands: true,
-                          hintText: s.enter_diet_description,
-                          onChanged: (value) {
-                            context.read<CreateDietCubit>().setDetails(value);
-                          },
-                        ),
+                      MarkdownEditor(
+                        key: _mdKey,
+                        initialText: descriptionController.text,
+                        hintText: s.enter_diet_description,
+                        hasError: state.dietDescriptionError != null,
+                        minLines: 6,
+                        maxLines: 8,
+                        showInlineToolbar: false,
+                        onToolbarVisibilityChanged: (v) => setState(() => _mdToolbarVisible = v),
+                        onChanged: (value) {
+                          descriptionController.text = value;
+                          context.read<CreateDietCubit>().setDetails(value);
+                        },
                       ),
-                      if (state.dietDescriptionError != null) ...[
-                        const SizedBox(
-                          height: 4,
-                        ),
-                        ValidationErrorWidget(error: state.dietDescriptionError ?? ''),
-                      ],
+                      if (state.dietDescriptionError != null) ...[const SizedBox(height: 4), ValidationErrorWidget(error: state.dietDescriptionError ?? '')],
                       const SizedBox(height: 12),
                       const DietDurationDropDownWidget(),
                       const SizedBox(height: 12),
@@ -171,9 +161,7 @@ class _CreateDietScreenContentState extends State<CreateDietScreenContent> {
                     child: Center(
                       child: Text(
                         '${s.diet_plan} (${state.dietData.duration ?? 0} ${getDayForm(state.dietData.duration ?? 0, s)})',
-                        style: TextStyles.headingXLSemibold.copyWith(
-                          color: appTheme.black,
-                        ),
+                        style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
                       ),
                     ),
                   ),
@@ -196,9 +184,7 @@ class _CreateDietScreenContentState extends State<CreateDietScreenContent> {
                         onPressed: () async {
                           context.read<CreateDietCubit>().setDietState(DietState.draft);
                           if (widget.diet != null) {
-                            final result = await context.read<CreateDietCubit>().updateDiet(
-                                  widget.diet!.id,
-                                );
+                            final result = await context.read<CreateDietCubit>().updateDiet(widget.diet!.id);
                             if (result == 'error') {
                               if (!context.mounted) return;
                               showErrorDialog(context, title: '${s.could_not_update_diet} ${state.dietData.name}');

lib/features/create_plan/presentation/create_plan_screen.dart

@@ -1,3 +1,4 @@
+import 'package:eatvio_app/common/widgets/markdown_editor.dart';
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
@@ -28,16 +29,21 @@ class CreatePlanScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (context) => sl<CreatePlanCubit>(),
-      child: const CreatePlanScreenContent(),
-    );
+    return BlocProvider(create: (context) => sl<CreatePlanCubit>(), child: const CreatePlanScreenContent());
   }
 }
 
-class CreatePlanScreenContent extends StatelessWidget {
+class CreatePlanScreenContent extends StatefulWidget {
   const CreatePlanScreenContent({super.key});
 
+  @override
+  State<CreatePlanScreenContent> createState() => _CreatePlanScreenContentState();
+}
+
+class _CreatePlanScreenContentState extends State<CreatePlanScreenContent> {
+  final GlobalKey<MarkdownEditorState> _mdKey = GlobalKey<MarkdownEditorState>();
+  bool _mdToolbarVisible = false;
+
   @override
   Widget build(BuildContext context) {
     final s = S.of(context);
@@ -51,15 +57,14 @@ class CreatePlanScreenContent extends StatelessWidget {
             showBottomSheetWithBlur(
               userRootNavigator: true,
               context: context,
-              child: SuccessPublishedDietOrPlanBottomSheet(
-                title: state.planData.name ?? 'План',
-                isPlan: true,
-              ),
+              child: SuccessPublishedDietOrPlanBottomSheet(title: state.planData.name ?? 'План', isPlan: true),
             );
           });
         }
         return Scaffold(
           backgroundColor: appTheme.gray100,
+          floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
+          floatingActionButton: _mdToolbarVisible && _mdKey.currentState != null ? _mdKey.currentState!.buildToolbar(context) : null,
           appBar: AppBar(
             centerTitle: true,
             title: Text(
@@ -104,10 +109,7 @@ class CreatePlanScreenContent extends StatelessWidget {
                                     },
                                     maxLength: 150,
                                   ),
-                                  if (state.validationState.titleHasError) ...[
-                                    const SizedBox(height: 4),
-                                    ValidationErrorWidget(error: s.atLeast3Symbols),
-                                  ],
+                                  if (state.validationState.titleHasError) ...[const SizedBox(height: 4), ValidationErrorWidget(error: s.atLeast3Symbols)],
                                 ],
                               );
                             },
@@ -140,20 +142,17 @@ class CreatePlanScreenContent extends StatelessWidget {
                             builder: (context, state) {
                               return Column(
                                 children: [
-                                  SizedBox(
-                                    height: 132,
-                                    child: CustomTextFormField(
-                                      hasError: state.validationState.descriptionHasError,
-                                      textAlignVertical: TextAlignVertical.top,
-                                      maxLength: 1000,
-                                      maxLines: null,
-                                      minLines: null,
-                                      expands: true,
-                                      hintText: s.plan_desc_example,
-                                      onChanged: (value) {
-                                        context.read<CreatePlanCubit>().setDetails(value);
-                                      },
-                                    ),
+                                  MarkdownEditor(
+                                    key: _mdKey,
+                                    hintText: s.plan_desc_example,
+                                    hasError: state.validationState.descriptionHasError,
+                                    minLines: 6,
+                                    maxLines: 8,
+                                    showInlineToolbar: false,
+                                    onToolbarVisibilityChanged: (v) => setState(() => _mdToolbarVisible = v),
+                                    onChanged: (value) {
+                                      context.read<CreatePlanCubit>().setDetails(value);
+                                    },
                                   ),
                                   if (state.validationState.descriptionHasError) ...[
                                     const SizedBox(height: 4),
@@ -253,10 +252,7 @@ class CreatePlanScreenContent extends StatelessWidget {
                   }
                   return const Padding(
                     padding: EdgeInsets.only(bottom: 24.0),
-                    child: Align(
-                      alignment: Alignment.bottomCenter,
-                      child: SelectExactOptionWidget(),
-                    ),
+                    child: Align(alignment: Alignment.bottomCenter, child: SelectExactOptionWidget()),
                   );
                 },
               ),

lib/features/create_recipe/presentation/pages/recipe_create_screen.dart

@@ -8,6 +8,7 @@ import 'package:eatvio_app/core/widgets/success_published_recipe_bottom_sheet.da
 import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart';
 import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_state.dart';
 import 'package:eatvio_app/features/create_recipe/presentation/widgets/info_about_recipe_widget.dart';
+import 'package:eatvio_app/common/widgets/markdown_editor.dart';
 import 'package:eatvio_app/features/create_recipe/presentation/widgets/ingredients_widget.dart';
 import 'package:eatvio_app/features/create_recipe/presentation/widgets/steps_widget.dart';
 import 'package:eatvio_app/features/feed/models/recipes_model.dart';
@@ -30,6 +31,8 @@ class RecipeCreateScreen extends StatefulWidget {
 
 class _RecipeCreateScreenState extends State<RecipeCreateScreen> {
   late final CreateRecipeCubit createRecipeCubit;
+  final GlobalKey<MarkdownEditorState> _mdKey = GlobalKey<MarkdownEditorState>();
+  bool _mdToolbarVisible = false;
 
   @override
   void initState() {
@@ -54,6 +57,10 @@ class _RecipeCreateScreenState extends State<RecipeCreateScreen> {
           } else {
             return Scaffold(
               backgroundColor: const Color(0xFFF0F2F5),
+              floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
+              floatingActionButton: _mdToolbarVisible && _mdKey.currentState != null
+                  ? _mdKey.currentState!.buildToolbar(context)
+                  : null,
               appBar: AppBar(
                 title: widget.recipe != null ? const Text('Редактирование рецепта') : const Text('Добавление рецепта'),
                 centerTitle: true,
@@ -65,7 +72,11 @@ class _RecipeCreateScreenState extends State<RecipeCreateScreen> {
                 child: Column(
                   spacing: 16,
                   children: [
-                    InfoAboutRecipeWidget(createRecipeCubit: createRecipeCubit),
+                    InfoAboutRecipeWidget(
+                      createRecipeCubit: createRecipeCubit,
+                      markdownEditorKey: _mdKey,
+                      onMarkdownToolbarVisibilityChanged: (v) => setState(() => _mdToolbarVisible = v),
+                    ),
                     const IngredientsWidget(),
                     StepsWidget(createRecipeCubit: createRecipeCubit),
                     BlocBuilder<CreateRecipeCubit, CreateRecipeState>(

lib/features/create_recipe/presentation/widgets/info_about_recipe_widget.dart

@@ -1,3 +1,4 @@
+import 'package:eatvio_app/common/widgets/markdown_editor.dart';
 import 'package:eatvio_app/app_keys.dart';
 import 'package:eatvio_app/core/data/selectionPopupModel/selection_popup_model.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
@@ -16,8 +17,10 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 
 class InfoAboutRecipeWidget extends StatefulWidget {
   final CreateRecipeCubit createRecipeCubit;
+  final GlobalKey<MarkdownEditorState>? markdownEditorKey;
+  final void Function(bool visible)? onMarkdownToolbarVisibilityChanged;
 
-  const InfoAboutRecipeWidget({super.key, required this.createRecipeCubit});
+  const InfoAboutRecipeWidget({super.key, required this.createRecipeCubit, this.markdownEditorKey, this.onMarkdownToolbarVisibilityChanged});
 
   @override
   State<InfoAboutRecipeWidget> createState() => _InfoAboutRecipeWidgetState();
@@ -105,19 +108,24 @@ class _InfoAboutRecipeWidgetState extends State<InfoAboutRecipeWidget> {
                 builder: (context, state) {
                   return Column(
                     children: [
-                      CustomTextFormField(
+                      KeyedSubtree(
                         key: AppKeys.recipeCreateScreenDescriptionField,
+                        child: MarkdownEditor(
+                          key: widget.markdownEditorKey,
                         hintText: 'Расскажите, почему вы выбрали именно этот рецепт? Опишите, каким будет готовое блюдо и в чём его достоинства.',
                         minLines: 5,
-                        initialValue: state.entity.description,
                         maxLines: 5,
+                        initialText: state.entity.description,
                         hasError: state.descriptionValidationError != null,
+                          showInlineToolbar: false,
+                          onToolbarVisibilityChanged: widget.onMarkdownToolbarVisibilityChanged,
                         onChanged: (value) {
                           widget.createRecipeCubit.replaceDescription(value);
                           if (state.descriptionValidationError != null) {
                             widget.createRecipeCubit.validateDescription();
                           }
                         },
+                        ),
                       ),
                       if (state.descriptionValidationError != null) ...[
                         const SizedBox(height: 4),

lib/features/diets/presentation/widgets/author_card.dart

@@ -4,22 +4,24 @@ import 'package:eatvio_app/features/diets/presentation/widgets/info_bouble.dart'
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/features/profile/models/profile_model.dart';
+import 'package:eatvio_app/features/user_details/presentation/user_details_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:go_router/go_router.dart';
 
 class AuthorCard extends StatelessWidget {
-  const AuthorCard({super.key, required this.author, required this.title, this.backgroundColor, this.titleStyle});
+  const AuthorCard({super.key, required this.author, required this.title, this.backgroundColor, this.titleStyle, this.customerProfile});
   final Author author;
   final String title;
   final Color? backgroundColor;
   final TextStyle? titleStyle;
-
+  final ProfileModel? customerProfile;
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
       onTap: () {
-        GoRouter.of(context).pushNamed('profileScreen', extra: author.authorSlug);
+        GoRouter.of(context).pushNamed('profileScreen', extra: customerProfile != null ? customerProfile!.slug : author.authorSlug);
       },
       child: Container(
         width: MediaQuery.sizeOf(context).width,
@@ -39,24 +41,48 @@ class AuthorCard extends StatelessWidget {
                         shape: BoxShape.circle,
                         image: DecorationImage(
                           image: NetworkImage(
-                            author.authorProfileIcon.contains('https') ? author.authorProfileIcon : sl<AppConfig>().baseUrl + author.authorProfileIcon,
+                            customerProfile != null
+                                ? customerProfile!.profilePhotoUrl.contains('https')
+                                      ? customerProfile!.profilePhotoUrl
+                                      : sl<AppConfig>().baseUrl + customerProfile!.profilePhotoUrl
+                                : author.authorProfileIcon.contains('https')
+                                ? author.authorProfileIcon
+                                : sl<AppConfig>().baseUrl + author.authorProfileIcon,
                           ),
                           fit: BoxFit.cover,
                         ),
                       ),
                     ),
-                    subtitle: Text(author.authorName, style: TextStyles.textLSemibold.copyWith(color: appTheme.black)),
+                    subtitle: Text(
+                      customerProfile != null ? customerProfile!.name : author.authorName,
+                      style: TextStyles.textLSemibold.copyWith(color: appTheme.black),
+                    ),
                     title: Text(title, style: titleStyle ?? TextStyles.textSSemibold.copyWith(color: appTheme.gray)),
                   ),
                   Row(
                     children: [
-                      Text('Консультант', style: TextStyles.textMMedium.copyWith(color: appTheme.black)),
-                      const SizedBox(width: 10),
-                      if (author.authorPlaceInRating != null)
-                        InfoBouble(
-                          radius: 12,
-                          backgroundColor: appTheme.whiteA700,
-                          children: [Text('${author.authorPlaceInRating}-й в рейтинге', style: TextStyles.textMMediumAuto.copyWith(color: appTheme.blueA400))],
+                      if (customerProfile == null) ...[
+                        Text('Консультант', style: TextStyles.textMMedium.copyWith(color: appTheme.black)),
+                        const SizedBox(width: 10),
+
+                        if (author.authorPlaceInRating != null)
+                          InfoBouble(
+                            radius: 12,
+                            backgroundColor: appTheme.whiteA700,
+                            children: [
+                              Text('${author.authorPlaceInRating}-й в рейтинге', style: TextStyles.textMMediumAuto.copyWith(color: appTheme.blueA400)),
+                            ],
+                          ),
+                      ] else
+                        GestureDetector(
+                          onTap: () {
+                            GoRouter.of(context).pushNamed(UserDetailsScreen.name, extra: customerProfile!.slug);
+                          },
+                          child: InfoBouble(
+                            radius: 12,
+                            backgroundColor: appTheme.whiteA700,
+                            children: [Text('Анкета пользователя', style: TextStyles.textMMediumAuto.copyWith(color: appTheme.blueA400))],
+                          ),
                         ),
                     ],
                   ),

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

@@ -17,6 +17,7 @@ import 'package:flutter_html/flutter_html.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:go_router/go_router.dart';
 import 'package:share_plus/share_plus.dart';
+import 'package:markdown/markdown.dart' as md;
 
 class BlogPostWidget extends StatefulWidget {
   final int index;
@@ -57,10 +58,7 @@ class _BlogPostWidgetState extends State<BlogPostWidget> {
                       children: [
                         GestureDetector(
                           onTap: () {
-                            GoRouter.of(context).pushNamed(
-                              'profileScreen',
-                              extra: state.feedBlogPostList[widget.index].author.authorSlug,
-                            );
+                            GoRouter.of(context).pushNamed('profileScreen', extra: state.feedBlogPostList[widget.index].author.authorSlug);
                           },
                           child: CircleAvatar(
                             radius: 20,
@@ -126,14 +124,39 @@ class _BlogPostWidgetState extends State<BlogPostWidget> {
                     const SizedBox(height: 8),
                   if (state.feedBlogPostList[widget.index].description.isNotEmpty)
                     Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 4),
+                      padding: const EdgeInsets.symmetric(horizontal: 12),
                       child: Html(
-                        data:
-                            (state.feedBlogPostList[widget.index].description.length > 200
-                                    ? state.feedBlogPostList[widget.index].description.substring(0, 200)
-                                    : state.feedBlogPostList[widget.index].description)
-                                .replaceAll('\n', '<br>'),
-                        style: {"*": Style(fontSize: FontSize(16), color: Colors.black87)},
+                        data: md.markdownToHtml(
+                          (state.feedBlogPostList[widget.index].description.length > 200
+                              ? state.feedBlogPostList[widget.index].description.substring(0, 200).replaceAll('\n', '<br>')
+                              : state.feedBlogPostList[widget.index].description.replaceAll('\n', '<br>')),
+                        ),
+                        style: {
+                          "body": Style(margin: Margins.zero, padding: HtmlPaddings.zero, fontSize: FontSize(16), lineHeight: const LineHeight(1.5)),
+                          "p": Style(margin: Margins.only(bottom: 12), color: Colors.black87),
+                          "h1, h2, h3, h4, h5, h6": Style(margin: Margins.only(top: 16, bottom: 8), color: Colors.black, fontWeight: FontWeight.bold),
+                          "h1": Style(fontSize: FontSize(24)),
+                          "h2": Style(fontSize: FontSize(20)),
+                          "h3": Style(fontSize: FontSize(18)),
+                          "ul, ol": Style(margin: Margins.only(bottom: 12), padding: HtmlPaddings.only(left: 16)),
+                          "li": Style(margin: Margins.only(bottom: 4), color: Colors.black87),
+                          "strong, b": Style(fontWeight: FontWeight.bold, color: Colors.black),
+                          "em, i": Style(fontStyle: FontStyle.italic),
+                          "code": Style(
+                            backgroundColor: Colors.grey.shade100,
+                            padding: HtmlPaddings.symmetric(horizontal: 4, vertical: 2),
+                            fontFamily: 'monospace',
+                          ),
+                          "pre": Style(backgroundColor: Colors.grey.shade100, padding: HtmlPaddings.all(12), margin: Margins.only(bottom: 12)),
+                          "blockquote": Style(
+                            padding: HtmlPaddings.only(left: 16),
+                            margin: Margins.only(left: 8, bottom: 12),
+                            fontStyle: FontStyle.italic,
+                            color: Colors.grey.shade700,
+                          ),
+                          "a": Style(color: Colors.blue, textDecoration: TextDecoration.underline),
+                          "img": Style(width: Width(MediaQuery.of(context).size.width - 32)),
+                        },
                       ),
                     ),
                   if (state.feedBlogPostList[widget.index].description.length > 200)

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

@@ -17,15 +17,12 @@ import 'package:flutter_html/flutter_html.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:go_router/go_router.dart';
 import 'package:share_plus/share_plus.dart';
+import 'package:markdown/markdown.dart' as md;
 
-class DietsWidget extends StatefulWidget { 
+class DietsWidget extends StatefulWidget {
   final Diet diet;
   final int index;
-  const DietsWidget({
-    super.key,
-    required this.diet,
-    required this.index,
-  });
+  const DietsWidget({super.key, required this.diet, required this.index});
 
   @override
   State<DietsWidget> createState() => _DietsWidgetState();
@@ -33,18 +30,11 @@ class DietsWidget extends StatefulWidget {
 
 class _DietsWidgetState extends State<DietsWidget> {
   bool isMoreOptionsVisible = false;
-  
+
   @override
   Widget build(BuildContext context) {
     return InkWell(
-      onTap: () => GoRouter.of(context).pushNamed(
-        'aboutDietScreen',
-        extra: {
-          'slug': widget.diet.slug,
-          'index': widget.index,
-          'navigateToComments': false,
-        },
-      ),
+      onTap: () => GoRouter.of(context).pushNamed('aboutDietScreen', extra: {'slug': widget.diet.slug, 'index': widget.index, 'navigateToComments': false}),
       child: Material(
         borderRadius: BorderRadius.circular(12),
         color: Colors.white,
@@ -104,12 +94,7 @@ class _DietsWidgetState extends State<DietsWidget> {
                   bottom: 16,
                   child: SizedBox(
                     width: MediaQuery.sizeOf(context).width,
-                    child: InfoRow(
-                      diet: widget.diet,
-                      itemsBackgroundColor: appTheme.whiteA700,
-                      disableDescriptionOfTypes: true,
-                      type: ProductType.diet,
-                    ),
+                    child: InfoRow(diet: widget.diet, itemsBackgroundColor: appTheme.whiteA700, disableDescriptionOfTypes: true, type: ProductType.diet),
                   ),
                 ),
               ],
@@ -120,26 +105,48 @@ class _DietsWidgetState extends State<DietsWidget> {
               children: [
                 Padding(
                   padding: const EdgeInsets.symmetric(horizontal: 16),
-                  child: Text(
-                    widget.diet.name,
-                    style: TextStyles.textMSemibold.copyWith(color: appTheme.black),
-                  ),
+                  child: Text(widget.diet.name, style: TextStyles.textMSemibold.copyWith(color: appTheme.black)),
                 ),
                 if (widget.diet.details.isNotEmpty) ...[
-                  const SizedBox(
-                    height: 12,
-                  ),
+                  const SizedBox(height: 12),
                   Padding(
                     padding: const EdgeInsets.symmetric(horizontal: 16),
                     child: Html(
-                      data: widget.diet.details.length > 200 ? '${widget.diet.details.substring(0, 200).replaceAll('\n', '<br>')}...' : widget.diet.details.replaceAll('\n', '<br>'),
+                      data: md.markdownToHtml(
+                        widget.diet.details.length > 200
+                            ? '${widget.diet.details.substring(0, 200).replaceAll('\n', '<br>')}...'
+                            : widget.diet.details.replaceAll('\n', '<br>'),
+                      ),
                       style: {
-                        "*": Style(
+                        "body": Style(
                           margin: Margins.zero,
-                          color: appTheme.black,
+                          padding: HtmlPaddings.zero,
                           fontSize: FontSize(TextStyles.textSMedium.fontSize ?? 14),
-                          fontWeight: TextStyles.textSMedium.fontWeight ?? FontWeight.w400,
+                          lineHeight: const LineHeight(1.5),
                         ),
+                        "p": Style(margin: Margins.only(bottom: 12), color: appTheme.black),
+                        "h1, h2, h3, h4, h5, h6": Style(margin: Margins.only(top: 16, bottom: 8), color: appTheme.black, fontWeight: FontWeight.bold),
+                        "h1": Style(fontSize: FontSize(24)),
+                        "h2": Style(fontSize: FontSize(20)),
+                        "h3": Style(fontSize: FontSize(18)),
+                        "ul, ol": Style(margin: Margins.only(bottom: 12), padding: HtmlPaddings.only(left: 16)),
+                        "li": Style(margin: Margins.only(bottom: 4), color: appTheme.black),
+                        "strong, b": Style(fontWeight: FontWeight.bold, color: appTheme.black),
+                        "em, i": Style(fontStyle: FontStyle.italic),
+                        "code": Style(
+                          backgroundColor: Colors.grey.shade100,
+                          padding: HtmlPaddings.symmetric(horizontal: 4, vertical: 2),
+                          fontFamily: 'monospace',
+                        ),
+                        "pre": Style(backgroundColor: Colors.grey.shade100, padding: HtmlPaddings.all(12), margin: Margins.only(bottom: 12)),
+                        "blockquote": Style(
+                          padding: HtmlPaddings.only(left: 16),
+                          margin: Margins.only(left: 8, bottom: 12),
+                          fontStyle: FontStyle.italic,
+                          color: Colors.grey.shade700,
+                        ),
+                        "a": Style(color: Colors.blue, textDecoration: TextDecoration.underline),
+                        "img": Style(width: Width(MediaQuery.of(context).size.width - 32)),
                       },
                     ),
                   ),
@@ -149,12 +156,7 @@ class _DietsWidgetState extends State<DietsWidget> {
                     padding: EdgeInsets.only(left: 16, top: 8),
                     child: Text(
                       'Показать ещё',
-                      style: TextStyle(
-                        height: 1,
-                        color: Color(0xFF8B8B8B),
-                        fontSize: 14,
-                        fontWeight: FontWeight.w600,
-                      ),
+                      style: TextStyle(height: 1, color: Color(0xFF8B8B8B), fontSize: 14, fontWeight: FontWeight.w600),
                     ),
                   ),
               ],
@@ -172,18 +174,14 @@ class _DietsWidgetState extends State<DietsWidget> {
                       await context.read<DietsCubit>().likeDiet(widget.diet.id, widget.index);
                     },
                   ),
-                  const SizedBox(
-                    width: 12,
-                  ),
+                  const SizedBox(width: 12),
                   FeedIconButton(
                     icon: Icons.chat_bubble_outline,
                     text: widget.diet.totalComments.toString(),
                     onTap: () =>
                         GoRouter.of(context).pushNamed('aboutDietScreen', extra: {'slug': widget.diet.slug, 'index': widget.index, 'navigateToComments': true}),
                   ),
-                  const SizedBox(
-                    width: 12,
-                  ),
+                  const SizedBox(width: 12),
                   FeedIconButton(
                     svgIcon: SvgPicture.asset('assets/icons/repost.svg'),
                     onTap: () async {

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

@@ -19,16 +19,13 @@ import 'package:flutter_html/flutter_html.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:go_router/go_router.dart';
 import 'package:share_plus/share_plus.dart';
+import 'package:markdown/markdown.dart' as md;
 
 class PlanWidget extends StatefulWidget {
   final PlanModel plan;
   final int index;
 
-  const PlanWidget({
-    super.key,
-    required this.plan,
-    required this.index,
-  });
+  const PlanWidget({super.key, required this.plan, required this.index});
 
   @override
   State<PlanWidget> createState() => _PlanWidgetState();
@@ -41,14 +38,7 @@ class _PlanWidgetState extends State<PlanWidget> {
   Widget build(BuildContext context) {
     final s = S.of(context);
     return InkWell(
-      onTap: () => GoRouter.of(context).pushNamed(
-        'aboutPlanScreen',
-        extra: {
-          'slug': widget.plan.slug,
-          'index': widget.index,
-          'navigateToComments': false,
-        },
-      ),
+      onTap: () => GoRouter.of(context).pushNamed('aboutPlanScreen', extra: {'slug': widget.plan.slug, 'index': widget.index, 'navigateToComments': false}),
       child: Material(
         borderRadius: BorderRadius.circular(12),
         color: Colors.white,
@@ -109,12 +99,7 @@ class _PlanWidgetState extends State<PlanWidget> {
                   bottom: 16,
                   child: SizedBox(
                     width: MediaQuery.sizeOf(context).width,
-                    child: InfoRow(
-                      plan: widget.plan,
-                      itemsBackgroundColor: appTheme.whiteA700,
-                      disableDescriptionOfTypes: true,
-                      type: ProductType.plan,
-                    ),
+                    child: InfoRow(plan: widget.plan, itemsBackgroundColor: appTheme.whiteA700, disableDescriptionOfTypes: true, type: ProductType.plan),
                   ),
                 ),
               ],
@@ -125,26 +110,43 @@ class _PlanWidgetState extends State<PlanWidget> {
               children: [
                 Padding(
                   padding: const EdgeInsets.symmetric(horizontal: 16),
-                  child: Text(
-                    widget.plan.name,
-                    style: TextStyles.textMSemibold.copyWith(color: appTheme.black, fontSize: 18),
-                  ),
+                  child: Text(widget.plan.name, style: TextStyles.textMSemibold.copyWith(color: appTheme.black, fontSize: 18)),
                 ),
                 if (widget.plan.details.isNotEmpty) ...[
-                  const SizedBox(
-                    height: 12,
-                  ),
+                  const SizedBox(height: 12),
                   Padding(
                     padding: const EdgeInsets.symmetric(horizontal: 16),
                     child: Html(
-                      data: widget.plan.details.length > 200 ? '${widget.plan.details.substring(0, 200).replaceAll('\n', '<br>')}...' : widget.plan.details.replaceAll('\n', '<br>'),
+                      data: md.markdownToHtml(
+                        widget.plan.details.length > 200
+                            ? '${widget.plan.details.substring(0, 200).replaceAll('\n', '<br>')}...'
+                            : widget.plan.details.replaceAll('\n', '<br>'),
+                      ),
                       style: {
-                        "*": Style(
-                          margin: Margins.zero,
-                          color: appTheme.black,
-                          fontSize: FontSize(16),
-                          fontWeight: TextStyles.textSMedium.fontWeight ?? FontWeight.w400,
+                        "body": Style(margin: Margins.zero, padding: HtmlPaddings.zero, fontSize: FontSize(16), lineHeight: const LineHeight(1.5)),
+                        "p": Style(margin: Margins.only(bottom: 12), color: appTheme.black),
+                        "h1, h2, h3, h4, h5, h6": Style(margin: Margins.only(top: 16, bottom: 8), color: appTheme.black, fontWeight: FontWeight.bold),
+                        "h1": Style(fontSize: FontSize(24)),
+                        "h2": Style(fontSize: FontSize(20)),
+                        "h3": Style(fontSize: FontSize(18)),
+                        "ul, ol": Style(margin: Margins.only(bottom: 12), padding: HtmlPaddings.only(left: 16)),
+                        "li": Style(margin: Margins.only(bottom: 4), color: appTheme.black),
+                        "strong, b": Style(fontWeight: FontWeight.bold, color: appTheme.black),
+                        "em, i": Style(fontStyle: FontStyle.italic),
+                        "code": Style(
+                          backgroundColor: Colors.grey.shade100,
+                          padding: HtmlPaddings.symmetric(horizontal: 4, vertical: 2),
+                          fontFamily: 'monospace',
                         ),
+                        "pre": Style(backgroundColor: Colors.grey.shade100, padding: HtmlPaddings.all(12), margin: Margins.only(bottom: 12)),
+                        "blockquote": Style(
+                          padding: HtmlPaddings.only(left: 16),
+                          margin: Margins.only(left: 8, bottom: 12),
+                          fontStyle: FontStyle.italic,
+                          color: Colors.grey.shade700,
+                        ),
+                        "a": Style(color: Colors.blue, textDecoration: TextDecoration.underline),
+                        "img": Style(width: Width(MediaQuery.of(context).size.width - 32)),
                       },
                     ),
                   ),
@@ -153,12 +155,7 @@ class _PlanWidgetState extends State<PlanWidget> {
                       padding: EdgeInsets.only(left: 16, top: 8),
                       child: Text(
                         'Показать ещё',
-                        style: TextStyle(
-                          height: 1,
-                          color: Color(0xFF8B8B8B),
-                          fontSize: 14,
-                          fontWeight: FontWeight.w600,
-                        ),
+                        style: TextStyle(height: 1, color: Color(0xFF8B8B8B), fontSize: 14, fontWeight: FontWeight.w600),
                       ),
                     ),
                 ],
@@ -167,10 +164,7 @@ class _PlanWidgetState extends State<PlanWidget> {
             const SizedBox(height: 16),
             GestureDetector(
               onTap: () {
-                GoRouter.of(context).pushNamed(
-                  'profileScreen',
-                  extra: widget.plan.author.authorSlug,
-                );
+                GoRouter.of(context).pushNamed('profileScreen', extra: widget.plan.author.authorSlug);
               },
               child: Padding(
                 padding: const EdgeInsets.only(left: 16.0),
@@ -181,10 +175,7 @@ class _PlanWidgetState extends State<PlanWidget> {
                     height: 46,
                     decoration: BoxDecoration(
                       shape: BoxShape.circle,
-                      image: DecorationImage(
-                        image: NetworkImage(sl<AppConfig>().baseUrl + widget.plan.author.authorProfileIcon),
-                        fit: BoxFit.cover,
-                      ),
+                      image: DecorationImage(image: NetworkImage(sl<AppConfig>().baseUrl + widget.plan.author.authorProfileIcon), fit: BoxFit.cover),
                     ),
                   ),
                   subtitle: Row(
@@ -194,12 +185,7 @@ class _PlanWidgetState extends State<PlanWidget> {
                         backgroundColor: appTheme.gray50,
                         padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 10),
                         children: [
-                          Text(
-                            '${widget.plan.author.authorPlaceInRating}-й в рейтинге',
-                            style: TextStyles.textXSSemibold.copyWith(
-                              color: appTheme.blueA400,
-                            ),
-                          ),
+                          Text('${widget.plan.author.authorPlaceInRating}-й в рейтинге', style: TextStyles.textXSSemibold.copyWith(color: appTheme.blueA400)),
                         ],
                       ),
                       const Spacer(),
@@ -212,21 +198,14 @@ class _PlanWidgetState extends State<PlanWidget> {
                   ),
                   title: Padding(
                     padding: const EdgeInsets.only(bottom: 4.0),
-                    child: Text(
-                      widget.plan.author.authorName,
-                      style: TextStyles.textSSemibold.copyWith(
-                        color: appTheme.black,
-                      ),
-                    ),
+                    child: Text(widget.plan.author.authorName, style: TextStyles.textSSemibold.copyWith(color: appTheme.black)),
                   ),
                 ),
               ),
             ),
             const SizedBox(height: 16),
             Padding(
-              padding: const EdgeInsets.only(
-                left: 16,
-              ),
+              padding: const EdgeInsets.only(left: 16),
               child: Row(
                 children: [
                   FeedIconButton(
@@ -238,20 +217,17 @@ class _PlanWidgetState extends State<PlanWidget> {
                       await context.read<PlansCubit>().likePlan(widget.plan.slug, widget.index);
                     },
                   ),
-                  const SizedBox(
-                    width: 12,
-                  ),
+                  const SizedBox(width: 12),
                   FeedIconButton(
                     icon: Icons.chat_bubble_outline,
                     text: widget.plan.totalComments.toString(),
-                    onTap: () {                      
-                      return GoRouter.of(context)
-                          .pushNamed('aboutPlanScreen', extra: {'slug': widget.plan.slug, 'index': widget.index, 'navigateToComments': true});
+                    onTap: () {
+                      return GoRouter.of(
+                        context,
+                      ).pushNamed('aboutPlanScreen', extra: {'slug': widget.plan.slug, 'index': widget.index, 'navigateToComments': true});
                     },
                   ),
-                  const SizedBox(
-                    width: 12,
-                  ),
+                  const SizedBox(width: 12),
                   FeedIconButton(
                     svgIcon: SvgPicture.asset('assets/icons/repost.svg'),
                     onTap: () async {

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

@@ -20,16 +20,13 @@ import 'package:flutter_html/flutter_html.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:go_router/go_router.dart';
 import 'package:share_plus/share_plus.dart';
+import 'package:markdown/markdown.dart' as md;
 
 class RecipesWidget extends StatefulWidget {
   final int index;
   final Recipe recipe;
 
-  const RecipesWidget({
-    super.key,
-    required this.recipe,
-    required this.index,
-  });
+  const RecipesWidget({super.key, required this.recipe, required this.index});
 
   @override
   State<RecipesWidget> createState() => _RecipesWidgetState();
@@ -56,14 +53,8 @@ class _RecipesWidgetState extends State<RecipesWidget> {
         }
         return InkWell(
           borderRadius: BorderRadius.circular(12),
-          onTap: () => GoRouter.of(context).pushNamed(
-            'aboutRecipesScreen',
-            extra: {
-              'recipe': widget.recipe.slug,
-              'index': widget.index,
-              'navigateToComments': false,
-            },
-          ),
+          onTap: () =>
+              GoRouter.of(context).pushNamed('aboutRecipesScreen', extra: {'recipe': widget.recipe.slug, 'index': widget.index, 'navigateToComments': false}),
           child: Material(
             borderRadius: BorderRadius.circular(12),
             color: Colors.white,
@@ -139,10 +130,7 @@ class _RecipesWidgetState extends State<RecipesWidget> {
                 const SizedBox(height: 12),
                 Padding(
                   padding: const EdgeInsets.symmetric(horizontal: 16),
-                  child: Text(
-                    widget.recipe.title ?? '',
-                    style: TextStyles.textMSemibold.copyWith(color: appTheme.black),
-                  ),
+                  child: Text(widget.recipe.title ?? '', style: TextStyles.textMSemibold.copyWith(color: appTheme.black)),
                 ),
                 if (widget.recipe.videoUrl != null && widget.recipe.videoUrl!.isNotEmpty) ...[
                   const SizedBox(height: 12),
@@ -152,10 +140,7 @@ class _RecipesWidgetState extends State<RecipesWidget> {
                       children: [
                         SvgPicture.asset('assets/icons/play_icon.svg', width: 16, height: 16),
                         const SizedBox(width: 8),
-                        Text(
-                          s.there_is_a_video,
-                          style: TextStyles.textXSSemibold.copyWith(color: appTheme.black),
-                        ),
+                        Text(s.there_is_a_video, style: TextStyles.textXSSemibold.copyWith(color: appTheme.black)),
                       ],
                     ),
                   ),
@@ -165,17 +150,41 @@ class _RecipesWidgetState extends State<RecipesWidget> {
                   Padding(
                     padding: const EdgeInsets.symmetric(horizontal: 16),
                     child: Html(
-                      data: widget.recipe.description.length > 200
-                          ? widget.recipe.description.substring(0, 200).replaceAll('\n', '<br>')
-                          : widget.recipe.description.replaceAll('\n', '<br>'),
+                      data: md.markdownToHtml(
+                        widget.recipe.description.length > 200
+                            ? widget.recipe.description.substring(0, 200).replaceAll('\n', '<br>')
+                            : widget.recipe.description.replaceAll('\n', '<br>'),
+                      ),
                       style: {
-                        "*": Style(
-                          color: appTheme.black,
-                          margin: Margins.all(0),
-                          fontFamily: TextStyles.textSMedium.fontFamily,
+                        "body": Style(
+                          margin: Margins.zero,
+                          padding: HtmlPaddings.zero,
                           fontSize: FontSize(TextStyles.textSMedium.fontSize ?? 14),
-                          fontWeight: TextStyles.textSMedium.fontWeight,
+                          lineHeight: const LineHeight(1.5),
                         ),
+                        "p": Style(margin: Margins.only(bottom: 12), color: appTheme.black),
+                        "h1, h2, h3, h4, h5, h6": Style(margin: Margins.only(top: 16, bottom: 8), color: appTheme.black, fontWeight: FontWeight.bold),
+                        "h1": Style(fontSize: FontSize(24)),
+                        "h2": Style(fontSize: FontSize(20)),
+                        "h3": Style(fontSize: FontSize(18)),
+                        "ul, ol": Style(margin: Margins.only(bottom: 12), padding: HtmlPaddings.only(left: 16)),
+                        "li": Style(margin: Margins.only(bottom: 4), color: appTheme.black),
+                        "strong, b": Style(fontWeight: FontWeight.bold, color: appTheme.black),
+                        "em, i": Style(fontStyle: FontStyle.italic),
+                        "code": Style(
+                          backgroundColor: Colors.grey.shade100,
+                          padding: HtmlPaddings.symmetric(horizontal: 4, vertical: 2),
+                          fontFamily: 'monospace',
+                        ),
+                        "pre": Style(backgroundColor: Colors.grey.shade100, padding: HtmlPaddings.all(12), margin: Margins.only(bottom: 12)),
+                        "blockquote": Style(
+                          padding: HtmlPaddings.only(left: 16),
+                          margin: Margins.only(left: 8, bottom: 12),
+                          fontStyle: FontStyle.italic,
+                          color: Colors.grey.shade700,
+                        ),
+                        "a": Style(color: Colors.blue, textDecoration: TextDecoration.underline),
+                        "img": Style(width: Width(MediaQuery.of(context).size.width - 32)),
                       },
                     ),
                   ),
@@ -184,12 +193,7 @@ class _RecipesWidgetState extends State<RecipesWidget> {
                     padding: EdgeInsets.only(left: 16, top: 8),
                     child: Text(
                       'Показать ещё',
-                      style: TextStyle(
-                        height: 1,
-                        color: Color(0xFF8B8B8B),
-                        fontSize: 14,
-                        fontWeight: FontWeight.w600,
-                      ),
+                      style: TextStyle(height: 1, color: Color(0xFF8B8B8B), fontSize: 14, fontWeight: FontWeight.w600),
                     ),
                   ),
                 const SizedBox(height: 12),
@@ -211,14 +215,9 @@ class _RecipesWidgetState extends State<RecipesWidget> {
                       FeedIconButton(
                         icon: Icons.chat_bubble_outline,
                         text: widget.recipe.commentsCount.toString(),
-                        onTap: () => GoRouter.of(context).pushNamed(
-                          'aboutRecipesScreen',
-                          extra: {
-                            'recipe': widget.recipe.slug,
-                            'index': widget.index,
-                            'navigateToComments': true,
-                          },
-                        ),
+                        onTap: () => GoRouter.of(
+                          context,
+                        ).pushNamed('aboutRecipesScreen', extra: {'recipe': widget.recipe.slug, 'index': widget.index, 'navigateToComments': true}),
                       ),
                       const SizedBox(width: 8),
                       FeedIconButton(
@@ -239,19 +238,11 @@ class _RecipesWidgetState extends State<RecipesWidget> {
                         },
                       ),
                       const Spacer(),
-                      Icon(
-                        Icons.visibility_rounded,
-                        size: 16,
-                        color: appTheme.gray500,
-                      ),
+                      Icon(Icons.visibility_rounded, size: 16, color: appTheme.gray500),
                       const SizedBox(width: 4),
                       Text(
                         widget.recipe.viewsCount.toString(),
-                        style: TextStyle(
-                          fontSize: 12,
-                          color: appTheme.gray500,
-                          fontWeight: FontWeight.w400,
-                        ),
+                        style: TextStyle(fontSize: 12, color: appTheme.gray500, fontWeight: FontWeight.w400),
                       ),
                     ],
                   ),
@@ -268,26 +259,17 @@ class _RecipesWidgetState extends State<RecipesWidget> {
   Container _iconButton(String iconPath, [String? text]) {
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
-      decoration: BoxDecoration(
-        color: appTheme.whiteA700,
-        borderRadius: BorderRadius.circular(16),
-      ),
+      decoration: BoxDecoration(color: appTheme.whiteA700, borderRadius: BorderRadius.circular(16)),
       height: 32,
       child: Row(
         mainAxisSize: MainAxisSize.min,
         children: [
-          SvgPicture.asset(
-            iconPath,
-          ),
+          SvgPicture.asset(iconPath),
           if (text != null) const SizedBox(width: 8),
           if (text != null)
             Text(
               text,
-              style: const TextStyle(
-                fontSize: 12,
-                color: Colors.black,
-                fontWeight: FontWeight.w500,
-              ),
+              style: const TextStyle(fontSize: 12, color: Colors.black, fontWeight: FontWeight.w500),
             ),
         ],
       ),

lib/features/my_diets/presentation/widgets/my_diet_widget.dart

@@ -24,14 +24,12 @@ import 'package:flutter_html/flutter_html.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:go_router/go_router.dart';
 import 'package:share_plus/share_plus.dart';
+import 'package:markdown/markdown.dart' as md;
 
 class MyDietWidget extends StatefulWidget {
   final Diet diet;
 
-  const MyDietWidget({
-    super.key,
-    required this.diet,
-  });
+  const MyDietWidget({super.key, required this.diet});
 
   @override
   State<MyDietWidget> createState() => _MyDietWidgetState();
@@ -42,10 +40,7 @@ class _MyDietWidgetState extends State<MyDietWidget> {
   Widget build(BuildContext context) {
     final s = S.of(context);
     return DecoratedBox(
-      decoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(12),
-        color: Colors.white,
-      ),
+      decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white),
       child: Column(
         mainAxisSize: MainAxisSize.min,
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -78,26 +73,48 @@ class _MyDietWidgetState extends State<MyDietWidget> {
             children: [
               Padding(
                 padding: const EdgeInsets.symmetric(horizontal: 16),
-                child: Text(
-                  widget.diet.name,
-                  style: TextStyles.textMSemibold.copyWith(color: appTheme.black),
-                ),
+                child: Text(widget.diet.name, style: TextStyles.textMSemibold.copyWith(color: appTheme.black)),
               ),
               if (widget.diet.details.isNotEmpty) ...[
-                const SizedBox(
-                  height: 12,
-                ),
+                const SizedBox(height: 12),
                 Padding(
                   padding: const EdgeInsets.symmetric(horizontal: 16),
                   child: Html(
-                    data: widget.diet.details.length > 200 ? '${widget.diet.details.substring(0, 200).replaceAll('\n', '<br>')}...' : widget.diet.details.replaceAll('\n', '<br>'),
+                    data: md.markdownToHtml(
+                      widget.diet.details.length > 200
+                          ? '${widget.diet.details.substring(0, 200).replaceAll('\n', '<br>')}...'
+                          : widget.diet.details.replaceAll('\n', '<br>'),
+                    ),
                     style: {
-                      "*": Style(
+                      "body": Style(
                         margin: Margins.zero,
-                        color: appTheme.black,
+                        padding: HtmlPaddings.zero,
                         fontSize: FontSize(TextStyles.textSMedium.fontSize ?? 14),
-                        fontWeight: TextStyles.textSMedium.fontWeight ?? FontWeight.w400,
+                        lineHeight: const LineHeight(1.5),
                       ),
+                      "p": Style(margin: Margins.only(bottom: 12), color: appTheme.black),
+                      "h1, h2, h3, h4, h5, h6": Style(margin: Margins.only(top: 16, bottom: 8), color: appTheme.black, fontWeight: FontWeight.bold),
+                      "h1": Style(fontSize: FontSize(24)),
+                      "h2": Style(fontSize: FontSize(20)),
+                      "h3": Style(fontSize: FontSize(18)),
+                      "ul, ol": Style(margin: Margins.only(bottom: 12), padding: HtmlPaddings.only(left: 16)),
+                      "li": Style(margin: Margins.only(bottom: 4), color: appTheme.black),
+                      "strong, b": Style(fontWeight: FontWeight.bold, color: appTheme.black),
+                      "em, i": Style(fontStyle: FontStyle.italic),
+                      "code": Style(
+                        backgroundColor: Colors.grey.shade100,
+                        padding: HtmlPaddings.symmetric(horizontal: 4, vertical: 2),
+                        fontFamily: 'monospace',
+                      ),
+                      "pre": Style(backgroundColor: Colors.grey.shade100, padding: HtmlPaddings.all(12), margin: Margins.only(bottom: 12)),
+                      "blockquote": Style(
+                        padding: HtmlPaddings.only(left: 16),
+                        margin: Margins.only(left: 8, bottom: 12),
+                        fontStyle: FontStyle.italic,
+                        color: Colors.grey.shade700,
+                      ),
+                      "a": Style(color: Colors.blue, textDecoration: TextDecoration.underline),
+                      "img": Style(width: Width(MediaQuery.of(context).size.width - 32)),
                     },
                   ),
                 ),
@@ -230,11 +247,7 @@ class _MyDietWidgetState extends State<MyDietWidget> {
                           },
                           height: 52,
                           width: 52,
-                          leftIcon: SvgPicture.asset(
-                            'assets/icons/trash_can.svg',
-                            width: 20,
-                            height: 20,
-                          ),
+                          leftIcon: SvgPicture.asset('assets/icons/trash_can.svg', width: 20, height: 20),
                           buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.red),
                           buttonStyle: ButtonStyle(
                             shape: WidgetStatePropertyAll(RoundedRectangleBorder(borderRadius: BorderRadius.circular(20))),

lib/features/my_plans/presentation/widgets/my_plan_widget.dart

@@ -18,6 +18,7 @@ import 'package:flutter_html/flutter_html.dart';
 // Removed SVG icon usage after switching to text buttons
 import 'package:go_router/go_router.dart';
 import 'package:share_plus/share_plus.dart';
+import 'package:markdown/markdown.dart' as md;
 
 class MyPlanWidget extends StatefulWidget {
   final PlanModel plan;
@@ -43,7 +44,11 @@ class _MyPlanWidgetState extends State<MyPlanWidget> {
                 onTap: () => GoRouter.of(context).pushNamed('aboutPlanScreen', extra: {'slug': widget.plan.slug, 'navigateToComments': false}),
                 child: ClipRRect(
                   borderRadius: const BorderRadius.vertical(top: Radius.circular(12)),
-                  child: CachedNetworkImage(imageUrl: '${sl<AppConfig>().baseUrl}/storage/${widget.plan.image}', fit: BoxFit.fitWidth, width: MediaQuery.of(context).size.width),
+                  child: CachedNetworkImage(
+                    imageUrl: '${sl<AppConfig>().baseUrl}/storage/${widget.plan.image}',
+                    fit: BoxFit.fitWidth,
+                    width: MediaQuery.of(context).size.width,
+                  ),
                 ),
               ),
               Positioned(
@@ -68,16 +73,41 @@ class _MyPlanWidgetState extends State<MyPlanWidget> {
                 Padding(
                   padding: const EdgeInsets.symmetric(horizontal: 16),
                   child: Html(
-                    data: widget.plan.details.length > 200
-                        ? '${widget.plan.details.substring(0, 200).replaceAll('\n', '<br>')}...'
-                        : widget.plan.details.replaceAll('\n', '<br>'),
+                    data: md.markdownToHtml(
+                      widget.plan.details.length > 200
+                          ? '${widget.plan.details.substring(0, 200).replaceAll('\n', '<br>')}...'
+                          : widget.plan.details.replaceAll('\n', '<br>'),
+                    ),
                     style: {
-                      "*": Style(
+                      "body": Style(
                         margin: Margins.zero,
-                        color: appTheme.black,
+                        padding: HtmlPaddings.zero,
                         fontSize: FontSize(TextStyles.textSMedium.fontSize ?? 14),
-                        fontWeight: TextStyles.textSMedium.fontWeight ?? FontWeight.w400,
+                        lineHeight: const LineHeight(1.5),
                       ),
+                      "p": Style(margin: Margins.only(bottom: 12), color: appTheme.black),
+                      "h1, h2, h3, h4, h5, h6": Style(margin: Margins.only(top: 16, bottom: 8), color: appTheme.black, fontWeight: FontWeight.bold),
+                      "h1": Style(fontSize: FontSize(24)),
+                      "h2": Style(fontSize: FontSize(20)),
+                      "h3": Style(fontSize: FontSize(18)),
+                      "ul, ol": Style(margin: Margins.only(bottom: 12), padding: HtmlPaddings.only(left: 16)),
+                      "li": Style(margin: Margins.only(bottom: 4), color: appTheme.black),
+                      "strong, b": Style(fontWeight: FontWeight.bold, color: appTheme.black),
+                      "em, i": Style(fontStyle: FontStyle.italic),
+                      "code": Style(
+                        backgroundColor: Colors.grey.shade100,
+                        padding: HtmlPaddings.symmetric(horizontal: 4, vertical: 2),
+                        fontFamily: 'monospace',
+                      ),
+                      "pre": Style(backgroundColor: Colors.grey.shade100, padding: HtmlPaddings.all(12), margin: Margins.only(bottom: 12)),
+                      "blockquote": Style(
+                        padding: HtmlPaddings.only(left: 16),
+                        margin: Margins.only(left: 8, bottom: 12),
+                        fontStyle: FontStyle.italic,
+                        color: Colors.grey.shade700,
+                      ),
+                      "a": Style(color: Colors.blue, textDecoration: TextDecoration.underline),
+                      "img": Style(width: Width(MediaQuery.of(context).size.width - 32)),
                     },
                   ),
                 ),

lib/features/order_info/cubit/order_info_cubit.dart

@@ -1,12 +1,13 @@
 import 'dart:developer';
-
 import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
 import 'package:eatvio_app/features/order_info/cubit/order_info_state.dart';
+import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
 class OrderInfoCubit extends Cubit<OrderInfoState> {
-  OrderInfoCubit({required this.chatRepository}) : super(OrderInfoState());
+  OrderInfoCubit({required this.chatRepository, required this.profileRepository}) : super(OrderInfoState());
   final ChatRepository chatRepository;
+  final ProfileRepository profileRepository;
 
   Future<String?> getPaymentLink() async {
     try {
@@ -20,10 +21,14 @@ class OrderInfoCubit extends Cubit<OrderInfoState> {
     }
   }
 
-  Future<void> getChosenPlan(int id) async {
+  Future<void> getChosenPlan({required int id, String? customerSlug}) async {
     try {
       emit(state.copyWith(isLoading: true));
       final chosenPlan = await chatRepository.getChosenPlan(id: id);
+      if (customerSlug != null) {
+        final profile = await profileRepository.getProfileBySlug(customerSlug);
+        emit(state.copyWith(customerProfile: profile));
+      }
       emit(state.copyWith(isLoading: false, chosenPlan: chosenPlan));
     } catch (e) {
       log(e.toString());

lib/features/order_info/cubit/order_info_state.dart

@@ -1,4 +1,5 @@
 import 'package:eatvio_app/features/plans/models/chosen_plan_model.dart';
+import 'package:eatvio_app/features/profile/models/profile_model.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'order_info_state.freezed.dart';
@@ -9,6 +10,7 @@ abstract class OrderInfoState with _$OrderInfoState {
   factory OrderInfoState({
     @Default(true) bool isLoading,
     @Default(null) ChosenPlanModel? chosenPlan,
+    @Default(null) ProfileModel? customerProfile,
   }) = _OrderInfoState;
   
 }

lib/features/order_info/presentation/info_by_order_screen.dart

@@ -24,31 +24,24 @@ import 'package:go_router/go_router.dart';
 class InfoByOrderScreen extends StatelessWidget {
   static const name = 'infoByOrderScreen';
   static const path = '/info-by-order-screen';
-  const InfoByOrderScreen({super.key, this.successfulPayment, required this.planId});
+  const InfoByOrderScreen({super.key, this.successfulPayment, required this.planId, this.customerSlug});
   final bool? successfulPayment;
   final int planId;
+  final String? customerSlug;
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => sl<OrderInfoCubit>()..getChosenPlan(planId),
-      child: InfoByOrderScreenContent(
-        successfulPayment: successfulPayment,
-        planId: planId,
-      ),
+      create: (context) => sl<OrderInfoCubit>()..getChosenPlan(id: planId, customerSlug: customerSlug),
+      child: InfoByOrderScreenContent(successfulPayment: successfulPayment, planId: planId, customerSlug: customerSlug),
     );
   }
 }
 
-class InfoByOrderScreenContent extends StatefulWidget {
-  static const name = 'infoByOrderScreen';
-  static const path = '/info-by-order-screen';
-  const InfoByOrderScreenContent({
-    super.key,
-    required this.planId,
-    required this.successfulPayment,
-  });
+class InfoByOrderScreenContent extends StatefulWidget {  
+  const InfoByOrderScreenContent({super.key, required this.planId, required this.successfulPayment, this.customerSlug});
   final int planId;
   final bool? successfulPayment;
+  final String? customerSlug;
   @override
   State<InfoByOrderScreenContent> createState() => _InfoByOrderScreenContentState();
 }
@@ -64,39 +57,30 @@ class _InfoByOrderScreenContentState extends State<InfoByOrderScreenContent> {
         if (state.isLoading) {
           return Scaffold(
             appBar: AppBar(
-              title: Text(
-                s.infoAboutOrder,
-                style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
-              ),
+              title: Text(s.infoAboutOrder, style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black)),
               leading: IconButton(
-                  icon: const Icon(Icons.arrow_back),
-                  onPressed: () {
-                    GoRouter.of(context).pop();
-                  }),
-            ),
-            body: const Center(
-              child: Loader(),
+                icon: const Icon(Icons.arrow_back),
+                onPressed: () {
+                  GoRouter.of(context).pop();
+                },
+              ),
             ),
+            body: const Center(child: Loader()),
           );
         }
         if (plan == null) {
           return Scaffold(
             appBar: AppBar(
-              title: Text(
-                s.infoAboutOrder,
-                style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
-              ),
+              title: Text(s.infoAboutOrder, style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black)),
               leading: IconButton(
-                  icon: const Icon(Icons.arrow_back),
-                  onPressed: () {
-                    GoRouter.of(context).pop();
-                  }),
+                icon: const Icon(Icons.arrow_back),
+                onPressed: () {
+                  GoRouter.of(context).pop();
+                },
+              ),
             ),
             body: Center(
-              child: Text(
-                s.sorry_we_did_not_find_the_plan,
-                style: TextStyles.textSSemibold.copyWith(color: appTheme.black),
-              ),
+              child: Text(s.sorry_we_did_not_find_the_plan, style: TextStyles.textSSemibold.copyWith(color: appTheme.black)),
             ),
           );
         }
@@ -122,58 +106,35 @@ class _InfoByOrderScreenContentState extends State<InfoByOrderScreenContent> {
         return Scaffold(
           backgroundColor: appTheme.gray100,
           appBar: AppBar(
-            title: Text(
-              s.infoAboutOrder,
-              style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
-            ),
+            title: Text(s.infoAboutOrder, style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black)),
             leading: IconButton(
-                icon: const Icon(Icons.arrow_back),
-                onPressed: () {
-                  GoRouter.of(context).pop();
-                }),
+              icon: const Icon(Icons.arrow_back),
+              onPressed: () {
+                GoRouter.of(context).pop();
+              },
+            ),
           ),
           body: SingleChildScrollView(
             child: Column(
               children: [
-                if (plan.chosenPlanState == ChosenPlanStateEnum.stateDone) ...[
-                  CollectChargeBanner(
-                    chosenPlan: plan,
-                    price: chosenOption?.price ?? 0,
-                  )
-                ],
-                if (widget.successfulPayment != null) ...[
-                  const SizedBox(height: 8),
-                  PaymentBanner(
-                    successfulPayment: widget.successfulPayment ?? false,
-                  ),
-                ],
+                if (plan.chosenPlanState == ChosenPlanStateEnum.stateDone) ...[CollectChargeBanner(chosenPlan: plan, price: chosenOption?.price ?? 0)],
+                if (widget.successfulPayment != null) ...[const SizedBox(height: 8), PaymentBanner(successfulPayment: widget.successfulPayment ?? false)],
                 const SizedBox(height: 8),
                 AuthorCard(
                   author: plan.plan.author,
-                  title: s.plan_seller,
+                  title: state.customerProfile != null ? s.customer : s.plan_seller,
                   titleStyle: TextStyles.textSSemibold.copyWith(color: appTheme.gray),
                   backgroundColor: appTheme.whiteA700,
+                  customerProfile: state.customerProfile,
                 ),
                 const SizedBox(height: 8),
-                PlanProps(
-                    planDuration: plan.plan.duration,
-                    planPrice: chosenOption?.price.toDouble()  ?? 0,
-                    planStatus: planStatus),
+                PlanProps(planDuration: plan.plan.duration, planPrice: chosenOption?.price.toDouble() ?? 0, planStatus: planStatus),
                 const SizedBox(height: 8),
-                PlanInfo(
-                  title: plan.plan.name,
-                  description: plan.plan.details,
-                  imagePath: plan.plan.image,
-                ),
+                PlanInfo(title: plan.plan.name, description: plan.plan.details, imagePath: plan.plan.image),
                 const SizedBox(height: 8),
-                OptionWidget(
-                  option: chosenOption,
-                  disableDuration: true,
-                ),
+                OptionWidget(option: chosenOption, disableDuration: true),
                 const SizedBox(height: 8),
-                PlanState(
-                  state: plan.chosenPlanState,
-                ),
+                PlanState(state: plan.chosenPlanState),
                 const SizedBox(height: 20),
                 if (widget.successfulPayment == null)
                   CustomOutlinedButton(
@@ -184,13 +145,10 @@ class _InfoByOrderScreenContentState extends State<InfoByOrderScreenContent> {
                     onPressed: () async {
                       showModalBottomSheet(
                         context: context,
-                        builder: (context) => CancelPlanBottomSheet(
-                          enableForm: plan.chosenPlanState.isStateAfterPaidState(),
-                          planId: plan.id,
-                        ),
+                        builder: (context) => CancelPlanBottomSheet(enableForm: plan.chosenPlanState.isStateAfterPaidState(), planId: plan.id),
                       );
                     },
-                  )
+                  ),
               ],
             ),
           ),

lib/features/profile/presentation/pages/profile_screen.dart

@@ -690,24 +690,47 @@ class _ProfileScreenState extends State<ProfileScreen> {
                     for (int i = 0; i < state.profile.badges.length; i++) ...[
                       state.profile.badges[i].image.contains('svg')
                           ? Tooltip(
-                              message: state.profile.badges[i].description,
+                              preferBelow: true,
+                              showDuration: const Duration(seconds: 5),
+                              richMessage: WidgetSpan(
+                                child: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  children: [
+                                    Text(state.profile.badges[i].title, style: TextStyles.textMSemibold.copyWith(color: appTheme.black)),
+                                    const SizedBox(height: 4),
+                                    Text(state.profile.badges[i].description, style: TextStyles.textSMedium.copyWith(color: appTheme.gray600)),
+                                  ],
+                                ),
+                              ),
                               triggerMode: TooltipTriggerMode.tap,
+                              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
                               textStyle: const TextStyle(color: Colors.black, fontSize: 16, fontWeight: FontWeight.w500),
                               decoration: BoxDecoration(
                                 color: Colors.white,
-                                borderRadius: BorderRadius.circular(4),
+                                borderRadius: BorderRadius.circular(12),
                                 boxShadow: [BoxShadow(color: Colors.black.withAlpha((255 * 0.2).toInt()), blurRadius: 32)],
                               ),
                               child: SvgPicture.network('${sl<AppConfig>().baseUrl}/storage/${state.profile.badges[i].image}', width: 40, height: 40),
                             )
                           : Tooltip(
-                              message: state.profile.badges[i].description,
-                              margin: const EdgeInsets.symmetric(horizontal: 32),
+                              preferBelow: true,
+                              showDuration: const Duration(seconds: 5),
+                              richMessage: WidgetSpan(
+                                child: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  children: [
+                                    Text(state.profile.badges[i].title, style: TextStyles.textMSemibold.copyWith(color: appTheme.black)),
+                                    const SizedBox(height: 4),
+                                    Text(state.profile.badges[i].description, style: TextStyles.textSMedium.copyWith(color: appTheme.gray600)),
+                                  ],
+                                ),
+                              ),
                               triggerMode: TooltipTriggerMode.tap,
+                              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
                               textStyle: const TextStyle(color: Colors.black, fontSize: 16, fontWeight: FontWeight.w500),
                               decoration: BoxDecoration(
                                 color: Colors.white,
-                                borderRadius: BorderRadius.circular(4),
+                                borderRadius: BorderRadius.circular(12),
                                 boxShadow: [BoxShadow(color: Colors.black.withAlpha((255 * 0.2).toInt()), blurRadius: 32)],
                               ),
                               child: CachedNetworkImage(imageUrl: '${sl<AppConfig>().baseUrl}/storage/${state.profile.badges[i].image}', width: 40, height: 40),
@@ -846,7 +869,10 @@ class _ProfileScreenState extends State<ProfileScreen> {
                 icon: 'assets/icons/eye.svg',
                 text: 'Посмотреть',
                 onTap: () async {
-                  context.pushTransparentRoute(rootNavigator: true, PhotoViewScreen(imageUrls: [sl<AppConfig>().baseUrl + state.profile.profilePhotoUrl], index: 0));
+                  context.pushTransparentRoute(
+                    rootNavigator: true,
+                    PhotoViewScreen(imageUrls: [sl<AppConfig>().baseUrl + state.profile.profilePhotoUrl], index: 0),
+                  );
                 },
               ),
               if (state.isMyProfile) ...[
@@ -1003,7 +1029,10 @@ class _ProfileScreenState extends State<ProfileScreen> {
                 onTap: () {
                   final box = context.findRenderObject() as RenderBox?;
                   SharePlus.instance.share(
-                    ShareParams(uri: Uri.parse('${sl<AppConfig>().baseUrl}/ru/profile/${state.profile.slug}'), sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size),
+                    ShareParams(
+                      uri: Uri.parse('${sl<AppConfig>().baseUrl}/ru/profile/${state.profile.slug}'),
+                      sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
+                    ),
                   );
                 },
               ),

lib/features/profile/presentation/widgets/profile_blog_post_widget.dart

@@ -16,17 +16,14 @@ 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';
+import 'package:markdown/markdown.dart' as md;
 import 'package:share_plus/share_plus.dart';
 
 class ProfileBlogPostWidget extends StatefulWidget {
   final int index;
   final ProfileCubit profileCubit;
 
-  const ProfileBlogPostWidget({
-    super.key,
-    required this.index,
-    required this.profileCubit,
-  });
+  const ProfileBlogPostWidget({super.key, required this.index, required this.profileCubit});
 
   @override
   State<ProfileBlogPostWidget> createState() => _ProfileBlogPostWidgetState();
@@ -46,15 +43,9 @@ class _ProfileBlogPostWidgetState extends State<ProfileBlogPostWidget> {
           totalLikes = state.blogPosts[widget.index].totalLikes;
           return InkWell(
             borderRadius: BorderRadius.circular(12),
-            onTap: () => GoRouter.of(context).pushNamed(
-              'blogPostScreen',
-              extra: state.blogPosts[widget.index].id,
-            ),
+            onTap: () => GoRouter.of(context).pushNamed('blogPostScreen', extra: state.blogPosts[widget.index].id),
             child: Ink(
-              decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(12),
-                color: Colors.white,
-              ),
+              decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white),
               child: Column(
                 mainAxisSize: MainAxisSize.min,
                 crossAxisAlignment: CrossAxisAlignment.start,
@@ -80,19 +71,12 @@ class _ProfileBlogPostWidgetState extends State<ProfileBlogPostWidget> {
                           children: [
                             Text(
                               state.blogPosts[widget.index].author.authorName,
-                              style: const TextStyle(
-                                height: 1,
-                                color: Colors.black87,
-                                fontWeight: FontWeight.w500,
-                              ),
+                              style: const TextStyle(height: 1, color: Colors.black87, fontWeight: FontWeight.w500),
                             ),
                             const SizedBox(height: 4),
                             Text(
                               '${calculateDifference(state.blogPosts[widget.index].createdAt)} в ${state.blogPosts[widget.index].createdAt.hour.toString().padLeft(2, '0')}:${state.blogPosts[widget.index].createdAt.minute.toString().padLeft(2, '0')}',
-                              style: const TextStyle(
-                                height: 1,
-                                color: Colors.black45,
-                              ),
+                              style: const TextStyle(height: 1, color: Colors.black45),
                             ),
                           ],
                         ),
@@ -114,11 +98,7 @@ class _ProfileBlogPostWidgetState extends State<ProfileBlogPostWidget> {
                       padding: const EdgeInsets.symmetric(horizontal: 12),
                       child: Text(
                         state.blogPosts[widget.index].title,
-                        style: const TextStyle(
-                          fontWeight: FontWeight.w600,
-                          fontSize: 18,
-                          color: Colors.black87,
-                        ),
+                        style: const TextStyle(fontWeight: FontWeight.w600, fontSize: 18, color: Colors.black87),
                       ),
                     ),
                   ],
@@ -128,14 +108,36 @@ class _ProfileBlogPostWidgetState extends State<ProfileBlogPostWidget> {
                     Padding(
                       padding: const EdgeInsets.symmetric(horizontal: 4),
                       child: Html(
-                        data: state.blogPosts[widget.index].description.length > 200
-                            ? state.blogPosts[widget.index].description.substring(0, 200).replaceAll('\n', '<br>')
-                            : state.blogPosts[widget.index].description.replaceAll('\n', '<br>'),
+                        data: md.markdownToHtml(
+                          state.blogPosts[widget.index].description.length > 200
+                              ? state.blogPosts[widget.index].description.substring(0, 200).replaceAll('\n', '<br>')
+                              : state.blogPosts[widget.index].description.replaceAll('\n', '<br>'),
+                        ),
                         style: {
-                          "*": Style(
-                            fontSize: FontSize(16),
-                            color: Colors.black87,
+                          "body": Style(margin: Margins.zero, padding: HtmlPaddings.zero, fontSize: FontSize(16), lineHeight: const LineHeight(1.5)),
+                          "p": Style(margin: Margins.only(bottom: 12), color: Colors.black87),
+                          "h1, h2, h3, h4, h5, h6": Style(margin: Margins.only(top: 16, bottom: 8), color: Colors.black, fontWeight: FontWeight.bold),
+                          "h1": Style(fontSize: FontSize(24)),
+                          "h2": Style(fontSize: FontSize(20)),
+                          "h3": Style(fontSize: FontSize(18)),
+                          "ul, ol": Style(margin: Margins.only(bottom: 12), padding: HtmlPaddings.only(left: 16)),
+                          "li": Style(margin: Margins.only(bottom: 4), color: Colors.black87),
+                          "strong, b": Style(fontWeight: FontWeight.bold, color: Colors.black),
+                          "em, i": Style(fontStyle: FontStyle.italic),
+                          "code": Style(
+                            backgroundColor: Colors.grey.shade100,
+                            padding: HtmlPaddings.symmetric(horizontal: 4, vertical: 2),
+                            fontFamily: 'monospace',
                           ),
+                          "pre": Style(backgroundColor: Colors.grey.shade100, padding: HtmlPaddings.all(12), margin: Margins.only(bottom: 12)),
+                          "blockquote": Style(
+                            padding: HtmlPaddings.only(left: 16),
+                            margin: Margins.only(left: 8, bottom: 12),
+                            fontStyle: FontStyle.italic,
+                            color: Colors.grey.shade700,
+                          ),
+                          "a": Style(color: Colors.blue, textDecoration: TextDecoration.underline),
+                          "img": Style(width: Width(MediaQuery.of(context).size.width - 32)),
                         },
                       ),
                     ),
@@ -144,12 +146,7 @@ class _ProfileBlogPostWidgetState extends State<ProfileBlogPostWidget> {
                       padding: EdgeInsets.symmetric(horizontal: 12),
                       child: Text(
                         'Показать ещё',
-                        style: TextStyle(
-                          height: 1,
-                          color: Color(0xFF8B8B8B),
-                          fontSize: 14,
-                          fontWeight: FontWeight.w600,
-                        ),
+                        style: TextStyle(height: 1, color: Color(0xFF8B8B8B), fontSize: 14, fontWeight: FontWeight.w600),
                       ),
                     ),
                   if (state.blogPosts[widget.index].title.isNotEmpty || state.blogPosts[widget.index].description.isNotEmpty) const SizedBox(height: 8),
@@ -157,10 +154,7 @@ class _ProfileBlogPostWidgetState extends State<ProfileBlogPostWidget> {
                     onTap: () {
                       context.pushTransparentRoute(
                         rootNavigator: true,
-                        PhotoViewScreen(
-                          imageUrls: ['${sl<AppConfig>().baseUrl}/storage/${state.blogPosts[widget.index].image}'],
-                          index: 0,
-                        ),
+                        PhotoViewScreen(imageUrls: ['${sl<AppConfig>().baseUrl}/storage/${state.blogPosts[widget.index].image}'], index: 0),
                       );
                     },
                     child: Hero(
@@ -192,10 +186,7 @@ class _ProfileBlogPostWidgetState extends State<ProfileBlogPostWidget> {
                             isLiked
                                 ? await context.read<FeedCubit>().likePost(state.blogPosts[widget.index].id)
                                 : await context.read<FeedCubit>().unlikedPost(state.blogPosts[widget.index].id);
-                            widget.profileCubit.updateFeedBlogPostList(
-                              state.blogPosts[widget.index],
-                              isLiked ? false : true,
-                            );
+                            widget.profileCubit.updateFeedBlogPostList(state.blogPosts[widget.index], isLiked ? false : true);
                           },
                         ),
                         const SizedBox(width: 8),
@@ -204,16 +195,10 @@ class _ProfileBlogPostWidgetState extends State<ProfileBlogPostWidget> {
                             'assets/icons/comment.svg',
                             height: 20,
                             width: 20,
-                            colorFilter: ColorFilter.mode(
-                              appTheme.gray600,
-                              BlendMode.srcIn,
-                            ),
+                            colorFilter: ColorFilter.mode(appTheme.gray600, BlendMode.srcIn),
                           ),
                           text: state.blogPosts[widget.index].totalComments.toString(),
-                          onTap: () => GoRouter.of(context).pushNamed(
-                            'blogPostScreen',
-                            extra: state.blogPosts[widget.index].id,
-                          ),
+                          onTap: () => GoRouter.of(context).pushNamed('blogPostScreen', extra: state.blogPosts[widget.index].id),
                         ),
                         const SizedBox(width: 8),
                         FeedIconButton(
@@ -234,19 +219,11 @@ class _ProfileBlogPostWidgetState extends State<ProfileBlogPostWidget> {
                           },
                         ),
                         const Spacer(),
-                        Icon(
-                          Icons.visibility_rounded,
-                          size: 16,
-                          color: appTheme.gray500,
-                        ),
+                        Icon(Icons.visibility_rounded, size: 16, color: appTheme.gray500),
                         const SizedBox(width: 4),
                         Text(
                           state.blogPosts[widget.index].totalViews.toString(),
-                          style: TextStyle(
-                            fontSize: 12,
-                            color: appTheme.gray500,
-                            fontWeight: FontWeight.w400,
-                          ),
+                          style: TextStyle(fontSize: 12, color: appTheme.gray500, fontWeight: FontWeight.w400),
                         ),
                       ],
                     ),

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

@@ -15,15 +15,13 @@ 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';
+import 'package:markdown/markdown.dart' as md;
 import 'package:share_plus/share_plus.dart';
 
 class MyRecipeWidget extends StatefulWidget {
   final MyRecipeModel recipe;
 
-  const MyRecipeWidget({
-    super.key,
-    required this.recipe,
-  });
+  const MyRecipeWidget({super.key, required this.recipe});
 
   @override
   State<MyRecipeWidget> createState() => _MyRecipeWidgetState();
@@ -50,10 +48,7 @@ class _MyRecipeWidgetState extends State<MyRecipeWidget> {
   Widget build(BuildContext context) {
     final s = S.of(context);
     return DecoratedBox(
-      decoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(12),
-        color: Colors.white,
-      ),
+      decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white),
       child: Column(
         mainAxisSize: MainAxisSize.min,
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -61,13 +56,7 @@ class _MyRecipeWidgetState extends State<MyRecipeWidget> {
           Stack(
             children: [
               InkWell(
-                onTap: () async => GoRouter.of(context).pushNamed(
-                  'aboutRecipesScreen',
-                  extra: {
-                    'recipe': widget.recipe.slug,
-                    'navigateToComments': false,
-                  },
-                ),
+                onTap: () async => GoRouter.of(context).pushNamed('aboutRecipesScreen', extra: {'recipe': widget.recipe.slug, 'navigateToComments': false}),
                 child: ClipRRect(
                   borderRadius: const BorderRadius.vertical(top: Radius.circular(12)),
                   child: CachedNetworkImage(
@@ -99,28 +88,48 @@ class _MyRecipeWidgetState extends State<MyRecipeWidget> {
             children: [
               Padding(
                 padding: const EdgeInsets.symmetric(horizontal: 16),
-                child: Text(
-                  widget.recipe.title!,
-                  style: TextStyles.textMSemibold.copyWith(color: appTheme.black),
-                ),
+                child: Text(widget.recipe.title!, style: TextStyles.textMSemibold.copyWith(color: appTheme.black)),
               ),
               if (widget.recipe.description.isNotEmpty) ...[
-                const SizedBox(
-                  height: 12,
-                ),
+                const SizedBox(height: 12),
                 Padding(
                   padding: const EdgeInsets.symmetric(horizontal: 16),
                   child: Html(
-                    data: widget.recipe.description.length > 200
-                        ? '${widget.recipe.description.substring(0, 200).replaceAll('\n', '<br>')}...'
-                        : widget.recipe.description.replaceAll('\n', '<br>'),
+                    data: md.markdownToHtml(
+                      widget.recipe.description.length > 200
+                          ? '${widget.recipe.description.substring(0, 200).replaceAll('\n', '<br>')}...'
+                          : widget.recipe.description.replaceAll('\n', '<br>'),
+                    ),
                     style: {
-                      "*": Style(
+                      "body": Style(
                         margin: Margins.zero,
-                        color: appTheme.black,
+                        padding: HtmlPaddings.zero,
                         fontSize: FontSize(TextStyles.textSMedium.fontSize ?? 14),
-                        fontWeight: TextStyles.textSMedium.fontWeight ?? FontWeight.w400,
+                        lineHeight: const LineHeight(1.5),
                       ),
+                      "p": Style(margin: Margins.only(bottom: 12), color: appTheme.black),
+                      "h1, h2, h3, h4, h5, h6": Style(margin: Margins.only(top: 16, bottom: 8), color: appTheme.black, fontWeight: FontWeight.bold),
+                      "h1": Style(fontSize: FontSize(24)),
+                      "h2": Style(fontSize: FontSize(20)),
+                      "h3": Style(fontSize: FontSize(18)),
+                      "ul, ol": Style(margin: Margins.only(bottom: 12), padding: HtmlPaddings.only(left: 16)),
+                      "li": Style(margin: Margins.only(bottom: 4), color: appTheme.black),
+                      "strong, b": Style(fontWeight: FontWeight.bold, color: appTheme.black),
+                      "em, i": Style(fontStyle: FontStyle.italic),
+                      "code": Style(
+                        backgroundColor: Colors.grey.shade100,
+                        padding: HtmlPaddings.symmetric(horizontal: 4, vertical: 2),
+                        fontFamily: 'monospace',
+                      ),
+                      "pre": Style(backgroundColor: Colors.grey.shade100, padding: HtmlPaddings.all(12), margin: Margins.only(bottom: 12)),
+                      "blockquote": Style(
+                        padding: HtmlPaddings.only(left: 16),
+                        margin: Margins.only(left: 8, bottom: 12),
+                        fontStyle: FontStyle.italic,
+                        color: Colors.grey.shade700,
+                      ),
+                      "a": Style(color: Colors.blue, textDecoration: TextDecoration.underline),
+                      "img": Style(width: Width(MediaQuery.of(context).size.width - 32)),
                     },
                   ),
                 ),
@@ -192,26 +201,17 @@ class _MyRecipeWidgetState extends State<MyRecipeWidget> {
   Container _iconButton(String iconPath, [String? text]) {
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
-      decoration: BoxDecoration(
-        color: appTheme.whiteA700,
-        borderRadius: BorderRadius.circular(16),
-      ),
+      decoration: BoxDecoration(color: appTheme.whiteA700, borderRadius: BorderRadius.circular(16)),
       height: 32,
       child: Row(
         mainAxisSize: MainAxisSize.min,
         children: [
-          SvgPicture.asset(
-            iconPath,
-          ),
+          SvgPicture.asset(iconPath),
           if (text != null) const SizedBox(width: 8),
           if (text != null)
             Text(
               text,
-              style: const TextStyle(
-                fontSize: 12,
-                color: Colors.black,
-                fontWeight: FontWeight.w500,
-              ),
+              style: const TextStyle(fontSize: 12, color: Colors.black, fontWeight: FontWeight.w500),
             ),
         ],
       ),

lib/generated/intl/messages_en.dart

@@ -250,6 +250,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "cunsutation_was_paid_successfully": MessageLookupByLibrary.simpleMessage(
       "Поздравляем, консультация успешно оплачена",
     ),
+    "customer": MessageLookupByLibrary.simpleMessage("Покупатель"),
     "customer_price": MessageLookupByLibrary.simpleMessage(
       "Цена для покупателя",
     ),

lib/generated/l10n.dart

@@ -3499,6 +3499,11 @@ class S {
     );
   }
 
+  /// `Покупатель`
+  String get customer {
+    return Intl.message('Покупатель', name: 'customer', desc: '', args: []);
+  }
+
   /// `Поздравляем!`
   String get congratulations {
     return Intl.message(

lib/l10n/intl_en.arb

@@ -415,6 +415,7 @@
   "cannotDeleteAccount": "Не получилось удалить ваш аккаунт",
   "resend": "Отправить повторно",
   "notifications": "Уведомления",
+  "customer": "Покупатель",
   "congratulations": "Поздравляем!",
   "youWithUs": "Вы с итвио уже\n",
   "fourteenDays": "14 дней",

pubspec.yaml

@@ -76,6 +76,7 @@ dependencies:
   appmetrica_plugin: ^3.3.0
   vk_id: ^1.0.3
   flutter_login_yandex: ^0.0.5
+  markdown: ^7.3.0
 
 dev_dependencies:
   build_runner: ^2.7.0