merge-requests/104/head
Mohammad ALjammal 6 years ago
commit 3495e6bc9b

@ -23,6 +23,7 @@ Helpers helpers = Helpers();
class LoginForm extends StatefulWidget with DrAppToastMsg { class LoginForm extends StatefulWidget with DrAppToastMsg {
LoginForm({this.changeLoadingStata}); LoginForm({this.changeLoadingStata});
final Function changeLoadingStata; final Function changeLoadingStata;
@override @override
@ -85,7 +86,7 @@ class _LoginFormState extends State<LoginForm> {
return null; return null;
}, },
onSaved: (value) { onSaved: (value) {
userInfo.UserID = value; userInfo.UserID = value.trim();
}, },
onFieldSubmitted: (_) { onFieldSubmitted: (_) {
FocusScope.of(context).requestFocus(focusPass); FocusScope.of(context).requestFocus(focusPass);
@ -184,9 +185,9 @@ class _LoginFormState extends State<LoginForm> {
); );
} }
/* /*
*@author: Elham Rababah *@author: Elham Rababah
*@Date:20/4/2020 *@Date:20/4/2020
*@param: context, hint, asset *@param: context, hint, asset
*@return: InputDecoration *@return: InputDecoration
*@desc: decorate input feilds *@desc: decorate input feilds
@ -337,6 +338,7 @@ class _LoginFormState extends State<LoginForm> {
userInfo.ProjectID = projectsList[index]["ID"]; userInfo.ProjectID = projectsList[index]["ID"];
projectIdController.text = projectsList[index]['Name']; projectIdController.text = projectsList[index]['Name'];
}); });
FocusScope.of(context).requestFocus(focusProject);
primaryFocus.unfocus();
} }
} }

@ -21,7 +21,9 @@ Helpers helpers = Helpers();
class VerifyAccount extends StatefulWidget { class VerifyAccount extends StatefulWidget {
VerifyAccount({this.changeLoadingStata}); VerifyAccount({this.changeLoadingStata});
final Function changeLoadingStata; final Function changeLoadingStata;
@override @override
_VerifyAccountState createState() => _VerifyAccountState(); _VerifyAccountState createState() => _VerifyAccountState();
} }
@ -37,8 +39,9 @@ class _VerifyAccountState extends State<VerifyAccount> {
Future _loggedUserFuture; Future _loggedUserFuture;
var _loggedUser; var _loggedUser;
AuthProvider authProv; AuthProvider authProv;
bool _isInit =true; bool _isInit = true;
var model; var model;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
@ -93,25 +96,30 @@ class _VerifyAccountState extends State<VerifyAccount> {
MainAxisAlignment.spaceAround, MainAxisAlignment.spaceAround,
children: <Widget>[ children: <Widget>[
Container( Container(
width: SizeConfig.realScreenWidth * 0.20, width: SizeConfig.realScreenWidth * 0.20,
child: TextFormField( child: TextFormField(
textInputAction: TextInputAction.next, textInputAction: TextInputAction.next,
style: buildTextStyle(), style: buildTextStyle(),
maxLength: 1, maxLength: 1,
textAlign: TextAlign.center, textAlign: TextAlign.center,
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
decoration: decoration: buildInputDecoration(context),
buildInputDecoration(context), onSaved: (val) {
onSaved: (val) { verifyAccountFormValue['digit1'] = val;
verifyAccountFormValue['digit1'] = },
val; validator: validateCodeDigit,
}, onFieldSubmitted: (_) {
validator: validateCodeDigit, FocusScope.of(context)
onFieldSubmitted: (_) { .requestFocus(focusD2);
},
onChanged: (val) {
if (val.length == 1) {
FocusScope.of(context) FocusScope.of(context)
.requestFocus(focusD2); .requestFocus(focusD2);
}, }
)), },
),
),
Container( Container(
width: SizeConfig.realScreenWidth * 0.20, width: SizeConfig.realScreenWidth * 0.20,
child: TextFormField( child: TextFormField(
@ -131,6 +139,12 @@ class _VerifyAccountState extends State<VerifyAccount> {
FocusScope.of(context) FocusScope.of(context)
.requestFocus(focusD3); .requestFocus(focusD3);
}, },
onChanged: (val) {
if (val.length == 1) {
FocusScope.of(context)
.requestFocus(focusD3);
}
},
validator: validateCodeDigit), validator: validateCodeDigit),
), ),
Container( Container(
@ -152,6 +166,12 @@ class _VerifyAccountState extends State<VerifyAccount> {
FocusScope.of(context) FocusScope.of(context)
.requestFocus(focusD4); .requestFocus(focusD4);
}, },
onChanged: (val) {
if (val.length == 1) {
FocusScope.of(context)
.requestFocus(focusD4);
}
},
validator: validateCodeDigit)), validator: validateCodeDigit)),
Container( Container(
width: SizeConfig.realScreenWidth * 0.20, width: SizeConfig.realScreenWidth * 0.20,
@ -214,10 +234,10 @@ class _VerifyAccountState extends State<VerifyAccount> {
}); });
} }
/* /*
*@author: Elham Rababah *@author: Elham Rababah
*@Date:19/4/2020 *@Date:19/4/2020
*@param: *@param:
*@return: *@return:
*@desc: change the style for the input field *@desc: change the style for the input field
*/ */
@ -234,9 +254,9 @@ class _VerifyAccountState extends State<VerifyAccount> {
return null; return null;
} }
/* /*
*@author: Elham Rababah *@author: Elham Rababah
*@Date:28/4/2020 *@Date:28/4/2020
*@param: context *@param: context
*@return:InputDecoration *@return:InputDecoration
*@desc: buildInputDecoration *@desc: buildInputDecoration
@ -255,10 +275,10 @@ class _VerifyAccountState extends State<VerifyAccount> {
)); ));
} }
/* /*
*@author: Elham Rababah *@author: Elham Rababah
*@Date:28/4/2020 *@Date:28/4/2020
*@param: *@param:
*@return: RichText *@return: RichText
*@desc: buildText *@desc: buildText
*/ */
@ -283,9 +303,9 @@ class _VerifyAccountState extends State<VerifyAccount> {
); );
} }
/* /*
*@author: Elham Rababah *@author: Elham Rababah
*@Date:15/4/2020 *@Date:15/4/2020
*@param: authProv *@param: authProv
*@return: *@return:
*@desc: verify Account func call sendActivationCodeByOtpNotificationType service *@desc: verify Account func call sendActivationCodeByOtpNotificationType service
@ -349,8 +369,8 @@ class _VerifyAccountState extends State<VerifyAccount> {
} }
} }
/* /*
*@author: Elham Rababah *@author: Elham Rababah
*@Date:17/5/2020 *@Date:17/5/2020
*@param: Map<String, dynamic> profile, Function changeLoadingStata *@param: Map<String, dynamic> profile, Function changeLoadingStata
*@return: *@return:
@ -385,7 +405,7 @@ class _VerifyAccountState extends State<VerifyAccount> {
}); });
} }
/* /*
*@author: Elham Rababah *@author: Elham Rababah
*@Date:17/5/2020 *@Date:17/5/2020
*@param: ClinicModel clinicInfo, Function changeLoadingStata *@param: ClinicModel clinicInfo, Function changeLoadingStata

Loading…
Cancel
Save