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

Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services

Browse Source
merge-requests/468/head
Mohammad Aljammal 4 years ago
parent 0dc6bbca34 77b4e0fdbe
commit 57d0243878
6 changed files with 83 additions and 54 deletions
Show Stats Download Patch File Download Diff File

2
lib/widgets/auth/known_user_login.dart
Unescape Escape View File

@ -319,7 +319,7 @@ class _KnownUserLoginState extends State<KnownUserLogin> {
} }
navigateToHome() { navigateToHome() {
Navigator.of(context).pushNamed(HOME); Navigator.of(context).pushReplacementNamed(HOME);
} }
showErorrMsg(localMsg) { showErorrMsg(localMsg) {

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

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

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

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

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

@ -122,7 +122,7 @@ class SMSOTP {
child: Directionality( child: Directionality(
textDirection: TextDirection.ltr, textDirection: TextDirection.ltr,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: <Widget>[ children: <Widget>[
Container( Container(
width: SizeConfig.realScreenWidth * 0.15, width: SizeConfig.realScreenWidth * 0.15,
@ -233,22 +233,23 @@ class SMSOTP {
)), )),
), ),
), ),
Padding( Column(
padding: EdgeInsets.only(top: 10), mainAxisAlignment: MainAxisAlignment.start,
child: Row(children: [ crossAxisAlignment: CrossAxisAlignment.start,
Expanded( children: [
child: AppText( AppText(
TranslationBase.of(context).validationMessage + ' ', TranslationBase.of(context).validationMessage + ' ',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), fontSize: 14,
), ),
AppText( AppText(
displayTime, displayTime,
color: Colors.red, color: Colors.red,
textAlign: TextAlign.center, textAlign: TextAlign.start,
fontWeight: FontWeight.bold, 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( CircleAvatar(
// radius: (52) // radius: (52)
child: ClipRRect( child: ClipRRect(
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(20),
child: Image.network( child: Image.network(
authProvider.doctorProfile.doctorImageURL, authProvider.doctorProfile.doctorImageURL,
fit: BoxFit.fill, fit: BoxFit.fill,

22
lib/widgets/shared/doctor_card_insurance.dart
Unescape Escape View File

@ -1,4 +1,5 @@
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/large_avatar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/large_avatar.dart';
import 'package:eva_icons_flutter/eva_icons_flutter.dart'; import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -89,7 +90,7 @@ class DoctorCardInsurance extends StatelessWidget {
child: Padding( child: Padding(
padding: const EdgeInsets.all(5.0), padding: const EdgeInsets.all(5.0),
child: Texts( child: Texts(
'$patientOut', '$patientOut'.replaceAll(" ", ""),
color: Colors.white, color: Colors.white,
fontSize: 13.0, fontSize: 13.0,
), ),
@ -102,7 +103,7 @@ class DoctorCardInsurance extends StatelessWidget {
Expanded( Expanded(
child: Texts( child: Texts(
doctorName, doctorName,
bold: true, fontWeight: FontWeight.w700,
)), )),
], ],
), ),
@ -153,11 +154,13 @@ class DoctorCardInsurance extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Texts( Texts(
'Clinic: ', 'Clinic: ',
color: Colors.grey[500], //fontWeight: FontWeight.w600,
//color: Colors.grey[500],
), ),
Expanded( Expanded(
child: Texts( child: Texts(
clinic, clinic,
fontWeight: FontWeight.w700,
), ),
) )
], ],
@ -167,19 +170,24 @@ class DoctorCardInsurance extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Texts( Texts(
'Approval No: ', 'Approval No: ',
color: Colors.grey[500], //color: Colors.grey[500],
), ),
Texts( Texts(
branch, branch,
fontWeight: FontWeight.w700,
) )
], ],
) )
]), ]),
), ),
), ),
Icon( Padding(
EvaIcons.eye, padding:
size: 38.0, const EdgeInsets.symmetric(horizontal: 15.0),
child: Icon(
DoctorApp.view,
size: 22.0,
),
) )
], ],
), ),

Write Preview
Loading…
Cancel
Save