|
|
|
@ -67,13 +67,24 @@ class _VerificationMethodsScreenState extends State<VerificationMethodsScreen> {
|
|
|
|
|
width: SizeConfig.realScreenWidth,
|
|
|
|
|
child: Column(
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
|
|
|
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
SizedBox(
|
|
|
|
|
height: 80,
|
|
|
|
|
),
|
|
|
|
|
InkWell(
|
|
|
|
|
onTap: (){
|
|
|
|
|
Navigator.of(context).pop();
|
|
|
|
|
},
|
|
|
|
|
child: Icon(Icons.arrow_back_ios,color: Color(0xFF2B353E),)
|
|
|
|
|
|
|
|
|
|
),
|
|
|
|
|
Container(
|
|
|
|
|
|
|
|
|
|
child: Column(
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
SizedBox(
|
|
|
|
|
height: 100,
|
|
|
|
|
height: 20,
|
|
|
|
|
),
|
|
|
|
|
authenticationViewModel.user != null && isMoreOption == false
|
|
|
|
|
? Column(
|
|
|
|
@ -81,92 +92,144 @@ class _VerificationMethodsScreenState extends State<VerificationMethodsScreen> {
|
|
|
|
|
MainAxisAlignment.spaceEvenly,
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase.of(context).welcomeBack),
|
|
|
|
|
TranslationBase.of(context).welcomeBack,
|
|
|
|
|
fontSize:12,
|
|
|
|
|
fontWeight: FontWeight.w700,
|
|
|
|
|
color: Color(0xFF2B353E),
|
|
|
|
|
),
|
|
|
|
|
AppText(
|
|
|
|
|
Helpers.capitalize(authenticationViewModel.user.doctorName),
|
|
|
|
|
fontSize: SizeConfig.textMultiplier * 3.5,
|
|
|
|
|
fontSize: 24,
|
|
|
|
|
color: Color(0xFF2B353E),
|
|
|
|
|
fontWeight: FontWeight.bold,
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
height: 20,
|
|
|
|
|
),
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase.of(context).accountInfo,
|
|
|
|
|
fontSize: SizeConfig.textMultiplier * 2.5,
|
|
|
|
|
TranslationBase.of(context).accountInfo ,
|
|
|
|
|
fontSize: 16,
|
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
height: 20,
|
|
|
|
|
),
|
|
|
|
|
Card(
|
|
|
|
|
Container(
|
|
|
|
|
padding: EdgeInsets.all(15),
|
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
child: Row(
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Flexible(
|
|
|
|
|
flex: 3,
|
|
|
|
|
child: ListTile(
|
|
|
|
|
title: Text(
|
|
|
|
|
TranslationBase.of(context)
|
|
|
|
|
.lastLoginAt,
|
|
|
|
|
overflow:
|
|
|
|
|
TextOverflow.ellipsis,
|
|
|
|
|
style: TextStyle(
|
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
|
fontWeight:
|
|
|
|
|
FontWeight
|
|
|
|
|
.w800,
|
|
|
|
|
fontSize: 14),
|
|
|
|
|
),
|
|
|
|
|
subtitle: AppText(
|
|
|
|
|
authenticationViewModel.getType(
|
|
|
|
|
authenticationViewModel.user
|
|
|
|
|
.logInTypeID,
|
|
|
|
|
context),
|
|
|
|
|
fontSize: 14,
|
|
|
|
|
))),
|
|
|
|
|
Flexible(
|
|
|
|
|
flex: 2,
|
|
|
|
|
child: ListTile(
|
|
|
|
|
title: AppText(
|
|
|
|
|
authenticationViewModel.user.editedOn !=
|
|
|
|
|
null
|
|
|
|
|
? DateUtils.getDayMonthYearDateFormatted(
|
|
|
|
|
DateUtils.convertStringToDate(
|
|
|
|
|
authenticationViewModel.user
|
|
|
|
|
.editedOn))
|
|
|
|
|
: authenticationViewModel.user.createdOn !=
|
|
|
|
|
null
|
|
|
|
|
? DateUtils.getDayMonthYearDateFormatted(
|
|
|
|
|
DateUtils.convertStringToDate(authenticationViewModel.user
|
|
|
|
|
.createdOn))
|
|
|
|
|
: '--',
|
|
|
|
|
textAlign:
|
|
|
|
|
TextAlign.right,
|
|
|
|
|
fontSize: 14,
|
|
|
|
|
fontWeight:
|
|
|
|
|
FontWeight.w800,
|
|
|
|
|
),
|
|
|
|
|
subtitle: AppText(
|
|
|
|
|
authenticationViewModel.user.editedOn !=
|
|
|
|
|
null
|
|
|
|
|
? DateUtils.getHour(
|
|
|
|
|
DateUtils.convertStringToDate(
|
|
|
|
|
authenticationViewModel.user
|
|
|
|
|
.editedOn))
|
|
|
|
|
: authenticationViewModel.user.createdOn !=
|
|
|
|
|
null
|
|
|
|
|
? DateUtils.getHour(
|
|
|
|
|
DateUtils.convertStringToDate(authenticationViewModel.user
|
|
|
|
|
.createdOn))
|
|
|
|
|
: '--',
|
|
|
|
|
textAlign:
|
|
|
|
|
TextAlign.right,
|
|
|
|
|
fontSize: 14,
|
|
|
|
|
),
|
|
|
|
|
))
|
|
|
|
|
borderRadius: BorderRadius.all(
|
|
|
|
|
Radius.circular(10),
|
|
|
|
|
),
|
|
|
|
|
border: Border.all(
|
|
|
|
|
color: HexColor('#707070'),
|
|
|
|
|
width: 0.1),
|
|
|
|
|
),
|
|
|
|
|
child: Row(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Column(
|
|
|
|
|
children: [
|
|
|
|
|
|
|
|
|
|
Text(
|
|
|
|
|
TranslationBase.of(context)
|
|
|
|
|
.lastLoginAt,
|
|
|
|
|
overflow:
|
|
|
|
|
TextOverflow.ellipsis,
|
|
|
|
|
style: TextStyle(
|
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
|
fontSize: 16,
|
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
|
fontWeight: FontWeight.w700,),
|
|
|
|
|
|
|
|
|
|
),
|
|
|
|
|
Row(
|
|
|
|
|
children: [
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase
|
|
|
|
|
.of(context)
|
|
|
|
|
.verifyWith,
|
|
|
|
|
fontSize: 14,
|
|
|
|
|
color: Color(0xFF575757),
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
|
),
|
|
|
|
|
AppText(
|
|
|
|
|
authenticationViewModel.getType(
|
|
|
|
|
authenticationViewModel.user
|
|
|
|
|
.logInTypeID,
|
|
|
|
|
context),
|
|
|
|
|
fontSize: 14,
|
|
|
|
|
color: Color(0xFF2B353E),
|
|
|
|
|
|
|
|
|
|
fontWeight: FontWeight.w700,
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
)
|
|
|
|
|
],
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,),
|
|
|
|
|
Column(children: [
|
|
|
|
|
AppText(
|
|
|
|
|
authenticationViewModel.user.editedOn !=
|
|
|
|
|
null
|
|
|
|
|
? DateUtils.getDayMonthYearDateFormatted(
|
|
|
|
|
DateUtils.convertStringToDate(
|
|
|
|
|
authenticationViewModel.user
|
|
|
|
|
.editedOn))
|
|
|
|
|
: authenticationViewModel.user.createdOn !=
|
|
|
|
|
null
|
|
|
|
|
? DateUtils.getDayMonthYearDateFormatted(
|
|
|
|
|
DateUtils.convertStringToDate(authenticationViewModel.user
|
|
|
|
|
.createdOn))
|
|
|
|
|
: '--',
|
|
|
|
|
textAlign:
|
|
|
|
|
TextAlign.right,
|
|
|
|
|
fontSize: 13,
|
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
|
fontWeight: FontWeight.w700,
|
|
|
|
|
),
|
|
|
|
|
AppText(
|
|
|
|
|
authenticationViewModel.user.editedOn !=
|
|
|
|
|
null
|
|
|
|
|
? DateUtils.getHour(
|
|
|
|
|
DateUtils.convertStringToDate(
|
|
|
|
|
authenticationViewModel.user
|
|
|
|
|
.editedOn))
|
|
|
|
|
: authenticationViewModel.user.createdOn !=
|
|
|
|
|
null
|
|
|
|
|
? DateUtils.getHour(
|
|
|
|
|
DateUtils.convertStringToDate(authenticationViewModel.user
|
|
|
|
|
.createdOn))
|
|
|
|
|
: '--',
|
|
|
|
|
textAlign:
|
|
|
|
|
TextAlign.right,
|
|
|
|
|
fontSize: 14,
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
|
color: Color(0xFF575757),
|
|
|
|
|
)
|
|
|
|
|
],
|
|
|
|
|
)),
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
|
|
|
|
|
)
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
height: 20,
|
|
|
|
|
),
|
|
|
|
|
Row(
|
|
|
|
|
children: [
|
|
|
|
|
AppText(
|
|
|
|
|
"Please Verify",
|
|
|
|
|
fontSize: 16,
|
|
|
|
|
color: Color(0xFF2B353E),
|
|
|
|
|
|
|
|
|
|
fontWeight: FontWeight.w700,
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
)
|
|
|
|
|
],
|
|
|
|
|
)
|
|
|
|
|
: Column(
|
|
|
|
@ -175,13 +238,17 @@ class _VerificationMethodsScreenState extends State<VerificationMethodsScreen> {
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
this.onlySMSBox == false
|
|
|
|
|
? AppText(
|
|
|
|
|
? Container(
|
|
|
|
|
margin: EdgeInsets.only(bottom: 20, top: 30),
|
|
|
|
|
child: AppText(
|
|
|
|
|
TranslationBase.of(context)
|
|
|
|
|
.verifyLoginWith,
|
|
|
|
|
fontSize:
|
|
|
|
|
SizeConfig.textMultiplier * 3.5,
|
|
|
|
|
.verifyLoginWith,
|
|
|
|
|
fontSize: 18,
|
|
|
|
|
color: Color(0xFF2E303A),
|
|
|
|
|
fontWeight: FontWeight.bold,
|
|
|
|
|
textAlign: TextAlign.left,
|
|
|
|
|
)
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
: AppText(
|
|
|
|
|
TranslationBase.of(context)
|
|
|
|
|
.verifyFingerprint2,
|
|
|
|
@ -317,15 +384,6 @@ class _VerificationMethodsScreenState extends State<VerificationMethodsScreen> {
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
bottomSheet: authenticationViewModel.user == null ? SizedBox(height: 0,) : Container(
|
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
borderRadius: BorderRadius.all(
|
|
|
|
|
Radius.circular(0.0),
|
|
|
|
|
),
|
|
|
|
|
border: Border.all(
|
|
|
|
|
color: HexColor('#707070'),
|
|
|
|
|
width: 0),
|
|
|
|
|
),
|
|
|
|
|
height: 90,
|
|
|
|
|
width: double.infinity,
|
|
|
|
|
child: Center(
|
|
|
|
@ -338,11 +396,8 @@ class _VerificationMethodsScreenState extends State<VerificationMethodsScreen> {
|
|
|
|
|
title: TranslationBase
|
|
|
|
|
.of(context)
|
|
|
|
|
.useAnotherAccount,
|
|
|
|
|
color: Colors.red[700],
|
|
|
|
|
color: Color(0xFFD02127),
|
|
|
|
|
onPressed: () {
|
|
|
|
|
projectsProvider.isLogin = true;
|
|
|
|
|
authenticationViewModel.unverified = false;
|
|
|
|
|
authenticationViewModel.isLogin = false;
|
|
|
|
|
authenticationViewModel.deleteUser();
|
|
|
|
|
|
|
|
|
|
Navigator.pushAndRemoveUntil(
|
|
|
|
@ -499,8 +554,6 @@ class _VerificationMethodsScreenState extends State<VerificationMethodsScreen> {
|
|
|
|
|
if (authenticationViewModel.state == ViewState.ErrorLocal) {
|
|
|
|
|
Helpers.showErrorToast(authenticationViewModel.error);
|
|
|
|
|
} else {
|
|
|
|
|
projectsProvider.isLogin = true;
|
|
|
|
|
|
|
|
|
|
Navigator.pushAndRemoveUntil(
|
|
|
|
|
context,
|
|
|
|
|
FadePage(
|
|
|
|
|