From 34b44849723b673829291a30be3e06631961919b Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Tue, 14 Dec 2021 08:30:32 +0200 Subject: [PATCH] fix tabs --- lib/config/config.dart | 4 ++-- lib/screens/doctor/doctor_replay/doctor_reply_screen.dart | 2 ++ lib/screens/patients/In_patient/in_patient_screen.dart | 2 ++ lib/screens/patients/out_patient/out_patient_screen.dart | 4 +--- .../patients/profile/referral/patient_referral_screen.dart | 1 + 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 09a3fcf8..03c74f52 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/doctor/doctor_replay/doctor_reply_screen.dart b/lib/screens/doctor/doctor_replay/doctor_reply_screen.dart index 4905da58..d30457b4 100644 --- a/lib/screens/doctor/doctor_replay/doctor_reply_screen.dart +++ b/lib/screens/doctor/doctor_replay/doctor_reply_screen.dart @@ -81,6 +81,8 @@ class _DoctorReplyScreenState extends State preferredSize: Size.fromHeight( MediaQuery.of(context).size.height * 0.070), child: Container( + color: Helpers.getBgTabColor(), + child: TabBar( isScrollable: false, controller: _tabController, diff --git a/lib/screens/patients/In_patient/in_patient_screen.dart b/lib/screens/patients/In_patient/in_patient_screen.dart index 5be1c1c5..ebb3118a 100644 --- a/lib/screens/patients/In_patient/in_patient_screen.dart +++ b/lib/screens/patients/In_patient/in_patient_screen.dart @@ -127,6 +127,8 @@ class _InPatientScreenState extends State color: Colors.white), child: Container( margin: EdgeInsets.only(top: 9), + color: Helpers.getBgTabColor(), + child: TabBar( isScrollable: false, controller: _tabController, diff --git a/lib/screens/patients/out_patient/out_patient_screen.dart b/lib/screens/patients/out_patient/out_patient_screen.dart index ab320f07..59601ea7 100644 --- a/lib/screens/patients/out_patient/out_patient_screen.dart +++ b/lib/screens/patients/out_patient/out_patient_screen.dart @@ -107,9 +107,7 @@ class _OutPatientsScreenState extends State { Container( // color: Colors.red, height: Helpers.getTabHeight(context), - decoration: TextFieldsUtils.containerBorderDecoration( - Color(0Xffffffff), Color(0xFFCCCCCC), - borderRadius: 4, borderWidth: 0), + color: Helpers.getBgTabColor(), child: Row( mainAxisSize: MainAxisSize.max, crossAxisAlignment: CrossAxisAlignment.center, diff --git a/lib/screens/patients/profile/referral/patient_referral_screen.dart b/lib/screens/patients/profile/referral/patient_referral_screen.dart index bb9db904..4dab4270 100644 --- a/lib/screens/patients/profile/referral/patient_referral_screen.dart +++ b/lib/screens/patients/profile/referral/patient_referral_screen.dart @@ -60,6 +60,7 @@ class _PatientReferralScreen extends State child: Center( child: Container( height: Helpers.getTabHeight(context), + color: Helpers.getBgTabColor(), child: Center( child: TabBar( isScrollable: false,