local Auth fix

merge-update-with-lab-changes
Aamir.Muhammad 2 years ago
parent 4c0d758dd1
commit 0588e68c67

@ -40,15 +40,14 @@ import 'package:flutter_svg/flutter_svg.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.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';
import 'package:local_auth_ios/local_auth_ios.dart'; import 'package:local_auth_darwin/types/auth_messages_ios.dart';
class ConfirmLogin extends StatefulWidget { class ConfirmLogin extends StatefulWidget {
final Function? changePageViewIndex; final Function? changePageViewIndex;
final fromRegistration; final fromRegistration;
final bool isDubai; final bool isDubai;
const ConfirmLogin( const ConfirmLogin({Key? key,
{Key? key,
this.changePageViewIndex, this.changePageViewIndex,
this.fromRegistration = false, this.fromRegistration = false,
this.isDubai = false}) this.isDubai = false})
@ -145,7 +144,9 @@ class _ConfirmLogin extends State<ConfirmLogin> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
TranslationBase.of(context).welcomeBack, TranslationBase
.of(context)
.welcomeBack,
style: TextStyle( style: TextStyle(
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -163,7 +164,9 @@ class _ConfirmLogin extends State<ConfirmLogin> {
), ),
SizedBox(height: 10), SizedBox(height: 10),
Text( Text(
TranslationBase.of(context).accountInfo, TranslationBase
.of(context)
.accountInfo,
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -193,7 +196,8 @@ class _ConfirmLogin extends State<ConfirmLogin> {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Text( Text(
TranslationBase.of(context) TranslationBase
.of(context)
.lastLoginAt .lastLoginAt
.toCamelCase, .toCamelCase,
style: TextStyle( style: TextStyle(
@ -225,7 +229,8 @@ class _ConfirmLogin extends State<ConfirmLogin> {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Text( Text(
TranslationBase.of(context) TranslationBase
.of(context)
.lastLoginWith .lastLoginWith
.toCamelCase, .toCamelCase,
style: TextStyle( style: TextStyle(
@ -268,7 +273,9 @@ class _ConfirmLogin extends State<ConfirmLogin> {
), ),
), ),
Text( Text(
TranslationBase.of(context).pleaseVerify, TranslationBase
.of(context)
.pleaseVerify,
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -306,7 +313,9 @@ class _ConfirmLogin extends State<ConfirmLogin> {
SizedBox(height: 23), SizedBox(height: 23),
this.onlySMSBox == false this.onlySMSBox == false
? Text( ? Text(
TranslationBase.of(context).verifyLoginWith, TranslationBase
.of(context)
.verifyLoginWith,
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -315,7 +324,8 @@ class _ConfirmLogin extends State<ConfirmLogin> {
height: 25 / 16), height: 25 / 16),
) )
: Text( : Text(
TranslationBase.of(context) TranslationBase
.of(context)
.verifyFingerprint2, .verifyFingerprint2,
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
@ -326,7 +336,9 @@ class _ConfirmLogin extends State<ConfirmLogin> {
), ),
SizedBox(height: 23), SizedBox(height: 23),
Text( Text(
TranslationBase.of(context).pleaseVerify, TranslationBase
.of(context)
.pleaseVerify,
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -357,7 +369,9 @@ class _ConfirmLogin extends State<ConfirmLogin> {
height: 12, height: 12,
), ),
DefaultButton( DefaultButton(
TranslationBase.of(context).useAnotherAccount, TranslationBase
.of(context)
.useAnotherAccount,
() { () {
Navigator.of(context).pushNamed(LOGIN_TYPE); Navigator.of(context).pushNamed(LOGIN_TYPE);
projectViewModel.analytics.loginRegistration projectViewModel.analytics.loginRegistration
@ -450,7 +464,8 @@ class _ConfirmLogin extends State<ConfirmLogin> {
sharedPref.setObject(REGISTER_DATA_FOR_REGISTER, request); sharedPref.setObject(REGISTER_DATA_FOR_REGISTER, request);
authService authService
.checkPatientAuthentication(request) .checkPatientAuthentication(request)
.then((value) => { .then((value) =>
{
GifLoaderDialogUtils.hideDialog(context), GifLoaderDialogUtils.hideDialog(context),
if (value['isSMSSent']) if (value['isSMSSent'])
{ {
@ -519,7 +534,8 @@ class _ConfirmLogin extends State<ConfirmLogin> {
(value) { (value) {
this.checkActivationCode(value: value); this.checkActivationCode(value: value);
}, },
() => { () =>
{
Navigator.pop(context), Navigator.pop(context),
}, },
).displayDialog(context); ).displayDialog(context);
@ -699,7 +715,8 @@ class _ConfirmLogin extends State<ConfirmLogin> {
authService authService
.checkActivationCodeRegister(request, value) .checkActivationCodeRegister(request, value)
.then((result) => { .then((result) =>
{
res = result, res = result,
if (result is Map) if (result is Map)
{ {
@ -743,7 +760,8 @@ class _ConfirmLogin extends State<ConfirmLogin> {
} else { } else {
authService authService
.checkActivationCode(request, value) .checkActivationCode(request, value)
.then((result) => { .then((result) =>
{
res = result, res = result,
if (result is Map) if (result is Map)
{ {
@ -888,7 +906,8 @@ class _ConfirmLogin extends State<ConfirmLogin> {
getToDoCount(); getToDoCount();
appointmentRateViewModel appointmentRateViewModel
.getIsLastAppointmentRatedList(projectViewModel.isArabic ? 1 : 2) .getIsLastAppointmentRatedList(projectViewModel.isArabic ? 1 : 2)
.then((value) => { .then((value) =>
{
GifLoaderDialogUtils.hideDialog(AppGlobal.context), GifLoaderDialogUtils.hideDialog(AppGlobal.context),
if (appointmentRateViewModel.isHaveAppointmentNotRate) if (appointmentRateViewModel.isHaveAppointmentNotRate)
{ {
@ -931,8 +950,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
}); });
} }
Widget _loginOptionButton( Widget _loginOptionButton(String _title, String _icon, int _flag, int? _loginIndex) {
String _title, String _icon, int _flag, int? _loginIndex) {
bool isDisable = bool isDisable =
(_flag == 3 && !checkIfBiometricAvailable(BiometricType.face) || (_flag == 3 && !checkIfBiometricAvailable(BiometricType.face) ||
_flag == 2 && _flag == 2 &&
@ -974,7 +992,9 @@ class _ConfirmLogin extends State<ConfirmLogin> {
color: isDisable ? Color(0xff2B353E).withOpacity(0.7) : null, color: isDisable ? Color(0xff2B353E).withOpacity(0.7) : null,
), ),
Text( Text(
TranslationBase.of(context).verifyThrough + " " + _title, TranslationBase
.of(context)
.verifyThrough + " " + _title,
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -994,23 +1014,31 @@ class _ConfirmLogin extends State<ConfirmLogin> {
Widget getButton(int flag) { Widget getButton(int flag) {
switch (flag) { switch (flag) {
case 4: case 4:
return _loginOptionButton(TranslationBase.of(context).verifyWhatsApp, return _loginOptionButton(TranslationBase
.of(context)
.verifyWhatsApp,
'assets/images/new/verify_whatsapp.svg', flag, null); 'assets/images/new/verify_whatsapp.svg', flag, null);
break; break;
case 1: case 1:
return _loginOptionButton(TranslationBase.of(context).verifySMS, return _loginOptionButton(TranslationBase
.of(context)
.verifySMS,
'assets/images/new/verify_sms.svg', flag, null); 'assets/images/new/verify_sms.svg', flag, null);
break; break;
case 2: case 2:
return _loginOptionButton( return _loginOptionButton(
TranslationBase.of(context).verifyFingerprint, TranslationBase
.of(context)
.verifyFingerprint,
'assets/images/new/verify_thumb.svg', 'assets/images/new/verify_thumb.svg',
flag, flag,
BiometricType.fingerprint.index); BiometricType.fingerprint.index);
break; break;
case 3: case 3:
return _loginOptionButton( return _loginOptionButton(
TranslationBase.of(context).verifyFaceID, TranslationBase
.of(context)
.verifyFaceID,
'assets/images/new/verify_face.svg', 'assets/images/new/verify_face.svg',
flag, flag,
BiometricType.face.index); BiometricType.face.index);
@ -1018,7 +1046,8 @@ class _ConfirmLogin extends State<ConfirmLogin> {
default: default:
return InkWell( return InkWell(
onTap: () => { onTap: () =>
{
setState(() { setState(() {
isMoreOption = true; isMoreOption = true;
}) })
@ -1046,7 +1075,9 @@ class _ConfirmLogin extends State<ConfirmLogin> {
: SizedBox( : SizedBox(
height: 20, height: 20,
), ),
Texts(TranslationBase.of(context).moreVerification, Texts(TranslationBase
.of(context)
.moreVerification,
fontSize: SizeConfig.textMultiplier! * 1.8, fontSize: SizeConfig.textMultiplier! * 1.8,
textAlign: TextAlign.center, textAlign: TextAlign.center,
color: Colors.black) color: Colors.black)
@ -1061,19 +1092,29 @@ class _ConfirmLogin extends State<ConfirmLogin> {
getType(type, context) { getType(type, context) {
switch (type) { switch (type) {
case 1: case 1:
return TranslationBase.of(context).verifySMS; return TranslationBase
.of(context)
.verifySMS;
break; break;
case 2: case 2:
return TranslationBase.of(context).verifyFingerprint; return TranslationBase
.of(context)
.verifyFingerprint;
break; break;
case 3: case 3:
return TranslationBase.of(context).verifyFaceID; return TranslationBase
.of(context)
.verifyFaceID;
break; break;
case 4: case 4:
return TranslationBase.of(context).verifyWhatsApp; return TranslationBase
.of(context)
.verifyWhatsApp;
break; break;
default: default:
return TranslationBase.of(context).verifySMS; return TranslationBase
.of(context)
.verifySMS;
break; break;
} }
} }

@ -51,7 +51,7 @@ dependencies:
pull_to_refresh: ^2.0.0 pull_to_refresh: ^2.0.0
# Native # Native
local_auth: ^2.1.7 local_auth: ^2.2.0
localstorage: ^4.0.0+1 localstorage: ^4.0.0+1
maps_launcher: ^2.0.1 maps_launcher: ^2.0.1
url_launcher: ^6.0.15 url_launcher: ^6.0.15

Loading…
Cancel
Save