Merge remote-tracking branch 'upstream/main'

lib/core/app_router.dart

@@ -31,7 +31,6 @@ import 'package:eatvio_app/features/profile/presentation/pages/profile_screen.da
 import 'package:eatvio_app/features/profile/presentation/pages/subs_screen.dart';
 import 'package:eatvio_app/features/recipes/presentation/pages/about_recipes_screen.dart';
 import 'package:eatvio_app/features/recipes/presentation/pages/recipe_create_screen.dart';
-import 'package:eatvio_app/features/recipes/presentation/pages/recipe_edit_screen.dart';
 import 'package:eatvio_app/features/registration/presentation/pages/registration_screen.dart';
 import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
 import 'package:eatvio_app/features/settings/presentation/pages/change_email_screen.dart';
@@ -135,13 +134,6 @@ class AppRouter {
         name: 'recipeCreateScreen',
         builder: (context, state) => RecipeCreateScreen(),
       ),
-      GoRoute(
-        path: '/recipe-edit-screen',
-        name: 'recipeEditScreen',
-        builder: (context, state) => RecipeEditScreen(
-          recipeID: state.extra as String,
-        ),
-      ),
       GoRoute(
         path: '/profile-screen',
         name: 'profileScreen',

lib/core/const.dart

@@ -1,4 +1,4 @@
-const String baseUrl = 'https://dev2.eatvio.com';
+String baseUrl = 'https://dev2.eatvio.com';
 
 const List<int> durationValues = [7, 14, 21];
 

lib/core/locator_service.dart

@@ -52,7 +52,7 @@ import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/prof
 import 'package:eatvio_app/features/profile/presentation/bloc/sub_cubit/sub_cubit.dart';
 import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
 import 'package:eatvio_app/features/profile/services/profile_service.dart';
-import 'package:eatvio_app/features/recipes/presentation/bloc/recipe_create_cubit.dart';
+import 'package:eatvio_app/features/recipes/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart';
 import 'package:eatvio_app/features/recipes/reporitories/recipe_repository.dart';
 import 'package:eatvio_app/features/recipes/services/recipe_service.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
@@ -81,7 +81,6 @@ Future<void> init() async {
   sl.registerFactory<CalendarCubit>(() => CalendarCubit(calendarRepository: sl()));
   sl.registerFactory<ProfileCubit>(() => ProfileCubit(profileRepository: sl(), chatRepository: sl()));
   sl.registerFactory<profilePlans.PlansCubit>(() => profilePlans.PlansCubit(plansRepository: sl()));
-  sl.registerFactory<RecipeCreateCubit>(() => RecipeCreateCubit(recipeRepository: sl()));
   sl.registerFactory<DietsCubit>(() => DietsCubit(feedRepository: sl(), dietsRepository: sl()));
   sl.registerFactory<CommentsCubit>(() => CommentsCubit(feedRepository: sl()));
   sl.registerFactory<ChatSelectCubit>(() => ChatSelectCubit(chatRepository: sl()));
@@ -96,6 +95,7 @@ Future<void> init() async {
   sl.registerFactory<CreatePlanCubit>(() => CreatePlanCubit());
   sl.registerFactory<FeedProfileCubit>(() => FeedProfileCubit(profileRepository: sl()));
   sl.registerFactory<AboutPlanCubit>(() => AboutPlanCubit(planRepository: sl()));
+  sl.registerFactory<CreateRecipeCubit>(() => CreateRecipeCubit());
   sl.registerFactory<MyDietsCubit>(() => MyDietsCubit(myDietsRepository: sl()));
   sl.registerFactory<MyPlansCubit>(() => MyPlansCubit(myPlansRepository: sl()));
 

lib/core/widgets/custom_drop_down.dart

@@ -64,11 +64,6 @@ class CustomDropDown extends StatelessWidget {
       value: value,
       isDense: true,
       isExpanded: true,
-      style: TextStyle(
-        fontSize: 16,
-        color: Colors.black,
-        fontWeight: FontWeight.w400,
-      ),
       items: items?.map((SelectionPopupModel item) {
         return DropdownMenuItem<SelectionPopupModel>(
           value: item,

lib/core/widgets/custom_text_form_field.dart

@@ -38,10 +38,12 @@ class CustomTextFormField extends StatelessWidget {
     this.expands = false,
     this.textAlignVertical,
     this.counter = const SizedBox.shrink(),
+    this.enabled = true,
     super.key,
     this.hasError = false,
     this.readOnly = false,
   });
+
   final Widget? counter;
   final Alignment? alignment;
   final double? width;
@@ -77,12 +79,15 @@ class CustomTextFormField extends StatelessWidget {
   final bool expands;
   final TextAlignVertical? textAlignVertical;
   final bool hasError;
+  final bool enabled;
+
   final bool readOnly;
   @override
   Widget build(BuildContext context) {
     return Align(
       alignment: alignment ?? Alignment.center,
       child: TextFormField(      
+        enabled: enabled,
         readOnly: readOnly,
         textAlignVertical: textAlignVertical,
         expands: expands,
@@ -114,6 +119,7 @@ class CustomTextFormField extends StatelessWidget {
           prefixIcon: prefix,
           prefixIconConstraints: prefixConstraints,
           suffixIcon: suffix,
+          floatingLabelBehavior: FloatingLabelBehavior.always,
           suffixStyle: TextStyle(
             fontSize: 16,
             fontWeight: FontWeight.w500,