From 05887cb39b18e73cbc38ff085d83c1e9b343e1a3 Mon Sep 17 00:00:00 2001 From: maxxkim Date: Thu, 21 Dec 2023 16:28:04 +0300 Subject: [PATCH] Initialized UserRegistrationSheet class --- .../additional_information_screen.dart | 16 ------- .../models/credentials_model.dart | 1 + .../bloc/language_select_bloc.dart | 1 + .../language_select_screen.dart | 45 +++++-------------- .../models/language_select_model.dart | 30 ++++++++++++- 5 files changed, 41 insertions(+), 52 deletions(-) diff --git a/lib/presentation/additional_information_screen/additional_information_screen.dart b/lib/presentation/additional_information_screen/additional_information_screen.dart index f93ed9d3..c3778012 100644 --- a/lib/presentation/additional_information_screen/additional_information_screen.dart +++ b/lib/presentation/additional_information_screen/additional_information_screen.dart @@ -82,22 +82,6 @@ class _AdditionalInformationScreenState title: AppbarTitleImage(imagePath: ImageConstant.imgLogoEatvio)); } - /// Section Widget - Widget _buildProgressIndicator(BuildContext context) { - return Container( - padding: EdgeInsets.symmetric(horizontal: 4.h, vertical: 3.v), - decoration: AppDecoration.outlinePrimary - .copyWith(borderRadius: BorderRadiusStyle.circleBorder8), - child: Container( - height: 8.v, - width: 332.h, - decoration: BoxDecoration( - color: appTheme.blueA400, - borderRadius: BorderRadius.circular(4.h), - border: - Border.all(color: theme.colorScheme.primary, width: 1.h)))); - } - /// Section Widget Widget _buildTextFormField(BuildContext context) { return SizedBox( diff --git a/lib/presentation/credentials_screen/models/credentials_model.dart b/lib/presentation/credentials_screen/models/credentials_model.dart index 57ae6d7c..666a756c 100644 --- a/lib/presentation/credentials_screen/models/credentials_model.dart +++ b/lib/presentation/credentials_screen/models/credentials_model.dart @@ -1,6 +1,7 @@ // ignore_for_file: must_be_immutable import 'package:equatable/equatable.dart'; +import 'package:eatvio_app/data/models/userRegistrationModel/user_registration_model.dart'; /// This class defines the variables used in the [credentials_screen], /// and is typically used to hold data that is passed between different parts of the application. diff --git a/lib/presentation/language_select_screen/bloc/language_select_bloc.dart b/lib/presentation/language_select_screen/bloc/language_select_bloc.dart index 8560203b..9fc3fe49 100644 --- a/lib/presentation/language_select_screen/bloc/language_select_bloc.dart +++ b/lib/presentation/language_select_screen/bloc/language_select_bloc.dart @@ -27,6 +27,7 @@ class LanguageSelectBloc Emitter emit, ) { emit(state.copyWith(selectedDropDownValue: event.value)); + LanguageSelectModel().userRegistrationSheet.lang = event.value.toString(); } List fillDropdownItemList() { diff --git a/lib/presentation/language_select_screen/language_select_screen.dart b/lib/presentation/language_select_screen/language_select_screen.dart index d3683263..9349ddcc 100644 --- a/lib/presentation/language_select_screen/language_select_screen.dart +++ b/lib/presentation/language_select_screen/language_select_screen.dart @@ -5,7 +5,7 @@ import 'package:eatvio_app/widgets/custom_drop_down.dart'; import 'package:eatvio_app/widgets/custom_outlined_button.dart'; import 'package:flutter/material.dart'; -class LanguageSelectScreen extends StatefulWidget { +class LanguageSelectScreen extends StatelessWidget { const LanguageSelectScreen({Key? key}) : super(key: key); static Widget builder(BuildContext context) { @@ -16,11 +16,6 @@ class LanguageSelectScreen extends StatefulWidget { child: LanguageSelectScreen()); } - @override - State createState() => _LanguageSelectScreenState(); -} - -class _LanguageSelectScreenState extends State { @override Widget build(BuildContext context) { mediaQueryData = MediaQuery.of(context); @@ -85,41 +80,21 @@ class _LanguageSelectScreenState extends State { }), Spacer(flex: 63) ])), - bottomNavigationBar: _buildContinueButtonSection(context))); - } - - /// Section Widget - Widget _buildProgressIndicatorSection(BuildContext context) { - return Container( - width: 343.h, - padding: EdgeInsets.symmetric(horizontal: 4.h, vertical: 3.v), - decoration: AppDecoration.outlinePrimary - .copyWith(borderRadius: BorderRadiusStyle.circleBorder8), - child: Container( - height: 8.v, - width: 20.h, - decoration: BoxDecoration( - color: appTheme.blueA400, - borderRadius: BorderRadius.circular(4.h), - border: - Border.all(color: theme.colorScheme.primary, width: 1.h)))); - } - - /// Section Widget - Widget _buildContinueButtonSection(BuildContext context) { - return CustomOutlinedButton( - text: "continue".tr.toUpperCase(), - margin: EdgeInsets.only(left: 16.h, right: 16.h, bottom: 50.v), - buttonStyle: CustomButtonStyles.outlinePrimaryTL15, - onPressed: () { - navigteToCredentials(context); - }); + bottomNavigationBar: CustomOutlinedButton( + text: "continue".tr.toUpperCase(), + margin: EdgeInsets.only(left: 16.h, right: 16.h, bottom: 50.v), + buttonStyle: CustomButtonStyles.outlinePrimaryTL15, + onPressed: () { + navigteToCredentials(context); + }))); } /// Navigates to the genderScreen when the action is triggered. navigteToCredentials(BuildContext context) { + LanguageSelectModel languageSelectModel = LanguageSelectModel(); NavigatorService.pushNamed( AppRoutes.credentialsScreen, + arguments: languageSelectModel.userRegistrationSheet, ); } } 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 0b9cb205..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,13 +1,41 @@ // 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'; /// 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}) {