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/widgets/patients/patient_card/PatientCard.dart b/lib/widgets/patients/patient_card/PatientCard.dart index 1365871c..00e43d71 100644 --- a/lib/widgets/patients/patient_card/PatientCard.dart +++ b/lib/widgets/patients/patient_card/PatientCard.dart @@ -12,6 +12,7 @@ import 'package:doctor_app_flutter/widgets/shared/user-guid/CusomRow.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:cached_network_image/cached_network_image.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:provider/provider.dart'; import '../../../util/extenstions.dart'; @@ -61,7 +62,7 @@ class PatientCard extends StatelessWidget { decoration: Helpers.getCardBoxDecoration(), child: CardWithBgWidget( padding: 0, - marginLeft: (!isMyPatient && isInpatient) ? 0 : 10, + marginLeft: (!isMyPatient && isInpatient) ||isFromLiveCare ? 0 : 10, marginSymmetric: isFromSearch ? 10 : 0.0, hasBorder: false, bgColor: isFromLiveCare @@ -317,6 +318,7 @@ class PatientCard extends StatelessWidget { ), ]), ), + if(nationalityName.isNotEmpty) Expanded( child: Row( mainAxisAlignment: MainAxisAlignment.end, @@ -466,11 +468,11 @@ class PatientCard extends StatelessWidget { children: [ Container( padding: EdgeInsets.all(4), - child: Image.asset( - 'assets/images/livecare.png', - height: 25, - width: 35, - color: Colors.grey.shade700, + child: SvgPicture.asset( + 'assets/images/svgs/profile_screen/livecare.svg', + height: 20, + width: 20, + // color: Colors.grey.shade700, )), ], ) @@ -480,15 +482,15 @@ class PatientCard extends StatelessWidget { children: [ Container( padding: EdgeInsets.all(4), - child: Image.asset( + child: SvgPicture.asset( patientInfo.appointmentType == 'Regular' && patientInfo.visitTypeId == 100 - ? 'assets/images/livecare.png' + ? 'assets/images/svgs/profile_screen/livecare.svg' : patientInfo.appointmentType == 'Walkin' - ? 'assets/images/walkin.png' - : 'assets/images/booked.png', + ? 'assets/images/svgs/profile_screen/walkin.svg' + : 'assets/images/svgs/profile_screen/booked.svg', height: 25, width: 35, )), diff --git a/lib/widgets/shared/bottom_nav_bar.dart b/lib/widgets/shared/bottom_nav_bar.dart index bcce6818..dca59ee0 100644 --- a/lib/widgets/shared/bottom_nav_bar.dart +++ b/lib/widgets/shared/bottom_nav_bar.dart @@ -41,56 +41,61 @@ class _BottomNavBarState extends State { elevation: 4, shape: CircularNotchedRectangle(), color: Colors.white, - child: Padding( - padding: EdgeInsets.symmetric(horizontal: 18), - child: Row( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: MainAxisAlignment.spaceAround, - children: [ - BottomNavigationItem( - icon: DoctorApp.home_1, - activeIcon: DoctorApp.home_active_1, - svgPath: "assets/images/svgs/bottom_nav/home-active.svg", - changeIndex: _changeIndex, - index: widget.index, - currentIndex: 0, - name: TranslationBase.of(context).home, - dashboardViewModel: widget.dashboardViewModel, - ), - BottomNavigationItem( - icon: DoctorApp.schedule_1, - activeIcon: DoctorApp.schedule_active_1, - svgPath: "assets/images/svgs/bottom_nav/schedule-active.svg", - changeIndex: _changeIndex, - index: widget.index, - currentIndex: 1, - name: TranslationBase.of(context).mySchedule, - dashboardViewModel: widget.dashboardViewModel, + child: Container( + decoration: BoxDecoration( + border: Border.all(color: Color(0XFFEFEFEF), width: 1) + ), + child: Padding( + padding: EdgeInsets.symmetric(horizontal: 18), + child: Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + BottomNavigationItem( + icon: DoctorApp.home_1, + activeIcon: DoctorApp.home_active_1, + svgPath: "assets/images/svgs/bottom_nav/home-active.svg", + changeIndex: _changeIndex, + index: widget.index, + currentIndex: 0, + name: TranslationBase.of(context).home, + dashboardViewModel: widget.dashboardViewModel, + ), + BottomNavigationItem( + icon: DoctorApp.schedule_1, + activeIcon: DoctorApp.schedule_active_1, + svgPath: "assets/images/svgs/bottom_nav/schedule-active.svg", + changeIndex: _changeIndex, + index: widget.index, + currentIndex: 1, + name: TranslationBase.of(context).mySchedule, + dashboardViewModel: widget.dashboardViewModel, - ), - BottomNavigationItem( - icon: DoctorApp.qr_reader, - activeIcon: DoctorApp.qr_reader_active_1, - svgPath: "assets/images/svgs/bottom_nav/reader-active.svg", - changeIndex: _changeIndex, - index: widget.index, - currentIndex: 2, - name: TranslationBase.of(context).qr, - dashboardViewModel: widget.dashboardViewModel, + ), + BottomNavigationItem( + icon: DoctorApp.qr_reader, + activeIcon: DoctorApp.qr_reader_active_1, + svgPath: "assets/images/svgs/bottom_nav/reader-active.svg", + changeIndex: _changeIndex, + index: widget.index, + currentIndex: 2, + name: TranslationBase.of(context).qr, + dashboardViewModel: widget.dashboardViewModel, - ), - BottomNavigationItem( - icon: DoctorApp.dr_reply_1, - activeIcon: DoctorApp.dr_reply_active_1, - svgPath: "assets/images/svgs/bottom_nav/reply-active.svg", - changeIndex: _changeIndex, - index: widget.index, - currentIndex: 3, - name: TranslationBase.of(context).replay2, - dashboardViewModel: widget.dashboardViewModel, + ), + BottomNavigationItem( + icon: DoctorApp.dr_reply_1, + activeIcon: DoctorApp.dr_reply_active_1, + svgPath: "assets/images/svgs/bottom_nav/reply-active.svg", + changeIndex: _changeIndex, + index: widget.index, + currentIndex: 3, + name: TranslationBase.of(context).replay2, + dashboardViewModel: widget.dashboardViewModel, - ), - ], + ), + ], + ), ), ), );