Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

login screen updated

Browse Source
merge-requests/464/head
Sultan Khan 4 years ago
parent e46d7c34ad
commit d77bd19450
4 changed files with 67 additions and 46 deletions
Show Stats Download Patch File Download Diff File

35
lib/widgets/auth/login_form.dart
Unescape Escape View File

@ -79,7 +79,7 @@ class _LoginFormState extends State<LoginForm> {
child: AppText(
TranslationBase.of(context).enterCredentials,
fontSize: 18,
fontWeight: FontWeight.w600,
fontWeight: FontWeight.bold,
),
padding: EdgeInsets.only(top: 10, bottom: 10)),
Container(
@ -97,7 +97,8 @@ class _LoginFormState extends State<LoginForm> {
padding: EdgeInsets.only(left: 10, top: 10),
child: AppText(
TranslationBase.of(context).enterId,
fontWeight: FontWeight.w600,
fontWeight: FontWeight.w800,
fontSize: 14,
)),
AppTextFormField(
labelText: '',
@ -144,7 +145,8 @@ class _LoginFormState extends State<LoginForm> {
padding: EdgeInsets.only(left: 10, top: 10),
child: AppText(
TranslationBase.of(context).enterPassword,
fontWeight: FontWeight.w600,
fontWeight: FontWeight.w800,
fontSize: 14,
)),
AppTextFormField(
focusNode: focusPass,
@ -198,6 +200,7 @@ class _LoginFormState extends State<LoginForm> {
focusNode: focusProject,
controller: projectIdController,
borderColor: Colors.white,
suffixIcon: Icons.arrow_drop_down,
onTap: () {
helpers.showCupertinoPicker(
context,
@ -234,19 +237,27 @@ class _LoginFormState extends State<LoginForm> {
padding: EdgeInsets.only(left: 10, top: 10),
child: AppText(
TranslationBase.of(context).selectYourProject,
fontWeight: FontWeight.w600,
fontWeight: FontWeight.w800,
fontSize: 14,
)),
AppTextFormField(
readOnly: true, borderColor: Colors.white
// decoration: buildInputDecoration(
// context,
// TranslationBase.of(context)
// .pleaseEnterYourProject,
// 'assets/images/password_icon.png')
readOnly: true, borderColor: Colors.white,
prefix: IconButton(
icon: Icon(Icons.arrow_drop_down),
iconSize: 30,
padding: EdgeInsets.only(bottom: 30),
),
)
// decoration: buildInputDecoration(
// context,
// TranslationBase.of(context)
// .pleaseEnterYourProject,
// 'assets/images/password_icon.png')
)
])),
buildSizedBox(),
SizedBox(
height: 100,
),
Row(
children: <Widget>[

53
lib/widgets/auth/verification_methods.dart
Unescape Escape View File

@ -155,7 +155,7 @@ class _VerificationMethodsState extends State<VerificationMethods> {
child: Row(
children: <Widget>[
Flexible(
flex: 4,
flex: 3,
child: ListTile(
title: Text(
TranslationBase.of(
@ -164,15 +164,17 @@ class _VerificationMethodsState extends State<VerificationMethods> {
overflow: TextOverflow
.ellipsis,
style: TextStyle(
fontFamily: 'Poppins',
fontWeight:
FontWeight.w600,
),
fontFamily:
'Poppins',
fontWeight:
FontWeight.w800,
fontSize: 14),
),
subtitle: AppText(
getType(
user.logInTypeID,
context),
fontSize: 14,
)
// Text(
// user.editedOn != null
@ -208,6 +210,9 @@ class _VerificationMethodsState extends State<VerificationMethods> {
: '--',
textAlign:
TextAlign.right,
fontSize: 14,
fontWeight:
FontWeight.w800,
),
subtitle: AppText(
user.editedOn != null
@ -223,6 +228,7 @@ class _VerificationMethodsState extends State<VerificationMethods> {
: '--',
textAlign:
TextAlign.right,
fontSize: 14,
),
))
],
@ -487,8 +493,8 @@ class _VerificationMethodsState extends State<VerificationMethods> {
children: [
Image.asset(
'assets/images/verify-whtsapp.png',
height: SizeConfig.imageSizeMultiplier * 13,
width: SizeConfig.imageSizeMultiplier * 16,
height: 60,
width: 60,
),
],
),
@ -497,7 +503,8 @@ class _VerificationMethodsState extends State<VerificationMethods> {
),
AppText(
TranslationBase.of(context).verifyWhatsApp,
fontSize: SizeConfig.textMultiplier * 2.2,
fontSize: 14,
fontWeight: FontWeight.w600,
)
],
),
@ -520,8 +527,8 @@ class _VerificationMethodsState extends State<VerificationMethods> {
children: <Widget>[
Image.asset(
'assets/images/verify-sms.png',
height: SizeConfig.imageSizeMultiplier * 13,
width: SizeConfig.imageSizeMultiplier * 16,
height: 60,
width: 60,
),
projectsProvider.isArabic
? SizedBox(
@ -532,9 +539,8 @@ class _VerificationMethodsState extends State<VerificationMethods> {
),
AppText(
TranslationBase.of(context).verifySMS,
fontSize: projectsProvider.isArabic
? SizeConfig.textMultiplier * 1.8
: SizeConfig.textMultiplier * 2.2,
fontSize: 14,
fontWeight: FontWeight.w600,
)
],
),
@ -560,15 +566,16 @@ class _VerificationMethodsState extends State<VerificationMethods> {
children: <Widget>[
Image.asset(
'assets/images/verification_fingerprint_icon.png',
height: SizeConfig.imageSizeMultiplier * 13,
width: SizeConfig.imageSizeMultiplier * 16,
height: 60,
width: 60,
),
SizedBox(
height: 20,
),
AppText(
TranslationBase.of(context).verifyFingerprint,
fontSize: SizeConfig.textMultiplier * 2.2,
fontSize: 14,
fontWeight: FontWeight.w600,
)
],
),
@ -602,15 +609,16 @@ class _VerificationMethodsState extends State<VerificationMethods> {
children: <Widget>[
Image.asset(
'assets/images/verification_faceid_icon.png',
height: SizeConfig.imageSizeMultiplier * 13,
width: SizeConfig.imageSizeMultiplier * 16,
height: 60,
width: 60,
),
SizedBox(
height: 20,
),
AppText(
TranslationBase.of(context).verifyFaceID,
fontSize: SizeConfig.textMultiplier * 2.2,
fontSize: 14,
fontWeight: FontWeight.w600,
)
],
),
@ -640,8 +648,8 @@ class _VerificationMethodsState extends State<VerificationMethods> {
children: <Widget>[
Image.asset(
'assets/images/login/more_icon.png',
height: SizeConfig.imageSizeMultiplier * 13,
width: SizeConfig.imageSizeMultiplier * 16,
height: 60,
width: 60,
),
projectsProvider.isArabic
? SizedBox(
@ -652,7 +660,8 @@ class _VerificationMethodsState extends State<VerificationMethods> {
),
AppText(
TranslationBase.of(context).moreVerification,
fontSize: SizeConfig.textMultiplier * 2.2,
fontSize: 14,
fontWeight: FontWeight.w600,
// textAlign: TextAlign.center,
)
],

23
lib/widgets/otp/sms-popup.dart
Unescape Escape View File

@ -122,7 +122,7 @@ class SMSOTP {
child: Directionality(
textDirection: TextDirection.ltr,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: <Widget>[
Container(
width: SizeConfig.realScreenWidth * 0.15,
@ -233,22 +233,23 @@ class SMSOTP {
)),
),
),
Padding(
padding: EdgeInsets.only(top: 10),
child: Row(children: [
Expanded(
child: AppText(
TranslationBase.of(context).validationMessage + ' ',
fontWeight: FontWeight.w600,
),
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.center,
textAlign: TextAlign.start,
fontWeight: FontWeight.bold,
fontSize: 14,
)
]))
])
],
))),
);

2
lib/widgets/patients/profile/profile-welcome-widget.dart
Unescape Escape View File

@ -57,7 +57,7 @@ class ProfileWelcomeWidget extends StatelessWidget {
CircleAvatar(
// radius: (52)
child: ClipRRect(
borderRadius: BorderRadius.circular(10),
borderRadius: BorderRadius.circular(20),
child: Image.network(
authProvider.doctorProfile.doctorImageURL,
fit: BoxFit.fill,

Write Preview
Loading…
Cancel
Save