diff --git a/lib/config/config.dart b/lib/config/config.dart index 03c74f52..09a3fcf8 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -5,8 +5,8 @@ const ONLY_NUMBERS = "[0-9]"; const ONLY_LETTERS = "[a-zA-Z &'\"]"; const ONLY_DATE = "[0-9/]"; const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/'; -// const BASE_URL = 'https://hmgwebservices.com/'; -const BASE_URL = 'https://uat.hmgwebservices.com/'; +const BASE_URL = 'https://hmgwebservices.com/'; +// const BASE_URL = 'https://uat.hmgwebservices.com/'; const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh"; const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList"; const PATIENT_PROGRESS_NOTE_URL = diff --git a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart index b2261f4c..a62fae57 100644 --- a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart +++ b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart @@ -251,7 +251,7 @@ class _PatientProfileScreenState extends State radius: 30, hPadding: 20, fontWeight: FontWeight.normal, - fontSize: 1.6, + fontSize: 12, icon: SvgPicture.asset( "assets/images/svgs/profile_screen/create episode.svg", color: Colors.white, @@ -283,7 +283,7 @@ class _PatientProfileScreenState extends State radius: 30, hPadding: 20, fontWeight: FontWeight.normal, - fontSize: 1.6, + fontSize: 12, icon: SvgPicture.asset( "assets/images/svgs/profile_screen/modify episode.svg", color: Colors.white, diff --git a/lib/widgets/patients/patient_card/PatientCard.dart b/lib/widgets/patients/patient_card/PatientCard.dart index 00e43d71..4c13d1f6 100644 --- a/lib/widgets/patients/patient_card/PatientCard.dart +++ b/lib/widgets/patients/patient_card/PatientCard.dart @@ -62,7 +62,7 @@ class PatientCard extends StatelessWidget { decoration: Helpers.getCardBoxDecoration(), child: CardWithBgWidget( padding: 0, - marginLeft: (!isMyPatient && isInpatient) ||isFromLiveCare ? 0 : 10, + marginLeft: (!isMyPatient && isInpatient) || isFromLiveCare ? 0 : 10, marginSymmetric: isFromSearch ? 10 : 0.0, hasBorder: false, bgColor: isFromLiveCare @@ -95,6 +95,7 @@ class PatientCard extends StatelessWidget { padding: EdgeInsets.only(left: 12.0), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, children: [ patientInfo.patientStatusType == 43 ? Row( @@ -210,6 +211,8 @@ class PatientCard extends StatelessWidget { ? Column( crossAxisAlignment: CrossAxisAlignment.end, + mainAxisAlignment: + MainAxisAlignment.start, children: [ AppText( AppDateUtils @@ -221,14 +224,16 @@ class PatientCard extends StatelessWidget { isMonthShort: true, ), fontFamily: 'Poppins', - fontWeight: FontWeight.w400, - fontSize: 15, + fontWeight: FontWeight.w600, + fontSize: 11, + letterSpacing: -0.64, ), AppText( "${AppDateUtils.getStartTime(patientInfo.startTime)}", fontFamily: 'Poppins', - fontWeight: FontWeight.w400, - fontSize: 15, + fontWeight: FontWeight.w600, + fontSize: 11, + letterSpacing: -0.64, ), ], ) @@ -239,6 +244,8 @@ class PatientCard extends StatelessWidget { ? Column( crossAxisAlignment: CrossAxisAlignment.end, + mainAxisAlignment: + MainAxisAlignment.start, children: [ AppText( "${AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.convertStringToDate( @@ -246,14 +253,16 @@ class PatientCard extends StatelessWidget { .appointmentDate, ), isMonthShort: true)}", fontFamily: 'Poppins', - fontWeight: FontWeight.w400, - fontSize: 15, + fontWeight: FontWeight.w600, + fontSize: 11, + letterSpacing: -0.64, ), AppText( " ${AppDateUtils.getStartTime(patientInfo.startTime)}", fontFamily: 'Poppins', - fontWeight: FontWeight.w400, - fontSize: 15, + fontWeight: FontWeight.w600, + fontSize: 11, + letterSpacing: -0.64, ), ], ) @@ -301,66 +310,66 @@ class PatientCard extends StatelessWidget { textOverflow: TextOverflow.ellipsis, ), if (patientInfo.gender == 1) - Icon( - DoctorApp.male_2, - color: Colors.blue, - size: 18, - ) + Container( + padding: EdgeInsets.symmetric(horizontal: 4, vertical: 2), + child: SvgPicture.asset("assets/images/svgs/male.svg"),) else - Icon( - DoctorApp.female_1, - color: Colors.pink, - size: 18, - ), + Container( + padding: EdgeInsets.symmetric(horizontal: 4, vertical: 2), + child: SvgPicture.asset("assets/images/svgs/female.svg"),), if (isFromLiveCare) ShowTimer( patientInfo: patientInfo, ), ]), ), - if(nationalityName.isNotEmpty) - Expanded( - child: Row( - mainAxisAlignment: MainAxisAlignment.end, - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - Expanded( - child: Container( - padding: EdgeInsets.only(top: 8), - alignment: Alignment.centerRight, - child: AppText( - nationalityName.truncate(14), - fontWeight: FontWeight.w600, - fontSize: 10, - color: Color(0xFF2E303A), - textOverflow: TextOverflow.ellipsis, + if (nationalityName.isNotEmpty) + Expanded( + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Expanded( + child: Container( + padding: EdgeInsets.only(top: 5), + alignment: Alignment.centerRight, + child: AppText( + nationalityName.truncate(14), + fontWeight: FontWeight.w600, + fontSize: 10, + color: Color(0xFF2E303A), + textOverflow: TextOverflow.ellipsis, + ), ), ), - ), - patientInfo.nationality != null || - patientInfo.nationalityId != null - ? ClipRRect( - borderRadius: - BorderRadius.circular(20.0), - child: CachedNetworkImage( - imageUrl: patientInfo - .nationalityFlagURL != - null - ? patientInfo.nationalityFlagURL - : '', - height: 16, - width: 22, - errorWidget: - (context, url, error) => - AppText( - 'No Image', - fontSize: 10, - ), - )) - : SizedBox() - ], - ), - ) + patientInfo.nationality != null || + patientInfo.nationalityId != null + ? Container( + padding: EdgeInsets.only(top: 5), + child: ClipRRect( + borderRadius: + BorderRadius.circular(20.0), + child: CachedNetworkImage( + imageUrl: patientInfo + .nationalityFlagURL != + null + ? patientInfo + .nationalityFlagURL + : '', + height: 16, + width: 22, + errorWidget: + (context, url, error) => + AppText( + 'No Image', + fontSize: 10, + ), + )), + ) + : SizedBox() + ], + ), + ) ], )), SizedBox( @@ -374,10 +383,11 @@ class PatientCard extends StatelessWidget { child: Container( width: 60, height: 60, - child: Image.asset( + //TODO Elham* create widget for this to make it use every where + child: SvgPicture.asset( patientInfo.gender == 1 - ? 'assets/images/male_avatar.png' - : 'assets/images/female_avatar.png', + ? 'assets/images/svgs/male avatar.svg' + : 'assets/images/svgs/female avatar.svg', fit: BoxFit.cover, ), ), @@ -479,9 +489,11 @@ class PatientCard extends StatelessWidget { : !isInpatient && !isFromSearch ? Row( mainAxisAlignment: MainAxisAlignment.end, + crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - padding: EdgeInsets.all(4), + padding: EdgeInsets.only( + left: 13, right: 13, bottom: 13), child: SvgPicture.asset( patientInfo.appointmentType == 'Regular' && @@ -498,11 +510,16 @@ class PatientCard extends StatelessWidget { : (isInpatient == true) ? Row( mainAxisAlignment: MainAxisAlignment.end, + crossAxisAlignment: + CrossAxisAlignment.start, children: [ Container( - padding: EdgeInsets.all(4), - child: Image.asset( - 'assets/images/inpatient.png', + padding: EdgeInsets.only( + left: 13, + right: 13, + bottom: 13), + child: SvgPicture.asset( + 'assets/images/svgs/inpatient.svg', height: 25, width: 35, )), diff --git a/lib/widgets/shared/buttons/app_buttons_widget.dart b/lib/widgets/shared/buttons/app_buttons_widget.dart index cc9559e3..bb43dc8c 100644 --- a/lib/widgets/shared/buttons/app_buttons_widget.dart +++ b/lib/widgets/shared/buttons/app_buttons_widget.dart @@ -32,7 +32,7 @@ class AppButton extends StatefulWidget { this.iconData, this.icon, this.color, - this.fontSize = 2, + this.fontSize = 16, this.padding = 13, this.loading = false, this.disabled = false, @@ -107,7 +107,7 @@ class _AppButtonState extends State { child: AppText( widget.title, color: widget.fontColor, - fontSize: 16.0, + fontSize: widget.fontSize, fontWeight: FontWeight.w600, letterSpacing: -0.48, ), diff --git a/lib/widgets/shared/errors/error_message.dart b/lib/widgets/shared/errors/error_message.dart index 21e04e6c..2930ae84 100644 --- a/lib/widgets/shared/errors/error_message.dart +++ b/lib/widgets/shared/errors/error_message.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import '../app_texts_widget.dart'; @@ -18,7 +19,7 @@ class ErrorMessage extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.center, children: [ SizedBox(height: 100,), - Image.asset('assets/images/no-data.png'), + SvgPicture.asset('assets/images/svgs/no data.svg'), Center( child: Center( child: Padding(