Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'hot_fix' into 'development'

Browse Source 
hot fix

See merge request Cloud_Solution/doctor_app_flutter!973
merge-requests/975/head
Elham Ali 4 years ago
parent d22ea2e2fa 70fa365377
commit 40faef136d
1 changed files with 57 additions and 59 deletions
Show Stats Download Patch File Download Diff File

116
lib/screens/procedures/base_add_procedure_tab_page.dart
Unescape Escape View File

@ -78,72 +78,70 @@ class _BaseAddProcedureTabPageState extends State<BaseAddProcedureTabPage>
appBar: BottomSheetTitle(title: procedureType.getToolbarLabel(context),), appBar: BottomSheetTitle(title: procedureType.getToolbarLabel(context),),
body: NetworkBaseView( body: NetworkBaseView(
baseViewModel: model, baseViewModel: model,
child: Expanded( child: Scaffold(
child: Scaffold( extendBodyBehindAppBar: true,
extendBodyBehindAppBar: true, appBar: PreferredSize(
appBar: PreferredSize( preferredSize: Size.fromHeight(
preferredSize: Size.fromHeight( MediaQuery.of(context).size.height * 0.070),
MediaQuery.of(context).size.height * 0.070), child: TabBar(
child: TabBar( isScrollable: false,
isScrollable: false, controller: _tabController,
controller: _tabController, indicatorColor: Colors.transparent,
indicatorColor: Colors.transparent, indicatorWeight: 1.0,
indicatorWeight: 1.0, indicatorSize: TabBarIndicatorSize.tab,
indicatorSize: TabBarIndicatorSize.tab, labelColor: Theme.of(context).primaryColor,
labelColor: Theme.of(context).primaryColor, labelPadding: EdgeInsets.only(
labelPadding: EdgeInsets.only( top: 0, left: 0, right: 0, bottom: 0),
top: 0, left: 0, right: 0, bottom: 0), unselectedLabelColor: Colors.grey[800],
unselectedLabelColor: Colors.grey[800], tabs: [
tabs: [ tabWidget(
tabWidget( screenSize,
screenSize, _activeTab == 0,
_activeTab == 0,
procedureType procedureType
.getFavouriteTabName(context), .getFavouriteTabName(context),
isFirst: true,context: context isFirst: true,context: context
), ),
tabWidget( tabWidget(
screenSize, screenSize,
_activeTab == 1, _activeTab == 1,
procedureType.getAllLabelName(context), procedureType.getAllLabelName(context),
isLast: true,context: context isLast: true,context: context
), ),
], ],
),
), ),
body: Column( ),
children: [ body: Column(
Expanded( children: [
child: TabBarView( Expanded(
physics: BouncingScrollPhysics(), child: TabBarView(
controller: _tabController, physics: BouncingScrollPhysics(),
children: [ controller: _tabController,
AddFavouriteProcedure( children: [
previousProcedureViewModel: model, AddFavouriteProcedure(
prescriptionModel: previousProcedureViewModel: model,
prescriptionModel:
widget.prescriptionModel,
patient: patient,
procedureType: procedureType,
),
if (widget.procedureType ==
ProcedureType.PRESCRIPTION)
AddPrescription(
widget.prescriptionModel, widget.prescriptionModel,
widget.patient,
widget.prescriptionModel.prescriptionList,
)
else
AddProcedurePage(
model: this.model,
patient: patient, patient: patient,
procedureType: procedureType, procedureType: procedureType,
), ),
if (widget.procedureType == ],
ProcedureType.PRESCRIPTION)
AddPrescription(
widget.prescriptionModel,
widget.patient,
widget.prescriptionModel.prescriptionList,
)
else
AddProcedurePage(
model: this.model,
patient: patient,
procedureType: procedureType,
),
],
),
), ),
], ),
), ],
), ),
) )
), ),

Write Preview
Loading…
Cancel
Save