diff --git a/lib/presentation/credentials_screen/credentials_screen.dart b/lib/presentation/credentials_screen/credentials_screen.dart index ecca2c9c..a68b47ec 100644 --- a/lib/presentation/credentials_screen/credentials_screen.dart +++ b/lib/presentation/credentials_screen/credentials_screen.dart @@ -8,22 +8,18 @@ import 'package:eatvio_app/widgets/custom_outlined_button.dart'; import 'package:eatvio_app/widgets/custom_text_form_field.dart'; import 'package:flutter/material.dart'; -class CredentialsScreen extends StatefulWidget { +class CredentialsScreen extends StatelessWidget { const CredentialsScreen({Key? key}) : super(key: key); static Widget builder(BuildContext context) { return BlocProvider( - create: (context) => CredentialsBloc( - CredentialsState(credentialsModelObj: CredentialsModel())) + create: (context) => CredentialsBloc(CredentialsState( + credentialsModelObj: + ModalRoute.of(context)?.settings.arguments as CredentialsModel)) ..add(CredentialsInitialEvent()), child: CredentialsScreen()); } - @override - State createState() => _CredentialsScreenState(); -} - -class _CredentialsScreenState extends State { @override Widget build(BuildContext context) { mediaQueryData = MediaQuery.of(context); diff --git a/lib/presentation/language_select_screen/models/language_select_model.dart b/lib/presentation/language_select_screen/models/language_select_model.dart index 9431c5ef..c19faa3f 100644 --- a/lib/presentation/language_select_screen/models/language_select_model.dart +++ b/lib/presentation/language_select_screen/models/language_select_model.dart @@ -1,15 +1,43 @@ // ignore_for_file: must_be_immutable import 'package:equatable/equatable.dart'; +import 'package:eatvio_app/data/models/userRegistrationModel/user_registration_model.dart'; import 'package:eatvio_app/data/models/selectionPopupModel/selection_popup_model.dart'; -import '../../userRegistrationSheet.dart'; /// This class defines the variables used in the [language_select_screen], /// and is typically used to hold data that is passed between different parts of the application. class LanguageSelectModel extends Equatable { LanguageSelectModel({this.dropdownItemList = const []}) {} - + UserRegistrationSheet userRegistrationSheet = UserRegistrationSheet( + firstName: '', + lastName: '', + email: '', + password: '', + passwordConfirmation: '', + termsAccepted: false, + birthdate: DateTime.now(), + gender: '', + country: '', + city: '', + lang: '', + weight: 0, + height: 0, + chestCircumference: 0, + waistCircumference: 0, + hipCircumference: 0, + bloodPressureUp: 0, + bloodPressureDown: 0, + hasHypo: false, + hasHyper: false, + aboutAllergy: '', + aboutTakingPils: '', + aboutSportHobbies: '', + favoriteFoods: '', + unfavoriteFoods: '', + additionalInfo: '', + ); List dropdownItemList; + LanguageSelectModel copyWith({List? dropdownItemList}) { return LanguageSelectModel( dropdownItemList: dropdownItemList ?? this.dropdownItemList,