fix merge issue in patient_referral_screen.dart

merge-requests/924/head
Elham Rababh 4 years ago
parent 3200a7a351
commit af10c60a7e

@ -46,15 +46,17 @@ class _PatientReferralScreen extends State<PatientReferralScreen>
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return AppScaffold(
isShowAppBar: true,
appBar: PatientSearchHeader( appBar: PatientSearchHeader(
title: TranslationBase.of(context).patientsreferral, title: TranslationBase.of(context).patientsreferral,
), ),
appBarTitle: TranslationBase.of(context).patientsreferral,
body: Scaffold( body: Scaffold(
extendBodyBehindAppBar: true, extendBodyBehindAppBar: true,
// backgroundColor: Colors.white, // backgroundColor: Colors.white,
appBar: PreferredSize( appBar: PreferredSize(
preferredSize: preferredSize:
Size.fromHeight(MediaQuery.of(context).size.height * 0.070), Size.fromHeight(MediaQuery.of(context).size.height * 0.070),
child: Center( child: Center(
child: Container( child: Container(
height: Helpers.getTabHeight(context), height: Helpers.getTabHeight(context),
@ -67,14 +69,14 @@ class _PatientReferralScreen extends State<PatientReferralScreen>
indicatorSize: TabBarIndicatorSize.tab, indicatorSize: TabBarIndicatorSize.tab,
labelColor: Theme.of(context).primaryColor, labelColor: Theme.of(context).primaryColor,
labelPadding: labelPadding:
EdgeInsets.only(top: 0, left: 0, right: 0, bottom: 0), EdgeInsets.only(top: 0, left: 0, right: 0, bottom: 0),
unselectedLabelColor: Colors.grey[800], unselectedLabelColor: Colors.grey[800],
tabs: [ tabs: [
Container( Container(
decoration: Helpers.getBoxTabsBoxDecoration( decoration: Helpers.getBoxTabsBoxDecoration(
isActive: index == 0, isFirst: true), isActive: index == 0, isFirst: true),
child: Center( child: Center(
child: Helpers.getTabText(title:TranslationBase.of(context).myReferredPatient, isActive:index == 0 ) child: Helpers.getTabText(title:TranslationBase.of(context).myReferredPatient, isActive:index == 0 )
), ),
), ),
Center( Center(
@ -82,7 +84,7 @@ class _PatientReferralScreen extends State<PatientReferralScreen>
decoration:Helpers.getBoxTabsBoxDecoration( decoration:Helpers.getBoxTabsBoxDecoration(
isActive: index == 1, isMiddle: true), isActive: index == 1, isMiddle: true),
child: Center( child: Center(
child:Helpers.getTabText(title:TranslationBase.of(context).referral, isActive:index == 1 ) child:Helpers.getTabText(title:TranslationBase.of(context).referral, isActive:index == 1 )
), ),
), ),
), ),
@ -101,20 +103,22 @@ class _PatientReferralScreen extends State<PatientReferralScreen>
), ),
), ),
), ),
Expanded( body: Column(
child: TabBarView( children: <Widget>[
physics: BouncingScrollPhysics(), Expanded(
controller: _tabController, child: TabBarView(
children: <Widget>[ physics: BouncingScrollPhysics(),
ReferredPatientScreen(), controller: _tabController,
MyReferralInPatientScreen(), children: <Widget>[
ReferralDischargedPatientPage() ReferredPatientScreen(),
// MyReferredPatient(), MyReferralInPatientScreen(),
], ReferralDischargedPatientPage()
), // MyReferredPatient(),
) ],
], ),
), )
); ],
),
));
} }
} }

Loading…
Cancel
Save