|
|
|
|
@ -103,127 +103,132 @@ class _ConfirmLogin extends State<ConfirmLogin> {
|
|
|
|
|
width: SizeConfig.realScreenWidth,
|
|
|
|
|
child: Column(
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Expanded(
|
|
|
|
|
flex: 3,
|
|
|
|
|
child: user != null && isMoreOption == false
|
|
|
|
|
? Column(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Image.asset(
|
|
|
|
|
'assets/images/DQ/dq_logo_icon.png',
|
|
|
|
|
height: 90,
|
|
|
|
|
width: 90,
|
|
|
|
|
),
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase.of(context).welcomeBack +
|
|
|
|
|
' ' +
|
|
|
|
|
user.name,
|
|
|
|
|
fontSize: SizeConfig.textMultiplier * 3.5,
|
|
|
|
|
),
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase.of(context).accountInfo,
|
|
|
|
|
fontSize: SizeConfig.textMultiplier * 2.5,
|
|
|
|
|
),
|
|
|
|
|
Card(
|
|
|
|
|
color: Colors.grey[300],
|
|
|
|
|
child: Row(
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Expanded(
|
|
|
|
|
child: ListTile(
|
|
|
|
|
title: Text(
|
|
|
|
|
TranslationBase.of(context).lastLoginAt,
|
|
|
|
|
textAlign: TextAlign.center,
|
|
|
|
|
),
|
|
|
|
|
subtitle: Text(
|
|
|
|
|
user.editedOn != null
|
|
|
|
|
user != null && isMoreOption == false
|
|
|
|
|
? Column(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Image.asset(
|
|
|
|
|
'assets/images/DQ/dq_logo_icon.png',
|
|
|
|
|
height: 90,
|
|
|
|
|
width: 90,
|
|
|
|
|
),
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase.of(context).welcomeBack +
|
|
|
|
|
' ' +
|
|
|
|
|
user.name,
|
|
|
|
|
fontSize: SizeConfig.textMultiplier * 3.5,
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
height: 20,
|
|
|
|
|
),
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase.of(context).accountInfo,
|
|
|
|
|
fontSize: SizeConfig.textMultiplier * 2.5,
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
height: 20,
|
|
|
|
|
),
|
|
|
|
|
Card(
|
|
|
|
|
color: Colors.grey[300],
|
|
|
|
|
child: Row(
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Flexible(
|
|
|
|
|
child: ListTile(
|
|
|
|
|
title: Text(
|
|
|
|
|
TranslationBase.of(context).lastLoginAt,
|
|
|
|
|
textAlign: TextAlign.center,
|
|
|
|
|
overflow: TextOverflow.ellipsis,
|
|
|
|
|
),
|
|
|
|
|
subtitle: Text(
|
|
|
|
|
user.editedOn != null
|
|
|
|
|
? formatDate(
|
|
|
|
|
DateUtil.convertStringToDate(
|
|
|
|
|
user.editedOn))
|
|
|
|
|
: user.createdOn != null
|
|
|
|
|
? formatDate(
|
|
|
|
|
DateUtil.convertStringToDate(
|
|
|
|
|
user.editedOn))
|
|
|
|
|
user.createdOn))
|
|
|
|
|
: '--',
|
|
|
|
|
textAlign: TextAlign.center),
|
|
|
|
|
)),
|
|
|
|
|
Expanded(
|
|
|
|
|
child: ListTile(
|
|
|
|
|
title: Text(
|
|
|
|
|
TranslationBase.of(context)
|
|
|
|
|
.lastLoginWith,
|
|
|
|
|
textAlign: TextAlign.center),
|
|
|
|
|
subtitle: Text(
|
|
|
|
|
getType(user.logInType, context),
|
|
|
|
|
textAlign: TextAlign.center),
|
|
|
|
|
))
|
|
|
|
|
],
|
|
|
|
|
overflow: TextOverflow.ellipsis,
|
|
|
|
|
textAlign: TextAlign.center),
|
|
|
|
|
)),
|
|
|
|
|
Flexible(
|
|
|
|
|
child: ListTile(
|
|
|
|
|
title: Text(
|
|
|
|
|
TranslationBase.of(context).lastLoginWith,
|
|
|
|
|
overflow: TextOverflow.ellipsis,
|
|
|
|
|
textAlign: TextAlign.center),
|
|
|
|
|
subtitle: Text(
|
|
|
|
|
getType(user.logInType, context),
|
|
|
|
|
overflow: TextOverflow.ellipsis,
|
|
|
|
|
textAlign: TextAlign.center),
|
|
|
|
|
))
|
|
|
|
|
],
|
|
|
|
|
)
|
|
|
|
|
: Column(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Image.asset(
|
|
|
|
|
'assets/images/DQ/dq_logo_icon.png',
|
|
|
|
|
height: 90,
|
|
|
|
|
width: 90,
|
|
|
|
|
),
|
|
|
|
|
this.onlySMSBox == false
|
|
|
|
|
? AppText(
|
|
|
|
|
TranslationBase.of(context)
|
|
|
|
|
.verifyLoginWith,
|
|
|
|
|
fontSize: SizeConfig.textMultiplier * 3.5,
|
|
|
|
|
textAlign: TextAlign.left,
|
|
|
|
|
)
|
|
|
|
|
: AppText(
|
|
|
|
|
TranslationBase.of(context)
|
|
|
|
|
.verifyFingerprint2,
|
|
|
|
|
fontSize: SizeConfig.textMultiplier * 2.5,
|
|
|
|
|
textAlign: TextAlign.start,
|
|
|
|
|
),
|
|
|
|
|
])),
|
|
|
|
|
],
|
|
|
|
|
)),
|
|
|
|
|
],
|
|
|
|
|
)
|
|
|
|
|
: Column(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Image.asset(
|
|
|
|
|
'assets/images/DQ/dq_logo_icon.png',
|
|
|
|
|
height: 90,
|
|
|
|
|
width: 90,
|
|
|
|
|
),
|
|
|
|
|
this.onlySMSBox == false
|
|
|
|
|
? AppText(
|
|
|
|
|
TranslationBase.of(context).verifyLoginWith,
|
|
|
|
|
fontSize: SizeConfig.textMultiplier * 3.5,
|
|
|
|
|
textAlign: TextAlign.left,
|
|
|
|
|
)
|
|
|
|
|
: AppText(
|
|
|
|
|
TranslationBase.of(context)
|
|
|
|
|
.verifyFingerprint2,
|
|
|
|
|
fontSize: SizeConfig.textMultiplier * 2.5,
|
|
|
|
|
textAlign: TextAlign.start,
|
|
|
|
|
),
|
|
|
|
|
]),
|
|
|
|
|
user != null && isMoreOption == false
|
|
|
|
|
? Expanded(
|
|
|
|
|
flex: 2,
|
|
|
|
|
child: Column(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.start,
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Row(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Expanded(
|
|
|
|
|
child: InkWell(
|
|
|
|
|
onTap: () => {
|
|
|
|
|
authenticateUser(
|
|
|
|
|
3, BiometricType.face.index)
|
|
|
|
|
},
|
|
|
|
|
child: getButton(user.logInType))),
|
|
|
|
|
Expanded(child: getButton(5))
|
|
|
|
|
])
|
|
|
|
|
]))
|
|
|
|
|
: Expanded(
|
|
|
|
|
flex: 4,
|
|
|
|
|
child: Column(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.start,
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
onlySMSBox == false
|
|
|
|
|
? Row(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Expanded(child: getButton(3)),
|
|
|
|
|
Expanded(child: getButton(2))
|
|
|
|
|
],
|
|
|
|
|
)
|
|
|
|
|
: SizedBox(),
|
|
|
|
|
Row(
|
|
|
|
|
? Column(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.start,
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Row(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Expanded(child: getButton(1)),
|
|
|
|
|
Expanded(child: getButton(4))
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
]),
|
|
|
|
|
),
|
|
|
|
|
Expanded(
|
|
|
|
|
child: InkWell(
|
|
|
|
|
onTap: () => {
|
|
|
|
|
authenticateUser(
|
|
|
|
|
3, BiometricType.face.index)
|
|
|
|
|
},
|
|
|
|
|
child: getButton(user.logInType))),
|
|
|
|
|
Expanded(child: getButton(5))
|
|
|
|
|
])
|
|
|
|
|
])
|
|
|
|
|
: Column(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.start,
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
onlySMSBox == false
|
|
|
|
|
? Row(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Expanded(child: getButton(3)),
|
|
|
|
|
Expanded(child: getButton(2))
|
|
|
|
|
],
|
|
|
|
|
)
|
|
|
|
|
: SizedBox(),
|
|
|
|
|
Row(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Expanded(child: getButton(1)),
|
|
|
|
|
Expanded(child: getButton(4))
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
]),
|
|
|
|
|
Expanded(
|
|
|
|
|
flex: 1,
|
|
|
|
|
child: Column(
|
|
|
|
|
@ -580,6 +585,9 @@ class _ConfirmLogin extends State<ConfirmLogin> {
|
|
|
|
|
authenticatedUserObject.isLogin = true;
|
|
|
|
|
appointmentRateViewModel.isLogin = true;
|
|
|
|
|
projectViewModel.isLogin = true;
|
|
|
|
|
projectViewModel.user = authenticatedUserObject.user;
|
|
|
|
|
Provider.of<ProjectViewModel>(context, listen: false)
|
|
|
|
|
.setUser(authenticatedUserObject.user);
|
|
|
|
|
getToDoCount();
|
|
|
|
|
appointmentRateViewModel
|
|
|
|
|
.getIsLastAppointmentRatedList()
|
|
|
|
|
@ -627,7 +635,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
|
|
|
|
|
borderColor: Colors.grey,
|
|
|
|
|
showBorder: true,
|
|
|
|
|
child: Padding(
|
|
|
|
|
padding: EdgeInsets.fromLTRB(25, 10, 25, 10),
|
|
|
|
|
padding: EdgeInsets.fromLTRB(30, 15, 30, 15),
|
|
|
|
|
child: Column(
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Image.asset(
|
|
|
|
|
@ -653,7 +661,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
|
|
|
|
|
borderColor: Colors.grey,
|
|
|
|
|
showBorder: true,
|
|
|
|
|
child: Padding(
|
|
|
|
|
padding: EdgeInsets.fromLTRB(20, 10, 20, 10),
|
|
|
|
|
padding: EdgeInsets.fromLTRB(30, 15, 30, 15),
|
|
|
|
|
child: Column(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
@ -662,12 +670,17 @@ class _ConfirmLogin extends State<ConfirmLogin> {
|
|
|
|
|
height: SizeConfig.imageSizeMultiplier * 13,
|
|
|
|
|
width: SizeConfig.imageSizeMultiplier * 16,
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
height: 20,
|
|
|
|
|
),
|
|
|
|
|
projectViewModel.isArabic
|
|
|
|
|
? SizedBox(
|
|
|
|
|
height: 0,
|
|
|
|
|
)
|
|
|
|
|
: SizedBox(
|
|
|
|
|
height: 20,
|
|
|
|
|
),
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase.of(context).verifySMS,
|
|
|
|
|
fontSize: SizeConfig.textMultiplier * 2,
|
|
|
|
|
textAlign: TextAlign.center,
|
|
|
|
|
)
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
@ -683,7 +696,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
|
|
|
|
|
borderColor: Colors.grey,
|
|
|
|
|
showBorder: true,
|
|
|
|
|
child: Padding(
|
|
|
|
|
padding: EdgeInsets.fromLTRB(25, 10, 25, 10),
|
|
|
|
|
padding: EdgeInsets.fromLTRB(30, 15, 30, 15),
|
|
|
|
|
child: Column(
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Image.asset(
|
|
|
|
|
@ -712,7 +725,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
|
|
|
|
|
borderColor: Colors.grey,
|
|
|
|
|
showBorder: true,
|
|
|
|
|
child: Padding(
|
|
|
|
|
padding: EdgeInsets.fromLTRB(20, 10, 20, 10),
|
|
|
|
|
padding: EdgeInsets.fromLTRB(30, 15, 30, 15),
|
|
|
|
|
child: Column(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
@ -755,9 +768,13 @@ class _ConfirmLogin extends State<ConfirmLogin> {
|
|
|
|
|
height: SizeConfig.imageSizeMultiplier * 13,
|
|
|
|
|
width: SizeConfig.imageSizeMultiplier * 16,
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
height: 20,
|
|
|
|
|
),
|
|
|
|
|
projectViewModel.isArabic
|
|
|
|
|
? SizedBox(
|
|
|
|
|
height: 15,
|
|
|
|
|
)
|
|
|
|
|
: SizedBox(
|
|
|
|
|
height: 20,
|
|
|
|
|
),
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase.of(context).moreVerification,
|
|
|
|
|
fontSize: SizeConfig.textMultiplier * 2,
|
|
|
|
|
|