Successfully passsed data between screens and imported UserRegistrationSheet for all screens

2023-12-25 12:12:23 +03:00
parent a621f8d1da
commit dbe2e40e3b
16 changed files with 57 additions and 36 deletions
--- a/lib/presentation/additional_information_screen/additional_information_screen.dart
+++ b/lib/presentation/additional_information_screen/additional_information_screen.dart
@@ -5,6 +5,7 @@ import 'package:eatvio_app/widgets/app_bar/appbar_leading_image.dart';
 import 'package:eatvio_app/widgets/app_bar/appbar_title_image.dart';
 import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart';
 import 'package:eatvio_app/widgets/next_step_button.dart';
+import 'package:eatvio_app/data/models/userRegistrationModel/user_registration_model.dart';
 import 'package:eatvio_app/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';

--- a/lib/presentation/allergies_screen/allergies_screen.dart
+++ b/lib/presentation/allergies_screen/allergies_screen.dart
@@ -5,6 +5,7 @@ import 'package:eatvio_app/widgets/app_bar/appbar_leading_image.dart';
 import 'package:eatvio_app/widgets/app_bar/appbar_title_image.dart';
 import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart';
 import 'package:eatvio_app/widgets/next_step_button.dart';
+import 'package:eatvio_app/data/models/userRegistrationModel/user_registration_model.dart';
 import 'package:eatvio_app/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';

--- a/lib/presentation/blood_pressure_screen/blood_pressure_screen.dart
+++ b/lib/presentation/blood_pressure_screen/blood_pressure_screen.dart
@@ -6,6 +6,7 @@ import 'package:eatvio_app/widgets/app_bar/appbar_title_image.dart';
 import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart';
 import 'package:eatvio_app/widgets/custom_drop_down.dart';
 import 'package:eatvio_app/widgets/next_step_button.dart';
+import 'package:eatvio_app/data/models/userRegistrationModel/user_registration_model.dart';
 import 'package:eatvio_app/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';

--- a/lib/presentation/body_circumferences_screen/body_circumferences_screen.dart
+++ b/lib/presentation/body_circumferences_screen/body_circumferences_screen.dart
@@ -5,6 +5,7 @@ import 'package:eatvio_app/widgets/app_bar/appbar_leading_image.dart';
 import 'package:eatvio_app/widgets/app_bar/appbar_title_image.dart';
 import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart';
 import 'package:eatvio_app/widgets/next_step_button.dart';
+import 'package:eatvio_app/data/models/userRegistrationModel/user_registration_model.dart';
 import 'package:eatvio_app/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';

--- a/lib/presentation/city_of_living_screen/city_of_living_screen.dart
+++ b/lib/presentation/city_of_living_screen/city_of_living_screen.dart
@@ -6,6 +6,7 @@ import 'package:eatvio_app/widgets/app_bar/appbar_title_image.dart';
 import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart';
 import 'package:eatvio_app/widgets/custom_drop_down.dart';
 import 'package:eatvio_app/widgets/next_step_button.dart';
+import 'package:eatvio_app/data/models/userRegistrationModel/user_registration_model.dart';
 import 'package:flutter/material.dart';

 class CityOfLivingScreen extends StatelessWidget {
--- a/lib/presentation/credentials_screen/credentials_screen.dart
+++ b/lib/presentation/credentials_screen/credentials_screen.dart
@@ -1,4 +1,3 @@
-import 'package:eatvio_app/data/models/userRegistrationModel/user_registration_model.dart';
 import 'bloc/credentials_bloc.dart';
 import 'models/credentials_model.dart';
 import 'package:eatvio_app/core/app_export.dart';
@@ -6,21 +5,22 @@ import 'package:eatvio_app/widgets/app_bar/appbar_leading_image.dart';
 import 'package:eatvio_app/widgets/app_bar/appbar_title_image.dart';
 import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart';
 import 'package:eatvio_app/widgets/next_step_button.dart';
+import 'package:eatvio_app/data/models/userRegistrationModel/user_registration_model.dart';
 import 'package:eatvio_app/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';

 class CredentialsScreen extends StatelessWidget {
-  const CredentialsScreen({Key? key}) : super(key: key);
-
  static Widget builder(BuildContext context) {
+    final sheet =
+        ModalRoute.of(context)!.settings.arguments as UserRegistrationSheet;
    return BlocProvider<CredentialsBloc>(
-        create: (context) => CredentialsBloc(CredentialsState(
-            credentialsModelObj: CredentialsModel(
-                userRegistrationSheet: ModalRoute.of(context)!
-                    .settings
-                    .arguments as UserRegistrationSheet)))
-          ..add(CredentialsInitialEvent()),
-        child: CredentialsScreen());
+      create: (context) => CredentialsBloc(
+        CredentialsState(
+          credentialsModelObj: CredentialsModel(userRegistrationSheet: sheet),
+        ),
+      )..add(CredentialsInitialEvent()),
+      child: CredentialsScreen(),
+    );
  }

  @override
@@ -90,12 +90,27 @@ class CredentialsScreen extends StatelessWidget {
                            textInputAction: TextInputAction.done);
                      }),
                  Spacer(),
-                  NextStepButton(
-                      text: "continue".tr.toUpperCase(),
-                      buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
-                      onPressed: () {
-                        navigateToName(context);
-                      }),
+                  BlocBuilder<CredentialsBloc, CredentialsState>(
+                      builder: (context, state) {
+                    return NextStepButton(
+                        text: "continue".tr.toUpperCase(),
+                        margin: EdgeInsets.only(
+                            left: 16.h, right: 16.h, bottom: 50.v),
+                        buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
+                        onPressed: () {
+                          UserRegistrationSheet sheet =
+                              state.credentialsModelObj!.userRegistrationSheet;
+                          sheet.email = state.valueController!.text;
+                          sheet.password = state.passwordController!.text;
+                          sheet.passwordConfirmation =
+                              state.passwordController!.text;
+                          Navigator.pushNamed(
+                            context,
+                            AppRoutes.nameScreen,
+                            arguments: sheet,
+                          );
+                        });
+                  }),
                  SizedBox(height: 17.v),
                ]))));
  }
@@ -118,11 +133,4 @@ class CredentialsScreen extends StatelessWidget {
  onTapArrowLeft(BuildContext context) {
    NavigatorService.goBack();
  }
-
-  /// Navigates to the weightScreen when the action is triggered.
-  navigateToName(BuildContext context) {
-    NavigatorService.pushNamed(
-      AppRoutes.nameScreen,
-    );
-  }
 }
--- a/lib/presentation/date_of_birth_screen/date_of_birth_screen.dart
+++ b/lib/presentation/date_of_birth_screen/date_of_birth_screen.dart
@@ -5,6 +5,7 @@ import 'package:eatvio_app/widgets/app_bar/appbar_leading_image.dart';
 import 'package:eatvio_app/widgets/app_bar/appbar_title_image.dart';
 import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart';
 import 'package:eatvio_app/widgets/next_step_button.dart';
+import 'package:eatvio_app/data/models/userRegistrationModel/user_registration_model.dart';
 import 'package:flutter/material.dart';

 class DateOfBirthScreen extends StatefulWidget {
--- a/lib/presentation/favorite_foods_screen/favorite_foods_screen.dart
+++ b/lib/presentation/favorite_foods_screen/favorite_foods_screen.dart
@@ -5,6 +5,7 @@ import 'package:eatvio_app/widgets/app_bar/appbar_leading_image.dart';
 import 'package:eatvio_app/widgets/app_bar/appbar_title_image.dart';
 import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart';
 import 'package:eatvio_app/widgets/next_step_button.dart';
+import 'package:eatvio_app/data/models/userRegistrationModel/user_registration_model.dart';
 import 'package:eatvio_app/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';

--- a/lib/presentation/favorite_sports_screen/favorite_sports_screen.dart
+++ b/lib/presentation/favorite_sports_screen/favorite_sports_screen.dart
@@ -5,6 +5,7 @@ import 'package:eatvio_app/widgets/app_bar/appbar_leading_image.dart';
 import 'package:eatvio_app/widgets/app_bar/appbar_title_image.dart';
 import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart';
 import 'package:eatvio_app/widgets/next_step_button.dart';
+import 'package:eatvio_app/data/models/userRegistrationModel/user_registration_model.dart';
 import 'package:eatvio_app/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';

--- a/lib/presentation/gender_screen/gender_screen.dart
+++ b/lib/presentation/gender_screen/gender_screen.dart
@@ -5,6 +5,7 @@ import 'package:eatvio_app/widgets/app_bar/appbar_leading_image.dart';
 import 'package:eatvio_app/widgets/app_bar/appbar_title_image.dart';
 import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart';
 import 'package:eatvio_app/widgets/next_step_button.dart';
+import 'package:eatvio_app/data/models/userRegistrationModel/user_registration_model.dart';
 import 'package:flutter/material.dart';

 enum Gender { male, female }
--- a/lib/presentation/height_screen/height_screen.dart
+++ b/lib/presentation/height_screen/height_screen.dart
@@ -6,6 +6,7 @@ import 'package:eatvio_app/widgets/app_bar/appbar_title_image.dart';
 import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart';
 import 'package:eatvio_app/widgets/custom_drop_down.dart';
 import 'package:eatvio_app/widgets/next_step_button.dart';
+import 'package:eatvio_app/data/models/userRegistrationModel/user_registration_model.dart';
 import 'package:flutter/material.dart';

 class HeightScreen extends StatefulWidget {
--- a/lib/presentation/language_select_screen/language_select_screen.dart
+++ b/lib/presentation/language_select_screen/language_select_screen.dart
@@ -1,11 +1,11 @@
 import 'package:eatvio_app/data/models/userRegistrationModel/user_registration_model.dart';
+import 'package:eatvio_app/presentation/credentials_screen/credentials_screen.dart';

 import 'bloc/language_select_bloc.dart';
 import 'models/language_select_model.dart';
 import 'package:eatvio_app/core/app_export.dart';
 import 'package:eatvio_app/widgets/custom_drop_down.dart';
 import 'package:eatvio_app/widgets/next_step_button.dart';
-import 'package:eatvio_app/presentation/credentials_screen/models/credentials_model.dart';
 import 'package:flutter/material.dart';

 class LanguageSelectScreen extends StatelessWidget {
@@ -74,7 +74,7 @@ class LanguageSelectScreen extends StatelessWidget {
                                    imagePath: ImageConstant.imgFavorite,
                                    height: 12.adaptSize,
                                    width: 12.adaptSize)),
-                            hintText: "Русский".tr,
+                            hintText: "Не выбрано".tr,
                            items:
                                languageSelectModelObj?.dropdownItemList ?? [],
                            onChanged: (value) {
@@ -94,18 +94,14 @@ class LanguageSelectScreen extends StatelessWidget {
                      EdgeInsets.only(left: 16.h, right: 16.h, bottom: 50.v),
                  buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
                  onPressed: () {
-                    navigteToCredentials(context, state);
+                    UserRegistrationSheet sheet =
+                        state.languageSelectModelObj!.userRegistrationSheet;
+                    Navigator.pushNamed(
+                      context,
+                      AppRoutes.credentialsScreen,
+                      arguments: sheet,
+                    );
                  });
            })));
  }
-
-  /// Navigates to the genderScreen when the action is triggered.
-  navigteToCredentials(BuildContext context, LanguageSelectState state) {
-    UserRegistrationSheet sheet =
-        state.languageSelectModelObj!.userRegistrationSheet;
-    NavigatorService.pushNamed(
-      AppRoutes.credentialsScreen,
-      arguments: sheet,
-    );
-  }
 }
--- a/lib/presentation/medicine_intake_screen/medicine_intake_screen.dart
+++ b/lib/presentation/medicine_intake_screen/medicine_intake_screen.dart
@@ -5,6 +5,7 @@ import 'package:eatvio_app/widgets/app_bar/appbar_leading_image.dart';
 import 'package:eatvio_app/widgets/app_bar/appbar_title_image.dart';
 import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart';
 import 'package:eatvio_app/widgets/next_step_button.dart';
+import 'package:eatvio_app/data/models/userRegistrationModel/user_registration_model.dart';
 import 'package:eatvio_app/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';

--- a/lib/presentation/name_screen/name_screen.dart
+++ b/lib/presentation/name_screen/name_screen.dart
@@ -5,6 +5,7 @@ import 'package:eatvio_app/widgets/app_bar/appbar_leading_image.dart';
 import 'package:eatvio_app/widgets/app_bar/appbar_title_image.dart';
 import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart';
 import 'package:eatvio_app/widgets/next_step_button.dart';
+import 'package:eatvio_app/data/models/userRegistrationModel/user_registration_model.dart';
 import 'package:eatvio_app/widgets/custom_text_form_field.dart';
 import 'package:eatvio_app/data/models/userRegistrationModel/user_registration_model.dart';
 import 'package:flutter/material.dart';
--- a/lib/presentation/weight_screen/weight_screen.dart
+++ b/lib/presentation/weight_screen/weight_screen.dart
@@ -6,6 +6,7 @@ import 'package:eatvio_app/widgets/app_bar/appbar_title_image.dart';
 import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart';
 import 'package:eatvio_app/widgets/custom_drop_down.dart';
 import 'package:eatvio_app/widgets/next_step_button.dart';
+import 'package:eatvio_app/data/models/userRegistrationModel/user_registration_model.dart';
 import 'package:flutter/material.dart';

 class WeightScreen extends StatefulWidget {
--- a/lib/widgets/custom_text_form_field.dart
+++ b/lib/widgets/custom_text_form_field.dart
@@ -25,6 +25,7 @@ class CustomTextFormField extends StatelessWidget {
    this.fillColor,
    this.filled = true,
    this.validator,
+    this.onSaved,
  }) : super(
          key: key,
        );
@@ -71,6 +72,8 @@ class CustomTextFormField extends StatelessWidget {

  final FormFieldValidator<String>? validator;

+  final void Function(String?)? onSaved;
+
  @override
  Widget build(BuildContext context) {
    return alignment != null
@@ -94,6 +97,7 @@ class CustomTextFormField extends StatelessWidget {
          maxLines: maxLines ?? 1,
          decoration: decoration,
          validator: validator,
+          onSaved: onSaved,
        ),
      );
  InputDecoration get decoration => InputDecoration(