feat(app): Recipe layouts

2024-06-05 16:20:14 +03:00
parent f4b331f280
commit 6947b9bea0
14 changed files with 1574 additions and 374 deletions
--- a/lib/presentation/recipe/recipe_create_screen/bloc/recipe_create_bloc.dart
+++ b/lib/presentation/recipe/recipe_create_screen/bloc/recipe_create_bloc.dart
@@ -16,6 +16,9 @@ class RecipeCreateBloc extends Bloc<RecipeCreateEvent, RecipeCreateState> {
  RecipeCreateBloc(RecipeCreateState initialState) : super(initialState) {
    on<RecipeCreateInitialEvent>(_onInitialize);
    on<CreateRecipe>(_createRecipe);
+    on<AddStep>(_addStep);
+    on<RemoveStep>(_removeStep);
+    on<ReloadScreen>(_reloadScreen);
  }

  _onInitialize(
@@ -34,22 +37,65 @@ class RecipeCreateBloc extends Bloc<RecipeCreateEvent, RecipeCreateState> {
      emit(currentState.copyWith(
          recipeModelObj: currentState.recipeModelObj,
          title: currentState.title,
+          token: currentState.token,
          description: currentState.description,
          video_url: currentState.video_url,
-          steps: currentState.steps));
+          steps: currentState.steps,
+          stepDescriptions: currentState.stepDescriptions,
+          tags: currentState.tags));
    } else {
      final Map<String, dynamic> step = {
        'description': '',
        'image': '',
      };
      emit(RecipeCreateLoadedState(
+          token: token,
          title: TextEditingController(),
          description: TextEditingController(),
          video_url: TextEditingController(),
+          tags: TextEditingController(),
+          stepDescriptions: [TextEditingController()],
          steps: [step]));
    }
  }

+  FutureOr<void> _addStep(
+      AddStep event, Emitter<RecipeCreateState> emit) async {
+    if (state is RecipeCreateLoadedState) {
+      var currentState = state as RecipeCreateLoadedState;
+
+      List<dynamic>? updatedSteps = currentState.steps;
+      List<TextEditingController>? updatedStepDescriptions =
+          currentState.stepDescriptions;
+
+      updatedSteps!.add({
+        'description': '',
+        'image': '',
+      });
+      updatedStepDescriptions!.add(TextEditingController());
+      emit(currentState.copyWith(
+          steps: updatedSteps, stepDescriptions: updatedStepDescriptions));
+      await _reloadScreen(event, emit);
+    }
+  }
+
+  FutureOr<void> _removeStep(
+      RemoveStep event, Emitter<RecipeCreateState> emit) async {
+    if (state is RecipeCreateLoadedState) {
+      var currentState = state as RecipeCreateLoadedState;
+
+      List<dynamic>? updatedSteps = currentState.steps;
+      List<TextEditingController>? updatedStepDescriptions =
+          currentState.stepDescriptions;
+
+      updatedSteps!.removeAt(event.id);
+      updatedStepDescriptions!.removeAt(event.id);
+      emit(currentState.copyWith(
+          steps: updatedSteps, stepDescriptions: updatedStepDescriptions));
+      await _reloadScreen(event, emit);
+    }
+  }
+
  FutureOr<void> _createRecipe(
      CreateRecipe event, Emitter<RecipeCreateState> emit) async {
    if (state is RecipeCreateLoadedState) {
@@ -59,6 +105,7 @@ class RecipeCreateBloc extends Bloc<RecipeCreateEvent, RecipeCreateState> {
        currentState.title?.text,
        currentState.video_url?.text,
        currentState.description?.text,
+        currentState.steps,
      );

      if (response.statusCode == 200) {
@@ -70,17 +117,14 @@ class RecipeCreateBloc extends Bloc<RecipeCreateEvent, RecipeCreateState> {
    }
  }

-  FutureOr<http.Response> sendRecipe(
-    String? title,
-    String? video_url,
-    String? description,
-  ) async {
+  FutureOr<http.Response> sendRecipe(String? title, String? video_url,
+      String? description, List<dynamic>? steps) async {
    String url = '${dotenv.env['SERVER_ROOT']!}/recipe/create';
-
    final Map<String, dynamic> credentials = {
      'title': title,
      'description': description,
      'video_url': video_url,
+      'steps': steps,
      'status': 'active',
    };

@@ -95,4 +139,28 @@ class RecipeCreateBloc extends Bloc<RecipeCreateEvent, RecipeCreateState> {

    return response;
  }
+
+  FutureOr<void> _reloadScreen(
+      RecipeCreateEvent? event, Emitter<RecipeCreateState> emit) async {
+    print('Reloading..');
+    final box = await Hive.openBox('token');
+    final token = box.get('token');
+    if (token == null) {
+      NavigatorService.popAndPushNamed(
+        AppRoutes.authScreen,
+      );
+    }
+    if (state is RecipeCreateLoadedState) {
+      var currentState = state as RecipeCreateLoadedState;
+      emit(currentState.copyWith(
+          recipeModelObj: currentState.recipeModelObj,
+          title: currentState.title,
+          token: currentState.token,
+          description: currentState.description,
+          video_url: currentState.video_url,
+          steps: currentState.steps,
+          stepDescriptions: currentState.stepDescriptions,
+          tags: currentState.tags));
+    }
+  }
 }
--- a/lib/presentation/recipe/recipe_create_screen/bloc/recipe_create_event.dart
+++ b/lib/presentation/recipe/recipe_create_screen/bloc/recipe_create_event.dart
@@ -19,3 +19,22 @@ class CreateRecipe extends RecipeCreateEvent {
  @override
  List<Object?> get props => [];
 }
+
+class AddStep extends RecipeCreateEvent {
+  AddStep();
+  @override
+  List<Object?> get props => [];
+}
+
+class RemoveStep extends RecipeCreateEvent {
+  RemoveStep(this.id);
+  final int id;
+  @override
+  List<Object?> get props => [id];
+}
+
+class ReloadScreen extends RecipeCreateEvent {
+  ReloadScreen();
+  @override
+  List<Object?> get props => [];
+}
--- a/lib/presentation/recipe/recipe_create_screen/bloc/recipe_create_state.dart
+++ b/lib/presentation/recipe/recipe_create_screen/bloc/recipe_create_state.dart
@@ -24,33 +24,52 @@ class RecipeCreateState extends Equatable {
 class RecipeCreateLoadedState extends RecipeCreateState {
  RecipeCreateLoadedState(
      {this.recipeModelObj,
+      this.token,
      this.title,
      this.description,
      this.video_url,
+      this.tags,
+      this.stepDescriptions,
      this.steps});

  RecipeCreateModel? recipeModelObj;
+  String? token;
  TextEditingController? title;
  TextEditingController? description;
  TextEditingController? video_url;
+  TextEditingController? tags;
  List<dynamic>? steps;
+  List<TextEditingController>? stepDescriptions;
  @override
-  List<Object?> get props =>
-      [recipeModelObj, title, description, video_url, steps];
+  List<Object?> get props => [
+        recipeModelObj,
+        title,
+        token,
+        description,
+        video_url,
+        steps,
+        tags,
+        stepDescriptions
+      ];
  RecipeCreateLoadedState copyWith({
    RecipeCreateModel? recipeModelObj,
+    String? token,
    TextEditingController? title,
    TextEditingController? description,
    TextEditingController? video_url,
+    TextEditingController? tags,
    List<dynamic>? steps,
+    List<TextEditingController>? stepDescriptions,
  }) {
    return RecipeCreateLoadedState(
-      recipeModelObj: recipeModelObj ?? this.recipeModelObj,
-      title: title ?? this.title,
-      description: description ?? this.description,
-      video_url: video_url ?? this.video_url,
-      steps: steps ?? this.steps,
-    );
+        recipeModelObj: recipeModelObj ?? this.recipeModelObj,
+        title: title ?? this.title,
+        description: description ?? this.description,
+        video_url: video_url ?? this.video_url,
+        token: token ?? this.token,
+        steps: steps ?? this.steps,
+        tags: tags ?? this.tags,
+        stepDescriptions: stepDescriptions ?? this.stepDescriptions);
  }
 }

--- a/lib/presentation/recipe/recipe_create_screen/recipe_create_screen.dart
+++ b/lib/presentation/recipe/recipe_create_screen/recipe_create_screen.dart
@@ -10,12 +10,12 @@ import 'package:eatvio_app/widgets/custom_outlined_button.dart';

 class RecipeCreateScreen extends StatelessWidget {
  const RecipeCreateScreen({Key? key}) : super(key: key);
-
  static Widget builder(BuildContext context) {
    final recipeID = ModalRoute.of(context)!.settings.arguments;
    return BlocProvider<RecipeCreateBloc>(
-        create: (context) =>
-            RecipeCreateBloc(RecipeCreateState(recipeModelObj: RecipeCreateModel(recipeID: recipeID.toString())))..add(RecipeCreateInitialEvent()),
+        create: (context) => RecipeCreateBloc(RecipeCreateState(
+            recipeModelObj: RecipeCreateModel(recipeID: recipeID.toString())))
+          ..add(RecipeCreateInitialEvent()),
        child: RecipeCreateScreen());
  }

@@ -50,29 +50,27 @@ class RecipeCreateScreen extends StatelessWidget {
      }
    }

-    return SafeArea(
-      child: Scaffold(
-        resizeToAvoidBottomInset: false,
-        body: Container(
-          width: double.maxFinite,
-          decoration: BoxDecoration(color: Colors.grey[200]),
-          child: ListView(
-            children: [
-              _buldAppBar(context),
-              SizedBox(height: 20.v),
-              _buildRecipeInfo(state, context),
-              SizedBox(height: 20.v),
-              Column(
-                crossAxisAlignment: CrossAxisAlignment.stretch,
-                children: steps,
-              ),
-              SizedBox(height: 20.v),
-              _buildAdditional(context, state)
-            ],
-          ),
-        ),
-      ),
-    );
+    return RefreshIndicator(
+        onRefresh: refreshPage(context),
+        child: SafeArea(
+            child: Scaffold(
+                resizeToAvoidBottomInset: false,
+                body: Container(
+                  width: double.maxFinite,
+                  decoration: BoxDecoration(color: Colors.grey[200]),
+                  child: ListView(children: [
+                    _buldAppBar(context),
+                    SizedBox(height: 20.v),
+                    _buildRecipeInfo(state, context),
+                    SizedBox(height: 20.v),
+                    Column(
+                      crossAxisAlignment: CrossAxisAlignment.stretch,
+                      children: steps,
+                    ),
+                    SizedBox(height: 20.v),
+                    _buildAdditional(context, state)
+                  ]),
+                ))));
  }

  _buldAppBar(BuildContext context) {
@@ -164,45 +162,50 @@ class RecipeCreateScreen extends StatelessWidget {
      ]),
    );
  }
-}

-_buildAddPhoto(BuildContext context, RecipeCreateLoadedState state) {
-  bool isLoading = false;
-  return GestureDetector(
-    child: Stack(
-      children: [
-        if (!isLoading)
-          Container(
-            padding: EdgeInsets.symmetric(
-              horizontal: 40.h,
-              vertical: 80.v,
-            ),
-            decoration: AppDecoration.fillGray.copyWith(
-              borderRadius: BorderRadiusStyle.roundedBorder5,
-            ),
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.end,
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Padding(
-                  padding: EdgeInsets.only(
-                    left: 7.h,
-                    top: 5.v,
+  refreshPage(BuildContext context) {
+    return () async {
+      context.read<RecipeCreateBloc>().add(ReloadScreen());
+    };
+  }
+
+  _buildAddPhoto(BuildContext context, RecipeCreateLoadedState state) {
+    bool isLoading = false;
+    return GestureDetector(
+      child: Stack(
+        children: [
+          if (!isLoading)
+            Container(
+              padding: EdgeInsets.symmetric(
+                horizontal: 40.h,
+                vertical: 80.v,
+              ),
+              decoration: AppDecoration.fillGray.copyWith(
+                borderRadius: BorderRadiusStyle.roundedBorder5,
+              ),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.end,
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Padding(
+                    padding: EdgeInsets.only(
+                      left: 7.h,
+                      top: 5.v,
+                    ),
+                    child: Text(
+                      "Добавить фото",
+                      selectionColor: appTheme.blueA400,
+                    ),
                  ),
-                  child: Text(
-                    "Добавить фото",
-                    selectionColor: appTheme.blueA400,
-                  ),
-                ),
-                Spacer(),
-                Icon(
-                  Icons.photo_library,
-                  color: appTheme.blueGray300,
-                )
-              ],
+                  Spacer(),
+                  Icon(
+                    Icons.photo_library,
+                    color: appTheme.blueGray300,
+                  )
+                ],
+              ),
            ),
-          ),
-        /*if (isLoading)
+          /*if (isLoading)
          Container(
            margin: EdgeInsets.symmetric(horizontal: 10.h),
            padding: EdgeInsets.symmetric(
@@ -218,155 +221,173 @@ _buildAddPhoto(BuildContext context, RecipeCreateLoadedState state) {
                      .blueGray300), // Замените на свой прелоадер при необходимости
            ),
          ),*/
-      ],
-    ),
-  );
-}
-
-_buildStep(BuildContext context, RecipeCreateLoadedState state, int i) {
-  bool isLastStep = i == state.steps!.length - 1;
-  bool isFirstStep = i == 0;
-
-  return Container(
-    margin: EdgeInsets.only(
-      left: 16.h,
-      right: 16.h,
-      bottom: 10.h,
-    ),
-    padding: EdgeInsets.all(12.h),
-    decoration: BoxDecoration(
-      color: Colors.white,
-      borderRadius: const BorderRadius.all(Radius.circular(12)),
-      boxShadow: [
-        BoxShadow(
-          color: Colors.grey.withOpacity(0.5),
-          spreadRadius: 2,
-          blurRadius: 5,
-          offset: Offset(0, 3),
-        ),
-      ],
-    ),
-    child: Column(mainAxisSize: MainAxisSize.min, children: [
-      Align(
-        alignment: Alignment.centerLeft,
-        child: Text(
-          "Шаг ${i + 1}",
-          style: CustomTextStyles.titleMediumSemiBold,
-        ),
+        ],
      ),
-      SizedBox(height: 8.0),
-      CustomTextFormField(
-        controller: state.description,
-        hintText: "Введите описание шага",
-        maxLines: 4,
-        fillColor: appTheme.gray50,
-        borderDecoration: OutlineInputBorder(
-          borderRadius: BorderRadius.circular(5.h),
-          borderSide: BorderSide(
-            color: appTheme.gray50,
-            width: 1,
+    );
+  }
+
+  _buildStep(BuildContext context, RecipeCreateLoadedState state, int i) {
+    bool isLastStep = i == state.steps!.length - 1;
+    bool isFirstStep = i == 0;
+
+    return Container(
+      margin: EdgeInsets.only(
+        left: 16.h,
+        right: 16.h,
+        bottom: 10.h,
+      ),
+      padding: EdgeInsets.all(12.h),
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: const BorderRadius.all(Radius.circular(12)),
+        boxShadow: [
+          BoxShadow(
+            color: Colors.grey.withOpacity(0.5),
+            spreadRadius: 2,
+            blurRadius: 5,
+            offset: Offset(0, 3),
+          ),
+        ],
+      ),
+      child: Column(mainAxisSize: MainAxisSize.min, children: [
+        Align(
+          alignment: Alignment.centerLeft,
+          child: Text(
+            "Шаг ${i + 1}",
+            style: CustomTextStyles.titleMediumSemiBold,
          ),
        ),
-      ),
-      SizedBox(height: 16.0),
-      _buildAddPhoto(context, state),
-      if (!isFirstStep)
-        Row(
-          children: [
-            Flexible(
-              flex: 5,
-              child: CustomOutlinedButton(
-                text: "Добавить шаг",
-                buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
-              ),
+        SizedBox(height: 8.0),
+        CustomTextFormField(
+          controller: state.stepDescriptions?[i],
+          hintText: "Введите описание шага",
+          maxLines: 4,
+          fillColor: appTheme.gray50,
+          borderDecoration: OutlineInputBorder(
+            borderRadius: BorderRadius.circular(5.h),
+            borderSide: BorderSide(
+              color: appTheme.gray50,
+              width: 1,
            ),
-            SizedBox(width: 8), // Add some spacing between the buttons
-            Flexible(
-              flex: 1,
-              child: CustomOutlinedButton(
-                text: "х",
-                onPressed: () => Navigator.pushNamed(
-                  context,
-                  AppRoutes.blogPostCreateScreen,
-                ),
-                buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
-              ),
-            ),
-          ],
+          ),
        ),
-      if (isLastStep) // Добавляем кнопку "Добавить шаг" только для последнего шага
        SizedBox(height: 16.0),
-      CustomOutlinedButton(
-        text: "Добавить шаг",
-        buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
-      ),
-    ]),
-  );
-}
+        _buildAddPhoto(context, state),
+        SizedBox(height: 16.0),
+        if (isFirstStep && isLastStep)
+          CustomOutlinedButton(
+            onPressed: () => context.read<RecipeCreateBloc>().add(AddStep()),
+            text: "Добавить шаг",
+            buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
+          ),
+        if (isLastStep &&
+            !isFirstStep) // Добавляем кнопку "Добавить шаг" только для последнего шага
+          Column(
+            children: [
+              SizedBox(height: 16.0),
+              Row(
+                children: [
+                  Flexible(
+                    flex: 5,
+                    child: CustomOutlinedButton(
+                      onPressed: () =>
+                          context.read<RecipeCreateBloc>().add(AddStep()),
+                      text: "Добавить шаг",
+                      buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
+                    ),
+                  ),
+                  SizedBox(width: 8), // Add some spacing between the buttons
+                  Flexible(
+                    flex: 1,
+                    child: CustomOutlinedButton(
+                      text: "х",
+                      onPressed: () =>
+                          context.read<RecipeCreateBloc>().add(RemoveStep(i)),
+                      buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        if (!isLastStep && !isFirstStep)
+          CustomOutlinedButton(
+            onPressed: () =>
+                context.read<RecipeCreateBloc>().add(RemoveStep(i)),
+            text: "x",
+            buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
+          ),
+      ]),
+    );
+  }

-_buildAdditional(BuildContext context, RecipeCreateLoadedState state) {
-  return Container(
-    margin: EdgeInsets.only(
-      left: 16.h,
-      right: 16.h,
-      bottom: 10.h,
-    ),
-    padding: EdgeInsets.all(12.h),
-    decoration: BoxDecoration(
-      color: Colors.white,
-      borderRadius: const BorderRadius.all(Radius.circular(12)),
-      boxShadow: [
-        BoxShadow(
-          color: Colors.grey.withOpacity(0.5),
-          spreadRadius: 2,
-          blurRadius: 5,
-          offset: Offset(0, 3),
-        ),
-      ],
-    ),
-    child: Column(mainAxisSize: MainAxisSize.min, children: [
-      Align(alignment: Alignment.centerLeft, child: Text("Теги")),
-      CustomTextFormField(
-        controller: state.title,
-        hintText: "Введите теги, через запятую",
-        fillColor: appTheme.gray50,
-        borderDecoration: OutlineInputBorder(
-          borderRadius: BorderRadius.circular(5.h),
-          borderSide: BorderSide(
-            color: appTheme.gray50,
-            width: 1,
+  _buildAdditional(BuildContext context, RecipeCreateLoadedState state) {
+    return Container(
+      margin: EdgeInsets.only(
+        left: 16.h,
+        right: 16.h,
+        bottom: 10.h,
+      ),
+      padding: EdgeInsets.all(12.h),
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: const BorderRadius.all(Radius.circular(12)),
+        boxShadow: [
+          BoxShadow(
+            color: Colors.grey.withOpacity(0.5),
+            spreadRadius: 2,
+            blurRadius: 5,
+            offset: Offset(0, 3),
+          ),
+        ],
+      ),
+      child: Column(mainAxisSize: MainAxisSize.min, children: [
+        Align(alignment: Alignment.centerLeft, child: Text("Теги")),
+        CustomTextFormField(
+          controller: state.tags,
+          hintText: "Введите теги, через запятую",
+          fillColor: appTheme.gray50,
+          borderDecoration: OutlineInputBorder(
+            borderRadius: BorderRadius.circular(5.h),
+            borderSide: BorderSide(
+              color: appTheme.gray50,
+              width: 1,
+            ),
          ),
        ),
-      ),
-      SizedBox(height: 8.0),
-      Align(alignment: Alignment.centerLeft, child: Text("Ссылка на видео (необязательно)")),
-      CustomTextFormField(
-        controller: state.description,
-        hintText: "YouTube",
-        fillColor: appTheme.gray50,
-        borderDecoration: OutlineInputBorder(
-          borderRadius: BorderRadius.circular(5.h),
-          borderSide: BorderSide(
-            color: appTheme.gray50,
-            width: 1,
+        SizedBox(height: 8.0),
+        Align(
+            alignment: Alignment.centerLeft,
+            child: Text("Ссылка на видео (необязательно)")),
+        CustomTextFormField(
+          controller: state.video_url,
+          hintText: "YouTube",
+          fillColor: appTheme.gray50,
+          borderDecoration: OutlineInputBorder(
+            borderRadius: BorderRadius.circular(5.h),
+            borderSide: BorderSide(
+              color: appTheme.gray50,
+              width: 1,
+            ),
          ),
        ),
-      ),
-      SizedBox(height: 16.0),
-      CustomOutlinedButton(
-        text: "Добавить рецепт",
-        buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
-      ),
-    ]),
-  );
-}
+        SizedBox(height: 16.0),
+        CustomOutlinedButton(
+          text: "Добавить рецепт",
+          buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
+        ),
+      ]),
+    );
+  }

-Function onTapBack(BuildContext context) {
-  return () {
-    onTapArrowLeft(context);
-  };
-}

-onTapArrowLeft(BuildContext context) {
-  NavigatorService.goBack();
+  Function onTapBack(BuildContext context) {
+    return () {
+      onTapArrowLeft(context);
+    };
+  }
+
+  onTapArrowLeft(BuildContext context) {
+    NavigatorService.goBack();
+  }
 }