create method card and remove future builder from verification method widget

auth_refactor
Elham Rababah 5 years ago
parent a3caf023e2
commit 3ca4ac3632

@ -337,7 +337,7 @@ const TRANSACTION_NO = 0;
const LANGUAGE_ID = 2; const LANGUAGE_ID = 2;
const STAMP = '2020-04-27T12:17:17.721Z'; const STAMP = '2020-04-27T12:17:17.721Z';
const IP_ADDRESS = '9.9.9.9'; const IP_ADDRESS = '9.9.9.9';
const VERSION_ID = 5.9; const VERSION_ID = 6.0;
const CHANNEL = 9; const CHANNEL = 9;
const SESSION_ID = 'BlUSkYymTt'; const SESSION_ID = 'BlUSkYymTt';
const IS_LOGIN_FOR_DOCTOR_APP = true; const IS_LOGIN_FOR_DOCTOR_APP = true;

@ -13,6 +13,8 @@ import 'package:doctor_app_flutter/models/auth/activation_Code_req_model.dart';
import 'package:doctor_app_flutter/models/auth/activation_code_for_verification_screen_model.dart'; import 'package:doctor_app_flutter/models/auth/activation_code_for_verification_screen_model.dart';
import 'package:doctor_app_flutter/models/auth/check_activation_code_request_model.dart'; import 'package:doctor_app_flutter/models/auth/check_activation_code_request_model.dart';
import 'package:doctor_app_flutter/models/doctor/user_model.dart'; import 'package:doctor_app_flutter/models/doctor/user_model.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:intl/intl.dart';
class AuthenticationViewModel extends BaseViewModel { class AuthenticationViewModel extends BaseViewModel {
AuthenticationService _authService = locator<AuthenticationService>(); AuthenticationService _authService = locator<AuthenticationService>();
@ -25,6 +27,8 @@ class AuthenticationViewModel extends BaseViewModel {
get activationCodeForDoctorAppRes => _authService.activationCodeForDoctorAppRes; get activationCodeForDoctorAppRes => _authService.activationCodeForDoctorAppRes;
get checkActivationCodeForDoctorAppRes => _authService.checkActivationCodeForDoctorAppRes; get checkActivationCodeForDoctorAppRes => _authService.checkActivationCodeForDoctorAppRes;
var loggedUser;
GetIMEIDetailsModel user;
Future selectDeviceImei(imei) async { Future selectDeviceImei(imei) async {
setState(ViewState.Busy); setState(ViewState.Busy);
await _authService.selectDeviceImei(imei); await _authService.selectDeviceImei(imei);
@ -127,4 +131,56 @@ class AuthenticationViewModel extends BaseViewModel {
} else } else
setState(ViewState.Idle); setState(ViewState.Idle);
} }
getDate(DateTime date) {
final DateFormat formatter = DateFormat('dd MMM yyyy');
return formatter.format(date);
}
getTime(DateTime date) {
final DateFormat formatter = DateFormat('HH:mm a');
return formatter.format(date);
}
getType(type, context) {
switch (type) {
case 1:
return TranslationBase
.of(context)
.verifySMS;
break;
case 3:
return TranslationBase
.of(context)
.verifyFingerprint;
break;
case 4:
return TranslationBase
.of(context)
.verifyFaceID;
break;
case 2:
return TranslationBase.of(context).verifyWhatsApp;
break;
default:
return TranslationBase.of(context).verifySMS;
break;
}
}
getInitUserInfo()async{
setState(ViewState.Busy);
loggedUser = await sharedPref.getObj(LOGGED_IN_USER);
var lastLogin = await sharedPref.getObj(LAST_LOGIN_USER);
if (lastLogin != null) {
user = GetIMEIDetailsModel.fromJson(lastLogin);
}
setState(ViewState.Idle);
}
} }

@ -28,29 +28,15 @@ class _VerificationMethodsScreenState extends State<VerificationMethodsScreen> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BaseView<AuthenticationViewModel>( return BaseView<AuthenticationViewModel>(
onModelReady: (model) async {},
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
isLoading: _isLoading, isLoading: _isLoading,
isShowAppBar: false, isShowAppBar: false,
isHomeIcon: false, isHomeIcon: false,
backgroundColor: HexColor('#F8F8F8'), backgroundColor: HexColor('#F8F8F8'),
body: ListView(children: <Widget>[ body:VerificationMethods(
Container(
margin: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
SizedBox(
height: 50,
),
VerificationMethods(
password: widget.password, password: widget.password,
changeLoadingState: changeLoadingState, changeLoadingState: changeLoadingState,
model:model // model:model
), )));
],
),
),
])));
} }
} }

@ -0,0 +1,242 @@
import 'package:doctor_app_flutter/core/enum/auth_method_types.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:local_auth/local_auth.dart';
import 'package:provider/provider.dart';
class MethodCard extends StatefulWidget {
final AuthMethodTypes authMethodType;
final Function ( AuthMethodTypes type, bool isActive) authenticateUser;
final Function onShowMore;
const MethodCard({Key key, this.authMethodType, this.authenticateUser, this.onShowMore}) : super(key: key);
@override
_MethodCardState createState() => _MethodCardState();
}
class _MethodCardState extends State<MethodCard> {
var _availableBiometrics;
final LocalAuthentication auth = LocalAuthentication();
ProjectViewModel projectsProvider;
@override
void initState() {
super.initState();
_getAvailableBiometrics();
}
bool checkIfBiometricAvailable(BiometricType biometricType) {
bool isAvailable = false;
if (_availableBiometrics != null) {
for (var i = 0; i < _availableBiometrics.length; i++) {
if (biometricType == _availableBiometrics[i]) isAvailable = true;
}
}
return isAvailable;
}
Future<void> _getAvailableBiometrics() async {
var availableBiometrics;
try {
availableBiometrics = await auth.getAvailableBiometrics();
} on PlatformException catch (e) {
print(e);
}
if (!mounted) return;
setState(() {
_availableBiometrics = availableBiometrics;
});
}
@override
Widget build(BuildContext context) {
projectsProvider = Provider.of<ProjectViewModel>(context);
switch (widget.authMethodType) {
case AuthMethodTypes.WhatsApp:
return InkWell(
onTap: () => {widget.authenticateUser(AuthMethodTypes.WhatsApp, true)},
child: Container(
margin: EdgeInsets.all(10),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
color: Colors.white,
),
child: Padding(
padding: EdgeInsets.fromLTRB(20, 15, 20, 15),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Row(
children: [
Image.asset(
'assets/images/verify-whtsapp.png',
height: 60,
width: 60,
),
],
),
SizedBox(
height: 20,
),
AppText(
TranslationBase.of(context).verifyWhatsApp,
fontSize: 14,
fontWeight: FontWeight.w600,
)
],
),
)));
break;
case AuthMethodTypes.SMS:
return InkWell(
onTap: () => {widget.authenticateUser(AuthMethodTypes.SMS, true)},
child: Container(
margin: EdgeInsets.all(10),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
color: Colors.white,
),
child: Padding(
padding: EdgeInsets.fromLTRB(20, 15, 20, 15),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Image.asset(
'assets/images/verify-sms.png',
height: 60,
width: 60,
),
SizedBox(
height: 20,
),
AppText(
TranslationBase.of(context).verifySMS,
fontSize: 14,
fontWeight: FontWeight.w600,
)
],
),
)));
break;
case AuthMethodTypes.Fingerprint:
return InkWell(
onTap: () => {
if (checkIfBiometricAvailable(BiometricType.fingerprint))
{widget.authenticateUser(AuthMethodTypes.Fingerprint, true)}
},
child: Container(
margin: EdgeInsets.all(10),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
color: Colors.white,
),
child: Padding(
padding: EdgeInsets.fromLTRB(20, 15, 20, 15),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Image.asset(
'assets/images/verification_fingerprint_icon.png',
height: 60,
width: 60,
),
SizedBox(
height: 20,
),
AppText(
TranslationBase.of(context).verifyFingerprint,
fontSize: 14,
fontWeight: FontWeight.w600,
)
],
),
)));
break;
case AuthMethodTypes.FaceID:
return InkWell(
onTap: () {
if (checkIfBiometricAvailable(BiometricType.face)) {
widget.authenticateUser(AuthMethodTypes.FaceID, true);
}
},
child:
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
color: Colors.white,
),
margin: EdgeInsets.all(10),
child: Padding(
padding: EdgeInsets.fromLTRB(20, 15, 20, 15),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Image.asset(
'assets/images/verification_faceid_icon.png',
height: 60,
width: 60,
),
SizedBox(
height: 20,
),
AppText(
TranslationBase.of(context).verifyFaceID,
fontSize: 14,
fontWeight: FontWeight.w600,
)
],
),
)));
break;
default:
return InkWell(
onTap: widget.onShowMore,
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
color: Colors.white,
),
child: Padding(
padding: EdgeInsets.fromLTRB(20, 15, 20, 15),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Image.asset(
'assets/images/login/more_icon.png',
height: 60,
width: 60,
),
projectsProvider.isArabic
? SizedBox(
height: 20,
)
: SizedBox(
height: 10,
),
AppText(
TranslationBase.of(context).moreVerification,
fontSize: 14,
fontWeight: FontWeight.w600,
)
],
),
)));
};
}
}

@ -61,9 +61,6 @@ class SMSOTP {
projectProvider = Provider.of(context); projectProvider = Provider.of(context);
return AlertDialog( return AlertDialog(
contentPadding: EdgeInsets.fromLTRB(24.0, 0.0, 0.0, 24.0), contentPadding: EdgeInsets.fromLTRB(24.0, 0.0, 0.0, 24.0),
// shape: RoundedRectangleBorder(
// borderRadius: BorderRadius.all(Radius.circular(10.0))),
content: StatefulBuilder(builder: (context, setState) { content: StatefulBuilder(builder: (context, setState) {
if (displayTime == '') { if (displayTime == '') {
startTimer(setState); startTimer(setState);

@ -7,22 +7,23 @@ import 'package:doctor_app_flutter/core/model/imei_details.dart';
import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/models/auth/activation_Code_req_model.dart'; import 'package:doctor_app_flutter/models/auth/activation_Code_req_model.dart';
import 'package:doctor_app_flutter/models/auth/check_activation_code_request_model.dart';
import 'package:doctor_app_flutter/models/auth/activation_code_for_verification_screen_model.dart'; import 'package:doctor_app_flutter/models/auth/activation_code_for_verification_screen_model.dart';
import 'package:doctor_app_flutter/models/auth/check_activation_code_request_model.dart';
import 'package:doctor_app_flutter/models/doctor/clinic_model.dart'; import 'package:doctor_app_flutter/models/doctor/clinic_model.dart';
import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart';
import 'package:doctor_app_flutter/models/doctor/profile_req_Model.dart'; import 'package:doctor_app_flutter/models/doctor/profile_req_Model.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/auth/sms-popup.dart'; import 'package:doctor_app_flutter/widgets/auth/sms-popup.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:intl/intl.dart';
import 'package:local_auth/auth_strings.dart'; import 'package:local_auth/auth_strings.dart';
import 'package:local_auth/local_auth.dart'; import 'package:local_auth/local_auth.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -33,30 +34,23 @@ import '../../landing_page.dart';
import '../../routes.dart'; import '../../routes.dart';
import '../../util/dr_app_shared_pref.dart'; import '../../util/dr_app_shared_pref.dart';
import '../../util/helpers.dart'; import '../../util/helpers.dart';
import '../../widgets/shared/dr_app_circular_progress_Indeicator.dart'; import 'method_card.dart';
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
Helpers helpers = Helpers(); Helpers helpers = Helpers();
class VerificationMethods extends StatefulWidget { class VerificationMethods extends StatefulWidget {
VerificationMethods({this.changeLoadingState, this.password, this.model}); VerificationMethods({this.changeLoadingState, this.password});
final password; final password;
final Function changeLoadingState; final Function changeLoadingState;
final AuthenticationViewModel model;
@override @override
_VerificationMethodsState createState() => _VerificationMethodsState(); _VerificationMethodsState createState() => _VerificationMethodsState();
} }
class _VerificationMethodsState extends State<VerificationMethods> { class _VerificationMethodsState extends State<VerificationMethods> {
MainAxisAlignment spaceBetweenMethods = MainAxisAlignment.spaceBetween;
Future _loggedUserFuture;
var _loggedUser;
var verificationMethod;
GetIMEIDetailsModel user;
final LocalAuthentication auth = LocalAuthentication();
var _availableBiometrics;
ProjectViewModel projectsProvider; ProjectViewModel projectsProvider;
bool isMoreOption = false; bool isMoreOption = false;
bool onlySMSBox = false; bool onlySMSBox = false;
@ -65,56 +59,45 @@ class _VerificationMethodsState extends State<VerificationMethods> {
bool authenticated; bool authenticated;
AuthMethodTypes fingrePrintBefore; AuthMethodTypes fingerPrintBefore;
AuthMethodTypes selectedOption; AuthMethodTypes selectedOption;
AuthenticationViewModel model;
final LocalAuthentication auth = LocalAuthentication();
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_loggedUserFuture = getSharedPref();
_getAvailableBiometrics();
} }
Future<void> getSharedPref() async {
sharedPref.getObj(LOGGED_IN_USER).then((userInfo) {
_loggedUser = userInfo;
});
sharedPref.getObj(LAST_LOGIN_USER).then((lastLogin) {
if (lastLogin != null) {
user = GetIMEIDetailsModel.fromJson(lastLogin);
}
});
print(user);
}
@override @override
void didChangeDependencies() { void didChangeDependencies() async{
super.didChangeDependencies(); super.didChangeDependencies();
final routeArgs = ModalRoute.of(context).settings.arguments as Map;
verificationMethod =
routeArgs != null ? routeArgs['verificationMethod'] : null;
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
doctorProfileViewModel = Provider.of<DoctorProfileViewModel>(context); doctorProfileViewModel = Provider.of<DoctorProfileViewModel>(context);
projectsProvider = Provider.of<ProjectViewModel>(context); projectsProvider = Provider.of<ProjectViewModel>(context);
return FutureBuilder( return BaseView<AuthenticationViewModel>(
future: Future.wait([_loggedUserFuture]), onModelReady: (model) async {
builder: (BuildContext context, AsyncSnapshot snapshot) { this.model = model;
switch (snapshot.connectionState) { await model.getInitUserInfo();
case ConnectionState.waiting: },
return DrAppCircularProgressIndeicator(); builder: (_, model, w) => AppScaffold(
default: isShowAppBar: false,
if (snapshot.hasError) { baseViewModel: model,
Helpers.showErrorToast('Error: ${snapshot.error}'); body: SingleChildScrollView(
return Text('Error: ${snapshot.error}'); child: Center(
} else { child: FractionallySizedBox(
return SingleChildScrollView( // widthFactor: 0.9,
child: Container( child: Container(
height: SizeConfig.realScreenHeight * .87, margin: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 0),
height: SizeConfig.realScreenHeight * .95,
width: SizeConfig.realScreenWidth, width: SizeConfig.realScreenWidth,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -122,20 +105,22 @@ class _VerificationMethodsState extends State<VerificationMethods> {
children: <Widget>[ children: <Widget>[
Container( Container(
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
user != null && isMoreOption == false SizedBox(
height: 100,
),
model.user != null && isMoreOption == false
? Column( ? Column(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.spaceEvenly, MainAxisAlignment.spaceEvenly,
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText(TranslationBase.of(context)
.welcomeBack),
AppText( AppText(
Helpers.capitalize(user.doctorName), TranslationBase.of(context).welcomeBack),
fontSize: AppText(
SizeConfig.textMultiplier * 3.5, Helpers.capitalize(model.user.doctorName),
fontSize: SizeConfig.textMultiplier * 3.5,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
SizedBox( SizedBox(
@ -143,8 +128,7 @@ class _VerificationMethodsState extends State<VerificationMethods> {
), ),
AppText( AppText(
TranslationBase.of(context).accountInfo, TranslationBase.of(context).accountInfo,
fontSize: fontSize: SizeConfig.textMultiplier * 2.5,
SizeConfig.textMultiplier * 2.5,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
SizedBox( SizedBox(
@ -158,21 +142,19 @@ class _VerificationMethodsState extends State<VerificationMethods> {
flex: 3, flex: 3,
child: ListTile( child: ListTile(
title: Text( title: Text(
TranslationBase.of( TranslationBase.of(context)
context)
.lastLoginAt, .lastLoginAt,
overflow: TextOverflow overflow:
.ellipsis, TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
fontFamily: fontFamily: 'Poppins',
'Poppins',
fontWeight: fontWeight:
FontWeight.w800, FontWeight.w800,
fontSize: 14), fontSize: 14),
), ),
subtitle: AppText( subtitle: AppText(
getType( model.getType(
user.logInTypeID, model.user.logInTypeID,
context), context),
fontSize: 14, fontSize: 14,
))), ))),
@ -180,37 +162,36 @@ class _VerificationMethodsState extends State<VerificationMethods> {
flex: 2, flex: 2,
child: ListTile( child: ListTile(
title: AppText( title: AppText(
user.editedOn != null model.user.editedOn != null
? getDate(DateUtils ? model.getDate(
DateUtils
.convertStringToDate( .convertStringToDate(
user model.user
.editedOn)) .editedOn))
: user.createdOn != : model.user.createdOn != null
null ? model
? getDate(DateUtils .getDate(DateUtils
.convertStringToDate( .convertStringToDate(
user.createdOn)) model.user.createdOn))
: '--', : '--',
textAlign: textAlign: TextAlign.right,
TextAlign.right,
fontSize: 14, fontSize: 14,
fontWeight: fontWeight: FontWeight.w800,
FontWeight.w800,
), ),
subtitle: AppText( subtitle: AppText(
user.editedOn != null model.user.editedOn != null
? getTime(DateUtils ? model.getTime(
DateUtils
.convertStringToDate( .convertStringToDate(
user model.user
.editedOn)) .editedOn))
: user.createdOn != : model.user.createdOn != null
null ? model
? getTime(DateUtils .getTime(DateUtils
.convertStringToDate( .convertStringToDate(
user.createdOn)) model.user.createdOn))
: '--', : '--',
textAlign: textAlign: TextAlign.right,
TextAlign.right,
fontSize: 14, fontSize: 14,
), ),
)) ))
@ -221,32 +202,28 @@ class _VerificationMethodsState extends State<VerificationMethods> {
: Column( : Column(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.spaceEvenly, MainAxisAlignment.spaceEvenly,
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
this.onlySMSBox == false this.onlySMSBox == false
? AppText( ? AppText(
TranslationBase.of(context) TranslationBase.of(context)
.verifyLoginWith, .verifyLoginWith,
fontSize: fontSize:
SizeConfig.textMultiplier * SizeConfig.textMultiplier * 3.5,
3.5,
textAlign: TextAlign.left, textAlign: TextAlign.left,
) )
: AppText( : AppText(
TranslationBase.of(context) TranslationBase.of(context)
.verifyFingerprint2, .verifyFingerprint2,
fontSize: fontSize:
SizeConfig.textMultiplier * SizeConfig.textMultiplier * 2.5,
2.5,
textAlign: TextAlign.start, textAlign: TextAlign.start,
), ),
]), ]),
user != null && isMoreOption == false model.user != null && isMoreOption == false
? Column( ? Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Row( Row(
mainAxisAlignment: mainAxisAlignment:
@ -257,20 +234,49 @@ class _VerificationMethodsState extends State<VerificationMethods> {
onTap: () => { onTap: () => {
// TODO check this logic it seem it will create bug to us // TODO check this logic it seem it will create bug to us
authenticateUser(AuthMethodTypes.Fingerprint, authenticateUser(
AuthMethodTypes
.Fingerprint,
true) true)
}, },
child: methodCard( child: MethodCard(
user.logInTypeID == 4 ?AuthMethodTypes.FaceID:user.logInTypeID == 2?AuthMethodTypes.WhatsApp:user.logInTypeID ==3? AuthMethodTypes.Fingerprint:AuthMethodTypes.SMS authMethodType: model.user
))), .logInTypeID ==
4
? AuthMethodTypes.FaceID
: model.user.logInTypeID == 2
? AuthMethodTypes
.WhatsApp
: model.user.logInTypeID ==
3
? AuthMethodTypes
.Fingerprint
: AuthMethodTypes
.SMS,
authenticateUser:
(AuthMethodTypes
authMethodType,
isActive) =>
authenticateUser(
authMethodType,
isActive),
)),
),
Expanded( Expanded(
child: methodCard(AuthMethodTypes.MoreOptions)) child: MethodCard(
authMethodType:
AuthMethodTypes.MoreOptions,
onShowMore: () {
setState(() {
isMoreOption = true;
});
},
))
]), ]),
]) ])
: Column( : Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
onlySMSBox == false onlySMSBox == false
? Row( ? Row(
@ -278,11 +284,29 @@ class _VerificationMethodsState extends State<VerificationMethods> {
MainAxisAlignment.center, MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: methodCard( child: MethodCard(
AuthMethodTypes.Fingerprint)), authMethodType:
AuthMethodTypes.Fingerprint,
authenticateUser:
(AuthMethodTypes
authMethodType,
isActive) =>
authenticateUser(
authMethodType,
isActive),
)),
Expanded( Expanded(
child: methodCard( child: MethodCard(
AuthMethodTypes.FaceID)) authMethodType:
AuthMethodTypes.FaceID,
authenticateUser:
(AuthMethodTypes
authMethodType,
isActive) =>
authenticateUser(
authMethodType,
isActive),
))
], ],
) )
: SizedBox(), : SizedBox(),
@ -291,9 +315,24 @@ class _VerificationMethodsState extends State<VerificationMethods> {
MainAxisAlignment.center, MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: methodCard(AuthMethodTypes.SMS)), child: MethodCard(
authMethodType: AuthMethodTypes.SMS,
authenticateUser:
(AuthMethodTypes authMethodType,
isActive) =>
authenticateUser(
authMethodType, isActive),
)),
Expanded( Expanded(
child: methodCard(AuthMethodTypes.WhatsApp)) child: MethodCard(
authMethodType:
AuthMethodTypes.WhatsApp,
authenticateUser:
(AuthMethodTypes authMethodType,
isActive) =>
authenticateUser(
authMethodType, isActive),
))
], ],
), ),
]), ]),
@ -305,7 +344,7 @@ class _VerificationMethodsState extends State<VerificationMethods> {
Column( Column(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[ children: <Widget>[
user != null model.user != null
? Row( ? Row(
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
@ -324,37 +363,41 @@ class _VerificationMethodsState extends State<VerificationMethods> {
), ),
], ],
), ),
),
),
),
),
)); ));
} }
}
});
}
sendActivationCodeByOtpNotificationType( sendActivationCodeByOtpNotificationType(
AuthMethodTypes authMethodType) async { AuthMethodTypes authMethodType) async {
if (authMethodType == AuthMethodTypes.SMS || authMethodType == AuthMethodTypes.WhatsApp) { if (authMethodType == AuthMethodTypes.SMS ||
authMethodType == AuthMethodTypes.WhatsApp) {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
int projectID = await sharedPref.getInt(PROJECT_ID); int projectID = await sharedPref.getInt(PROJECT_ID);
// TODO create model for _loggedUser; // TODO create model for model.loggedUser;
ActivationCodeModel activationCodeModel = ActivationCodeModel( ActivationCodeModel activationCodeModel = ActivationCodeModel(
facilityId: projectID, facilityId: projectID,
memberID: _loggedUser['List_MemberInformation'][0]['MemberID'], memberID: model.loggedUser['List_MemberInformation'][0]['MemberID'],
zipCode: _loggedUser['ZipCode'], zipCode: model.loggedUser['ZipCode'],
mobileNumber: _loggedUser['MobileNumber'], mobileNumber: model.loggedUser['MobileNumber'],
otpSendType: authMethodType.getTypeIdService().toString(), otpSendType: authMethodType.getTypeIdService().toString(),
password: widget.password); password: widget.password);
await widget.model await model.sendActivationCodeForDoctorApp(activationCodeModel);
.sendActivationCodeForDoctorApp(activationCodeModel); if (model.state == ViewState.ErrorLocal) {
if(widget.model.state == ViewState.ErrorLocal) { Helpers.showErrorToast(model.error);
Helpers.showErrorToast(widget.model.error);
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
}else{ } else {
print("VerificationCode : " + widget.model.activationCodeForDoctorAppRes["VerificationCode"]); print("VerificationCode : " +
sharedPref.setString(VIDA_AUTH_TOKEN_ID, widget.model.activationCodeForDoctorAppRes["VidaAuthTokenID"]); model.activationCodeForDoctorAppRes["VerificationCode"]);
sharedPref.setString( sharedPref.setString(VIDA_AUTH_TOKEN_ID,
VIDA_REFRESH_TOKEN_ID, widget.model.activationCodeForDoctorAppRes["VidaRefreshTokenID"]); model.activationCodeForDoctorAppRes["VidaAuthTokenID"]);
sharedPref.setString(LOGIN_TOKEN_ID, widget.model.activationCodeForDoctorAppRes["LogInTokenID"]); sharedPref.setString(VIDA_REFRESH_TOKEN_ID,
model.activationCodeForDoctorAppRes["VidaRefreshTokenID"]);
sharedPref.setString(LOGIN_TOKEN_ID,
model.activationCodeForDoctorAppRes["LogInTokenID"]);
sharedPref.setString(PASSWORD, widget.password); sharedPref.setString(PASSWORD, widget.password);
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
this.startSMSService(authMethodType); this.startSMSService(authMethodType);
@ -363,38 +406,42 @@ class _VerificationMethodsState extends State<VerificationMethods> {
// TODO route to this page with parameters to inicate we should present 2 option // TODO route to this page with parameters to inicate we should present 2 option
if (Platform.isAndroid && authMethodType == AuthMethodTypes.Fingerprint) { if (Platform.isAndroid && authMethodType == AuthMethodTypes.Fingerprint) {
Helpers.showErrorToast('Your device not support this feature'); Helpers.showErrorToast('Your device not support this feature');
} else { } else {}
}
} }
} }
sendActivationCodeVerificationScreen( sendActivationCodeVerificationScreen(AuthMethodTypes authMethodType) async {
AuthMethodTypes authMethodType) async {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
ActivationCodeForVerificationScreenModel activationCodeModel = ActivationCodeForVerificationScreenModel( ActivationCodeForVerificationScreenModel activationCodeModel =
iMEI: user.iMEI, ActivationCodeForVerificationScreenModel(
facilityId: user.projectID, iMEI: model.user.iMEI,
memberID: user.doctorID, facilityId: model.user.projectID,
zipCode: user.outSA == true ? '971' : '966', memberID: model.user.doctorID,
mobileNumber: user.mobile, zipCode: model.user.outSA == true ? '971' : '966',
oTPSendType: authMethodType ==AuthMethodTypes.FaceID?4:authMethodType ==AuthMethodTypes.Fingerprint?3:authMethodType ==AuthMethodTypes.WhatsApp?2:1, mobileNumber: model.user.mobile,
oTPSendType: authMethodType.getTypeIdService(),
isMobileFingerPrint: 1, isMobileFingerPrint: 1,
vidaAuthTokenID: user.vidaAuthTokenID, vidaAuthTokenID: model.user.vidaAuthTokenID,
vidaRefreshTokenID: user.vidaRefreshTokenID); vidaRefreshTokenID: model.user.vidaRefreshTokenID);
await widget.model await model
.sendActivationCodeVerificationScreen(activationCodeModel); .sendActivationCodeVerificationScreen(activationCodeModel);
if(widget.model.state == ViewState.ErrorLocal) { if (model.state == ViewState.ErrorLocal) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
Helpers.showErrorToast(widget.model.error); Helpers.showErrorToast(model.error);
} else { } else {
print("VerificationCode : " + widget.model.activationCodeVerificationScreenRes["VerificationCode"]); print("VerificationCode : " +
sharedPref.setString(VIDA_AUTH_TOKEN_ID, widget.model.activationCodeVerificationScreenRes["VidaAuthTokenID"]); model.activationCodeVerificationScreenRes["VerificationCode"]);
sharedPref.setString(VIDA_AUTH_TOKEN_ID,
model.activationCodeVerificationScreenRes["VidaAuthTokenID"]);
sharedPref.setString( sharedPref.setString(
VIDA_REFRESH_TOKEN_ID, widget.model.activationCodeVerificationScreenRes["VidaRefreshTokenID"]); VIDA_REFRESH_TOKEN_ID,
sharedPref.setString(LOGIN_TOKEN_ID, widget.model.activationCodeVerificationScreenRes["LogInTokenID"]); model.activationCodeVerificationScreenRes["VidaRefreshTokenID"]);
if (authMethodType == AuthMethodTypes.SMS || authMethodType == AuthMethodTypes.WhatsApp) { sharedPref.setString(LOGIN_TOKEN_ID,
model.activationCodeVerificationScreenRes["LogInTokenID"]);
if (authMethodType == AuthMethodTypes.SMS ||
authMethodType == AuthMethodTypes.WhatsApp) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
this.startSMSService(authMethodType); this.startSMSService(authMethodType);
} else { } else {
@ -403,226 +450,13 @@ class _VerificationMethodsState extends State<VerificationMethods> {
} }
} }
Widget methodCard(AuthMethodTypes authMethodType) { authenticateUser(AuthMethodTypes authMethodType, isActive) {
switch (authMethodType) { if (authMethodType == AuthMethodTypes.Fingerprint ||
case AuthMethodTypes.WhatsApp: authMethodType == AuthMethodTypes.FaceID) {
return InkWell( fingerPrintBefore = authMethodType;
onTap: () => {authenticateUser(AuthMethodTypes.WhatsApp, true)},
child: Container(
margin: EdgeInsets.all(10),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
color: Colors.white,
),
child: Padding(
padding: EdgeInsets.fromLTRB(20, 15, 20, 15),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Row(
children: [
Image.asset(
'assets/images/verify-whtsapp.png',
height: 60,
width: 60,
),
],
),
SizedBox(
height: 20,
),
AppText(
TranslationBase.of(context).verifyWhatsApp,
fontSize: 14,
fontWeight: FontWeight.w600,
)
],
),
)));
break;
case AuthMethodTypes.SMS:
return InkWell(
onTap: () => {authenticateUser(AuthMethodTypes.SMS, true)},
child: Container(
margin: EdgeInsets.all(10),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
color: Colors.white,
),
child: Padding(
padding: EdgeInsets.fromLTRB(20, 15, 20, 15),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Image.asset(
'assets/images/verify-sms.png',
height: 60,
width: 60,
),
SizedBox(
height: 20,
),
AppText(
TranslationBase.of(context).verifySMS,
fontSize: 14,
fontWeight: FontWeight.w600,
)
],
),
)));
break;
case AuthMethodTypes.Fingerprint:
return InkWell(
onTap: () => {
if (checkIfBiometricAvailable(BiometricType.fingerprint))
{authenticateUser(AuthMethodTypes.Fingerprint, true)}
},
child: Container(
margin: EdgeInsets.all(10),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
color: Colors.white,
),
child: Padding(
padding: EdgeInsets.fromLTRB(20, 15, 20, 15),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Image.asset(
'assets/images/verification_fingerprint_icon.png',
height: 60,
width: 60,
),
SizedBox(
height: 20,
),
AppText(
TranslationBase.of(context).verifyFingerprint,
fontSize: 14,
fontWeight: FontWeight.w600,
)
],
),
)));
break;
case AuthMethodTypes.FaceID:
return InkWell(
onTap: () {
if (checkIfBiometricAvailable(BiometricType.face)) {
authenticateUser(AuthMethodTypes.FaceID, true);
}
},
child:
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
color: Colors.white,
),
margin: EdgeInsets.all(10),
child: Padding(
padding: EdgeInsets.fromLTRB(20, 15, 20, 15),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Image.asset(
'assets/images/verification_faceid_icon.png',
height: 60,
width: 60,
),
SizedBox(
height: 20,
),
AppText(
TranslationBase.of(context).verifyFaceID,
fontSize: 14,
fontWeight: FontWeight.w600,
)
],
),
)));
break;
default:
return InkWell(
onTap: () => {
setState(() {
isMoreOption = true;
})
},
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
color: Colors.white,
),
child: Padding(
padding: EdgeInsets.fromLTRB(20, 15, 20, 15),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Image.asset(
'assets/images/login/more_icon.png',
height: 60,
width: 60,
),
projectsProvider.isArabic
? SizedBox(
height: 20,
)
: SizedBox(
height: 10,
),
AppText(
TranslationBase.of(context).moreVerification,
fontSize: 14,
fontWeight: FontWeight.w600,
)
],
),
)));
}
}
getType(type, context) {
switch (type) {
case 1:
return TranslationBase.of(context).verifySMS;
break;
case 3:
return TranslationBase.of(context).verifyFingerprint;
break;
case 4:
return TranslationBase.of(context).verifyFaceID;
break;
case 2:
return TranslationBase.of(context).verifyWhatsApp;
break;
default:
return TranslationBase.of(context).verifySMS;
break;
}
} }
this.selectedOption =
bool checkIfBiometricAvailable(BiometricType biometricType) { fingerPrintBefore != null ? fingerPrintBefore : authMethodType;
bool isAvailable = false;
if (_availableBiometrics != null) {
for (var i = 0; i < _availableBiometrics.length; i++) {
if (biometricType == _availableBiometrics[i]) isAvailable = true;
}
}
return isAvailable;
}
authenticateUser( AuthMethodTypes authMethodType, isActive) {
if (authMethodType == AuthMethodTypes.Fingerprint || authMethodType == AuthMethodTypes.FaceID) {
fingrePrintBefore = authMethodType;
}
this.selectedOption = fingrePrintBefore != null ? fingrePrintBefore : authMethodType;
switch (authMethodType) { switch (authMethodType) {
case AuthMethodTypes.SMS: case AuthMethodTypes.SMS:
@ -632,7 +466,8 @@ class _VerificationMethodsState extends State<VerificationMethods> {
sendActivationCode(authMethodType); sendActivationCode(authMethodType);
break; break;
case AuthMethodTypes.Fingerprint: case AuthMethodTypes.Fingerprint:
this.loginWithFingerPrintOrFaceID(AuthMethodTypes.Fingerprint, isActive); this.loginWithFingerPrintOrFaceID(
AuthMethodTypes.Fingerprint, isActive);
break; break;
case AuthMethodTypes.FaceID: case AuthMethodTypes.FaceID:
this.loginWithFingerPrintOrFaceID(AuthMethodTypes.FaceID, isActive); this.loginWithFingerPrintOrFaceID(AuthMethodTypes.FaceID, isActive);
@ -643,23 +478,8 @@ class _VerificationMethodsState extends State<VerificationMethods> {
sharedPref.setInt(OTP_TYPE, selectedOption.getTypeIdService()); sharedPref.setInt(OTP_TYPE, selectedOption.getTypeIdService());
} }
Future<void> _getAvailableBiometrics() async {
var availableBiometrics;
try {
availableBiometrics = await auth.getAvailableBiometrics();
} on PlatformException catch (e) {
print(e);
}
if (!mounted) return;
setState(() {
_availableBiometrics = availableBiometrics;
});
}
sendActivationCode(AuthMethodTypes authMethodType) async { sendActivationCode(AuthMethodTypes authMethodType) async {
if (user != null) { if (model.user != null) {
sendActivationCodeVerificationScreen(authMethodType); sendActivationCodeVerificationScreen(authMethodType);
} else { } else {
sendActivationCodeByOtpNotificationType(authMethodType); sendActivationCodeByOtpNotificationType(authMethodType);
@ -667,10 +487,11 @@ class _VerificationMethodsState extends State<VerificationMethods> {
} }
startSMSService(AuthMethodTypes type) { startSMSService(AuthMethodTypes type) {
// TODO improve this logic
new SMSOTP( new SMSOTP(
context, context,
type, type,
_loggedUser != null ? _loggedUser['MobileNumber'] : user.mobile, model.loggedUser != null ? model.loggedUser['MobileNumber'] : model.user.mobile,
(value) { (value) {
showDialog( showDialog(
context: context, context: context,
@ -682,14 +503,16 @@ class _VerificationMethodsState extends State<VerificationMethods> {
this.checkActivationCode(value: value); this.checkActivationCode(value: value);
}, },
() => { () =>
{
widget.changeLoadingState(false), widget.changeLoadingState(false),
print('Faild..'), print('Faild..'),
}, },
).displayDialog(context); ).displayDialog(context);
} }
loginWithFingerPrintOrFaceID(AuthMethodTypes authMethodTypes, isActive) async { loginWithFingerPrintOrFaceID(AuthMethodTypes authMethodTypes,
isActive) async {
if (isActive) { if (isActive) {
const iosStrings = const IOSAuthMessages( const iosStrings = const IOSAuthMessages(
cancelButton: 'cancel', cancelButton: 'cancel',
@ -707,7 +530,7 @@ class _VerificationMethodsState extends State<VerificationMethods> {
DrAppToastMsg.showErrorToast(e.toString()); DrAppToastMsg.showErrorToast(e.toString());
} }
if (!mounted) return; if (!mounted) return;
if (user != null && (user.logInTypeID == 3 || user.logInTypeID == 4)) { if (model.user != null && (model.user.logInTypeID == 3 || model.user.logInTypeID == 4)) {
this.sendActivationCode(authMethodTypes); this.sendActivationCode(authMethodTypes);
} else { } else {
setState(() { setState(() {
@ -717,34 +540,44 @@ class _VerificationMethodsState extends State<VerificationMethods> {
} }
} }
checkActivationCode( {value}) async { checkActivationCode({value}) async {
CheckActivationCodeRequestModel checkActivationCodeForDoctorApp = CheckActivationCodeRequestModel checkActivationCodeForDoctorApp =
new CheckActivationCodeRequestModel( new CheckActivationCodeRequestModel(
zipCode: zipCode:
_loggedUser != null ? _loggedUser['ZipCode'] : user.zipCode, model.loggedUser != null ? model.loggedUser['ZipCode'] : model.user.zipCode,
mobileNumber: mobileNumber:
_loggedUser != null ? _loggedUser['MobileNumber'] : user.mobile, model.loggedUser != null ? model.loggedUser['MobileNumber'] : model.user.mobile,
projectID: await sharedPref.getInt(PROJECT_ID) != null projectID: await sharedPref.getInt(PROJECT_ID) != null
? await sharedPref.getInt(PROJECT_ID) ? await sharedPref.getInt(PROJECT_ID)
: user.projectID, : model.user.projectID,
logInTokenID: await sharedPref.getString(LOGIN_TOKEN_ID), logInTokenID: await sharedPref.getString(LOGIN_TOKEN_ID),
activationCode: value ?? '0000', activationCode: value ?? '0000',
oTPSendType: await sharedPref.getInt(OTP_TYPE), oTPSendType: await sharedPref.getInt(OTP_TYPE),
generalid: "Cs2020@2016\$2958"); generalid: "Cs2020@2016\$2958");
await widget.model.checkActivationCodeForDoctorApp(checkActivationCodeForDoctorApp); await model
.checkActivationCodeForDoctorApp(checkActivationCodeForDoctorApp);
if(widget.model.state == ViewState.ErrorLocal){ if (model.state == ViewState.ErrorLocal) {
Navigator.pop(context); Navigator.pop(context);
Helpers.showErrorToast(widget.model.error); Helpers.showErrorToast(model.error);
} else { } else {
sharedPref.setString(TOKEN, widget.model.checkActivationCodeForDoctorAppRes['AuthenticationTokenID']); sharedPref.setString(
if (widget.model.checkActivationCodeForDoctorAppRes['List_DoctorProfile'] != null) { TOKEN,
loginProcessCompleted(widget.model.checkActivationCodeForDoctorAppRes['List_DoctorProfile'][0]); model
sharedPref.setObj(CLINIC_NAME, widget.model.checkActivationCodeForDoctorAppRes['List_DoctorsClinic']); .checkActivationCodeForDoctorAppRes['AuthenticationTokenID']);
if (model.checkActivationCodeForDoctorAppRes['List_DoctorProfile'] !=
null) {
loginProcessCompleted(model.checkActivationCodeForDoctorAppRes['List_DoctorProfile'][0]);
sharedPref.setObj(
CLINIC_NAME,
model
.checkActivationCodeForDoctorAppRes['List_DoctorsClinic']);
} else { } else {
sharedPref.setObj(CLINIC_NAME, widget.model.checkActivationCodeForDoctorAppRes['List_DoctorsClinic']); sharedPref.setObj(
ClinicModel clinic = CLINIC_NAME,
ClinicModel.fromJson(widget.model.checkActivationCodeForDoctorAppRes['List_DoctorsClinic'][0]); model
.checkActivationCodeForDoctorAppRes['List_DoctorsClinic']);
ClinicModel clinic = ClinicModel.fromJson(model.checkActivationCodeForDoctorAppRes['List_DoctorsClinic'][0]);
getDocProfiles(clinic); getDocProfiles(clinic);
} }
} }
@ -783,16 +616,4 @@ class _VerificationMethodsState extends State<VerificationMethods> {
Helpers.showErrorToast(err); Helpers.showErrorToast(err);
}); });
} }
getDate(DateTime date) {
final DateFormat formatter = DateFormat('dd MMM yyyy');
return formatter.format(date);
}
getTime(DateTime date) {
final DateFormat formatter = DateFormat('HH:mm a');
return formatter.format(date);
}
} }

Loading…
Cancel
Save