feat(md): Issue-746

2025-10-31 00:20:21 +03:00
parent f3af743487
commit dbd92a65ea
5 changed files with 566 additions and 33 deletions
--- a/lib/features/create_diet/presentation/create_diet_screen.dart
+++ b/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() {
@@ -92,6 +95,8 @@ class _CreateDietScreenContentState extends State<CreateDietScreenContent> {

        return Scaffold(
          backgroundColor: appTheme.gray100,
+          floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
+          floatingActionButton: _mdToolbarVisible && _mdKey.currentState != null ? _mdKey.currentState!.buildToolbar(context) : null,
          appBar: AppBar(
            centerTitle: true,
            title: Text(
@@ -122,20 +127,19 @@ class _CreateDietScreenContentState extends State<CreateDietScreenContent> {
                      ),
                      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 ?? '')],
                      const SizedBox(height: 12),
--- a/lib/features/create_plan/presentation/create_plan_screen.dart
+++ b/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';
@@ -32,9 +33,17 @@ class CreatePlanScreen extends StatelessWidget {
  }
 }

-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);
@@ -54,6 +63,8 @@ class CreatePlanScreenContent extends StatelessWidget {
        }
        return Scaffold(
          backgroundColor: appTheme.gray100,
+          floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
+          floatingActionButton: _mdToolbarVisible && _mdKey.currentState != null ? _mdKey.currentState!.buildToolbar(context) : null,
          appBar: AppBar(
            centerTitle: true,
            title: Text(
@@ -131,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),
--- a/lib/features/create_recipe/presentation/pages/recipe_create_screen.dart
+++ b/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>(
--- a/lib/features/create_recipe/presentation/widgets/info_about_recipe_widget.dart
+++ b/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),