Merge pull request #14 from AbdoWa7eed/feature/profile_completion

AbdoWa7eed · web-flow · commit b6db570c0329 · 2025-04-28T17:17:02.000+03:00
Refactor ProfileCompletionCubit and Update Dependency Injection
diff --git a/lib/core/di/di.config.dart b/lib/core/di/di.config.dart
diff --git a/lib/core/routes/app_routes.dart b/lib/core/routes/app_routes.dart
@@ -1,11 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
 import 'package:graduation_project/core/widgets/slide_transition.dart';
 import 'package:graduation_project/features/auth/presentation/views/login_view.dart';
 import 'package:graduation_project/features/auth/presentation/views/register_view.dart';
 import 'package:graduation_project/features/onboarding/presentation/views/onboarding_view.dart';
-import 'package:graduation_project/features/profile_completion/presentation/cubit/profile_completion_cubit.dart';
 import 'package:graduation_project/features/profile_completion/presentation/views/birth_year_selection_view.dart';
 import 'package:graduation_project/features/profile_completion/presentation/views/gender_selection_view.dart';
 import 'package:graduation_project/features/profile_completion/presentation/views/setup_user_info_view.dart';
diff --git a/lib/core/routes/app_routes.main.dart b/lib/core/routes/app_routes.main.dart
@@ -52,24 +52,16 @@ abstract class RouteGenerator {
     GoRoute(
       path: Routes.genderSelectionRoute,
       pageBuilder: (context, state) {
-        final cubit = state.extra as ProfileCompletionCubit;
         return PageSlideTransition(
-          child: BlocProvider.value(
-            value: cubit,
-            child: const GenderSelectionView(),
-          ),
+          child: const GenderSelectionView(),
         );
       },
     ),
     GoRoute(
       path: Routes.birthYearSelectionRoute,
       pageBuilder: (context, state) {
-        final cubit = state.extra as ProfileCompletionCubit;
         return PageSlideTransition(
-          child: BlocProvider.value(
-            value: cubit,
-            child: const BirthYearSelectionView(),
-          ),
+          child: const BirthYearSelectionView(),
         );
       },
     ),
diff --git a/lib/features/profile_completion/presentation/cubit/profile_completion_cubit.dart b/lib/features/profile_completion/presentation/cubit/profile_completion_cubit.dart
@@ -3,7 +3,7 @@ import 'package:bloc/bloc.dart';
 import 'package:graduation_project/core/utils/enums.dart';
 import 'package:injectable/injectable.dart';
 import 'package:graduation_project/features/profile_completion/presentation/cubit/profile_completion_state.dart';
-@injectable
+@lazySingleton
 class ProfileCompletionCubit extends Cubit<ProfileCompletionState> {
   ProfileCompletionCubit() : super(const ProfileCompletionState());
 
diff --git a/lib/features/profile_completion/presentation/views/birth_year_selection_view.dart b/lib/features/profile_completion/presentation/views/birth_year_selection_view.dart
@@ -1,24 +1,30 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:graduation_project/core/di/di.dart';
 import 'package:graduation_project/core/res/strings_manager.dart';
 import 'package:graduation_project/core/res/values_manager.dart';
 import 'package:graduation_project/core/widgets/custom_app_bar.dart';
+import 'package:graduation_project/features/profile_completion/presentation/cubit/profile_completion_cubit.dart';
 import 'package:graduation_project/features/profile_completion/presentation/widgets/birth_year_selection_view_body.dart';
 
 class BirthYearSelectionView extends StatelessWidget {
   const BirthYearSelectionView({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: CustomAppBar(title: AppStrings.completeProfile),
-      body: SafeArea(
-        child: Padding(
-          padding: const EdgeInsetsDirectional.only(
-            start: AppPadding.p20,
-            end: AppPadding.p20,
-            bottom: AppPadding.p20,
+    return BlocProvider.value(
+      value: getIt<ProfileCompletionCubit>(),
+      child: Scaffold(
+        appBar: CustomAppBar(title: AppStrings.completeProfile),
+        body: SafeArea(
+          child: Padding(
+            padding: const EdgeInsetsDirectional.only(
+              start: AppPadding.p20,
+              end: AppPadding.p20,
+              bottom: AppPadding.p20,
+            ),
+            child: BirthYearSelectionViewBody(),
           ),
-          child: BirthYearSelectionViewBody(),
         ),
       ),
     );
diff --git a/lib/features/profile_completion/presentation/views/gender_selection_view.dart b/lib/features/profile_completion/presentation/views/gender_selection_view.dart
@@ -1,23 +1,29 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:graduation_project/core/di/di.dart';
 import 'package:graduation_project/core/res/strings_manager.dart';
 import 'package:graduation_project/core/res/values_manager.dart';
 import 'package:graduation_project/core/widgets/custom_app_bar.dart';
+import 'package:graduation_project/features/profile_completion/presentation/cubit/profile_completion_cubit.dart';
 import 'package:graduation_project/features/profile_completion/presentation/widgets/gender_selection_view_body.dart';
 
 class GenderSelectionView extends StatelessWidget {
   const GenderSelectionView({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: CustomAppBar(title: AppStrings.completeProfile),
-      body: Padding(
-        padding: const EdgeInsetsDirectional.only(
-          start: AppPadding.p20,
-          end: AppPadding.p20,
-          bottom: AppPadding.p20,
+    return BlocProvider.value(
+      value: getIt<ProfileCompletionCubit>(),
+      child: Scaffold(
+        appBar: CustomAppBar(title: AppStrings.completeProfile),
+        body: Padding(
+          padding: const EdgeInsetsDirectional.only(
+            start: AppPadding.p20,
+            end: AppPadding.p20,
+            bottom: AppPadding.p20,
+          ),
+          child: GenderSelectionViewBody(),
         ),
-        child: GenderSelectionViewBody(),
       ),
     );
   }
diff --git a/lib/features/profile_completion/presentation/views/setup_user_info_view.dart b/lib/features/profile_completion/presentation/views/setup_user_info_view.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:graduation_project/core/di/di.dart';
 import 'package:graduation_project/features/profile_completion/presentation/cubit/profile_completion_cubit.dart';
-import 'package:get_it/get_it.dart';
 import 'package:graduation_project/features/profile_completion/presentation/widgets/compelete_user_info/complete_user_info_view_body.dart';
 
 class CompleteUserInfoView extends StatelessWidget {
@@ -10,7 +10,7 @@ class CompleteUserInfoView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => GetIt.I<ProfileCompletionCubit>(),
+      create: (context) => getIt<ProfileCompletionCubit>(),
       child: const Scaffold(body: SafeArea(child: CompleteUserInfoViewBody())),
     );
   }
diff --git a/lib/features/profile_completion/presentation/widgets/birth_year_selection_view_body.dart b/lib/features/profile_completion/presentation/widgets/birth_year_selection_view_body.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:go_router/go_router.dart';
 import 'package:graduation_project/core/res/strings_manager.dart';
 import 'package:graduation_project/core/routes/app_routes.dart';
 import 'package:graduation_project/core/widgets/custom_elevated_button.dart';
 import 'package:graduation_project/core/widgets/page_intro_text_widget.dart';
 import 'package:graduation_project/features/profile_completion/presentation/cubit/profile_completion_cubit.dart';
 import 'package:graduation_project/features/profile_completion/presentation/widgets/year_picker_widget.dart';
+import 'package:graduation_project/core/utils/extensions.dart';
 
 class BirthYearSelectionViewBody extends StatelessWidget {
   const BirthYearSelectionViewBody({super.key});
@@ -22,14 +22,19 @@ class BirthYearSelectionViewBody extends StatelessWidget {
           ),
           YearPickerWidget(
             onYearSelected: (selectedYear) {
-              context.read<ProfileCompletionCubit>().updateBirthYear(selectedYear);
+              context.read<ProfileCompletionCubit>().updateBirthYear(
+                selectedYear,
+              );
             },
           ),
           CustomElevatedButton(
             text: AppStrings.next,
             onPressed: () {
               final cubit = context.read<ProfileCompletionCubit>();
-              context.push(Routes.heightSelectionRoute, extra: cubit);
+              context.popAllThenPush(
+                Routes.heightSelectionRoute,
+                extra: {'gender': cubit.state.profile.gender},
+              );
             },
           ),
         ],
diff --git a/lib/features/profile_completion/presentation/widgets/compelete_user_info/complete_user_info_view_body.dart b/lib/features/profile_completion/presentation/widgets/compelete_user_info/complete_user_info_view_body.dart
@@ -80,7 +80,7 @@ class _CompleteUserInfoViewBodyState extends State<CompleteUserInfoViewBody> {
         lastName: _lastNameController.text.trim(),
       );
 
-      context.push(Routes.genderSelectionRoute, extra: cubit);
+      context.push(Routes.genderSelectionRoute);
 
       Logger.success("Complete profile form is valid");
     } else {
diff --git a/lib/features/profile_completion/presentation/widgets/gender_selection_view_body.dart b/lib/features/profile_completion/presentation/widgets/gender_selection_view_body.dart
@@ -60,7 +60,6 @@ class GenderSelectionViewBody extends StatelessWidget {
   }
 
   void _submit(BuildContext context) {
-    final cubit = context.read<ProfileCompletionCubit>();
-    context.push(Routes.birthYearSelectionRoute, extra: cubit);
+    context.push(Routes.birthYearSelectionRoute);
   }
 }
diff --git a/lib/features/trainee_measurements/presentation/widgets/height/height_selection_view_body.dart b/lib/features/trainee_measurements/presentation/widgets/height/height_selection_view_body.dart
@@ -36,7 +36,7 @@ class HeightSelectionViewBody extends StatelessWidget {
               'height': height,
               'gender': prevData['gender'],
             };
-            context.push(Routes.weightSelectionRoute , extra:data);
+            context.push(Routes.weightSelectionRoute , extra: data);
           }, // Disable button if invalid
         ),
       ],
diff --git a/lib/features/trainee_measurements/presentation/widgets/weight/weight_picker_widget.dart b/lib/features/trainee_measurements/presentation/widgets/weight/weight_picker_widget.dart
@@ -20,7 +20,7 @@ class WeightRulerSection extends StatelessWidget {
         final weight = state.isKg ? state.weight : cubit.weightInPounds;
         return Column(
           mainAxisAlignment: MainAxisAlignment.center,
-          mainAxisSize: MainAxisSize.min,
+          mainAxisSize: MainAxisSize.min, 
           children: [
             UnitTextWidget(
               value: weight,

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,6 @@ class GenderSelectionViewBody extends StatelessWidget {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`void _submit(BuildContext context) {`
`63`		`- final cubit = context.read<ProfileCompletionCubit>();`
`64`		`- context.push(Routes.birthYearSelectionRoute, extra: cubit);`
	`63`	`+ context.push(Routes.birthYearSelectionRoute);`
`65`	`64`	`}`
`66`	`65`	`}`