Merge pull request 'Plans creation has been completed' (#401) from misha/eatvio_app:main into main

Reviewed-on: eatvio/eatvio_app#401

lib/core/app_router.dart

@@ -174,7 +174,10 @@ class AppRouter {
       GoRoute(
         path: CardSettingsScreen.path,
         name: CardSettingsScreen.name,
-        builder: (context, state) => const CardSettingsScreen(),
+        builder: (context, state) {
+          final chosenPlanId = state.extra as int?;
+          return CardSettingsScreen(chosenPlanId: chosenPlanId);
+        },
       ),
       GoRoute(
         path: '/about-plan-screen',
@@ -220,7 +223,8 @@ class AppRouter {
         builder: (context, state) {
           final data = state.extra as Map<String, dynamic>;
           final chatId = data['chatId'] as String;
-          return ChatScreen(chatId: chatId);
+          final sendInitialMessage = data['sendInitialMessage'] as bool;
+          return ChatScreen(chatId: chatId, sendInitialMessage: sendInitialMessage,);
         },
       ),
       GoRoute(

lib/core/locator_service.dart

@@ -19,6 +19,8 @@ import 'package:eatvio_app/features/create_diet/presentation/cubit/create_diet_c
 import 'package:eatvio_app/features/create_diet/repositories/create_diet_repository.dart';
 import 'package:eatvio_app/features/create_diet/services/create_diet_service.dart';
 import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_cubit.dart';
+import 'package:eatvio_app/features/create_plan/repositories/create_plan_repository.dart';
+import 'package:eatvio_app/features/create_plan/services/create_plan_service.dart';
 import 'package:eatvio_app/features/diary/presentation/bloc/consultant_comments_cubit/consultant_comments_cubit.dart';
 import 'package:eatvio_app/features/diets/repositories/diet_repository.dart';
 import 'package:eatvio_app/features/diets/services/diet_service.dart';
@@ -117,7 +119,7 @@ Future<void> init() async {
   sl.registerFactory<BlogPostCreateCubit>(() => BlogPostCreateCubit(blogPostRepository: sl()));
   sl.registerFactory<SubCubit>(() => SubCubit(profileRepository: sl()));
   sl.registerFactory<CreateDietCubit>(() => CreateDietCubit(profileRepository: sl(), createDietRepository: sl(), glossaryRepository: sl()));
-  sl.registerFactory<CreatePlanCubit>(() => CreatePlanCubit());
+  sl.registerFactory<CreatePlanCubit>(() => CreatePlanCubit(createPlanRepository: sl()));
   sl.registerFactory<FeedProfileCubit>(() => FeedProfileCubit(profileRepository: sl()));
   sl.registerFactory<AboutPlanCubit>(() => AboutPlanCubit(planRepository: sl()));
   sl.registerFactory<CreateRecipeCubit>(() => CreateRecipeCubit(recipeRepository: sl()));
@@ -158,6 +160,7 @@ Future<void> init() async {
   sl.registerLazySingleton<CardsRepository>(() => CardsRepository(cardsService: sl()));
   sl.registerLazySingleton<ConsultationsRepository>(() => ConsultationsRepository(consultationService: sl()));
   sl.registerLazySingleton<CancelPlanRepository>(() => CancelPlanRepository(cancelService: sl()));
+  sl.registerLazySingleton<CreatePlanRepository>(() => CreatePlanRepository(createPlanService: sl()));
 
   // Services
   sl.registerLazySingleton<ChatService>(() => ChatService(sl()));
@@ -184,6 +187,7 @@ Future<void> init() async {
   sl.registerLazySingleton<CardsService>(() => CardsService(sl()));
   sl.registerLazySingleton<ConsultationService>(() => ConsultationService(sl()));
   sl.registerLazySingleton<CancelPlanService>(() => CancelPlanService(sl()));
+  sl.registerLazySingleton<CreatePlanService>(() => CreatePlanService(sl()));
 
   // External
   sl.registerLazySingleton(

lib/core/theme/theme_helper.dart

@@ -147,6 +147,8 @@ class PrimaryColors {
 
   Color get greenA70001 => const Color(0XFF00BE13);
 
+  Color get green => const Color(0XFF0BB450);
+
   // LightGreen
   Color get lightGreen300 => const Color(0XFFB2DF8A);
 

lib/core/widgets/custom_text_form_field.dart

@@ -99,7 +99,7 @@ class CustomTextFormField extends StatelessWidget {
         controller: controller,
         focusNode: focusNode,
         autofocus: autofocus,
-        style: const TextStyle(fontSize: 16, color: Colors.black, fontWeight: FontWeight.w500),
+        style: textStyle ?? const TextStyle(fontSize: 16, color: Colors.black, fontWeight: FontWeight.w500),
         obscureText: obscureText!,
         textInputAction: textInputAction,
         maxLines: maxLines,
@@ -115,20 +115,17 @@ class CustomTextFormField extends StatelessWidget {
           prefixIconConstraints: prefixConstraints,
           suffixIcon: suffix,
           floatingLabelBehavior: FloatingLabelBehavior.always,
-          suffixStyle: textStyle ?? const TextStyle(fontSize: 16, fontWeight: FontWeight.w500, color: Color(0xFF323F4B)),
+          suffixStyle: const TextStyle(fontSize: 16, fontWeight: FontWeight.w500, color: Color(0xFF323F4B)),
           suffixIconConstraints: suffixConstraints,
           isDense: false,
           contentPadding: const EdgeInsets.symmetric(vertical: 16, horizontal: 12),
           fillColor: const Color(0xFFF6F6F6),
           filled: true,
-          border:
-              borderDecoration ??
+          border: borderDecoration ??
               OutlineInputBorder(borderRadius: BorderRadius.circular(20), borderSide: hasError ? BorderSide(color: appTheme.red, width: 1) : BorderSide.none),
-          enabledBorder:
-              borderDecoration ??
+          enabledBorder: borderDecoration ??
               OutlineInputBorder(borderRadius: BorderRadius.circular(20), borderSide: hasError ? BorderSide(color: appTheme.red, width: 1) : BorderSide.none),
-          focusedBorder:
-              borderDecoration ??
+          focusedBorder: borderDecoration ??
               OutlineInputBorder(borderRadius: BorderRadius.circular(20), borderSide: hasError ? BorderSide(color: appTheme.red, width: 1) : BorderSide.none),
         ),
         keyboardType: keyboardType,

lib/core/widgets/success_published_diet_bottom_sheet.dart

@@ -7,9 +7,10 @@ import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 
-class SuccessPublishedDietBottomSheet extends StatelessWidget {
-  const SuccessPublishedDietBottomSheet({super.key, required this.title});
+class SuccessPublishedDietOrPlanBottomSheet extends StatelessWidget {
+  const SuccessPublishedDietOrPlanBottomSheet({super.key, required this.title, this.isPlan = false});
   final String title;
+  final bool isPlan;
   @override
   Widget build(BuildContext context) {
     final s = S.of(context);
@@ -27,7 +28,7 @@ class SuccessPublishedDietBottomSheet extends StatelessWidget {
           style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
         ),
         Text(
-          'опубликованна',
+          isPlan ? 'опубликован' : 'опубликованна',
           style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
         ),
         const SizedBox(