diff --git a/lib/pages/auth/view/login_web_page.dart b/lib/pages/auth/view/login_web_page.dart index 72cad7cc..a6de87cf 100644 --- a/lib/pages/auth/view/login_web_page.dart +++ b/lib/pages/auth/view/login_web_page.dart @@ -55,12 +55,12 @@ class _LoginWebPageState extends State with HelperResponsiveLayout final isSmallScreen = isSmallScreenSize(context); final isMediumScreen = isMediumScreenSize(context); Size size = MediaQuery.of(context).size; - late ScrollController _scrollController; - _scrollController = ScrollController(); + late ScrollController scrollController; + scrollController = ScrollController(); - void _scrollToCenter() { - final double middlePosition = _scrollController.position.maxScrollExtent / 2; - _scrollController.animateTo( + void scrollToCenter() { + final double middlePosition = scrollController.position.maxScrollExtent / 2; + scrollController.animateTo( middlePosition, duration: const Duration(seconds: 1), curve: Curves.easeInOut, @@ -68,7 +68,7 @@ class _LoginWebPageState extends State with HelperResponsiveLayout } WidgetsBinding.instance.addPostFrameCallback((_) { - _scrollToCenter(); + scrollToCenter(); }); return Stack( @@ -76,7 +76,7 @@ class _LoginWebPageState extends State with HelperResponsiveLayout FirstLayer( second: Center( child: ListView( - controller: _scrollController, + controller: scrollController, shrinkWrap: true, children: [ Container( @@ -199,7 +199,7 @@ class _LoginWebPageState extends State with HelperResponsiveLayout width: size.width * 0.9, child: DropdownButtonHideUnderline( child: DropdownButton2( - style: TextStyle(color: Colors.black), + style: const TextStyle(color: Colors.black), isExpanded: true, hint: Text( 'Select your region/country', @@ -336,6 +336,16 @@ class _LoginWebPageState extends State with HelperResponsiveLayout obscureText: loginBloc.obscureText, keyboardType: TextInputType.visiblePassword, controller: loginBloc.loginPasswordController, + onFieldSubmitted: (value) { + if (loginBloc.loginFormKey.currentState!.validate()) { + loginBloc.add(LoginButtonPressed( + username: loginBloc.loginEmailController.text, + password: value, + )); + } else { + loginBloc.add(ChangeValidateEvent()); + } + }, decoration: textBoxDecoration()!.copyWith( hintText: 'At least 8 characters', hintStyle: Theme.of(context) @@ -393,7 +403,7 @@ class _LoginWebPageState extends State with HelperResponsiveLayout Transform.scale( scale: 1.2, child: Checkbox( - fillColor: MaterialStateProperty.all(Colors.white), + fillColor: WidgetStateProperty.all(Colors.white), activeColor: Colors.white, value: loginBloc.isChecked, checkColor: Colors.black,