diff --git a/lib/presentation/credentials_screen/credentials_screen.dart b/lib/presentation/credentials_screen/credentials_screen.dart index f7b297c5..3666fb4a 100644 --- a/lib/presentation/credentials_screen/credentials_screen.dart +++ b/lib/presentation/credentials_screen/credentials_screen.dart @@ -1,5 +1,4 @@ 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'; @@ -16,8 +15,10 @@ class CredentialsScreen extends StatelessWidget { static Widget builder(BuildContext context) { return BlocProvider( create: (context) => CredentialsBloc(CredentialsState( - credentialsModelObj: - ModalRoute.of(context)?.settings.arguments as CredentialsModel)) + credentialsModelObj: CredentialsModel( + userRegistrationSheet: ModalRoute.of(context)! + .settings + .arguments as UserRegistrationSheet))) ..add(CredentialsInitialEvent()), child: CredentialsScreen()); } 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 e86c0c6f..d6ae042c 100644 --- a/lib/presentation/language_select_screen/bloc/language_select_bloc.dart +++ b/lib/presentation/language_select_screen/bloc/language_select_bloc.dart @@ -29,7 +29,6 @@ class LanguageSelectBloc emit(state.copyWith(selectedDropDownValue: event.value)); state.languageSelectModelObj?.userRegistrationSheet.lang = event.value.title; - print(state.languageSelectModelObj?.userRegistrationSheet.lang); } 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 0d1f3b9d..a4b26e44 100644 --- a/lib/presentation/language_select_screen/language_select_screen.dart +++ b/lib/presentation/language_select_screen/language_select_screen.dart @@ -1,3 +1,5 @@ +import 'package:eatvio_app/data/models/userRegistrationModel/user_registration_model.dart'; + import 'bloc/language_select_bloc.dart'; import 'models/language_select_model.dart'; import 'package:eatvio_app/core/app_export.dart'; @@ -99,15 +101,11 @@ class LanguageSelectScreen extends StatelessWidget { /// Navigates to the genderScreen when the action is triggered. navigteToCredentials(BuildContext context, LanguageSelectState state) { - if (state.languageSelectModelObj != null) { - CredentialsModel credentialsModel = CredentialsModel( - userRegistrationSheet: - state.languageSelectModelObj.userRegistrationSheet, - ); - NavigatorService.pushNamed( - AppRoutes.credentialsScreen, - arguments: credentialsModel, - ); - } + UserRegistrationSheet sheet = + state.languageSelectModelObj!.userRegistrationSheet; + NavigatorService.pushNamed( + AppRoutes.credentialsScreen, + arguments: sheet, + ); } } diff --git a/pubspec.yaml b/pubspec.yaml index 3b441985..295bc454 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -9,10 +9,10 @@ dependencies: flutter_localizations: sdk: flutter flutter_bloc: ^8.0.0 - connectivity_plus: ^2.3.6 + connectivity_plus: ^5.0.2 shared_preferences: ^2.0.15 cached_network_image: ^3.2.1 - flutter_svg: ^1.1.6 + flutter_svg: ^2.0.9 equatable: ^2.0.0 dev_dependencies: flutter_test: