bug fixes

merge-requests/447/head
mosazaid 5 years ago
parent 8b6b7fe2e6
commit b735a69a4f

@ -17,6 +17,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.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:doctor_app_flutter/widgets/shared/borderedButton.dart'; import 'package:doctor_app_flutter/widgets/shared/borderedButton.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';

@ -8,6 +8,7 @@ import 'package:doctor_app_flutter/widgets/patients/profile/profile-welcome-widg
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.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:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../../../routes.dart'; import '../../../../routes.dart';
@ -74,11 +75,8 @@ class MyReferralPatientScreen extends StatelessWidget {
'referral': model.pendingReferral[index] 'referral': model.pendingReferral[index]
}); });
}, },
child: Icon( child: Icon(FontAwesomeIcons.arrowRight,
Icons.info_outline, size: 25, color: Colors.black),
color: Colors.black,
size: 30,
),
), ),
), ),
), ),

@ -463,36 +463,41 @@ class PatientReferralItemWidget extends StatelessWidget {
width: 30, width: 30,
height: 30, height: 30,
margin: EdgeInsets.only( margin: EdgeInsets.only(
left: projectViewModel.isArabic ? 10 : 10 /*10:85*/, left:
right: projectViewModel.isArabic ? 10 : 10 /*85:10*/, projectViewModel.isArabic ? 10 : 10 /*10:85*/,
right:
projectViewModel.isArabic ? 10 : 10 /*85:10*/,
top: 5), top: 5),
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.rectangle, shape: BoxShape.rectangle,
border: Border( border: Border(
bottom: bottom: BorderSide(
BorderSide(color: Colors.grey[400], width: 2.5), color: Colors.grey[400], width: 2.5),
left: left: BorderSide(
BorderSide(color: Colors.grey[400], width: 2.5), color: Colors.grey[400], width: 2.5),
)), )),
), ),
Expanded( Expanded(
flex: 4, flex: 4,
child: Container( child: Container(
margin: EdgeInsets.only(left: 10, top: 25, right : 10, bottom: 0), margin: EdgeInsets.only(
left: 10, top: 25, right: 10, bottom: 0),
child: Column( child: Column(
children: [ children: [
RichText( RichText(
text: TextSpan( text: TextSpan(
style: TextStyle( style: TextStyle(
fontSize: 2.0 * SizeConfig.textMultiplier, fontSize:
2.0 * SizeConfig.textMultiplier,
color: Colors.black), color: Colors.black),
children: <TextSpan>[ children: <TextSpan>[
TextSpan( TextSpan(
text: TranslationBase.of(context) text: TranslationBase.of(context)
.referralDoctor + .referralDoctor +
" : ", " : ",
style: TextStyle( style: TextStyle(
fontSize: 14, fontFamily: 'Poppins')), fontSize: 14,
fontFamily: 'Poppins')),
TextSpan( TextSpan(
text: referralDoctorName, text: referralDoctorName,
style: TextStyle( style: TextStyle(
@ -511,8 +516,7 @@ class PatientReferralItemWidget extends StatelessWidget {
Container( Container(
width: double.infinity, width: double.infinity,
alignment: Alignment.centerRight, alignment: Alignment.centerRight,
child: Icon(FontAwesomeIcons.arrowRight, child: infoIcon ?? Container())
size: 25, color: Colors.black))
], ],
), ),
// onTap: onTap, // onTap: onTap,

@ -116,7 +116,7 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: 12, fontSize: 12,
), ),
arrivalType == '1' arrivalType == '1'|| patient.arrivedOn == null
? AppText( ? AppText(
patient.startTime != null patient.startTime != null
? patient.startTime ? patient.startTime

@ -116,7 +116,7 @@ class PatientProfileHeaderNewDesign extends StatelessWidget {
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: 12, fontSize: 12,
), ),
arrivalType == '1' arrivalType == '1' || patient.arrivedOn == null
? AppText( ? AppText(
patient.startTime != null patient.startTime != null
? patient.startTime ? patient.startTime

@ -150,7 +150,7 @@ class PatientProfileHeaderWhitAppointment extends StatelessWidget {
'Poppins', 'Poppins',
fontSize: 12, fontSize: 12,
), ),
arrivalType == '1' arrivalType == '1' || patient.arrivedOn == null
? AppText( ? AppText(
patient.startTime != patient.startTime !=
null null

@ -150,7 +150,7 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
'Poppins', 'Poppins',
fontSize: 12, fontSize: 12,
), ),
arrivalType == '1' arrivalType == '1' || patient.arrivedOn == null
? AppText( ? AppText(
patient.startTime != patient.startTime !=
null null

Loading…
Cancel
Save