diff --git a/lib/screens/medicine/search_medicine_patient_screen.dart b/lib/screens/medicine/search_medicine_patient_screen.dart index 0e4d7e86..245c0602 100644 --- a/lib/screens/medicine/search_medicine_patient_screen.dart +++ b/lib/screens/medicine/search_medicine_patient_screen.dart @@ -50,17 +50,15 @@ class _SearchMedicinePatientScreen extends State child: Center( child: Container( height: 60.0, - color: Colors.white, margin: EdgeInsets.only(top: 10.0), - - width: MediaQuery.of(context).size.width, // 0.9, - // decoration: BoxDecoration( - // border: Border( - // bottom: BorderSide( - // color: Theme.of(context).dividerColor, - // width: 0.9), //width: 0.7 - // ), - // color: Colors.white), + width: MediaQuery.of(context).size.width * 0.92, // 0.9, + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + color: Theme.of(context).dividerColor, + width: 0.9), //width: 0.7 + ), + color: Colors.white), child: TabBar( isScrollable: true, onTap: (index) { @@ -69,42 +67,31 @@ class _SearchMedicinePatientScreen extends State }); }, controller: _tabController, - indicatorWeight: 0.01, - indicatorSize: TabBarIndicatorSize.label, + indicatorWeight: 5.0, + indicatorSize: TabBarIndicatorSize.tab, + indicatorColor: Colors.red[800], labelColor: Theme.of(context).primaryColor, - indicatorColor: Colors.grey[800], - // labelPadding: - // EdgeInsets.only(top: 4.0, left: 35.0, right: 35.0), + labelPadding: + EdgeInsets.only(top: 4.0, left: 35.0, right: 35.0), unselectedLabelColor: Colors.grey[800], tabs: [ Container( - width: MediaQuery.of(context).size.width * 0.40, - decoration: BoxDecoration( - color: activeIndex == 0 - ? Colors.red[700] - : Colors.grey[200], - borderRadius: BorderRadius.circular(5)), + width: MediaQuery.of(context).size.width * 0.30, child: Center( child: AppText( TranslationBase.of(context).searchPatient, - color: activeIndex == 0 ? Colors.white : Colors.black, + color: Colors.black, fontWeight: FontWeight.bold, ), ), ), Container( - width: MediaQuery.of(context).size.width * 0.40, - decoration: BoxDecoration( - color: activeIndex == 1 - ? Colors.red[700] - : Colors.grey[200], - borderRadius: BorderRadius.circular(5)), + width: MediaQuery.of(context).size.width * 0.30, child: Center( child: AppText( - TranslationBase.of(context).searchMedicine, - fontWeight: FontWeight.bold, - color: activeIndex == 1 ? Colors.white : Colors.black, - ), + TranslationBase.of(context).searchMedicine, + fontWeight: FontWeight.bold, + color: Colors.black), ), ), ], diff --git a/lib/screens/patients/profile/referral/patient_referral_screen.dart b/lib/screens/patients/profile/referral/patient_referral_screen.dart index f4b04d02..80f30aad 100644 --- a/lib/screens/patients/profile/referral/patient_referral_screen.dart +++ b/lib/screens/patients/profile/referral/patient_referral_screen.dart @@ -55,6 +55,7 @@ class _PatientReferralScreen extends State child: TabBar( isScrollable: true, controller: _tabController, + indicatorColor: Colors.red[800], indicatorWeight: 5.0, indicatorSize: TabBarIndicatorSize.tab, labelColor: Theme.of(context).primaryColor,