fix sms pop up

merge-requests/928/head
Elham Rababh 4 years ago
parent 5d20480e9b
commit 74540f054a

@ -1,6 +1,5 @@
import 'dart:async'; import 'dart:async';
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/auth_method_types.dart'; 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/core/viewModel/project_view_model.dart';
@ -9,6 +8,7 @@ import 'package:doctor_app_flutter/util/translations_delegate_base.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:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class SMSOTP { class SMSOTP {
final AuthMethodTypes type; final AuthMethodTypes type;
final mobileNo; final mobileNo;
@ -48,231 +48,307 @@ class SMSOTP {
String displayTime = ''; String displayTime = '';
bool isClosed = false; bool isClosed = false;
displayDialog(BuildContext context) async { displayDialog(BuildContext context) async {
double dialogWidth = MediaQuery.of(context).size.width * 0.90;
double dialogInputWidth = (dialogWidth / 4) -
(SizeConfig.isWidthLarge
? SizeConfig.getWidthMultiplier(width: dialogWidth) * 4.5
: 20);
double dialogHeight = SizeConfig.isHeightVeryShort
? MediaQuery.of(context).size.height * 0.50
: MediaQuery.of(context).size.height * 0.40;
return showDialog( return showDialog(
context: context, context: context,
barrierColor: Colors.black.withOpacity(0.7), builder: (ctx) => Center(
builder: (context) { child: Container(
projectProvider = Provider.of(context); color: Colors.white,
return AlertDialog( height: dialogHeight,
contentPadding: EdgeInsets.fromLTRB(24.0, 0.0, 0.0, 24.0), width: dialogWidth,
content: StatefulBuilder(builder: (context, setState) { child: Material(
if (displayTime == '') { color: Colors.white,
startTimer(setState); child: SingleChildScrollView(
} child: Center(
return Container( child: Container(
color: Colors.white, color: Colors.white,
height: MediaQuery.of(context).size.height * 0.50, child: StatefulBuilder(builder: (context, setState) {
width: MediaQuery.of(context).size.width * 0.84, if (displayTime == '') {
child: Center( startTimer(setState);
child: SingleChildScrollView( }
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, return Center(
children: <Widget>[ child: FractionallySizedBox(
Padding( widthFactor: 0.9,
padding: EdgeInsets.all(13), child: Column(
child: Row( crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween, children: <Widget>[
children: [ SizedBox(
type == AuthMethodTypes.SMS height: SizeConfig.getHeightMultiplier(
? Padding( height: dialogHeight) *
child: Icon( 2,
DoctorApp.verify_sms_1, ),
size: 50,
),
padding: EdgeInsets.only(bottom: 20),
)
: Padding(
child: Icon(
DoctorApp.verify_whtsapp,
size: 50,
),
padding: EdgeInsets.only(bottom: 20),
),
Row( Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment:
children: <Widget>[ MainAxisAlignment.spaceBetween,
Padding( children: [
padding: EdgeInsets.only( Icon(
left: 10, right: 10, bottom: 20), type == AuthMethodTypes.SMS
child: IconButton( ? DoctorApp.verify_sms_1
icon: Icon(Icons.close), : DoctorApp.verify_whtsapp,
iconSize: 40, size: SizeConfig.getHeightMultiplier(
onPressed: () { height: dialogHeight) *
this.isClosed = true; 9,
Navigator.pop(context); color: Color(0xFF2B353E),
this.onFailure(); ),
}, Row(
)) mainAxisAlignment: MainAxisAlignment.end,
], children: <Widget>[
) IconButton(
])), icon: Icon(Icons.close),
Padding( color: Color(0xFF2B353E),
padding: EdgeInsets.only(top: 5, right: 5), iconSize:
child: AppText( SizeConfig.getHeightMultiplier(
TranslationBase.of(context).verificationMessage + height: dialogHeight) *
' XXXXXX' + 15,
mobileNo onPressed: () {
.toString() this.isClosed = true;
.substring(mobileNo.toString().length - 3), Navigator.pop(context);
textAlign: TextAlign.start, this.onFailure();
fontWeight: FontWeight.bold, },
fontSize: 14, )
maxLines: 2, ],
)), )
Form( ]),
key: verifyAccountForm, SizedBox(
child: Padding( height: SizeConfig.getHeightMultiplier(
padding: EdgeInsets.only(top: 20), height: dialogHeight) *
child: Directionality( (SizeConfig.isHeightVeryShort ? 10 : 5),
textDirection: TextDirection.ltr, ),
child: Row( Padding(
mainAxisAlignment: MainAxisAlignment.start, padding: EdgeInsets.only(top: 5, right: 5),
children: <Widget>[ child: AppText(
Container( TranslationBase.of(context)
width: SizeConfig.realScreenWidth * 0.16, .verificationMessage +
margin: EdgeInsets.all(5), ' XXXXXX' +
child: TextFormField( mobileNo.toString().substring(
textInputAction: TextInputAction.next, mobileNo.toString().length - 3),
style: buildTextStyle(), textAlign: TextAlign.start,
autofocus: true, fontWeight: FontWeight.w700,
maxLength: 1, letterSpacing: -0.48,
controller: digit1, color: Color(0xFF2B353E),
textAlign: TextAlign.center, fontSize: SizeConfig
keyboardType: TextInputType.number, .getTextMultiplierBasedOnWidth(
decoration: buildInputDecoration(context), width: dialogWidth) *
onSaved: (val) {}, 3.5, //14,
validator: validateCodeDigit, maxLines: 2,
onFieldSubmitted: (_) { )),
FocusScope.of(context) Form(
.requestFocus(focusD2); key: verifyAccountForm,
}, child: Padding(
onChanged: (val) { padding: EdgeInsets.only(
if (val.length == 1) { top: SizeConfig.getHeightMultiplier(
FocusScope.of(context) height: dialogHeight) *
.requestFocus(focusD2); 2),
verifyAccountFormValue['digit1'] = child: Directionality(
val.trim(); textDirection: TextDirection.ltr,
checkValue(); child: Row(
} mainAxisAlignment:
}, MainAxisAlignment.start,
), children: <Widget>[
), Container(
Container( width: dialogInputWidth,
width: SizeConfig.realScreenWidth * 0.16, height:
margin: EdgeInsets.all(5), SizeConfig.getHeightMultiplier(
child: TextFormField( height: dialogHeight) *
focusNode: focusD2, 30,
textInputAction: TextInputAction.next, margin: EdgeInsets.symmetric(
maxLength: 1, vertical: 2, horizontal: 5),
controller: digit2, child: TextFormField(
textAlign: TextAlign.center, textInputAction:
style: buildTextStyle(), TextInputAction.next,
keyboardType: TextInputType.number, style: buildTextStyle(),
decoration: buildInputDecoration(context), autofocus: true,
onSaved: (val) {}, maxLength: 1,
onFieldSubmitted: (_) { controller: digit1,
FocusScope.of(context) textAlign: TextAlign.center,
.requestFocus(focusD3); keyboardType:
}, TextInputType.number,
onChanged: (val) { decoration:
if (val.length == 1) { buildInputDecoration(context),
FocusScope.of(context) onSaved: (val) {},
.requestFocus(focusD3); validator: validateCodeDigit,
verifyAccountFormValue['digit2'] = onFieldSubmitted: (_) {
val.trim(); FocusScope.of(context)
checkValue(); .requestFocus(focusD2);
} },
}, onChanged: (val) {
validator: validateCodeDigit), if (val.length == 1) {
FocusScope.of(context)
.requestFocus(focusD2);
verifyAccountFormValue[
'digit1'] = val.trim();
checkValue();
}
},
),
),
Container(
width: dialogInputWidth,
height:
SizeConfig.getHeightMultiplier(
height: dialogHeight) *
30,
margin: EdgeInsets.symmetric(
vertical: 2, horizontal: 5),
child: TextFormField(
focusNode: focusD2,
textInputAction:
TextInputAction.next,
maxLength: 1,
controller: digit2,
textAlign: TextAlign.center,
style: buildTextStyle(),
keyboardType:
TextInputType.number,
decoration:
buildInputDecoration(
context),
onSaved: (val) {},
onFieldSubmitted: (_) {
FocusScope.of(context)
.requestFocus(focusD3);
},
onChanged: (val) {
if (val.length == 1) {
FocusScope.of(context)
.requestFocus(focusD3);
verifyAccountFormValue[
'digit2'] = val.trim();
checkValue();
}
},
validator: validateCodeDigit),
),
Container(
margin: EdgeInsets.symmetric(
vertical: 2, horizontal: 5),
width: dialogInputWidth,
height: SizeConfig
.getHeightMultiplier(
height:
dialogHeight) *
30,
child: TextFormField(
focusNode: focusD3,
textInputAction:
TextInputAction.next,
maxLength: 1,
controller: digit3,
textAlign: TextAlign.center,
style: buildTextStyle(),
keyboardType:
TextInputType.number,
decoration:
buildInputDecoration(
context),
onSaved: (val) {},
onFieldSubmitted: (_) {
FocusScope.of(context)
.requestFocus(focusD4);
},
onChanged: (val) {
if (val.length == 1) {
FocusScope.of(context)
.requestFocus(
focusD4);
verifyAccountFormValue[
'digit3'] =
val.trim();
checkValue();
}
},
validator:
validateCodeDigit)),
Container(
margin: EdgeInsets.symmetric(
vertical: 2, horizontal: 5),
width: dialogInputWidth,
height: SizeConfig
.getHeightMultiplier(
height:
dialogHeight) *
30,
child: TextFormField(
focusNode: focusD4,
maxLength: 1,
textAlign: TextAlign.center,
style: buildTextStyle(),
controller: digit4,
keyboardType:
TextInputType.number,
decoration:
buildInputDecoration(
context),
onFieldSubmitted: (_) {
FocusScope.of(context)
.requestFocus(focusD4);
},
onChanged: (val) {
if (val.length == 1) {
verifyAccountFormValue[
'digit4'] =
val.trim();
checkValue();
}
},
validator:
validateCodeDigit)),
],
)),
), ),
Container( ),
margin: EdgeInsets.all(5), Column(
width: SizeConfig.realScreenWidth * 0.16, mainAxisAlignment: MainAxisAlignment.start,
child: TextFormField( crossAxisAlignment: CrossAxisAlignment.start,
focusNode: focusD3, children: [
textInputAction: TextInputAction.next, AppText(
maxLength: 1, TranslationBase.of(context)
controller: digit3, .validationMessage +
textAlign: TextAlign.center, ' ',
style: buildTextStyle(), textAlign: TextAlign.start,
keyboardType: TextInputType.number, fontWeight: FontWeight.w700,
decoration: letterSpacing: -0.48,
buildInputDecoration(context), color: Color(0xFF2B353E),
onSaved: (val) {}, fontSize: SizeConfig
onFieldSubmitted: (_) { .getTextMultiplierBasedOnWidth(
FocusScope.of(context) width: dialogWidth) *
.requestFocus(focusD4); 3.5,
}, ),
onChanged: (val) { AppText(
if (val.length == 1) { displayTime,
FocusScope.of(context) color: Colors.red,
.requestFocus(focusD4); textAlign: TextAlign.start,
verifyAccountFormValue['digit3'] = fontWeight: FontWeight.bold,
val.trim(); fontSize: SizeConfig
checkValue(); .getTextMultiplierBasedOnWidth(
} width: dialogWidth) *
}, 3.5,
validator: validateCodeDigit)), )
Container( ])
margin: EdgeInsets.all(5), ],
width: SizeConfig.realScreenWidth * 0.16, ),
child: TextFormField( ),
focusNode: focusD4, );
maxLength: 1, })),
textAlign: TextAlign.center, ),
style: buildTextStyle(), ),
controller: digit4, ),
keyboardType: TextInputType.number, ),
decoration: ),
buildInputDecoration(context), );
onFieldSubmitted: (_) {
FocusScope.of(context)
.requestFocus(focusD4);
},
onChanged: (val) {
if (val.length == 1) {
verifyAccountFormValue['digit4'] =
val.trim();
checkValue();
}
},
validator: validateCodeDigit)),
],
)),
),
),
Padding(
padding: const EdgeInsets.all(12.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context).validationMessage +
' ',
fontWeight: FontWeight.w600,
fontSize: 14,
),
AppText(
displayTime,
color: Colors.red,
textAlign: TextAlign.start,
fontWeight: FontWeight.bold,
fontSize: 14,
)
]),
)
],
))),
);
}),
);
});
} }
TextStyle buildTextStyle() { TextStyle buildTextStyle() {
return TextStyle( return TextStyle(
fontSize: SizeConfig.textMultiplier * 3, fontSize: SizeConfig.textMultiplier * 2.5,
); );
} }
@ -316,7 +392,6 @@ class SMSOTP {
digit3.text.toString() + digit3.text.toString() +
digit4.text.toString()); digit4.text.toString());
this.isClosed = true; this.isClosed = true;
} }
} }
@ -341,7 +416,7 @@ class SMSOTP {
displayTime = this.getSecondsAsDigitalClock(this.remainingTime); displayTime = this.getSecondsAsDigitalClock(this.remainingTime);
}); });
Future.delayed(Duration(seconds: 1), () { Future.delayed(Duration(seconds: 1), () {
if (this.remainingTime > 0) { if (this.remainingTime > 0) {
if (isClosed == false) { if (isClosed == false) {
startTimer(setState); startTimer(setState);

Loading…
Cancel
Save