fix design

merge-requests/709/head
Elham Rababah 5 years ago
parent 69eca869b4
commit 837ff69c82

@ -2,14 +2,11 @@ import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/model/hospitals/get_hospitals_response_model.dart'; import 'package:doctor_app_flutter/core/model/hospitals/get_hospitals_response_model.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/screens/auth/verification_methods_screen.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.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/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/shared/text_fields/app-textfield-custom.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/app_text_form_field.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -26,7 +23,6 @@ class _LoginScreenState extends State<LoginScreen> {
String platformImei; String platformImei;
bool allowCallApi = true; bool allowCallApi = true;
//TODO change AppTextFormField to AppTextFormFieldCustom
final loginFormKey = GlobalKey<FormState>(); final loginFormKey = GlobalKey<FormState>();
var projectIdController = TextEditingController(); var projectIdController = TextEditingController();
var userIdController = TextEditingController(); var userIdController = TextEditingController();
@ -42,20 +38,16 @@ class _LoginScreenState extends State<LoginScreen> {
return AppScaffold( return AppScaffold(
isShowAppBar: false, isShowAppBar: false,
backgroundColor: HexColor('#F8F8F8'), backgroundColor: HexColor('#F8F8F8'),
body: SafeArea( body: SingleChildScrollView(
child: ListView(children: <Widget>[ child: SafeArea(
Container( child: Container(
margin: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 30), margin: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 30),
alignment: Alignment.topLeft, alignment: Alignment.topLeft,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
//TODO Use App Text rather than text //TODO Use App Text rather than text
Container( Container(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment crossAxisAlignment: CrossAxisAlignment
.start, .start,
@ -80,7 +72,7 @@ class _LoginScreenState extends State<LoginScreen> {
.of(context) .of(context)
.welcomeTo, .welcomeTo,
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 12,
fontWeight: FontWeight fontWeight: FontWeight
.w600, .w600,
fontFamily: 'Poppins'), fontFamily: 'Poppins'),
@ -93,24 +85,14 @@ class _LoginScreenState extends State<LoginScreen> {
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
fontWeight: FontWeight fontWeight: FontWeight
.bold, .bold,
fontSize: SizeConfig fontSize: 24,
.isMobile
? 24
: SizeConfig
.realScreenWidth *
0.029,
fontFamily: 'Poppins'), fontFamily: 'Poppins'),
), ),
Text( Text(
"Doctor App", "Doctor App",
style: TextStyle( style: TextStyle(
fontSize: fontSize: 12,
SizeConfig.isMobile
? 16
: SizeConfig
.realScreenWidth *
0.030,
fontWeight: FontWeight fontWeight: FontWeight
.w600, .w600,
color: Color(0xFFD02127)), color: Color(0xFFD02127)),
@ -124,16 +106,6 @@ class _LoginScreenState extends State<LoginScreen> {
Form( Form(
key: loginFormKey, key: loginFormKey,
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment
.spaceBetween,
children: <Widget>[
Container(
width: SizeConfig
.realScreenWidth * 0.90,
height: SizeConfig
.realScreenHeight * 0.65,
child:
Column(
crossAxisAlignment: CrossAxisAlignment crossAxisAlignment: CrossAxisAlignment
.start, children: [ .start, children: [
@ -166,14 +138,9 @@ class _LoginScreenState extends State<LoginScreen> {
value value
.trim(); .trim();
}); });
// if(allowCallApi) {
this.getProjects( this.getProjects(
authenticationViewModel.userInfo authenticationViewModel.userInfo
.userID); .userID);
// setState(() {
// allowCallApi = false;
// });
// }
}, },
onClick: (){ onClick: (){
@ -198,20 +165,19 @@ class _LoginScreenState extends State<LoginScreen> {
), ),
buildSizedBox() buildSizedBox(),
]), ]),
), ),
], SizedBox(
height: 40,
), ),
)
], ],
) )),
])) ),
]),
), ),
bottomSheet: Container( bottomSheet: Container(
height: 90, height: 85,
width: double.infinity, width: double.infinity,
child: Center( child: Center(
child: FractionallySizedBox( child: FractionallySizedBox(
@ -260,15 +226,6 @@ class _LoginScreenState extends State<LoginScreen> {
} else { } else {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
authenticationViewModel.setUnverified(true,isFromLogin: true); authenticationViewModel.setUnverified(true,isFromLogin: true);
// Navigator.of(context).pushReplacement(
// MaterialPageRoute(
// builder: (BuildContext context) =>
// VerificationMethodsScreen(
// password: authenticationViewModel.userInfo.password,
// isFromLogin: true,
// ),
// ),
// );
} }
} }
} }

@ -65,16 +65,13 @@ class _VerificationMethodsScreenState extends State<VerificationMethodsScreen> {
body: SingleChildScrollView( body: SingleChildScrollView(
child: Center( child: Center(
child: FractionallySizedBox( child: FractionallySizedBox(
child: Container( widthFactor: 0.9,
margin: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 0),
height: SizeConfig.realScreenHeight * .95,
width: SizeConfig.realScreenWidth,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
// mainAxisAlignment: MainAxisAlignment.spaceBetween, // mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
height: 80, height: 40,
), ),
if(authenticationViewModel.isFromLogin) if(authenticationViewModel.isFromLogin)
InkWell( InkWell(
@ -85,9 +82,7 @@ class _VerificationMethodsScreenState extends State<VerificationMethodsScreen> {
child: Icon(Icons.arrow_back_ios,color: Color(0xFF2B353E),) child: Icon(Icons.arrow_back_ios,color: Color(0xFF2B353E),)
), ),
Container( Column(
child: Column(
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
height: 20, height: 20,
@ -382,13 +377,11 @@ class _VerificationMethodsScreenState extends State<VerificationMethodsScreen> {
// ) // )
], ],
), ),
),
], ],
), ),
), ),
), ),
), ),
),
bottomSheet: authenticationViewModel.user == null ? SizedBox(height: 0,) : Container( bottomSheet: authenticationViewModel.user == null ? SizedBox(height: 0,) : Container(
height: 90, height: 90,
width: double.infinity, width: double.infinity,

@ -31,7 +31,7 @@ class MethodTypeCard extends StatelessWidget {
), ),
height: 170, height: 170,
child: Padding( child: Padding(
padding: EdgeInsets.fromLTRB(20, 15, 20, 15), padding: EdgeInsets.fromLTRB(10, 15, 10, 15),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -50,7 +50,7 @@ class MethodTypeCard extends StatelessWidget {
), ),
AppText( AppText(
label, label,
fontSize: 14, fontSize: 12,
color: Color(0xFF2E303A), color: Color(0xFF2E303A),
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
) )

@ -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';
@ -48,6 +47,8 @@ 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.84;
double dialogHeight = MediaQuery.of(context).size.height * 0.50;
return showDialog( return showDialog(
context: context, context: context,
barrierColor: Colors.black.withOpacity(0.7), barrierColor: Colors.black.withOpacity(0.7),
@ -61,8 +62,8 @@ class SMSOTP {
} }
return Container( return Container(
color: Colors.white, color: Colors.white,
height: MediaQuery.of(context).size.height * 0.50, height: dialogHeight,
width: MediaQuery.of(context).size.width * 0.84, width: dialogWidth,
child: Center( child: Center(
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
@ -71,20 +72,15 @@ class SMSOTP {
Padding( Padding(
padding: EdgeInsets.all(13), padding: EdgeInsets.all(13),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment
.spaceBetween,
children: [ children: [
type == AuthMethodTypes.SMS Padding(
? Padding(
child: Icon(
DoctorApp.verify_sms_1,
size: 50,
),
padding: EdgeInsets.only(bottom: 20),
)
: Padding(
child: Icon( child: Icon(
DoctorApp.verify_whtsapp, type == AuthMethodTypes.SMS
size: 50, ? DoctorApp.verify_sms_1
: DoctorApp.verify_whtsapp,
size: dialogWidth * 0.13,
), ),
padding: EdgeInsets.only(bottom: 20), padding: EdgeInsets.only(bottom: 20),
), ),
@ -96,7 +92,7 @@ class SMSOTP {
left: 10, right: 10, bottom: 20), left: 10, right: 10, bottom: 20),
child: IconButton( child: IconButton(
icon: Icon(Icons.close), icon: Icon(Icons.close),
iconSize: 40, iconSize: dialogWidth * 0.13,
onPressed: () { onPressed: () {
this.isClosed = true; this.isClosed = true;
Navigator.pop(context); Navigator.pop(context);
@ -129,17 +125,20 @@ class SMSOTP {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Container( Container(
width: SizeConfig.realScreenWidth * 0.16, width: (dialogWidth / 4) - 20,
height: 100,
margin: EdgeInsets.all(5), margin: EdgeInsets.all(5),
child: TextFormField( child: TextFormField(
textInputAction: TextInputAction.next, textInputAction: TextInputAction
.next,
style: buildTextStyle(), style: buildTextStyle(),
autofocus: true, autofocus: true,
maxLength: 1, maxLength: 1,
controller: digit1, controller: digit1,
textAlign: TextAlign.center, textAlign: TextAlign.center,
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
decoration: buildInputDecoration(context), decoration: buildInputDecoration(
context),
onSaved: (val) {}, onSaved: (val) {},
validator: validateCodeDigit, validator: validateCodeDigit,
onFieldSubmitted: (_) { onFieldSubmitted: (_) {
@ -158,17 +157,20 @@ class SMSOTP {
), ),
), ),
Container( Container(
width: SizeConfig.realScreenWidth * 0.16, width: dialogWidth / 4 - 30,
margin: EdgeInsets.all(5), margin: EdgeInsets.all(5),
child: TextFormField( child: TextFormField(
focusNode: focusD2, focusNode: focusD2,
textInputAction: TextInputAction.next, textInputAction: TextInputAction
.next,
maxLength: 1, maxLength: 1,
controller: digit2, controller: digit2,
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: buildTextStyle(), style: buildTextStyle(),
keyboardType: TextInputType.number, keyboardType: TextInputType
decoration: buildInputDecoration(context), .number,
decoration: buildInputDecoration(
context),
onSaved: (val) {}, onSaved: (val) {},
onFieldSubmitted: (_) { onFieldSubmitted: (_) {
FocusScope.of(context) FocusScope.of(context)
@ -187,15 +189,17 @@ class SMSOTP {
), ),
Container( Container(
margin: EdgeInsets.all(5), margin: EdgeInsets.all(5),
width: SizeConfig.realScreenWidth * 0.16, width: dialogWidth / 4 - 30,
child: TextFormField( child: TextFormField(
focusNode: focusD3, focusNode: focusD3,
textInputAction: TextInputAction.next, textInputAction: TextInputAction
.next,
maxLength: 1, maxLength: 1,
controller: digit3, controller: digit3,
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: buildTextStyle(), style: buildTextStyle(),
keyboardType: TextInputType.number, keyboardType: TextInputType
.number,
decoration: decoration:
buildInputDecoration(context), buildInputDecoration(context),
onSaved: (val) {}, onSaved: (val) {},
@ -215,14 +219,15 @@ class SMSOTP {
validator: validateCodeDigit)), validator: validateCodeDigit)),
Container( Container(
margin: EdgeInsets.all(5), margin: EdgeInsets.all(5),
width: SizeConfig.realScreenWidth * 0.16, width: dialogWidth / 4 - 30,
child: TextFormField( child: TextFormField(
focusNode: focusD4, focusNode: focusD4,
maxLength: 1, maxLength: 1,
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: buildTextStyle(), style: buildTextStyle(),
controller: digit4, controller: digit4,
keyboardType: TextInputType.number, keyboardType: TextInputType
.number,
decoration: decoration:
buildInputDecoration(context), buildInputDecoration(context),
onFieldSubmitted: (_) { onFieldSubmitted: (_) {

Loading…
Cancel
Save