Merge branch 'sultan' into 'development'

Sultan

See merge request Cloud_Solution/doctor_app_flutter!465
merge-requests/466/merge
Mohammad Aljammal 5 years ago
commit fd63977dd5

@ -119,7 +119,7 @@ class _LoginsreenState extends State<Loginsreen> {
children: <Widget>[ children: <Widget>[
AuthHeader(loginType.knownUser), AuthHeader(loginType.knownUser),
SizedBox( SizedBox(
height: 60, height: 40,
), ),
LoginForm( LoginForm(
changeLoadingStata: changeLoadingStata, changeLoadingStata: changeLoadingStata,

@ -69,231 +69,232 @@ class _LoginFormState extends State<LoginForm> {
return Form( return Form(
key: loginFormKey, key: loginFormKey,
child: Container( child: Column(
width: SizeConfig.realScreenWidth * 0.90, mainAxisAlignment: MainAxisAlignment.spaceBetween,
child: Column( children: <Widget>[
crossAxisAlignment: CrossAxisAlignment.start, Container(
children: <Widget>[ width: SizeConfig.realScreenWidth * 0.90,
buildSizedBox(), height: SizeConfig.realScreenHeight * 0.65,
Padding( child:
child: AppText( Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
TranslationBase.of(context).enterCredentials, buildSizedBox(),
fontSize: 18, Padding(
fontWeight: FontWeight.bold, child: AppText(
), TranslationBase.of(context).enterCredentials,
padding: EdgeInsets.only(top: 10, bottom: 10)), fontSize: 18,
Container( fontWeight: FontWeight.bold,
decoration: BoxDecoration( ),
borderRadius: BorderRadius.all(Radius.circular(6.0)), padding: EdgeInsets.only(top: 10, bottom: 10)),
border: Border.all( Container(
width: 1.0, decoration: BoxDecoration(
color: HexColor("#CCCCCC"), borderRadius: BorderRadius.all(Radius.circular(6.0)),
), border: Border.all(
color: Colors.white), width: 1.0,
child: Column( color: HexColor("#CCCCCC"),
crossAxisAlignment: CrossAxisAlignment.start, ),
children: [ color: Colors.white),
Padding( child: Column(
padding: EdgeInsets.only(left: 10, top: 10), crossAxisAlignment: CrossAxisAlignment.start,
child: AppText( children: [
TranslationBase.of(context).enterId, Padding(
fontWeight: FontWeight.w800, padding: EdgeInsets.only(left: 10, top: 10),
fontSize: 14, child: AppText(
)), TranslationBase.of(context).enterId,
AppTextFormField( fontWeight: FontWeight.w800,
labelText: '', fontSize: 14,
borderColor: Colors.white, )),
// keyboardType: TextInputType.number, AppTextFormField(
textInputAction: TextInputAction.next, labelText: '',
// decoration: buildInputDecoration( borderColor: Colors.white,
// context, // keyboardType: TextInputType.number,
// TranslationBase.of(context).enterId, textInputAction: TextInputAction.next,
// 'assets/images/user_id_icon.png'), // decoration: buildInputDecoration(
validator: (value) { // context,
if (value != null && value.isEmpty) { // TranslationBase.of(context).enterId,
return TranslationBase.of(context) // 'assets/images/user_id_icon.png'),
.pleaseEnterYourID; validator: (value) {
} if (value != null && value.isEmpty) {
return null; return TranslationBase.of(context)
}, .pleaseEnterYourID;
onSaved: (value) { }
if (value != null) userInfo.userID = value.trim(); return null;
}, },
onChanged: (value) { onSaved: (value) {
if (value != null) userInfo.userID = value.trim(); if (value != null) userInfo.userID = value.trim();
}, },
onFieldSubmitted: (_) { onChanged: (value) {
focusPass.nextFocus(); if (value != null) userInfo.userID = value.trim();
}, },
// onEditingComplete: () {}, onFieldSubmitted: (_) {
// autofocus: false, focusPass.nextFocus();
) },
])), // onEditingComplete: () {},
buildSizedBox(), // autofocus: false,
Container( )
decoration: BoxDecoration( ])),
borderRadius: BorderRadius.all(Radius.circular(6.0)), buildSizedBox(),
border: Border.all( Container(
width: 1.0, decoration: BoxDecoration(
color: HexColor("#CCCCCC"), borderRadius: BorderRadius.all(Radius.circular(6.0)),
), border: Border.all(
color: Colors.white), width: 1.0,
child: Column( color: HexColor("#CCCCCC"),
crossAxisAlignment: CrossAxisAlignment.start, ),
children: [ color: Colors.white),
Padding( child: Column(
padding: EdgeInsets.only(left: 10, top: 10), crossAxisAlignment: CrossAxisAlignment.start,
child: AppText( children: [
TranslationBase.of(context).enterPassword, Padding(
fontWeight: FontWeight.w800, padding: EdgeInsets.only(left: 10, top: 10),
fontSize: 14, child: AppText(
)), TranslationBase.of(context).enterPassword,
AppTextFormField( fontWeight: FontWeight.w800,
focusNode: focusPass, fontSize: 14,
obscureText: true, )),
borderColor: Colors.white, AppTextFormField(
textInputAction: TextInputAction.next, focusNode: focusPass,
// decoration: buildInputDecoration( obscureText: true,
// context, borderColor: Colors.white,
// TranslationBase.of(context).enterPassword, textInputAction: TextInputAction.next,
// 'assets/images/password_icon.png'), // decoration: buildInputDecoration(
validator: (value) { // context,
if (value != null && value.isEmpty) { // TranslationBase.of(context).enterPassword,
return TranslationBase.of(context) // 'assets/images/password_icon.png'),
.pleaseEnterPassword; validator: (value) {
} if (value != null && value.isEmpty) {
return null; return TranslationBase.of(context)
}, .pleaseEnterPassword;
onSaved: (value) { }
userInfo.password = value; return null;
}, },
onFieldSubmitted: (_) { onSaved: (value) {
focusPass.nextFocus(); userInfo.password = value;
helpers.showCupertinoPicker(context, projectsList, },
'facilityName', onSelectProject); onFieldSubmitted: (_) {
}, focusPass.nextFocus();
onTap: () { helpers.showCupertinoPicker(context, projectsList,
this.getProjects(userInfo.userID); 'facilityName', onSelectProject);
}, },
) onTap: () {
])), this.getProjects(userInfo.userID);
buildSizedBox(), },
projectsList.length > 0 )
? Container( ])),
decoration: BoxDecoration( buildSizedBox(),
borderRadius: BorderRadius.all(Radius.circular(6.0)), projectsList.length > 0
border: Border.all( ? Container(
width: 1.0, decoration: BoxDecoration(
color: HexColor("#CCCCCC"), borderRadius: BorderRadius.all(Radius.circular(6.0)),
), border: Border.all(
color: Colors.white), width: 1.0,
child: Column( color: HexColor("#CCCCCC"),
crossAxisAlignment: CrossAxisAlignment.start, ),
children: [ color: Colors.white),
Padding( child: Column(
padding: EdgeInsets.only(left: 10, top: 10), crossAxisAlignment: CrossAxisAlignment.start,
child: AppText( children: [
TranslationBase.of(context).selectYourProject, Padding(
fontWeight: FontWeight.w600, padding: EdgeInsets.only(left: 10, top: 10),
)), child: AppText(
AppTextFormField( TranslationBase.of(context).selectYourProject,
focusNode: focusProject, fontWeight: FontWeight.w600,
controller: projectIdController, )),
borderColor: Colors.white, AppTextFormField(
suffixIcon: Icons.arrow_drop_down, focusNode: focusProject,
onTap: () { controller: projectIdController,
helpers.showCupertinoPicker( borderColor: Colors.white,
context, suffixIcon: Icons.arrow_drop_down,
projectsList, onTap: () {
'facilityName', helpers.showCupertinoPicker(
onSelectProject); context,
}, projectsList,
// showCursor: false, 'facilityName',
// //readOnly: true, onSelectProject);
},
// showCursor: false,
// //readOnly: true,
// decoration: buildInputDecoration(
// context,
// TranslationBase.of(context).selectYourProject,
// 'assets/images/password_icon.png'),
validator: (value) {
if (value != null && value.isEmpty) {
return TranslationBase.of(context)
.pleaseEnterYourProject;
}
return null;
})
]))
: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
border: Border.all(
width: 1.0,
color: HexColor("#CCCCCC"),
),
color: Colors.white),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: EdgeInsets.only(left: 10, top: 10),
child: AppText(
TranslationBase.of(context).selectYourProject,
fontWeight: FontWeight.w800,
fontSize: 14,
)),
AppTextFormField(
readOnly: true, borderColor: Colors.white,
prefix: IconButton(
icon: Icon(Icons.arrow_drop_down),
iconSize: 30,
padding: EdgeInsets.only(bottom: 30),
),
// decoration: buildInputDecoration( // decoration: buildInputDecoration(
// context, // context,
// TranslationBase.of(context).selectYourProject, // TranslationBase.of(context)
// 'assets/images/password_icon.png'), // .pleaseEnterYourProject,
validator: (value) { // 'assets/images/password_icon.png')
if (value != null && value.isEmpty) { )
return TranslationBase.of(context) ])),
.pleaseEnterYourProject; ]),
} ),
return null; Row(
}) mainAxisAlignment: MainAxisAlignment.end,
])) children: <Widget>[
: Container( Expanded(
decoration: BoxDecoration( child: Button(
borderRadius: BorderRadius.all(Radius.circular(6.0)), title: TranslationBase.of(context).login,
border: Border.all( color: HexColor('#D02127'),
width: 1.0, onTap: () {
color: HexColor("#CCCCCC"), login(context, authProv, widget.changeLoadingStata);
), },
color: Colors.white), )),
child: Column( ],
crossAxisAlignment: CrossAxisAlignment.start, )
children: [ // Row(
Padding( // mainAxisAlignment: MainAxisAlignment.end,
padding: EdgeInsets.only(left: 10, top: 10), // children: <Widget>[
child: AppText( // RaisedButton(
TranslationBase.of(context).selectYourProject, // onPressed: () {
fontWeight: FontWeight.w800, // login(context, authProv, widget.changeLoadingStata);
fontSize: 14, // },
)), // textColor: Colors.white,
AppTextFormField( // elevation: 0.0,
readOnly: true, borderColor: Colors.white, // padding: const EdgeInsets.all(0.0),
prefix: IconButton( // shape: RoundedRectangleBorder(
icon: Icon(Icons.arrow_drop_down), // borderRadius: BorderRadius.circular(10),
iconSize: 30, // side: BorderSide(width: 0.5, color: HexColor('#CCCCCC'))),
padding: EdgeInsets.only(bottom: 30), // child: Container(
), // padding: const EdgeInsets.all(10.0),
// height: 50,
// decoration: buildInputDecoration( // width: SizeConfig.realScreenWidth * 0.35,
// context, // child: ),
// TranslationBase.of(context) // )
// .pleaseEnterYourProject, // ],
// 'assets/images/password_icon.png') // ),
) ],
])),
SizedBox(
height: 100,
),
Row(
children: <Widget>[
Expanded(
child: Button(
title: TranslationBase.of(context).login,
color: Colors.red[700],
onTap: () {
login(context, authProv, widget.changeLoadingStata);
},
)),
],
)
// Row(
// mainAxisAlignment: MainAxisAlignment.end,
// children: <Widget>[
// RaisedButton(
// onPressed: () {
// login(context, authProv, widget.changeLoadingStata);
// },
// textColor: Colors.white,
// elevation: 0.0,
// padding: const EdgeInsets.all(0.0),
// shape: RoundedRectangleBorder(
// borderRadius: BorderRadius.circular(10),
// side: BorderSide(width: 0.5, color: HexColor('#CCCCCC'))),
// child: Container(
// padding: const EdgeInsets.all(10.0),
// height: 50,
// width: SizeConfig.realScreenWidth * 0.35,
// child: ),
// )
// ],
// ),
],
),
), ),
); );
} }

@ -60,20 +60,8 @@ class SMSOTP {
builder: (context) { builder: (context) {
projectProvider = Provider.of(context); projectProvider = Provider.of(context);
return AlertDialog( return AlertDialog(
contentPadding: EdgeInsets.fromLTRB(24.0, 20.0, 0.0, 24.0), contentPadding: EdgeInsets.fromLTRB(24.0, 0.0, 0.0, 24.0),
title: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
IconButton(
icon: Icon(Icons.close),
onPressed: () {
this.isClosed = true;
Navigator.pop(context);
this.onFailure();
},
)
],
),
// shape: RoundedRectangleBorder( // shape: RoundedRectangleBorder(
// borderRadius: BorderRadius.all(Radius.circular(10.0))), // borderRadius: BorderRadius.all(Radius.circular(10.0))),
content: StatefulBuilder(builder: (context, setState) { content: StatefulBuilder(builder: (context, setState) {
@ -89,21 +77,44 @@ class SMSOTP {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
type == 1 Padding(
? Padding( padding: EdgeInsets.all(10),
child: Icon( child: Row(
DoctorApp.verify_sms_1, mainAxisAlignment: MainAxisAlignment.spaceBetween,
size: 40, children: [
), type == 1
padding: EdgeInsets.only(bottom: 20), ? Padding(
) child: Icon(
: Padding( DoctorApp.verify_sms_1,
child: Icon( size: 40,
DoctorApp.verify_whtsapp, ),
size: 40, padding: EdgeInsets.only(bottom: 20),
), )
padding: EdgeInsets.only(bottom: 20), : Padding(
), child: Icon(
DoctorApp.verify_whtsapp,
size: 40,
),
padding: EdgeInsets.only(bottom: 20),
),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
Padding(
padding: EdgeInsets.only(
left: 10, right: 10, bottom: 20),
child: IconButton(
icon: Icon(Icons.close),
iconSize: 40,
onPressed: () {
this.isClosed = true;
Navigator.pop(context);
this.onFailure();
},
))
],
)
])),
Padding( Padding(
padding: EdgeInsets.only(top: 5), padding: EdgeInsets.only(top: 5),
child: AppText( child: AppText(

Loading…
Cancel
Save